mirror of
https://github.com/mclueppers/xo-server.git
synced 2025-07-23 22:15:47 +02:00
Repository reorganization.
This commit is contained in:
Julien Fontanet
parent
bc2806bd05
commit
1209143de7
6
.gitignore
vendored
6
.gitignore
vendored
@ -1,4 +1,4 @@
|
||||
/src/config/local.php
|
||||
/src/database.json
|
||||
/src/log
|
||||
/config/local.php
|
||||
/database.json
|
||||
/log
|
||||
/vendor/
|
||||
|
||||
@ -17,8 +17,8 @@ _There is currently no package available for XO-Server, you must therefore use t
|
||||
|
||||
1. Download the code, you may either use git `git clone git://github.com/vatesfr/xo-server` or download a [Zip archive](https://github.com/vatesfr/xo-server/archive/master.zip).
|
||||
2. XO-Web uses [Composer](https://getcomposer.org) for its dependency management, so, once you have [installed it](https://getcomposer.org/download/), juste run `php composer.phar install`.
|
||||
3. Copy `src/config/local.php.dist` to `src/config/local.php` and complete the configuration.
|
||||
4. Finally, run `./src/xo-server`.
|
||||
3. Copy `config/local.php.dist` to `config/local.php` and complete the configuration.
|
||||
4. Finally, run `./xo-server`.
|
||||
|
||||
The first time you start XO-Server an `admin` user with the `admin` password is created.
|
||||
|
||||
|
||||
@ -11,10 +11,12 @@
|
||||
"require": {
|
||||
"php": ">=5.3.0",
|
||||
"ext-xmlrpc": "*",
|
||||
"ircmaxell/password-compat": "dev-master",
|
||||
"monolog/monolog": "~1.2",
|
||||
"ircmaxell/password-compat": "dev-master"
|
||||
"vates/eventus": "dev-master",
|
||||
"vates/rekodi": "dev-master"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": { "": "src/lib" }
|
||||
"psr-0": { "": "lib" }
|
||||
}
|
||||
}
|
||||
|
||||
118
composer.lock
generated
118
composer.lock
generated
@ -1,5 +1,5 @@
|
||||
{
|
||||
"hash": "d65aa7e3aad71264202dfcffcccb3cc1",
|
||||
"hash": "34887398d705932ba85d75c55bc43ce1",
|
||||
"packages": [
|
||||
{
|
||||
"name": "ircmaxell/password-compat",
|
||||
@ -7,15 +7,14 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/ircmaxell/password_compat.git",
|
||||
"reference": "fc4ad2d46794ace07cbf04fe654a8bf546fc6764"
|
||||
"reference": "733c06c599bfeb511f54253ddb127701bce0917d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/fc4ad2d46794ace07cbf04fe654a8bf546fc6764",
|
||||
"reference": "fc4ad2d46794ace07cbf04fe654a8bf546fc6764",
|
||||
"url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/733c06c599bfeb511f54253ddb127701bce0917d",
|
||||
"reference": "733c06c599bfeb511f54253ddb127701bce0917d",
|
||||
"shasum": ""
|
||||
},
|
||||
"time": "2013-02-04 16:45:02",
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"files": [
|
||||
@ -38,20 +37,21 @@
|
||||
"keywords": [
|
||||
"hashing",
|
||||
"password"
|
||||
]
|
||||
],
|
||||
"time": "2013-02-13 16:58:34"
|
||||
},
|
||||
{
|
||||
"name": "monolog/monolog",
|
||||
"version": "1.3.1",
|
||||
"version": "1.4.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Seldaek/monolog",
|
||||
"reference": "1.3.1"
|
||||
"reference": "1.4.0"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/1.3.1",
|
||||
"reference": "1.3.1",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/1.4.0",
|
||||
"reference": "1.4.0",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -70,11 +70,10 @@
|
||||
"mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server",
|
||||
"raven/raven": "Allow sending log messages to a Sentry server"
|
||||
},
|
||||
"time": "2013-01-11 10:23:20",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.3.x-dev"
|
||||
"dev-master": "1.4.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -100,7 +99,8 @@
|
||||
"log",
|
||||
"logging",
|
||||
"psr-3"
|
||||
]
|
||||
],
|
||||
"time": "2013-02-13 18:06:51"
|
||||
},
|
||||
{
|
||||
"name": "psr/log",
|
||||
@ -116,7 +116,6 @@
|
||||
"reference": "1.0.0",
|
||||
"shasum": ""
|
||||
},
|
||||
"time": "2012-12-21 11:40:51",
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
@ -138,7 +137,92 @@
|
||||
"log",
|
||||
"psr",
|
||||
"psr-3"
|
||||
]
|
||||
],
|
||||
"time": "2012-12-21 11:40:51"
|
||||
},
|
||||
{
|
||||
"name": "vates/eventus",
|
||||
"version": "dev-master",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/vatesfr/eventus.git",
|
||||
"reference": "27efc85692f8f77531f0864da30a3724890a44b7"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/vatesfr/eventus/zipball/27efc85692f8f77531f0864da30a3724890a44b7",
|
||||
"reference": "27efc85692f8f77531f0864da30a3724890a44b7",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": ">=3.7,<3.8"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"GPL-3.0"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Julien Fontanet",
|
||||
"email": "julien.fontanet@vates.fr"
|
||||
}
|
||||
],
|
||||
"description": "Small event library.",
|
||||
"keywords": [
|
||||
"event"
|
||||
],
|
||||
"time": "2013-02-16 11:40:13"
|
||||
},
|
||||
{
|
||||
"name": "vates/rekodi",
|
||||
"version": "dev-master",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/vatesfr/rekodi.git",
|
||||
"reference": "608abef5d01a09c5122905a6b99c5197140745a0"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/vatesfr/rekodi/zipball/608abef5d01a09c5122905a6b99c5197140745a0",
|
||||
"reference": "608abef5d01a09c5122905a6b99c5197140745a0",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": ">=3.7,<3.8"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"GPL-3.0"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Julien Fontanet",
|
||||
"email": "julien.fontanet@vates.fr"
|
||||
}
|
||||
],
|
||||
"description": "Small data management library.",
|
||||
"keywords": [
|
||||
"event"
|
||||
],
|
||||
"time": "2013-02-17 16:58:01"
|
||||
}
|
||||
],
|
||||
"packages-dev": null,
|
||||
@ -147,6 +231,8 @@
|
||||
],
|
||||
"minimum-stability": "stable",
|
||||
"stability-flags": {
|
||||
"ircmaxell/password-compat": 20
|
||||
"ircmaxell/password-compat": 20,
|
||||
"vates/eventus": 20,
|
||||
"vates/rekodi": 20
|
||||
}
|
||||
}
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
*/
|
||||
final class Application extends Base
|
||||
{
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ -178,10 +177,7 @@ final class Application extends Base
|
||||
{
|
||||
/* If available, we use OpenSSL to create more secure tokens.
|
||||
*
|
||||
* @todo Maybe we should also use a time-resistant token comparison
|
||||
* algorithm in authentication.
|
||||
*
|
||||
* @todo Move the if outside of this function and furthermore of
|
||||
* @todo Move the “if” outside of this function and furthermore of
|
||||
* this loop for performance concerns.
|
||||
*/
|
||||
if (function_exists('openssl_random_pseudo_bytes'))
|
||||
@ -39,7 +39,7 @@ function _bootstrap()
|
||||
;
|
||||
|
||||
// Class autoloading is done by composer.
|
||||
require($root_dir.'/../vendor/autoload.php');
|
||||
require($root_dir.'/vendor/autoload.php');
|
||||
|
||||
// Reads configuration.
|
||||
$config = new Config(array_merge_recursive(
|
||||
Loading…
x
Reference in New Issue
Block a user