diff --git a/main/install/index.php b/main/install/index.php index bb7408185f..fafc04424c 100644 --- a/main/install/index.php +++ b/main/install/index.php @@ -30,7 +30,7 @@ $app['root_sys'] = dirname(dirname(__DIR__)).'/'; $app['sys_root'] = $app['root_sys']; $app['sys_data_path'] = isset($_configuration['sys_data_path']) ? $_configuration['sys_data_path'] : $app['root_sys'].'data/'; $app['sys_config_path'] = isset($_configuration['sys_config_path']) ? $_configuration['sys_config_path'] : $app['root_sys'].'config/'; -$app['sys_course_path'] = isset($_configuration['sys_course_path']) ? $_configuration['sys_course_path'] : $app['sys_data_path'].'/course'; +$app['sys_course_path'] = isset($_configuration['sys_course_path']) ? $_configuration['sys_course_path'] : $app['sys_data_path'].'/course/'; $app['sys_log_path'] = isset($_configuration['sys_log_path']) ? $_configuration['sys_log_path'] : $app['root_sys'].'logs/'; $app['sys_temp_path'] = isset($_configuration['sys_temp_path']) ? $_configuration['sys_temp_path'] : $app['sys_data_path'].'temp/'; @@ -176,9 +176,12 @@ $app->match('/', function () use ($app) { return $app->redirect($url); } - return $app['twig']->render('index.tpl', array('form' => $form->createView())); + return $app['twig']->render( + 'index.tpl', + array('form' => $form->createView()) + ); }) -->bind('welcome') +->bind('root') // need because api_get_path() ->before($blockInstallation); $app->match('/requirements', function () use ($app) { diff --git a/main/install/install.lib.php b/main/install/install.lib.php index bd9d54fa6e..8aa2352f8d 100755 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -6,8 +6,6 @@ * This file contains functions used by the install and upgrade scripts. */ - - /** * Check if current system is allowed to install * @return bool @@ -296,8 +294,6 @@ function compare_setting_values($current_value, $wanted_value) } } - - function drawPermissionsSettings($app) { $html = null; @@ -306,7 +302,7 @@ function drawPermissionsSettings($app) $html .= '
'; $course_attempt_name = '__XxTestxX__'; - $course_dir = api_get_path(SYS_COURSE_PATH).$course_attempt_name; + $course_dir = $app['sys_course_path'].$course_attempt_name; // Just in case. if (is_file($course_dir.'/test.txt')) { diff --git a/vendor/autoload.php b/vendor/autoload.php index dd4c555f43..ffbb0fbabc 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInitbbdc7dea11a66b6e7562e6c0fd58031a::getLoader(); +return ComposerAutoloaderInit7d601c150b9796f69feaec06e1a01b36::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 84da2d5a1f..fad7c21121 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -18,6 +18,8 @@ return array( 'AddManySessionToCategoryFunctions' => $baseDir . '/main/inc/lib/add_many_session_to_category_functions.lib.php', 'AdminPage' => $baseDir . '/main/admin/admin_page.class.php', 'Agenda' => $baseDir . '/main/inc/lib/agenda.lib.php', + 'Aiken2Question' => $baseDir . '/main/exercice/export/aiken/aiken_classes.php', + 'AikenAnswerMultipleChoice' => $baseDir . '/main/exercice/export/aiken/aiken_classes.php', 'Announcement' => $baseDir . '/main/coursecopy/classes/Announcement.class.php', 'AnnouncementEmail' => $baseDir . '/main/inc/lib/announcement_email.class.php', 'AnnouncementManager' => $baseDir . '/main/inc/lib/announcements.inc.php', @@ -60,7 +62,6 @@ return array( 'ClassManager' => $baseDir . '/main/inc/lib/classmanager.lib.php', 'Collator' => $vendorDir . '/symfony/intl/Symfony/Component/Intl/Resources/stubs/Collator.php', 'ConditionalLogin' => $baseDir . '/main/inc/lib/conditional_login.class.php', - 'Converter' => $baseDir . '/main/inc/lib/system/text/converter.class.php', 'Course' => $baseDir . '/main/coursecopy/classes/Course.class.php', 'CourseArchiver' => $baseDir . '/main/coursecopy/classes/CourseArchiver.class.php', 'CourseBuilder' => $baseDir . '/main/coursecopy/classes/CourseBuilder.class.php', @@ -158,9 +159,6 @@ return array( 'CssVariablesMinifierFilter' => $vendorDir . '/natxet/CssMin/src/CssMin.php', 'CssVariablesMinifierPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php', 'CssWhitesmithsFormatter' => $vendorDir . '/natxet/CssMin/src/CssMin.php', - 'CsvObjectWriter' => $baseDir . '/main/inc/lib/system/io/csv_object_writer.class.php', - 'CsvReader' => $baseDir . '/main/inc/lib/system/io/csv_reader.class.php', - 'CsvWriter' => $baseDir . '/main/inc/lib/system/io/csv_writer.class.php', 'CurrentCourse' => $baseDir . '/main/inc/lib/current_course.class.php', 'CurrentUser' => $baseDir . '/main/inc/lib/current_user.class.php', 'CustomPages' => $baseDir . '/main/inc/lib/custom_pages.class.php', @@ -173,6 +171,7 @@ return array( 'DatePicker' => $baseDir . '/main/inc/lib/formvalidator/Element/DatePicker.php', 'DateRangePicker' => $baseDir . '/main/inc/lib/formvalidator/Element/DateRangePicker.php', 'DateTimePicker' => $baseDir . '/main/inc/lib/formvalidator/Element/DateTimePicker.php', + 'DateTimeRule' => $baseDir . '/main/inc/lib/formvalidator/Rule/DateTimeRule.php', 'Diagnoser' => $baseDir . '/main/inc/lib/diagnoser.lib.php', 'Display' => $baseDir . '/main/inc/lib/display.lib.php', 'DisplayGradebook' => $baseDir . '/main/gradebook/lib/fe/displaygradebook.php', @@ -181,8 +180,6 @@ return array( 'Draggable' => $baseDir . '/main/exercice/draggable.class.php', 'DropboxLink' => $baseDir . '/main/gradebook/lib/be/dropboxlink.class.php', 'DummyCourseCreator' => $baseDir . '/main/coursecopy/classes/DummyCourseCreator.class.php', - 'Encoding' => $baseDir . '/main/inc/lib/system/text/encoding.class.php', - 'EncodingConverter' => $baseDir . '/main/inc/lib/system/text/encoding_converter.class.php', 'EvalForm' => $baseDir . '/main/gradebook/lib/fe/evalform.class.php', 'EvalLink' => $baseDir . '/main/gradebook/lib/be/evallink.class.php', 'Evaluation' => $baseDir . '/main/gradebook/lib/be/evaluation.class.php', @@ -202,8 +199,6 @@ return array( 'Facebook' => $baseDir . '/main/auth/external_login/facebook-php-sdk/src/facebook.php', 'FacebookApiException' => $baseDir . '/main/auth/external_login/facebook-php-sdk/src/base_facebook.php', 'FileManager' => $baseDir . '/main/inc/lib/fileManager.lib.php', - 'FileReader' => $baseDir . '/main/inc/lib/system/io/file_reader.class.php', - 'FileWriter' => $baseDir . '/main/inc/lib/system/io/file_writer.class.php', 'FillBlanks' => $baseDir . '/main/exercice/fill_blanks.class.php', 'FlatViewDataGenerator' => $baseDir . '/main/gradebook/lib/flatview_data_generator.class.php', 'FlatViewTable' => $baseDir . '/main/gradebook/lib/fe/flatviewtable.class.php', @@ -608,7 +603,6 @@ return array( 'Table_Row_Group_Frame_Decorator' => $baseDir . '/main/inc/lib/phpdocx/pdf/include/table_row_group_frame_decorator.cls.php', 'Table_Row_Group_Frame_Reflower' => $baseDir . '/main/inc/lib/phpdocx/pdf/include/table_row_group_frame_reflower.cls.php', 'Table_Row_Positioner' => $baseDir . '/main/inc/lib/phpdocx/pdf/include/table_row_positioner.cls.php', - 'Temp' => $baseDir . '/main/inc/lib/system/io/temp.class.php', 'Testcategory' => $baseDir . '/main/exercice/testcategory.class.php', 'Text' => $baseDir . '/main/inc/lib/text.lib.php', 'Text_CAPTCHA' => $baseDir . '/main/inc/lib/pear/Text/CAPTCHA.php', @@ -665,9 +659,6 @@ return array( 'UserGroup' => $baseDir . '/main/inc/lib/usergroup.lib.php', 'UserManager' => $baseDir . '/main/inc/lib/usermanager.lib.php', 'UserTable' => $baseDir . '/main/gradebook/lib/fe/usertable.class.php', - 'Utf8' => $baseDir . '/main/inc/lib/system/text/utf8.class.php', - 'Utf8Decoder' => $baseDir . '/main/inc/lib/system/text/utf8_decoder.class.php', - 'Utf8Encoder' => $baseDir . '/main/inc/lib/system/text/utf8_encoder.class.php', 'View' => $baseDir . '/main/inc/lib/app_view.php', 'ViewException' => $baseDir . '/main/inc/lib/app_view.php', 'WCAG_Rendering' => $baseDir . '/main/inc/lib/WCAG/WCAG_rendering.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 88975ecbfd..c97b6ddf3c 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitbbdc7dea11a66b6e7562e6c0fd58031a +class ComposerAutoloaderInit7d601c150b9796f69feaec06e1a01b36 { private static $loader; @@ -19,9 +19,9 @@ class ComposerAutoloaderInitbbdc7dea11a66b6e7562e6c0fd58031a return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitbbdc7dea11a66b6e7562e6c0fd58031a', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit7d601c150b9796f69feaec06e1a01b36', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitbbdc7dea11a66b6e7562e6c0fd58031a', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit7d601c150b9796f69feaec06e1a01b36', 'loadClassLoader')); $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); @@ -45,14 +45,14 @@ class ComposerAutoloaderInitbbdc7dea11a66b6e7562e6c0fd58031a $includeFiles = require __DIR__ . '/autoload_files.php'; foreach ($includeFiles as $file) { - composerRequirebbdc7dea11a66b6e7562e6c0fd58031a($file); + composerRequire7d601c150b9796f69feaec06e1a01b36($file); } return $loader; } } -function composerRequirebbdc7dea11a66b6e7562e6c0fd58031a($file) +function composerRequire7d601c150b9796f69feaec06e1a01b36($file) { require $file; } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index f434c06b59..64e9bc206c 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -3311,54 +3311,6 @@ "description": "Symfony Yaml Component", "homepage": "http://symfony.com" }, - { - "name": "chamilo/chash", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/chamilo/chash.git", - "reference": "aba27ef17cd839cf9b20e72b5e9e340fc583733b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/chamilo/chash/zipball/aba27ef17cd839cf9b20e72b5e9e340fc583733b", - "reference": "aba27ef17cd839cf9b20e72b5e9e340fc583733b", - "shasum": "" - }, - "require": { - "alchemy/zippy": "~0.1", - "composer/composer": "1.0.*@dev", - "doctrine/dbal": "~2.3", - "doctrine/migrations": "dev-master", - "doctrine/orm": "~2.3", - "php": ">=5.3.2", - "symfony/console": "~2.3", - "symfony/filesystem": "~2.3", - "symfony/finder": "~2.3", - "symfony/yaml": "~2.3", - "zendframework/zend-config": "~2.2", - "zendframework/zend-stdlib": "~2.2" - }, - "require-dev": { - "mikey179/vfsstream": ">=1.2", - "phpunit/phpunit": "3.7.*" - }, - "time": "2014-04-15 10:09:19", - "type": "library", - "installation-source": "source", - "autoload": { - "psr-0": { - "Chash": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-3.0" - ], - "description": "Chamilo Shell", - "homepage": "http://www.chamilo.org" - }, { "name": "flint/tacker", "version": "0.4.2", @@ -6318,5 +6270,53 @@ "assetic", "silex" ] + }, + { + "name": "chamilo/chash", + "version": "dev-master", + "version_normalized": "9999999-dev", + "source": { + "type": "git", + "url": "https://github.com/chamilo/chash.git", + "reference": "9ad5b2e1679d490c46bd3b49d1fe610811678f0c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/chamilo/chash/zipball/9ad5b2e1679d490c46bd3b49d1fe610811678f0c", + "reference": "9ad5b2e1679d490c46bd3b49d1fe610811678f0c", + "shasum": "" + }, + "require": { + "alchemy/zippy": "~0.1", + "composer/composer": "1.0.*@dev", + "doctrine/dbal": "~2.3", + "doctrine/migrations": "dev-master", + "doctrine/orm": "~2.3", + "php": ">=5.3.2", + "symfony/console": "~2.3", + "symfony/filesystem": "~2.3", + "symfony/finder": "~2.3", + "symfony/yaml": "~2.3", + "zendframework/zend-config": "~2.2", + "zendframework/zend-stdlib": "~2.2" + }, + "require-dev": { + "mikey179/vfsstream": ">=1.2", + "phpunit/phpunit": "3.7.*" + }, + "time": "2014-05-03 12:04:27", + "type": "library", + "installation-source": "source", + "autoload": { + "psr-0": { + "Chash": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-3.0" + ], + "description": "Chamilo Shell", + "homepage": "http://www.chamilo.org" } ]