chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - Code style review

Browse Source
1.10.x
Yannick Warnier 11 years ago
parent 49dbf86b25
commit ed5fb23e02
2 changed files with 85 additions and 64 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 98
      main/install/install_db.inc.php
  2. 51
      main/install/install_files.inc.php

98
main/install/install_db.inc.php
Unescape View File

@ -1,10 +1,10 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Install the Chamilo database
* Notice : This script has to be included by index.php
* Install the Chamilo database
* Notice : This script has to be included by index.php
*
* @package chamilo.install
* @package chamilo.install
*/
/* This page is called only during a NEW chamilo installation */
@ -13,74 +13,74 @@
* Init checks
*/
if (!defined('SYSTEM_INSTALLATION')) {
echo 'You are not allowed here!';
exit;
echo 'You are not allowed here!';
exit;
}
$urlForm = api_add_trailing_slash($urlForm);
switch ($encryptPassForm) {
case 'md5' :
$passToStore = md5($passForm);
break;
case 'sha1' :
$passToStore = sha1($passForm);
break;
case 'none' :
$passToStore = $passForm;
break;
case 'md5' :
$passToStore = md5($passForm);
break;
case 'sha1' :
$passToStore = sha1($passForm);
break;
case 'none' :
$passToStore = $passForm;
break;
}
$dbPrefixForm = preg_replace('/[^a-zA-Z0-9_\-]/', '', $dbPrefixForm);
$dbNameForm = preg_replace('/[^a-zA-Z0-9_\-]/', '', $dbNameForm);
if (!empty($dbPrefixForm) && strpos($dbNameForm, $dbPrefixForm) !== 0) {
$dbNameForm = $dbPrefixForm.$dbNameForm;
$dbNameForm = $dbPrefixForm . $dbNameForm;
}
$dbStatsForm = preg_replace('/[^a-zA-Z0-9_\-]/', '', $dbStatsForm);
if (!empty($dbPrefixForm) && strpos($dbStatsForm, $dbPrefixForm) !== 0) {
$dbStatsForm = $dbPrefixForm.$dbStatsForm;
$dbStatsForm = $dbPrefixForm . $dbStatsForm;
}
$dbUserForm = preg_replace('/[^a-zA-Z0-9_\-]/', '', $dbUserForm);
if (!empty($dbPrefixForm) && strpos($dbUserForm, $dbPrefixForm) !== 0) {
$dbUserForm = $dbPrefixForm.$dbUserForm;
$dbUserForm = $dbPrefixForm . $dbUserForm;
}
$mysqlMainDb = $dbNameForm;
if (empty($mysqlMainDb) || $mysqlMainDb == 'mysql' || $mysqlMainDb == $dbPrefixForm) {
$mysqlMainDb = $dbPrefixForm.'main';
$mysqlMainDb = $dbPrefixForm . 'main';
}
$mysqlStatsDb = $dbStatsForm;
if (empty($mysqlStatsDb) || $mysqlStatsDb == 'mysql' || $mysqlStatsDb == $dbPrefixForm) {
$mysqlStatsDb = $dbPrefixForm.'stats';
$mysqlStatsDb = $dbPrefixForm . 'stats';
}
$mysqlUserDb = $dbUserForm;
if (empty($mysqlUserDb) || $mysqlUserDb == 'mysql' || $mysqlUserDb == $dbPrefixForm) {
$mysqlUserDb = $dbPrefixForm.'user';
$mysqlUserDb = $dbPrefixForm . 'user';
}
//This parameter is needed to run a command line to install Chamilo using BNPanel + ISPConfig see #1799
if (!defined('CLI_INSTALLATION')) {
$result = Database::query("SHOW VARIABLES LIKE 'datadir'") or die(Database::error());
$result = Database::query("SHOW VARIABLES LIKE 'datadir'") or die(Database::error());
$mysqlRepositorySys = Database::fetch_array($result);
$mysqlRepositorySys = $mysqlRepositorySys['Value'];
$mysqlRepositorySys = Database::fetch_array($result);
$mysqlRepositorySys = $mysqlRepositorySys['Value'];
$create_database = true;
$create_database = true;
if (database_exists($mysqlMainDb)) {
if (database_exists($mysqlMainDb)) {
$create_database = false;
}
//Create database
if ($create_database) {
$sql = "CREATE DATABASE IF NOT EXISTS `$mysqlMainDb`";
Database::query($sql) or die(Database::error());
}
//Create database
if ($create_database) {
$sql = "CREATE DATABASE IF NOT EXISTS `$mysqlMainDb`";
Database::query($sql) or die(Database::error());
}
}
$mysqlStatsDb = $mysqlMainDb;
@ -88,31 +88,31 @@ $mysqlUserDb = $mysqlMainDb;
// This parameter is needed to run a command line install of Chamilo (needed for Phing)
if (!defined('CLI_INSTALLATION')) {
include api_get_path(SYS_LANG_PATH).'english/create_course.inc.php';
include api_get_path(SYS_LANG_PATH) . 'english/create_course.inc.php';
if ($languageForm != 'english') {
include api_get_path(SYS_LANG_PATH).$languageForm.'/create_course.inc.php';
}
if ($languageForm != 'english') {
include api_get_path(SYS_LANG_PATH) . $languageForm . '/create_course.inc.php';
}
}
Database::select_db($mysqlMainDb) or die(Database::error());
$installation_settings = array();
$installation_settings['{ORGANISATIONNAME}'] = $institutionForm;
$installation_settings['{ORGANISATIONURL}'] = $institutionUrlForm;
$installation_settings['{CAMPUSNAME}'] = $campusForm;
$installation_settings['{PLATFORMLANGUAGE}'] = $languageForm;
$installation_settings['{ALLOWSELFREGISTRATION}'] = trueFalse($allowSelfReg);
$installation_settings['{ALLOWTEACHERSELFREGISTRATION}'] = trueFalse($allowSelfRegProf);
$installation_settings['{ADMINLASTNAME}'] = $adminLastName;
$installation_settings['{ADMINFIRSTNAME}'] = $adminFirstName;
$installation_settings['{ADMINLOGIN}'] = $loginForm;
$installation_settings['{ADMINPASSWORD}'] = $passToStore;
$installation_settings['{ADMINEMAIL}'] = $emailForm;
$installation_settings['{ADMINPHONE}'] = $adminPhoneForm;
$installation_settings['{PLATFORM_AUTH_SOURCE}'] = PLATFORM_AUTH_SOURCE;
$installation_settings['{ADMINLANGUAGE}'] = $languageForm;
$installation_settings['{HASHFUNCTIONMODE}'] = $encryptPassForm;
$installation_settings['{ORGANISATIONNAME}'] = $institutionForm;
$installation_settings['{ORGANISATIONURL}'] = $institutionUrlForm;
$installation_settings['{CAMPUSNAME}'] = $campusForm;
$installation_settings['{PLATFORMLANGUAGE}'] = $languageForm;
$installation_settings['{ALLOWSELFREGISTRATION}'] = trueFalse($allowSelfReg);
$installation_settings['{ALLOWTEACHERSELFREGISTRATION}'] = trueFalse($allowSelfRegProf);
$installation_settings['{ADMINLASTNAME}'] = $adminLastName;
$installation_settings['{ADMINFIRSTNAME}'] = $adminFirstName;
$installation_settings['{ADMINLOGIN}'] = $loginForm;
$installation_settings['{ADMINPASSWORD}'] = $passToStore;
$installation_settings['{ADMINEMAIL}'] = $emailForm;
$installation_settings['{ADMINPHONE}'] = $adminPhoneForm;
$installation_settings['{PLATFORM_AUTH_SOURCE}'] = PLATFORM_AUTH_SOURCE;
$installation_settings['{ADMINLANGUAGE}'] = $languageForm;
$installation_settings['{HASHFUNCTIONMODE}'] = $encryptPassForm;
AddCourse::drop_course_tables();

51
main/install/install_files.inc.php
Unescape View File

@ -16,23 +16,44 @@
if (defined('SYSTEM_INSTALLATION')) {
// Write the system config file
write_system_config_file(api_get_path(CONFIGURATION_PATH).'configuration.php');
// Write the system config file
write_system_config_file(api_get_path(CONFIGURATION_PATH) . 'configuration.php');
// Write a distribution file with the config as a backup for the admin
write_system_config_file(api_get_path(CONFIGURATION_PATH).'configuration.dist.php');
// Write a distribution file with the config as a backup for the admin
write_system_config_file(api_get_path(CONFIGURATION_PATH) . 'configuration.dist.php');
// Write a .htaccess file in the course repository
write_courses_htaccess_file($urlAppendPath);
// Write a .htaccess file in the course repository
write_courses_htaccess_file($urlAppendPath);
// Copy distribution files with renaming for being the actual system configuration files.
copy(api_get_path(CONFIGURATION_PATH).'add_course.conf.dist.php', api_get_path(CONFIGURATION_PATH).'add_course.conf.php');
copy(api_get_path(CONFIGURATION_PATH).'course_info.conf.dist.php', api_get_path(CONFIGURATION_PATH).'course_info.conf.php');
copy(api_get_path(CONFIGURATION_PATH).'mail.conf.dist.php', api_get_path(CONFIGURATION_PATH).'mail.conf.php');
copy(api_get_path(CONFIGURATION_PATH).'profile.conf.dist.php', api_get_path(CONFIGURATION_PATH).'profile.conf.php');
copy(api_get_path(CONFIGURATION_PATH).'events.conf.dist.php', api_get_path(CONFIGURATION_PATH).'events.conf.php');
copy(api_get_path(CONFIGURATION_PATH).'auth.conf.dist.php', api_get_path(CONFIGURATION_PATH).'auth.conf.php');
copy(api_get_path(CONFIGURATION_PATH).'portfolio.conf.dist.php', api_get_path(CONFIGURATION_PATH).'portfolio.conf.php');
// Copy distribution files with renaming for being the actual system configuration files.
copy(
api_get_path(CONFIGURATION_PATH) . 'add_course.conf.dist.php',
api_get_path(CONFIGURATION_PATH) . 'add_course.conf.php'
);
copy(
api_get_path(CONFIGURATION_PATH) . 'course_info.conf.dist.php',
api_get_path(CONFIGURATION_PATH) . 'course_info.conf.php'
);
copy(
api_get_path(CONFIGURATION_PATH) . 'mail.conf.dist.php',
api_get_path(CONFIGURATION_PATH) . 'mail.conf.php'
);
copy(
api_get_path(CONFIGURATION_PATH) . 'profile.conf.dist.php',
api_get_path(CONFIGURATION_PATH) . 'profile.conf.php'
);
copy(
api_get_path(CONFIGURATION_PATH) . 'events.conf.dist.php',
api_get_path(CONFIGURATION_PATH) . 'events.conf.php'
);
copy(
api_get_path(CONFIGURATION_PATH) . 'auth.conf.dist.php',
api_get_path(CONFIGURATION_PATH) . 'auth.conf.php'
);
copy(
api_get_path(CONFIGURATION_PATH) . 'portfolio.conf.dist.php',
api_get_path(CONFIGURATION_PATH) . 'portfolio.conf.php'
);
} else {
echo 'You are not allowed here !' . __FILE__;
echo 'You are not allowed here !' . __FILE__;
}

Write Preview
Loading…
Cancel
Save