Minor - Fix code indentation and spacing

1.10.x
Yannick Warnier 11 years ago
parent 7124eb5bed
commit eee8f36197
  1. 54
      main/install/index.php

@ -219,7 +219,7 @@ if (!isset($_GET['running'])) {
$languageForm = api_get_interface_language();
$checkEmailByHashSent = 0;
$ShowEmailnotcheckedToStudent = 1;
$ShowEmailNotCheckedToStudent = 1;
$userMailCanBeEmpty = 1;
$allowSelfReg = 1;
$allowSelfRegProf = 1;
@ -437,7 +437,7 @@ if ($encryptPassForm == '1') {
<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="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); ?>" />
@ -472,28 +472,44 @@ if (@$_POST['step2']) {
);
$tmp = get_config_param_from_db('platformLanguage');
if (!empty($tmp)) $languageForm = $tmp;
if (!empty($tmp)) {
$languageForm = $tmp;
}
$tmp = get_config_param_from_db('emailAdministrator');
if (!empty($tmp)) $emailForm = $tmp;
if (!empty($tmp)) {
$emailForm = $tmp;
}
$tmp = get_config_param_from_db('administratorName');
if (!empty($tmp)) $adminFirstName = $tmp;
if (!empty($tmp)) {
$adminFirstName = $tmp;
}
$tmp = get_config_param_from_db('administratorSurname');
if (!empty($tmp)) $adminLastName = $tmp;
if (!empty($tmp)) {
$adminLastName = $tmp;
}
$tmp = get_config_param_from_db('administratorTelephone');
if (!empty($tmp)) $adminPhoneForm = $tmp;
if (!empty($tmp)) {
$adminPhoneForm = $tmp;
}
$tmp = get_config_param_from_db('siteName');
if (!empty($tmp)) $campusForm = $tmp;
if (!empty($tmp)) {
$campusForm = $tmp;
}
$tmp = get_config_param_from_db('Institution');
if (!empty($tmp)) $institutionForm = $tmp;
if (!empty($tmp)) {
$institutionForm = $tmp;
}
$tmp = get_config_param_from_db('InstitutionUrl');
if (!empty($tmp)) $institutionUrlForm = $tmp;
if (!empty($tmp)) {
$institutionUrlForm = $tmp;
}
// For version 1.9
$urlForm = $_configuration['root_web'];
@ -507,11 +523,15 @@ if (@$_POST['step2']) {
$allowSelfReg = false;
$tmp = get_config_param_from_db('allow_registration');
if (!empty($tmp)) $allowSelfReg = $tmp;
if (!empty($tmp)) {
$allowSelfReg = $tmp;
}
$allowSelfRegProf = false;
$tmp = get_config_param_from_db('allow_registration_as_teacher');
if (!empty($tmp)) $allowSelfRegProf = $tmp;
if (!empty($tmp)) {
$allowSelfRegProf = $tmp;
}
}
display_configuration_settings_form(
@ -542,11 +562,11 @@ if (@$_POST['step2']) {
<?php echo get_lang('HereAreTheValuesYouEntered'); ?>
</div><br />
<?php if ($installType == 'new'): ?>
<?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: ?>
<?php endif;
<?php
if ($installType == 'new') {
echo get_lang('AdminLogin') . ' : <strong>' . $loginForm . '</strong><br />';
echo get_lang('AdminPass') . ' : <strong>' . $passForm . '</strong><br /><br />'; /* TODO: Maybe this password should be hidden too? */
}
if (api_is_western_name_order()) {
echo get_lang('AdminFirstName').' : '.$adminFirstName, '<br />', get_lang('AdminLastName').' : '.$adminLastName, '<br />';

Loading…
Cancel
Save