From eee8f36197b4e25d87a1299eefa524a18a5c7793 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 21 Apr 2015 09:29:23 -0500 Subject: [PATCH] Minor - Fix code indentation and spacing --- main/install/index.php | 848 +++++++++++++++++++++-------------------- 1 file changed, 434 insertions(+), 414 deletions(-) diff --git a/main/install/index.php b/main/install/index.php index 3526139ecb..8cbe13c99a 100755 --- a/main/install/index.php +++ b/main/install/index.php @@ -14,7 +14,7 @@ * @package chamilo.install */ -/* CONSTANTS */ +/* CONSTANTS */ use ChamiloSession as Session; @@ -26,7 +26,7 @@ define('FORM_FIELD_DISPLAY_LENGTH', 40); define('DATABASE_FORM_FIELD_DISPLAY_LENGTH', 25); define('MAX_FORM_FIELD_LENGTH', 80); -/* PHP VERSION CHECK */ +/* PHP VERSION CHECK */ // Including necessary libraries. require_once '../inc/lib/api.lib.php'; @@ -44,23 +44,23 @@ require_once 'install.lib.php'; // We need to provide some limited support for it through initialization of the // global array-type variable $_setting. $_setting = array( - 'platform_charset' => 'UTF-8', - 'server_type' => 'production', // 'production' | 'test' - 'permissions_for_new_directories' => '0770', - 'permissions_for_new_files' => '0660', - 'stylesheets' => 'chamilo' + 'platform_charset' => 'UTF-8', + 'server_type' => 'production', // 'production' | 'test' + 'permissions_for_new_directories' => '0770', + 'permissions_for_new_files' => '0660', + 'stylesheets' => 'chamilo' ); // Determination of the language during the installation procedure. if (!empty($_POST['language_list'])) { - $search = array('../', '\\0'); - $install_language = str_replace($search, '', urldecode($_POST['language_list'])); - Session::write('install_language',$install_language); + $search = array('../', '\\0'); + $install_language = str_replace($search, '', urldecode($_POST['language_list'])); + Session::write('install_language', $install_language); } elseif (isset($_SESSION['install_language']) && $_SESSION['install_language']) { - $install_language = $_SESSION['install_language']; + $install_language = $_SESSION['install_language']; } else { - // Trying to switch to the browser's language, it is covenient for most of the cases. - $install_language = detect_browser_language(); + // Trying to switch to the browser's language, it is covenient for most of the cases. + $install_language = detect_browser_language(); } // Language validation. @@ -99,16 +99,16 @@ error_reporting(E_ALL); // Upgrading from any subversion of 1.9 $update_from_version_8 = array( - '1.9.0', - '1.9.2', - '1.9.4', - '1.9.6', - '1.9.6.1', - '1.9.8', - '1.9.8.1', - '1.9.8.2', - '1.9.10', - '1.9.10.2' + '1.9.0', + '1.9.2', + '1.9.4', + '1.9.6', + '1.9.6.1', + '1.9.8', + '1.9.8.1', + '1.9.8.2', + '1.9.10', + '1.9.10.2' ); $my_old_version = ''; @@ -134,185 +134,185 @@ if (isAlreadyInstalledSystem()) { die(); } -/* STEP 1 : INITIALIZES FORM VARIABLES IF IT IS THE FIRST VISIT */ +/* STEP 1 : INITIALIZES FORM VARIABLES IF IT IS THE FIRST VISIT */ // Is valid request $is_valid_request = isset($_REQUEST['is_executable']) ? $_REQUEST['is_executable'] : null; /*foreach ($_POST as $request_index => $request_value) { - if (substr($request_index, 0, 4) == 'step') { - if ($request_index != $is_valid_request) { - unset($_POST[$request_index]); - } - } + if (substr($request_index, 0, 4) == 'step') { + if ($request_index != $is_valid_request) { + unset($_POST[$request_index]); + } + } }*/ $badUpdatePath = false; $emptyUpdatePath = true; $proposedUpdatePath = ''; if (!empty($_POST['updatePath'])) { - $proposedUpdatePath = $_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']) { - $emptyUpdatePath = false; - $proposedUpdatePath = api_add_trailing_slash(empty($_POST['updatePath']) ? api_get_path(SYS_PATH) : $_POST['updatePath']); - if (file_exists($proposedUpdatePath)) { - if (in_array($my_old_version, $update_from_version_8)) { - $_POST['step2'] = 1; - } else { - $badUpdatePath = true; - } - } else { - $badUpdatePath = true; - } - } - } + if (@$_POST['step2_install']) { + $installType = 'new'; + $_POST['step2'] = 1; + } else { + $installType = 'update'; + if (@$_POST['step2_update_8']) { + $emptyUpdatePath = false; + $proposedUpdatePath = api_add_trailing_slash(empty($_POST['updatePath']) ? api_get_path(SYS_PATH) : $_POST['updatePath']); + if (file_exists($proposedUpdatePath)) { + if (in_array($my_old_version, $update_from_version_8)) { + $_POST['step2'] = 1; + } else { + $badUpdatePath = true; + } + } else { + $badUpdatePath = true; + } + } + } } elseif (@$_POST['step1']) { - $_POST['updatePath'] = ''; - $installType = ''; - $updateFromConfigFile = ''; - unset($_GET['running']); + $_POST['updatePath'] = ''; + $installType = ''; + $updateFromConfigFile = ''; + unset($_GET['running']); } else { - $installType = isset($_GET['installType']) ? $_GET['installType'] : null; - $updateFromConfigFile = isset($_GET['updateFromConfigFile']) ? $_GET['updateFromConfigFile'] : false; + $installType = isset($_GET['installType']) ? $_GET['installType'] : null; + $updateFromConfigFile = isset($_GET['updateFromConfigFile']) ? $_GET['updateFromConfigFile'] : false; } if ($installType == 'update' && in_array($my_old_version, $update_from_version_8)) { - // This is the main configuration file of the system before the upgrade. - include api_get_path(CONFIGURATION_PATH).'configuration.php'; // Don't change to include_once + // This is the main configuration file of the system before the upgrade. + include api_get_path(CONFIGURATION_PATH) . 'configuration.php'; // Don't change to include_once } if (!isset($_GET['running'])) { - $dbHostForm = 'localhost'; - $dbUsernameForm = 'root'; - $dbPassForm = ''; - $dbNameForm = 'chamilo'; - - // Extract the path to append to the url if Chamilo is not installed on the web root directory. - $urlAppendPath = api_remove_trailing_slash(api_get_path(REL_PATH)); - $urlForm = api_get_path(WEB_PATH); - $pathForm = api_get_path(SYS_PATH); - $emailForm = 'webmaster@localhost'; - if (!empty($_SERVER['SERVER_ADMIN'])) { - $emailForm = $_SERVER['SERVER_ADMIN']; - } - $email_parts = explode('@', $emailForm); - if (isset($email_parts[1]) && $email_parts[1] == 'localhost') { - $emailForm .= '.localdomain'; - } - $adminLastName = 'Doe'; - $adminFirstName = 'John'; - $loginForm = 'admin'; - $passForm = api_generate_password(); - - $campusForm = 'My campus'; - $educationForm = 'Albert Einstein'; - $adminPhoneForm = '(000) 001 02 03'; - $institutionForm = 'My Organisation'; - $institutionUrlForm = 'http://www.chamilo.org'; - $languageForm = api_get_interface_language(); - - $checkEmailByHashSent = 0; - $ShowEmailnotcheckedToStudent = 1; - $userMailCanBeEmpty = 1; - $allowSelfReg = 1; - $allowSelfRegProf = 1; - $encryptPassForm = 'sha1'; - $session_lifetime = 360000; + $dbHostForm = 'localhost'; + $dbUsernameForm = 'root'; + $dbPassForm = ''; + $dbNameForm = 'chamilo'; + + // Extract the path to append to the url if Chamilo is not installed on the web root directory. + $urlAppendPath = api_remove_trailing_slash(api_get_path(REL_PATH)); + $urlForm = api_get_path(WEB_PATH); + $pathForm = api_get_path(SYS_PATH); + $emailForm = 'webmaster@localhost'; + if (!empty($_SERVER['SERVER_ADMIN'])) { + $emailForm = $_SERVER['SERVER_ADMIN']; + } + $email_parts = explode('@', $emailForm); + if (isset($email_parts[1]) && $email_parts[1] == 'localhost') { + $emailForm .= '.localdomain'; + } + $adminLastName = 'Doe'; + $adminFirstName = 'John'; + $loginForm = 'admin'; + $passForm = api_generate_password(); + + $campusForm = 'My campus'; + $educationForm = 'Albert Einstein'; + $adminPhoneForm = '(000) 001 02 03'; + $institutionForm = 'My Organisation'; + $institutionUrlForm = 'http://www.chamilo.org'; + $languageForm = api_get_interface_language(); + + $checkEmailByHashSent = 0; + $ShowEmailNotCheckedToStudent = 1; + $userMailCanBeEmpty = 1; + $allowSelfReg = 1; + $allowSelfRegProf = 1; + $encryptPassForm = 'sha1'; + $session_lifetime = 360000; } else { - foreach ($_POST as $key => $val) { - $magic_quotes_gpc = ini_get('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) { - $val2 = stripslashes($val2); - } - $val2 = trim($val2); - $_POST[$key][$key2] = $val2; - } - } - $GLOBALS[$key] = $_POST[$key]; - } + foreach ($_POST as $key => $val) { + $magic_quotes_gpc = ini_get('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) { + $val2 = stripslashes($val2); + } + $val2 = trim($val2); + $_POST[$key][$key2] = $val2; + } + } + $GLOBALS[$key] = $_POST[$key]; + } } -/* NEXT STEPS IMPLEMENTATION */ +/* NEXT STEPS IMPLEMENTATION */ $total_steps = 7; 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))) { - $current_step = 2; -} elseif (!empty($_POST['step2']) or (!empty($_POST['step2_update_8']) or (!empty($_POST['step2_update_6'])) )) { - $current_step = 3; + $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))) { + $current_step = 2; +} elseif (!empty($_POST['step2']) or (!empty($_POST['step2_update_8']) or (!empty($_POST['step2_update_6'])))) { + $current_step = 3; } elseif (!empty($_POST['step3'])) { - $current_step = 4; + $current_step = 4; } elseif (!empty($_POST['step4'])) { - $current_step = 5; + $current_step = 5; } elseif (!empty($_POST['step5'])) { - $current_step = 6; + $current_step = 6; } // Managing the $encryptPassForm if ($encryptPassForm == '1') { - $encryptPassForm = 'sha1'; + $encryptPassForm = 'sha1'; } elseif ($encryptPassForm == '0') { - $encryptPassForm = 'none'; + $encryptPassForm = 'none'; } ?> - — <?php echo get_lang('ChamiloInstallation').' — '.get_lang('Version_').' '.$new_version; ?> - - - + - +
-
+
-
+

'.get_lang('ChamiloInstallation').' – '.get_lang('Version_').' '.$new_version.'

'; ?> @@ -393,10 +393,10 @@ if ($encryptPassForm == '1') {
- + -
+
@@ -404,190 +404,210 @@ if ($encryptPassForm == '1') {

'.$instalation_type_label.'

'; - } +$instalation_type_label = ''; +if ($installType == 'new') { + $instalation_type_label = get_lang('NewInstallation'); +} elseif ($installType == 'update') { + $update_from_version = isset($update_from_version) ? $update_from_version : null; + $instalation_type_label = get_lang('UpdateFromLMSVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : ''); +} +if (!empty($instalation_type_label) && empty($_POST['step6'])) { + echo '

'.$instalation_type_label.'

'; +} ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-

-
+

+
- -

+ +
- - '.$loginForm; ?>
- '.$passForm; /* TODO: Maybe this password should be hidden too? */ ?>

- - ' . $loginForm . '
'; + echo get_lang('AdminPass') . ' : ' . $passForm . '

'; /* TODO: Maybe this password should be hidden too? */ + } - if (api_is_western_name_order()) { - echo get_lang('AdminFirstName').' : '.$adminFirstName, '
', get_lang('AdminLastName').' : '.$adminLastName, '
'; - } else { - echo get_lang('AdminLastName').' : '.$adminLastName, '
', get_lang('AdminFirstName').' : '.$adminFirstName, '
'; - } + if (api_is_western_name_order()) { + echo get_lang('AdminFirstName').' : '.$adminFirstName, '
', get_lang('AdminLastName').' : '.$adminLastName, '
'; + } else { + echo get_lang('AdminLastName').' : '.$adminLastName, '
', get_lang('AdminFirstName').' : '.$adminFirstName, '
'; + } echo get_lang('AdminEmail').' : '.$emailForm; ?>
-
-

-
-
-
- '.$dbNameForm; ?>
-
- +
+

+
+
+
+ '.$dbNameForm; ?>
+
+

-
-
-
-
- '.get_lang( - 'Warning' - ).'
'.get_lang('TheInstallScriptWillEraseAllTables'), - false - ); - } - ?> - - +
+
+
+
+ '.get_lang( + 'Warning' + ).'
'.get_lang('TheInstallScriptWillEraseAllTables'), + false + ); + } + ?> + +
-
+ + @@ -599,11 +619,11 @@ if (@$_POST['step2']) {
+ -getConnection()->getSchemaManager()->dropAndCreateDatabase($dbNameForm); + // Drop and create the database anyways + $manager->getConnection()->getSchemaManager()->dropAndCreateDatabase($dbNameForm); - $manager = testDbConnect( - $dbHostForm, - $dbUsernameForm, - $dbPassForm, - $dbNameForm - ); + $manager = testDbConnect( + $dbHostForm, + $dbUsernameForm, + $dbPassForm, + $dbNameForm + ); - $metadataList = $manager->getMetadataFactory()->getAllMetadata(); - $schema = $manager->getConnection()->getSchemaManager()->createSchema(); + $metadataList = $manager->getMetadataFactory()->getAllMetadata(); + $schema = $manager->getConnection()->getSchemaManager()->createSchema(); - // Create database schema - $tool = new \Doctrine\ORM\Tools\SchemaTool($manager); - $tool->createSchema($metadataList); + // Create database schema + $tool = new \Doctrine\ORM\Tools\SchemaTool($manager); + $tool->createSchema($metadataList); - finishInstallation( - $manager, + finishInstallation( + $manager, $sysPath, - $encryptPassForm, - $passForm, - $adminLastName, - $adminFirstName, - $loginForm, - $emailForm, - $adminPhoneForm, - $languageForm, - $institutionForm, - $institutionUrlForm, - $campusForm, - $allowSelfReg, - $allowSelfRegProf - ); - - include 'install_files.inc.php'; - } + $encryptPassForm, + $passForm, + $adminLastName, + $adminFirstName, + $loginForm, + $emailForm, + $adminPhoneForm, + $languageForm, + $institutionForm, + $institutionUrlForm, + $campusForm, + $allowSelfReg, + $allowSelfRegProf + ); + + include 'install_files.inc.php'; + } display_after_install_message($installType); // Hide the "please wait" message sent previously echo ''; } elseif (@$_POST['step1'] || $badUpdatePath) { - //STEP 1 : REQUIREMENTS + //STEP 1 : REQUIREMENTS //make sure that proposed path is set, shouldn't be necessary but... - if (empty($proposedUpdatePath)) { - $proposedUpdatePath = $_POST['updatePath']; - } + if (empty($proposedUpdatePath)) { + $proposedUpdatePath = $_POST['updatePath']; + } display_requirements($installType, $badUpdatePath, $proposedUpdatePath, $update_from_version_8); } else { - // This is the start screen. + // This is the start screen. display_language_selection(); } ?> - - - - -
- - - + + + + +
+ + +