Fix installation errors

pull/3883/head
Julio Montoya 5 years ago
parent 4aaf8c65e6
commit 32c676f4af
  1. 11
      main/install/index.php
  2. 2
      main/install/install.lib.php

@ -216,6 +216,7 @@ if ($installType == 'update' && in_array($my_old_version, $update_from_version_8
}
$session_lifetime = 360000;
$institutionUrlForm = 'http://www.chamilo.org';
if (!isset($_GET['running'])) {
$dbHostForm = 'localhost';
@ -435,6 +436,14 @@ if (empty($installationProfile)) {
$installationProfile = api_htmlentities($_POST['installationProfile']);
}
}
$institutionUrlFormResult = '';
if (api_stristr($institutionUrlForm, 'http://') || api_stristr($institutionUrlForm, 'https://')) {
$institutionUrlFormResult = api_htmlentities($institutionUrlForm, ENT_QUOTES);
} else {
$institutionUrlFormResult = api_htmlentities($institutionUrlForm, ENT_QUOTES);
}
?>
<input type="hidden" name="updatePath" value="<?php if (!$badUpdatePath) {
echo api_htmlentities($proposedUpdatePath, ENT_QUOTES);
@ -459,7 +468,7 @@ if (empty($installationProfile)) {
<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="institutionUrlForm" value="<?php echo $institutionUrlFormResult; ?>" />
<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); ?>" />

@ -778,7 +778,7 @@ function display_requirements(
if (!$properlyAccessUrl) {
echo '
<div class="alert alert-danger">
'.Display::return_icon('error.png', get_lang('Error'), [], ICON_SIZE_MEDIUM, true, false, true).
'.Display::return_icon('error.png', get_lang('Error'), [], ICON_SIZE_MEDIUM, true, false, false).
' '.
sprintf(get_lang('InstallMultiURLDetectedNotMainURL'), api_get_configuration_value('root_web')).'
</div>

Loading…
Cancel
Save