Minor fixes during the installation

skala
Julio Montoya 12 years ago
parent d1b9631446
commit f777886ce2
  1. 2
      main/inc/services.php
  2. 4
      main/install/index.php
  3. 6
      src/ChamiloLMS/Command/Database/CommonCommand.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);
//}
}
}

@ -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) {

@ -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'
),

Loading…
Cancel
Save