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 HTML fixes in the installation + showing the several/on DB inputs see #3804

Browse Source
skala
Julio Montoya 14 years ago
parent e6da6f8f7e
commit b2922fb361
2 changed files with 132 additions and 148 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. 25
      main/install/index.php
  2. 95
      main/install/install.lib.php

25
main/install/index.php
Unescape View File

@ -126,13 +126,13 @@ $software_name = 'Chamilo';
$software_url = 'http://www.chamilo.org/';
// A protection measure for already installed systems.
/*
if (is_already_installed_system()) {
// The system has already been installed, so block re-installation.
$global_error_code = 6;
require '../inc/global_error_message.inc.php';
die();
}
}*/
/* STEP 1 : INITIALIZES FORM VARIABLES IF IT IS THE FIRST VISIT */
@ -377,7 +377,7 @@ if ($encryptPassForm == '1') {
}
//document.getElementById('optional_param5').style.display = '';
document.getElementById('optional_param6').style.display = '';
//document.getElementById('optional_param6').style.display = '';
init_visibility = 1;
document.getElementById('optionalparameters').innerHTML='<img style="vertical-align:middle;" src="../img/div_hide.gif" alt="" /> <?php echo get_lang('OptionalParameters', ''); ?>';
} else {
@ -389,7 +389,7 @@ if ($encryptPassForm == '1') {
document.getElementById('optional_param4').style.display = 'none';
*/
document.getElementById('optional_param5').style.display = 'none';
document.getElementById('optional_param6').style.display = 'none';
//document.getElementById('optional_param6').style.display = 'none';
document.getElementById('optionalparameters').innerHTML='<img style="vertical-align:middle;" src="../img/div_show.gif" alt="" /> <?php echo get_lang('OptionalParameters', ''); ?>';
init_visibility = 0;
}
@ -448,7 +448,6 @@ if ($encryptPassForm == '1') {
<div id="header">
<div id="header1">
<div id="logo">
<img src="../css/chamilo/images/header-logo.png" hspace="10" vspace="10" alt="Chamilo" />
</div>
@ -686,11 +685,9 @@ if ($_POST['step2']) {
<?php if ($installType == 'new'): ?>
<div style="background-color:#FFFFFF">
<div class="warning-message"><center><h2><?php echo get_lang('Warning'); ?> !</h2></center><br />
<?php echo get_lang('TheInstallScriptWillEraseAllTables'); ?>
</div>
</div>
<?php endif; ?>
@ -796,9 +793,7 @@ if ($_POST['step2']) {
default:
break;
}
} else {
set_file_folder_permissions();
database_server_connect();
@ -828,13 +823,17 @@ if ($_POST['step2']) {
</tr>
</table>
</form>
</div>
<br style="clear:both;" />
</div> <!-- main end-->
<div class="push"></div>
</div><!-- wrapper end-->
<div id="footer">
<div class="copyright"><?php echo get_lang('Platform'); ?> <a href="<?php echo $software_url; ?>" target="_blank"><?php echo $software_name; ?> <?php echo $new_version; ?></a> &copy; <?php echo date('Y'); ?> </div>
&nbsp;
<div id="bottom_corner"></div>
<div class="copyright">
<?php echo get_lang('Platform'); ?> <a href="<?php echo $software_url; ?>" target="_blank"><?php echo $software_name; ?> <?php echo $new_version; ?></a> &copy; <?php echo date('Y'); ?>
</div>
<div class="footer_emails"><div style="clear:both"></div></div>
</div>
</body>
</html>

95
main/install/install.lib.php
Unescape View File

@ -1013,7 +1013,7 @@ function display_language_selection() { ?>
<p><?php echo get_lang('PleaseSelectInstallationProcessLanguage'); ?>:</p>
<form id="lang_form" method="post" action="<?php echo api_get_self(); ?>">
<?php display_language_selection_box('language_list', api_get_interface_language()); ?>
<button type="submit" name="step1" class="next" value="<?php get_lang('Next'); ?> &gt;"><?php echo get_lang('Next'); ?></button>
<button type="submit" name="step1" class="next" value="<?php echo get_lang('Next'); ?>"><?php echo get_lang('Next'); ?></button>
<input type="hidden" name="is_executable" id="is_executable" value="-" />
</form>
</div>
@ -1040,7 +1040,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
echo get_lang('MoreDetails').' <a href="../../documentation/installation_guide.html" target="_blank">'.get_lang('ReadTheInstallGuide').'</a>.<br />'."\n";
if ($installType == 'update') {
echo get_lang('IfYouPlanToUpgradeFromOlderVersionYouMightWantToHaveAlookAtTheChangelog').'<br />'."\n";
echo get_lang('IfYouPlanToUpgradeFromOlderVersionYouMightWantToHaveAlookAtTheChangelog').'<br />';
}
echo '</div>';
@ -1377,9 +1377,10 @@ function display_license_agreement() {
</td>
</tr>
<tr><td>
<input type="checkbox" name="accept" id="accept_licence" value="1">
<input type="checkbox" name="accept" id="accept_licence" value="1" />
<label for="accept_licence"><?php echo get_lang('IAccept'); ?></label>
</td></tr>
</td>
</tr>
<tr><td><p><?php echo get_lang('DokeosArtLicense'); ?></p></td></tr>
<tr>
<td>
@ -1401,16 +1402,17 @@ function display_license_agreement() {
<div>
<div class="formw">
<a href="javascript://" class = "advanced_parameters" >
<span id="img_plus_and_minus">&nbsp;<img src="<?php echo api_get_path(WEB_IMG_PATH) ?>div_hide.gif" alt="<?php echo get_lang('Hide') ?>" title="<?php echo get_lang('Hide')?>" style ="vertical-align:middle" >&nbsp;<?php echo get_lang('ContactInformation') ?></span>
<span id="img_plus_and_minus">&nbsp;<img src="<?php echo api_get_path(WEB_IMG_PATH) ?>div_hide.gif" alt="<?php echo get_lang('Hide') ?>" title="<?php echo get_lang('Hide')?>" style ="vertical-align:middle" />&nbsp;<?php echo get_lang('ContactInformation') ?></span>
</a>
</div>
</div>
<div id="id_contact_form" style="display:block">
<div class="normal-message"><?php echo get_lang('ContactInformationDescription') ?></div>
<div id="contact_registration">
<p><?php echo get_contact_registration_form() ?></p><br />
</div>
</div>
<?php
}
@ -1421,7 +1423,6 @@ function display_license_agreement() {
function get_contact_registration_form() {
$html ='
<div id="contact_registration">
<fieldset style="width:95%;padding:15px;border:1pt solid #eee">
<div id="div_sent_information"></div>
<form>
@ -1457,14 +1458,14 @@ function get_contact_registration_form() {
<Option value="Shipping/Transportation">Shipping/Transportation</Option>
<Option value="Technology">Technology</Option><Option value="Telecommunications">Telecommunications</Option>
<Option value="Other">Other</Option>
</Select>
</select>
</div>
</div>
<div class="row">
<div class="label"><span class="form_required">*</span>'.get_lang('PersonRole').'</div>
<div class="formw">
<Select name="person_role" id="person_role" >
<select name="person_role" id="person_role" >
<option value="">--- '.get_lang('SelectOne').' ---</option>
<Option value="Administration">Administration</Option><Option value="CEO/President/ Owner">CEO/President/ Owner</Option>
<Option value="CFO">CFO</Option><Option value="CIO/CTO">CIO/CTO</Option>
@ -1477,21 +1478,19 @@ function get_contact_registration_form() {
<Option value="Partner/Principal">Partner/Principal</Option><Option value="Purchasing Manager">Purchasing Manager</Option>
<Option value="Sales/ Business Dev. Manager">Sales/ Business Dev. Manager</Option><Option value="Sales/ Business Dev.">Sales/ Business Dev.</Option>
<Option value="Vice President/Senior Manager">Vice President/Senior Manager</Option><Option value="Other">Other</Option>
</Select>
</select>
</div>
</div>
<div class="row">
<div class="label">'.get_lang('HaveYouThePowerToTakeFinancialDecisions').'</div>
<div class="formw">
<input type="radio" name="financial_decision" id="financial_decision1" value="1" checked>'.get_lang('Yes').'
<input type="radio" name="financial_decision" id="financial_decision2" value="0">'.get_lang('No').'
<input type="radio" name="financial_decision" id="financial_decision1" value="1" checked />'.get_lang('Yes').'
<input type="radio" name="financial_decision" id="financial_decision2" value="0" />'.get_lang('No').'
</div>
</div>
<div class="row">
<div class="label"><span class="form_required">*</span>'.get_lang('CompanyCountry').'</div>
<div class="formw">
'.get_countries_list_from_array(true).'
</div>
<div class="formw">'.get_countries_list_from_array(true).'</div>
</div>
<div class="row">
<div class="label">'.get_lang('CompanyCity').'</div>
@ -1503,7 +1502,7 @@ function get_contact_registration_form() {
<div class="label">'.get_lang('WhichLanguageWouldYouLikeToUseWhenContactingYou').'</div>
<div class="formw">
<select id="language" name="language">
<option value="bulgarian">??????????????????</option>
<option value="bulgarian">Bulgarian</option>
<option value="indonesian">Bahasa Indonesia</option>
<option value="bosnian">Bosanski</option>
<option value="german">Deutsch</option>
@ -1527,15 +1526,10 @@ function get_contact_registration_form() {
<div class="label">&nbsp;</div>
<div class="formw"><span class="form_required">*</span><small>'.get_lang('FieldRequired').'</small></div>
</div>
</form>
</fieldset>
</div>
';
</fieldset>';
return $html;
}
/**
@ -1551,10 +1545,10 @@ return $html;
* @return void Direct output
*/
function display_database_parameter($install_type, $parameter_name, $form_field_name, $parameter_value, $extra_notice, $display_when_update = true, $tr_attribute = '') {
echo "<tr ".$tr_attribute.">\n";
echo "<td>$parameter_name&nbsp;&nbsp;</td>\n";
echo "<tr ".$tr_attribute.">";
echo "<td>$parameter_name&nbsp;&nbsp;</td>";
if ($install_type == INSTALL_TYPE_UPDATE && $display_when_update) {
echo '<td><input type="hidden" name="'.$form_field_name.'" id="'.$form_field_name.'" value="'.api_htmlentities($parameter_value).'" />'.$parameter_value."</td>\n";
echo '<td><input type="hidden" name="'.$form_field_name.'" id="'.$form_field_name.'" value="'.api_htmlentities($parameter_value).'" />'.$parameter_value."</td>";
} else {
$inputtype = $form_field_name == 'dbPassForm' ? 'password' : 'text';
@ -1565,12 +1559,12 @@ function display_database_parameter($install_type, $parameter_name, $form_field_
echo '<td>'.api_htmlentities($parameter_value)."</td>";
//echo "<td>$extra_notice</td>\n";
} else {
echo '<td><input type="'.$inputtype.'" size="'.DATABASE_FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.$maxlength.'" name="'.$form_field_name.'" id="'.$form_field_name.'" value="'.api_htmlentities($parameter_value).'" />'."</td>\n";
echo "<td>$extra_notice</td>\n";
echo '<td><input type="'.$inputtype.'" size="'.DATABASE_FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.$maxlength.'" name="'.$form_field_name.'" id="'.$form_field_name.'" value="'.api_htmlentities($parameter_value).'" />'."</td>";
echo "<td>$extra_notice</td>";
}
}
echo "</tr>\n";
echo "</tr>";
}
/**
@ -1628,8 +1622,7 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
if (empty($dbPrefixForm)) { //make sure there is a default value for db prefix
$dbPrefixForm = 'chamilo_';
}
echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2>';
echo '</div>';
echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
echo '<div class="RequirementContent">';
echo get_lang('DBSettingIntro');
echo '</div>';
@ -1659,18 +1652,10 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
//database user password
$example_password = get_lang('EG').' '.api_generate_password();
display_database_parameter($installType, get_lang('DBPassword'), 'dbPassForm', $dbPassForm, $example_password);
//Fields for the four standard Chamilo databases
if ($installType != INSTALL_TYPE_UPDATE) {
echo '<tr><td colspan="3">';
echo '<a href="#;" onclick="javascript:show_hide_option();" id="optionalparameters"><img style="vertical-align:middle;" src="../img/div_show.gif" alt="show-hide" /> '.get_lang('OptionalParameters').'</a>';
echo '</td></tr>';
}
?>
<input type="hidden" name="enableTrackingForm" value="1" />
<tr id="optional_param6" style="display:none;">
<td><?php echo get_lang('SingleDb'); ?> </td>
<tr id="optional_param6">
<td><?php echo get_lang('SingleDb'); ?> </td>
<?php if ($installType == INSTALL_TYPE_UPDATE): ?>
<td><input type="hidden" name="singleDbForm" value="<?php echo $singleDbForm; ?>" /><?php echo $singleDbForm ? get_lang('One') : get_lang('Several'); ?></td>
<?php else: ?>
@ -1679,13 +1664,23 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
<input class="checkbox" type="radio" name="singleDbForm" value="0" id="singleDb0" <?php echo $singleDbForm ? '' : 'checked="checked" '; ?> onclick="javascript: show_hide_tracking_and_user_db(this.id);" /> <label for="singleDb0"><?php echo get_lang('Several'); ?></label>
</td>
<?php endif; ?>
<td>&nbsp;</td>
</tr>
</div>
<?php
//Fields for the four standard Chamilo databases
if ($installType != INSTALL_TYPE_UPDATE) {
echo '<tr><td colspan="3">';
echo '<a href="#;" onclick="javascript:show_hide_option();" id="optionalparameters">
<img style="vertical-align:middle;" src="../img/div_show.gif" alt="show-hide" /> '.get_lang('OptionalParameters').'</a>';
echo '</td></tr>';
}
?>
<input type="hidden" name="enableTrackingForm" value="1" />
<?php
$style = 'style="display:none;"';
$style = 'style="display:none;"';
if ($installType == INSTALL_TYPE_UPDATE) {
$style = '';
}
@ -1706,8 +1701,6 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
//Database Prefix
display_database_parameter($installType, get_lang('DbPrefixForm'), 'dbPrefixForm', $dbPrefixForm, '', null, 'id="optional_param5" '.$style); //get_lang('DbPrefixCom')
/* Tracking is always available see #2066
*
<tr id="optional_param5" style="display:none;">
@ -1732,24 +1725,16 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
if ($dbConnect == 1): ?>
<td colspan="2">
<div class="confirmation-message">
<!--<div style="float:left; margin-right:10px;">
<img src="../img/message_confirmation.png" alt="Confirmation" />
</div>-->
<!--<div style="float:left;">-->
Database host info: <strong><?php echo Database::get_host_info(); ?></strong><br />
Database server version: <strong><?php echo Database::get_server_info(); ?></strong><br />
Database client version: <strong><?php echo Database::get_client_info(); ?></strong><br />
Database protocol version: <strong><?php echo Database::get_proto_info(); ?></strong>
<!--</div>-->
<div style="clear:both;"></div>
</div>
</td>
<?php else: ?>
<td colspan="2">
<div style="float:left;" class="error-message">
<!--<div style="float:left; margin-right:10px;">
<img src="../img/message_error.png" alt="Error" />
</div>-->
<div style="float:left;">
<strong>Database error: <?php echo Database::errno(); ?></strong><br />
<?php echo Database::error().'<br />'; ?>
@ -1797,7 +1782,7 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
echo '<p>'.get_lang('ConfigSettingsInfo').' <strong>main/inc/conf/configuration.php</strong></p>';
echo '</div>';
echo "</td></tr>\n<tr><td>";
echo "</td></tr> <tr><td>";
echo "<table width=\"100%\">";
//First parameter: language

Write Preview
Loading…
Cancel
Save