diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | .gitmodules | 5 | ||||
| -rw-r--r-- | README-ENG.md | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | composer.json | 20 | ||||
| -rw-r--r-- | includes/engelsystem_provider.php | 7 | ||||
| m--------- | vendor/parsedown | 0 |
7 files changed, 34 insertions, 6 deletions
@@ -20,3 +20,7 @@ _vimrc_local.vim # Project files /config/config.php /test/coverage + +# Composer files +/vendor/ +/composer.lock diff --git a/.gitmodules b/.gitmodules index 0aa8483a..2d19e8e9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "vendor/parsedown"] - path = vendor/parsedown - url = https://github.com/erusev/parsedown.git [submodule "vendor/bootstrap"] path = themes/assets/bootstrap - url = https://github.com/twbs/bootstrap.git + url = https://github.com/twbs/bootstrap.git
\ No newline at end of file diff --git a/README-ENG.md b/README-ENG.md index 3632882c..d379e192 100644 --- a/README-ENG.md +++ b/README-ENG.md @@ -7,6 +7,8 @@ ## Directions: * Clone the master branch with the submodules: `git clone --recursive https://github.com/engelsystem/engelsystem.git` + * Install [Composer](https://getcomposer.org/download/) + * Install project dependencies: `composer install` * Webserver must have write access to the 'import' directory and read access for all other directories * Webserver must be public. @@ -10,6 +10,8 @@ ## Vorgehen: * Klonen des `master` inkl. submodules in lokales Verzeichnis: `git clone --recursive https://github.com/engelsystem/engelsystem.git` + * [Composer](https://getcomposer.org/download/) installieren + * Abhängigkeiten installieren: `composer install` * Der Webserver muss Schreibrechte auf das Verzeichnis `import` bekommen, für alle anderen Dateien reichen Leserechte. * Der Webserver muss auf `public` als http-root zeigen. diff --git a/composer.json b/composer.json new file mode 100644 index 00000000..5b56395b --- /dev/null +++ b/composer.json @@ -0,0 +1,20 @@ +{ + "name": "engelsystem/engelsystem", + "description": "Shift planning system for chaos events", + "type": "project", + "license": "GPL-2.0", + "authors": [ + { + "name": "msquare", + "email": "msquare@notrademark.de" + }, + { + "name": "MyIgel", + "email": "igor.scheller@igorshp.de" + } + ], + "require": { + "php": ">=5.4", + "erusev/parsedown": "1.6.*" + } +} diff --git a/includes/engelsystem_provider.php b/includes/engelsystem_provider.php index 595af9f9..c2b979d8 100644 --- a/includes/engelsystem_provider.php +++ b/includes/engelsystem_provider.php @@ -2,6 +2,11 @@ /** * This file includes all needed functions, connects to the db etc. */ +if(!is_readable(__DIR__ . '/../vendor/autoload.php')){ + die('Please run composer.phar install'); +} +require __DIR__ . '/../vendor/autoload.php'; + require_once realpath(__DIR__ . '/../includes/mysqli_provider.php'); require_once realpath(__DIR__ . '/../includes/sys_auth.php'); @@ -91,8 +96,6 @@ require_once realpath(__DIR__ . '/../includes/pages/user_questions.php'); require_once realpath(__DIR__ . '/../includes/pages/user_settings.php'); require_once realpath(__DIR__ . '/../includes/pages/user_shifts.php'); -require_once realpath(__DIR__ . '/../vendor/parsedown/Parsedown.php'); - session_start(); gettext_init(); diff --git a/vendor/parsedown b/vendor/parsedown deleted file mode 160000 -Subproject 3ebbd730b5c2cf5ce78bc1bf64071407fc6674b |