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

Feature #272 - The installation script: Some minor corrections and cosmetic changes.

Browse Source
skala
Ivan Tcholakov 15 years ago
parent b6084703a2
commit 71f7591482
1 changed files with 258 additions and 313 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. 353
      main/install/index.php

353
main/install/index.php
Unescape View File

@ -11,7 +11,7 @@
*
* @todo reduce high level of duplication in this code
* @todo (busy) organise code into functions
* @package dokeos.install
* @package chamilo.install
==============================================================================
*/
@ -33,21 +33,25 @@ if ( !function_exists('version_compare') || version_compare( phpversion(), REQUI
/*
==============================================================================
INIT SECTION
INITIALIZATION SECTION
==============================================================================
*/
session_start();
// Including necessary files
// Including necessary core libraries.
@include '../inc/installedVersion.inc.php';
require '../inc/lib/main_api.lib.php';
// Loading language files.
require '../lang/english/trad4all.inc.php';
require '../lang/english/install.inc.php';
if (!empty($_POST['language_list'])) {
$search = array('../', '\\0');
$install_language = str_replace($search, '', urldecode($_POST['language_list']));
if(!is_dir('../lang/'.$install_language)){$install_language = 'english';}
if (!is_dir('../lang/'.$install_language)) {
$install_language = 'english';
}
include_once "../lang/$install_language/trad4all.inc.php";
include_once "../lang/$install_language/install.inc.php";
api_session_register('install_language');
@ -64,14 +68,14 @@ $language_interface_initial_value = $install_language;
// Character set during the installation, it is always to be 'UTF-8'.
$charset = 'UTF-8';
// Page encoding initialization.
header('Content-Type: text/html; charset='. $charset);
// Initialization of the internationalization library.
api_initialize_internationalization();
// Initialization of the default encoding that will be used by the multibyte string routines in the internationalization library.
api_set_internationalization_default_encoding($charset);
// Page encoding initialization.
header('Content-Type: text/html; charset='. api_get_system_encoding());
require_once 'install_upgrade.lib.php'; //also defines constants
require_once 'install_functions.inc.php';
@ -82,7 +86,7 @@ define('INSTALL_TYPE_UPDATE', 'update');
define('FORM_FIELD_DISPLAY_LENGTH', 40);
define('DATABASE_FORM_FIELD_DISPLAY_LENGTH', 25);
define('MAX_FORM_FIELD_LENGTH', 80);
define('DEFAULT_LANGUAGE', 'english');
define('DEFAULT_LANGUAGE', 'english'); // TODO: To be examined.
// setting the error reporting
error_reporting(E_COMPILE_ERROR | E_ERROR | E_CORE_ERROR);
@ -100,15 +104,14 @@ if(!empty($_POST['old_version'])) {
$my_old_version = $_POST['old_version'];
} elseif (!empty($tmp_version)) {
$my_old_version = $tmp_version;
}
elseif(!empty($dokeos_version)) //variable coming from installedVersion, normally
{
} elseif (!empty($dokeos_version)) { //variable coming from installedVersion, normally
$my_old_version = $dokeos_version;
}
$new_version = '1.8.7';
$new_version_stable = false;
$new_version_major = true;
/*
==============================================================================
STEP 1 : INITIALIZES FORM VARIABLES IF IT IS THE FIRST VISIT
@ -119,7 +122,7 @@ $new_version_major = true;
$is_valid_request = $_REQUEST['is_executable'];
foreach ($_POST as $request_index => $request_value) {
if (substr($request_index, 0, 4) == 'step') {
if ($request_index<>$is_valid_request) {
if ($request_index != $is_valid_request) {
unset($_POST[$request_index]);
}
}
@ -128,100 +131,70 @@ foreach ($_POST as $request_index=>$request_value) {
$badUpdatePath = false;
$emptyUpdatePath = true;
$proposedUpdatePath = '';
if(!empty($_POST['updatePath']))
{
if(!empty($_POST['updatePath'])) {
$proposedUpdatePath = $_POST['updatePath'];
}
if ($_POST['step2_install'] || $_POST['step2_update_8'] || $_POST['step2_update_6']) {
if ($_POST['step2_install']) {
$installType = 'new';
$_POST['step2'] = 1;
} else {
$installType = 'update';
if($_POST['step2_update_8'])
{
if ($_POST['step2_update_8']) {
$emptyUpdatePath = false;
if(empty($_POST['updatePath']))
{
if(empty($_POST['updatePath'])) {
$proposedUpdatePath = $_SERVER['DOCUMENT_ROOT'];
}
else
{
} else {
$proposedUpdatePath = $_POST['updatePath'];
}
if(substr($proposedUpdatePath,-1) != '/')
{
if (substr($proposedUpdatePath,-1) != '/') {
$proposedUpdatePath .= '/';
}
if(file_exists($proposedUpdatePath))
{
if(in_array($my_old_version,$update_from_version_8))
{
if (file_exists($proposedUpdatePath)) {
if (in_array($my_old_version,$update_from_version_8)) {
$_POST['step2'] = 1;
}
else
{
} else {
$badUpdatePath = true;
}
}
else
{
} else {
$badUpdatePath = true;
}
}
else //step2_update_6, presumably
{
if(empty($_POST['updatePath']))
{
} else { //step2_update_6, presumably
if (empty($_POST['updatePath'])) {
$_POST['step1'] = 1;
}
else
{
} else {
$emptyUpdatePath = false;
if(substr($_POST['updatePath'],-1) != '/')
{
if(substr($_POST['updatePath'], -1) != '/') {
$_POST['updatePath'] .= '/';
}
if(file_exists($_POST['updatePath']))
{
if (file_exists($_POST['updatePath'])) {
//1.6.x
$my_old_version = get_config_param('clarolineVersion', $_POST['updatePath']);
if(in_array($my_old_version,$update_from_version_6))
{
if (in_array($my_old_version, $update_from_version_6)) {
$_POST['step2'] = 1;
$proposedUpdatePath = $_POST['updatePath'];
}
else
{
} else {
$badUpdatePath = true;
}
}
else
{
} else {
$badUpdatePath = true;
}
}
}
}
}
elseif($_POST['step1'])
{
} elseif($_POST['step1']) {
$_POST['updatePath'] = '';
$installType = '';
$updateFromConfigFile = '';
unset($_GET['running']);
}
else
{
} else {
$installType = $_GET['installType'];
$updateFromConfigFile = $_GET['updateFromConfigFile'];
}
if($installType=='update' && in_array($my_old_version,$update_from_version_8))
{
if ($installType == 'update' && in_array($my_old_version, $update_from_version_8)) {
include_once '../inc/conf/configuration.php';
}
@ -243,8 +216,7 @@ if(!isset($_GET['running'])) {
$emailForm = $_SERVER['SERVER_ADMIN'];
$email_parts = explode('@', $emailForm);
if($email_parts[1] == 'localhost')
{
if ($email_parts[1] == 'localhost') {
$emailForm .= '.localdomain';
}
$adminLastName = 'Doe';
@ -269,68 +241,43 @@ if(!isset($_GET['running'])) {
$encryptPassForm = 'md5';
$session_lifetime = 360000;
} else {
foreach($_POST as $key=>$val)
{
foreach($_POST as $key => $val) {
$magic_quotes_gpc = ini_get('magic_quotes_gpc') ? true : false;
if(is_string($val))
{
if($magic_quotes_gpc)
{
if (is_string($val)) {
if ($magic_quotes_gpc) {
$val = stripslashes($val);
}
$val = trim($val);
$_POST[$key] = $val;
}
elseif(is_array($val))
{
foreach($val as $key2=>$val2)
{
if($magic_quotes_gpc)
{
} elseif(is_array($val)) {
foreach ($val as $key2 => $val2) {
if ($magic_quotes_gpc) {
$val2 = stripslashes($val2);
}
$val2 = trim($val2);
$_POST[$key][$key2] = $val2;
}
}
$GLOBALS[$key] = $_POST[$key];
}
}
// The Steps
$total_steps = 7;
if (!$_POST)
{
if (!$_POST) {
$current_step = 1;
}
elseif (!empty($_POST['language_list']) or !empty($_POST['step1']) or ((!empty($_POST['step2_update_8']) or (!empty($_POST['step2_update_6']))) && ($emptyUpdatePath or $badUpdatePath)))
{
} elseif (!empty($_POST['language_list']) or !empty($_POST['step1']) or ((!empty($_POST['step2_update_8']) or (!empty($_POST['step2_update_6']))) && ($emptyUpdatePath or $badUpdatePath))) {
$current_step = 2;
}
elseif (!empty($_POST['step2']) or (!empty($_POST['step2_update_8']) or (!empty($_POST['step2_update_6'])) ))
{
} elseif (!empty($_POST['step2']) or (!empty($_POST['step2_update_8']) or (!empty($_POST['step2_update_6'])) )) {
$current_step = 3;
}
elseif (!empty($_POST['step3']))
{
} elseif (!empty($_POST['step3'])) {
$current_step = 4;
}
elseif (!empty($_POST['step4']))
{
} elseif (!empty($_POST['step4'])) {
$current_step = 5;
}
elseif (!empty($_POST['step5']))
{
} elseif (!empty($_POST['step5'])) {
$current_step = 6;
}
// Managing the $encryptPassForm
if ($encryptPassForm == '1') {
$encryptPassForm = 'md5';
@ -417,11 +364,9 @@ if ($encryptPassForm=='1' ) {
}
}
</script>
<?php if(!empty($charset)){ ?>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset ?>" />
<?php } ?>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo api_get_system_encoding(); ?>" />
</head>
<body dir="<?php echo $text_dir ?>">
<body dir="<?php echo api_get_text_direction(); ?>">
<div id="wrapper">
@ -466,94 +411,95 @@ if ($encryptPassForm=='1' ) {
</tr>
<tr>
<td>
<input type="hidden" name="updatePath" value="<?php if(!$badUpdatePath) echo api_htmlentities($proposedUpdatePath, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="urlAppendPath" value="<?php echo api_htmlentities($urlAppendPath, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="pathForm" value="<?php echo api_htmlentities($pathForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="urlForm" value="<?php echo api_htmlentities($urlForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="dbHostForm" value="<?php echo api_htmlentities($dbHostForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="dbUsernameForm" value="<?php echo api_htmlentities($dbUsernameForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="dbPassForm" value="<?php echo api_htmlentities($dbPassForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="singleDbForm" value="<?php echo api_htmlentities($singleDbForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="dbPrefixForm" value="<?php echo api_htmlentities($dbPrefixForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="dbNameForm" value="<?php echo api_htmlentities($dbNameForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="updatePath" value="<?php if (!$badUpdatePath) echo api_htmlentities($proposedUpdatePath, ENT_QUOTES); ?>" />
<input type="hidden" name="urlAppendPath" value="<?php echo api_htmlentities($urlAppendPath, ENT_QUOTES); ?>" />
<input type="hidden" name="pathForm" value="<?php echo api_htmlentities($pathForm, ENT_QUOTES); ?>" />
<input type="hidden" name="urlForm" value="<?php echo api_htmlentities($urlForm, ENT_QUOTES); ?>" />
<input type="hidden" name="dbHostForm" value="<?php echo api_htmlentities($dbHostForm, ENT_QUOTES); ?>" />
<input type="hidden" name="dbUsernameForm" value="<?php echo api_htmlentities($dbUsernameForm, ENT_QUOTES); ?>" />
<input type="hidden" name="dbPassForm" value="<?php echo api_htmlentities($dbPassForm, ENT_QUOTES); ?>" />
<input type="hidden" name="singleDbForm" value="<?php echo api_htmlentities($singleDbForm, ENT_QUOTES); ?>" />
<input type="hidden" name="dbPrefixForm" value="<?php echo api_htmlentities($dbPrefixForm, ENT_QUOTES); ?>" />
<input type="hidden" name="dbNameForm" value="<?php echo api_htmlentities($dbNameForm, ENT_QUOTES); ?>" />
<?php
if($installType == 'update' OR $singleDbForm == 0)
{
if ($installType == 'update' OR $singleDbForm == 0) {
?>
<input type="hidden" name="dbStatsForm" value="<?php echo api_htmlentities($dbStatsForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="dbScormForm" value="<?php echo api_htmlentities($dbScormForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="dbUserForm" value="<?php echo api_htmlentities($dbUserForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="dbStatsForm" value="<?php echo api_htmlentities($dbStatsForm, ENT_QUOTES); ?>" />
<input type="hidden" name="dbScormForm" value="<?php echo api_htmlentities($dbScormForm, ENT_QUOTES); ?>" />
<input type="hidden" name="dbUserForm" value="<?php echo api_htmlentities($dbUserForm, ENT_QUOTES); ?>" />
<?php
}
else
{
} else {
?>
<input type="hidden" name="dbStatsForm" value="<?php echo api_htmlentities($dbNameForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="dbUserForm" value="<?php echo api_htmlentities($dbNameForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="dbStatsForm" value="<?php echo api_htmlentities($dbNameForm, ENT_QUOTES); ?>" />
<input type="hidden" name="dbUserForm" value="<?php echo api_htmlentities($dbNameForm, ENT_QUOTES); ?>" />
<?php
}
?>
<input type="hidden" name="enableTrackingForm" value="<?php echo api_htmlentities($enableTrackingForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="allowSelfReg" value="<?php echo api_htmlentities($allowSelfReg, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="allowSelfRegProf" value="<?php echo api_htmlentities($allowSelfRegProf, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="emailForm" value="<?php echo api_htmlentities($emailForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="adminLastName" value="<?php echo api_htmlentities($adminLastName, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="adminFirstName" value="<?php echo api_htmlentities($adminFirstName, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="adminPhoneForm" value="<?php echo api_htmlentities($adminPhoneForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="loginForm" value="<?php echo api_htmlentities($loginForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="passForm" value="<?php echo api_htmlentities($passForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="languageForm" value="<?php echo api_htmlentities($languageForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="campusForm" value="<?php echo api_htmlentities($campusForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="educationForm" value="<?php echo api_htmlentities($educationForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="institutionForm" value="<?php echo api_htmlentities($institutionForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="institutionUrlForm" value="<?php echo api_stristr($institutionUrlForm, 'http://', false, $charset) ? api_htmlentities($institutionUrlForm, ENT_QUOTES, $charset) : api_stristr($institutionUrlForm, 'https://', false, $charset) ? api_htmlentities($institutionUrlForm, ENT_QUOTES, $charset) : 'http://'.api_htmlentities($institutionUrlForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="checkEmailByHashSent" value="<?php echo api_htmlentities($checkEmailByHashSent, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="ShowEmailnotcheckedToStudent" value="<?php echo api_htmlentities($ShowEmailnotcheckedToStudent, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="userMailCanBeEmpty" value="<?php echo api_htmlentities($userMailCanBeEmpty, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="encryptPassForm" value="<?php echo api_htmlentities($encryptPassForm, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="session_lifetime" value="<?php echo api_htmlentities($session_lifetime, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="old_version" value="<?php echo api_htmlentities($my_old_version, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="new_version" value="<?php echo api_htmlentities($new_version, ENT_QUOTES, $charset); ?>" />
<input type="hidden" name="enableTrackingForm" value="<?php echo api_htmlentities($enableTrackingForm, ENT_QUOTES); ?>" />
<input type="hidden" name="allowSelfReg" value="<?php echo api_htmlentities($allowSelfReg, ENT_QUOTES); ?>" />
<input type="hidden" name="allowSelfRegProf" value="<?php echo api_htmlentities($allowSelfRegProf, ENT_QUOTES); ?>" />
<input type="hidden" name="emailForm" value="<?php echo api_htmlentities($emailForm, ENT_QUOTES); ?>" />
<input type="hidden" name="adminLastName" value="<?php echo api_htmlentities($adminLastName, ENT_QUOTES); ?>" />
<input type="hidden" name="adminFirstName" value="<?php echo api_htmlentities($adminFirstName, ENT_QUOTES); ?>" />
<input type="hidden" name="adminPhoneForm" value="<?php echo api_htmlentities($adminPhoneForm, ENT_QUOTES); ?>" />
<input type="hidden" name="loginForm" value="<?php echo api_htmlentities($loginForm, ENT_QUOTES); ?>" />
<input type="hidden" name="passForm" value="<?php echo api_htmlentities($passForm, ENT_QUOTES); ?>" />
<input type="hidden" name="languageForm" value="<?php echo api_htmlentities($languageForm, ENT_QUOTES); ?>" />
<input type="hidden" name="campusForm" value="<?php echo api_htmlentities($campusForm, ENT_QUOTES); ?>" />
<input type="hidden" name="educationForm" value="<?php echo api_htmlentities($educationForm, ENT_QUOTES); ?>" />
<input type="hidden" name="institutionForm" value="<?php echo api_htmlentities($institutionForm, ENT_QUOTES); ?>" />
<input type="hidden" name="institutionUrlForm" value="<?php echo api_stristr($institutionUrlForm, 'http://', false) ? api_htmlentities($institutionUrlForm, ENT_QUOTES) : api_stristr($institutionUrlForm, 'https://', false) ? api_htmlentities($institutionUrlForm, ENT_QUOTES) : 'http://'.api_htmlentities($institutionUrlForm, ENT_QUOTES); ?>" />
<input type="hidden" name="checkEmailByHashSent" value="<?php echo api_htmlentities($checkEmailByHashSent, ENT_QUOTES); ?>" />
<input type="hidden" name="ShowEmailnotcheckedToStudent" value="<?php echo api_htmlentities($ShowEmailnotcheckedToStudent, ENT_QUOTES); ?>" />
<input type="hidden" name="userMailCanBeEmpty" value="<?php echo api_htmlentities($userMailCanBeEmpty, ENT_QUOTES); ?>" />
<input type="hidden" name="encryptPassForm" value="<?php echo api_htmlentities($encryptPassForm, ENT_QUOTES); ?>" />
<input type="hidden" name="session_lifetime" value="<?php echo api_htmlentities($session_lifetime, ENT_QUOTES); ?>" />
<input type="hidden" name="old_version" value="<?php echo api_htmlentities($my_old_version, ENT_QUOTES); ?>" />
<input type="hidden" name="new_version" value="<?php echo api_htmlentities($new_version, ENT_QUOTES); ?>" />
<?php
if($_POST['step2'])
{
if ($_POST['step2']) {
//STEP 3 : LICENSE
display_license_agreement();
} elseif ($_POST['step3']) {
//STEP 4 : MYSQL DATABASE SETTINGS
display_database_settings_form($installType, $dbHostForm, $dbUsernameForm, $dbPassForm, $dbPrefixForm, $enableTrackingForm, $singleDbForm, $dbNameForm, $dbStatsForm, $dbScormForm, $dbUserForm);
}
elseif($_POST['step4'])
{
} elseif ($_POST['step4']) {
//STEP 5 : CONFIGURATION SETTINGS
//if update, try getting settings from the database...
if($installType == 'update')
{
if ($installType == 'update') {
$db_name = $dbNameForm;
$tmp = get_config_param_from_db($dbHostForm, $dbUsernameForm, $dbPassForm, $db_name, 'platformLanguage');
if (!empty($tmp)) $languageForm = $tmp;
$tmp = get_config_param_from_db($dbHostForm, $dbUsernameForm, $dbPassForm, $db_name, 'emailAdministrator');
if (!empty($tmp)) $emailForm = $tmp;
$tmp = get_config_param_from_db($dbHostForm, $dbUsernameForm, $dbPassForm, $db_name, 'administratorName');
if (!empty($tmp)) $adminFirstName = $tmp;
$tmp = get_config_param_from_db($dbHostForm, $dbUsernameForm, $dbPassForm, $db_name, 'administratorSurname');
if (!empty($tmp)) $adminLastName = $tmp;
$tmp = get_config_param_from_db($dbHostForm, $dbUsernameForm, $dbPassForm, $db_name, 'administratorTelephone');
if (!empty($tmp)) $adminPhoneForm = $tmp;
$tmp = get_config_param_from_db($dbHostForm, $dbUsernameForm, $dbPassForm, $db_name, 'siteName');
if (!empty($tmp)) $campusForm = $tmp;
$tmp = get_config_param_from_db($dbHostForm, $dbUsernameForm, $dbPassForm, $db_name, 'Institution');
if (!empty($tmp)) $institutionForm = $tmp;
$tmp = get_config_param_from_db($dbHostForm, $dbUsernameForm, $dbPassForm, $db_name, 'InstitutionUrl');
if (!empty($tmp)) $institutionUrlForm = $tmp;
if(in_array($my_old_version,$update_from_version_6))
{ //for version 1.6
if (in_array($my_old_version, $update_from_version_6)) { //for version 1.6
$urlForm = get_config_param('rootWeb');
$encryptPassForm = get_config_param('userPasswordCrypted');
// Managing the $encryptPassForm
@ -565,9 +511,8 @@ elseif($_POST['step4'])
$allowSelfReg = get_config_param('allowSelfReg');
$allowSelfRegProf = get_config_param('allowSelfRegProf');
}
else
{ //for version 1.8
} else { //for version 1.8
$urlForm = $_configuration['root_web'];
$encryptPassForm = get_config_param('userPasswordCrypted');
// Managing the $encryptPassForm
@ -580,15 +525,16 @@ elseif($_POST['step4'])
$allowSelfReg = false;
$tmp = get_config_param_from_db($dbHostForm, $dbUsernameForm, $dbPassForm, $db_name, 'allow_registration');
if (!empty($tmp)) $allowSelfReg = $tmp;
$allowSelfRegProf = false;
$tmp = get_config_param_from_db($dbHostForm, $dbUsernameForm, $dbPassForm, $db_name, 'allow_registration_as_teacher');
if (!empty($tmp)) $allowSelfRegProf = $tmp;
}
}
display_configuration_settings_form($installType, $urlForm, $languageForm, $emailForm, $adminFirstName, $adminLastName, $adminPhoneForm, $campusForm, $institutionForm, $institutionUrlForm, $encryptPassForm, $allowSelfReg, $allowSelfRegProf, $loginForm, $passForm);
}
elseif($_POST['step5'])
{
} elseif($_POST['step5']) {
//STEP 6 : LAST CHECK BEFORE INSTALL
?>
@ -596,7 +542,7 @@ elseif($_POST['step5'])
<?php echo get_lang('HereAreTheValuesYouEntered'); ?>
<br />
<b><?php echo get_lang('PrintThisPageToRememberPassAndOthers');?></b>
<strong><?php echo get_lang('PrintThisPageToRememberPassAndOthers'); ?></strong>
<blockquote>
@ -606,20 +552,17 @@ elseif($_POST['step5'])
<?php echo get_lang('DBLogin').' : '.$dbUsernameForm; ?><br />
<?php echo get_lang('DBPassword').' : '.str_repeat('*', strlen($dbPassForm)); ?><br />
<?php if (!empty($dbPrefixForm)) echo get_lang('DbPrefixForm').' : '.$dbPrefixForm.'<br />'; ?>
<?php echo get_lang('MainDB').' : <b>'.$dbNameForm; ?></b><?php if($installType == 'new') echo ' (<font color="#cc0033">'.get_lang('ReadWarningBelow').'</font>)'; ?><br />
<?php echo get_lang('MainDB').' : <strong>'.$dbNameForm; ?></strong><?php if($installType == 'new') echo ' (<font color="#cc0033">'.get_lang('ReadWarningBelow').'</font>)'; ?><br />
<?php
if(!$singleDbForm)
{
echo get_lang('StatDB').' : <b>'.$dbStatsForm.'</b>';
if($installType == 'new')
{
if (!$singleDbForm) {
echo get_lang('StatDB').' : <strong>'.$dbStatsForm.'</strong>';
if ($installType == 'new') {
echo ' (<font color="#cc0033">'.get_lang('ReadWarningBelow').'</font>)';
}
echo '<br />';
echo get_lang('UserDB').' : <b>'.$dbUserForm.'</b>';
if($installType == 'new')
{
echo get_lang('UserDB').' : <strong>'.$dbUserForm.'</strong>';
if ($installType == 'new') {
echo ' (<font color="#cc0033">'.get_lang('ReadWarningBelow').'</font>)';
}
echo '<br />';
@ -644,8 +587,8 @@ elseif($_POST['step5'])
<?php echo get_lang('AdminPhone').' : '.$adminPhoneForm; ?><br />
<?php if($installType == 'new'): ?>
<?php echo get_lang('AdminLogin').' : <b>'.$loginForm; ?></b><br />
<?php echo get_lang('AdminPass').' : <b>'.$passForm; ?></b><br /><br />
<?php echo get_lang('AdminLogin').' : <strong>'.$loginForm; ?></strong><br />
<?php echo get_lang('AdminPass').' : <strong>'.$passForm; /* TODO: Maybe this password should be hidden too? */ ?></strong><br /><br />
<?php else: ?>
<br />
<?php endif; ?>
@ -659,10 +602,10 @@ elseif($_POST['step5'])
<?php if($installType == 'new'): ?>
<div style="background-color:#FFFFFF">
<p align="center"><b><font color="red">
<p align="center"><strong><font color="red">
<?php echo get_lang('Warning');?> !<br />
<?php echo get_lang('TheInstallScriptWillEraseAllTables'); ?>
</font></b></p>
</font></strong></p>
</div>
<?php endif; ?>
@ -674,12 +617,10 @@ elseif($_POST['step5'])
</table>
<?php
}
elseif($_POST['step6'])
{
} elseif($_POST['step6']) {
//STEP 6 : INSTALLATION PROCESS
if($installType == 'update')
{
if ($installType == 'update') {
if (empty($my_old_version)) { $my_old_version = '1.8.6'; } //we guess
$_configuration['main_database'] = $dbNameForm;
//$urlAppendPath = get_config_param('urlAppend');
@ -699,50 +640,54 @@ elseif($_POST['step6'])
case '1.6.3':
case '1.6.4':
case '1.6.5':
include('update-db-1.6.x-1.8.0.inc.php');
include('update-files-1.6.x-1.8.0.inc.php');
include 'update-db-1.6.x-1.8.0.inc.php';
include 'update-files-1.6.x-1.8.0.inc.php';
//intentionally no break to continue processing
case '1.8':
case '1.8.0':
include('update-db-1.8.0-1.8.2.inc.php');
include 'update-db-1.8.0-1.8.2.inc.php';
//intentionally no break to continue processing
case '1.8.2':
include('update-db-1.8.2-1.8.3.inc.php');
include 'update-db-1.8.2-1.8.3.inc.php';
//intentionally no break to continue processing
case '1.8.3':
include('update-db-1.8.3-1.8.4.inc.php');
include('update-files-1.8.3-1.8.4.inc.php');
include 'update-db-1.8.3-1.8.4.inc.php';
include 'update-files-1.8.3-1.8.4.inc.php';
case '1.8.4':
include('update-db-1.8.4-1.8.5.inc.php');
include('update-files-1.8.4-1.8.5.inc.php');
include 'update-db-1.8.4-1.8.5.inc.php';
include 'update-files-1.8.4-1.8.5.inc.php';
case '1.8.5':
include('update-db-1.8.5-1.8.6.inc.php');
include('update-files-1.8.5-1.8.6.inc.php');
include 'update-db-1.8.5-1.8.6.inc.php';
include 'update-files-1.8.5-1.8.6.inc.php';
case '1.8.6':
include('update-db-1.8.6-1.8.6.1.inc.php');
include('update-files-1.8.6-1.8.6.1.inc.php');
include 'update-db-1.8.6-1.8.6.1.inc.php';
include 'update-files-1.8.6-1.8.6.1.inc.php';
case '1.8.6.1':
include('update-db-1.8.6.1-1.8.6.2.inc.php');
include('update-files-1.8.6.1-1.8.6.2.inc.php');
include 'update-db-1.8.6.1-1.8.6.2.inc.php';
include 'update-files-1.8.6.1-1.8.6.2.inc.php';
case '1.8.6.2':
include('update-db-1.8.6.2-1.8.7.inc.php');
//include('update-files-1.8.6.2-1.8.7.inc.php');
include 'update-db-1.8.6.2-1.8.7.inc.php';
//include 'update-files-1.8.6.2-1.8.7.inc.php';
default:
break;
}
} else {
include('install_db.inc.php');
include('install_files.inc.php');
include 'install_db.inc.php';
include 'install_files.inc.php';
}
display_after_install_message($installType, $nbr_courses);
} elseif ($_POST['step1'] || $badUpdatePath) {
//STEP 1 : REQUIREMENTS
//make sure that proposed path is set, shouldn't be necessary but...
if (empty($proposedUpdatePath)) { $proposedUpdatePath = $_POST['updatePath']; }
display_requirements($installType, $badUpdatePath, $proposedUpdatePath, $update_from_version_8, $update_from_version_6);
} else {
//start screen
// This is the start screen.
display_language_selection();
}
?>
@ -755,7 +700,7 @@ elseif($_POST['step6'])
<div class="push"></div>
</div><!-- wrapper end-->
<div id="footer">
<div class="copyright"><?php echo get_lang('Platform');?> <a href="http://www.chamilo.org" target="_blank"> Chamilo <?php echo $new_version ?></a> &copy; <?php echo date('Y'); ?> </div>
<div class="copyright"><?php echo get_lang('Platform'); ?> <a href="http://www.chamilo.org" target="_blank"> Chamilo <?php echo $new_version; ?></a> &copy; <?php echo date('Y'); ?> </div>
&nbsp;
</div>
</body>

Write Preview
Loading…
Cancel
Save