浏览代码

Minor fixes during the installation

Julio Montoya 11 年之前
父节点
当前提交
f777886ce2
共有 3 个文件被更改,包括 8 次插入4 次删除
  1. 1 1
      main/inc/services.php
  2. 2 2
      main/install/index.php
  3. 5 1
      src/ChamiloLMS/Command/Database/CommonCommand.php

+ 1 - 1
main/inc/services.php

@@ -309,7 +309,7 @@ if (is_writable($app['sys_temp_path'])) {
             );
             $app->mount('/_profiler', $p);
         }
-        //$app->register(new Whoops\Provider\Silex\WhoopsServiceProvider);
+        $app->register(new Whoops\Provider\Silex\WhoopsServiceProvider);
         //}
     }
 }

+ 2 - 2
main/install/index.php

@@ -95,8 +95,6 @@ $console->add(new \Doctrine\DBAL\Tools\Console\Command\RunSqlCommand());
 $console->add(new \Doctrine\DBAL\Tools\Console\Command\ImportCommand());
 $console->add(new \Doctrine\DBAL\Migrations\Tools\Console\Command\MigrateCommand());
 
-
-//$console->run();
 // Controllers
 
 $app->match('/', function() use($app) {
@@ -197,6 +195,7 @@ $app->match('/check-database', function() use($app) {
 })->bind('check-database');
 
 $app->match('/portal-settings', function() use($app) {
+    /** @var Request $request */
     $request = $app['request'];
 
     /** @var \ChamiloLMS\Command\Database\InstallCommand $command */
@@ -205,6 +204,7 @@ $app->match('/portal-settings', function() use($app) {
     $builder  = $app['form.factory']->createBuilder('form');
 
     $data = $command->getPortalSettingsParams();
+    $data['institution_url']['attributes']['data'] = str_replace('main/install/', '', $request->getUriForPath('/'));
     $permissionNewDir = $app['session']->get('permissions_for_new_directories');
 
     if ($permissionNewDir) {

+ 5 - 1
src/ChamiloLMS/Command/Database/CommonCommand.php

@@ -180,7 +180,11 @@ class CommonCommand extends AbstractCommand
             ),
             'encrypt_method' => array(
                 'attributes' => array(
-                    'choices' => array('sha1', 'md5', 'none'),
+                    'choices' => array(
+                        'sha1' => 'sha1',
+                        'md5' => 'md5',
+                        'none' => 'none'
+                    ),
                     'data' => 'sha1'
                 ),