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

manual merge

Browse Source
1.9.x
Yannick Warnier 11 years ago
parent 31507a98eb 6a37a7717a
commit cd1c2bfb1f
1 changed files with 75 additions and 80 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. 39
      main/install/install.lib.php

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

@ -1428,13 +1428,11 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
printf(get_lang('NoWritePermissionPleaseReadInstallGuide'), '</font>
<a href="../../documentation/installation_guide.html" target="blank">', '</a> <font color="red">');
echo '</div>';
echo '<ul>';
foreach ($notwritable as $value) {
echo '<li>'.$value.'</li>';
}
echo '</ul>';
}
// Check wether a Chamilo configuration file already exists.
@ -1480,17 +1478,16 @@ function display_license_agreement() {
?>
<table>
<tr><td>
<p style="font-size:90%">
<textarea cols="90" rows="7" class="span6">
<?php echo api_htmlentities(@file_get_contents(api_get_path(SYS_PATH).'documentation/license.txt')); ?>
</textarea></p>
<pre style="overflow: auto; height: 150px; margin-top: 5px;" class="span7"><?php echo api_htmlentities(@file_get_contents(api_get_path(SYS_PATH).'documentation/license.txt')); ?></pre>
</td>
</tr>
<tr><td>
<p>
<label class="checkbox">
<input type="checkbox" name="accept" id="accept_licence" value="1" />
<?php echo get_lang('IAccept'); ?>
</label>
</p>
</td>
</tr>
<tr><td><p style="color:#666"><br /><?php echo get_lang('DokeosArtLicense'); ?></p></td></tr>
@ -1852,7 +1849,6 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
<strong><?php echo get_lang('FailedConectionDatabase'); ?></strong><br />
<strong>Database error: <?php echo Database::errno(); ?></strong><br />
<?php echo Database::error().'<br />'; ?>
</div>
</div>
</td>
@ -1984,18 +1980,17 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
<?php } else { ?>
<td>
<div class="control-group">
<label class="checkbox inline">
<input class="checkbox" type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" <?php echo ($encryptPassForm == 'sha1') ? 'checked="checked" ': ''; ?>/><?php echo 'sha1'; ?>
<label class="radio inline">
<input type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" <?php echo ($encryptPassForm == 'sha1') ? 'checked="checked" ': ''; ?>/><?php echo 'sha1'; ?>
</label>
<label class="checkbox inline">
<input class="checkbox" type="radio" name="encryptPassForm" value="md5" id="encryptPass0" <?php echo $encryptPassForm == 1 ? 'checked="checked" ' : ''; ?>/><?php echo 'md5'; ?>
<label class="radio inline">
<input type="radio" name="encryptPassForm" value="md5" id="encryptPass0" <?php echo $encryptPassForm == 1 ? 'checked="checked" ' : ''; ?>/><?php echo 'md5'; ?>
</label>
<label class="checkbox inline">
<input class="checkbox" type="radio" name="encryptPassForm" value="none" id="encryptPass2" <?php echo $encryptPassForm === '0' or $encryptPassForm === 0 ? 'checked="checked" ':''; ?>/><?php echo get_lang('None'); ?>
<label class="radio inline">
<input type="radio" name="encryptPassForm" value="none" id="encryptPass2" <?php echo $encryptPassForm === '0' or $encryptPassForm === 0 ? 'checked="checked" ':''; ?>/><?php echo get_lang('None'); ?>
</label>
</div>
</td>
<?php } ?>
@ -2008,11 +2003,11 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
<?php else: ?>
<td>
<div class="control-group">
<label class="checkbox inline">
<input class="checkbox" type="radio" name="allowSelfReg" value="1" id="allowSelfReg1" <?php echo $allowSelfReg ? 'checked="checked" ' : ''; ?>/> <?php echo get_lang('Yes'); ?>
<label class="radio inline">
<input type="radio" name="allowSelfReg" value="1" id="allowSelfReg1" <?php echo $allowSelfReg ? 'checked="checked" ' : ''; ?>/> <?php echo get_lang('Yes'); ?>
</label>
<label class="checkbox inline">
<input class="checkbox" type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" <?php echo $allowSelfReg ? '' : 'checked="checked" '; ?>/><?php echo get_lang('No'); ?>
<label class="radio inline">
<input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" <?php echo $allowSelfReg ? '' : 'checked="checked" '; ?>/><?php echo get_lang('No'); ?>
</label>
</div>
</td>
@ -2027,12 +2022,12 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
<?php else: ?>
<td>
<div class="control-group">
<label class="checkbox inline">
<input class="checkbox" type="radio" name="allowSelfRegProf" value="1" id="allowSelfRegProf1" <?php echo $allowSelfRegProf ? 'checked="checked" ' : ''; ?>/>
<label class="radio inline">
<input type="radio" name="allowSelfRegProf" value="1" id="allowSelfRegProf1" <?php echo $allowSelfRegProf ? 'checked="checked" ' : ''; ?>/>
<?php echo get_lang('Yes'); ?>
</label>
<label class="checkbox inline">
<input class="checkbox" type="radio" name="allowSelfRegProf" value="0" id="allowSelfRegProf0" <?php echo $allowSelfRegProf ? '' : 'checked="checked" '; ?>/>
<label class="radio inline">
<input type="radio" name="allowSelfRegProf" value="0" id="allowSelfRegProf0" <?php echo $allowSelfRegProf ? '' : 'checked="checked" '; ?>/>
<?php echo get_lang('No'); ?>
</label>
</div>

Write Preview
Loading…
Cancel
Save