open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed review issues

Browse Source
remotes/origin/stable6
vsapronov 11 years ago
parent dc382bc9cc
commit 1efbf7774f
2 changed files with 14 additions and 14 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. 20
      core/setup.php
  2. 8
      core/templates/installation.php

20
core/setup.php
Unescape View File

@ -8,15 +8,15 @@ if( file_exists( $autosetup_file )) {
$_POST = array_merge ($_POST, $AUTOCONFIG); $_POST = array_merge ($_POST, $AUTOCONFIG);
} }
$dbSet = isset($_POST['dbtype']); $dbIsSet = isset($_POST['dbtype']);
$directorySet = isset($_POST['directory']); $directoryIsSet = isset($_POST['directory']);
$adminAccountSet = isset($_POST['adminlogin']); $adminAccountIsSet = isset($_POST['adminlogin']);
if ($dbSet AND $directorySet AND $adminAccountSet) { if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
$_POST['install'] = 'true'; $_POST['install'] = 'true';
if( file_exists( $autosetup_file )) { if( file_exists( $autosetup_file )) {
unlink($autosetup_file); unlink($autosetup_file);
} }
} }
OC_Util::addScript('setup'); OC_Util::addScript('setup');
@ -46,8 +46,8 @@ $opts = array(
'htaccessWorking' => OC_Util::isHtAccessWorking(), 'htaccessWorking' => OC_Util::isHtAccessWorking(),
'vulnerableToNullByte' => $vulnerableToNullByte, 'vulnerableToNullByte' => $vulnerableToNullByte,
'errors' => array(), 'errors' => array(),
'dbSet' => $dbSet, 'dbIsSet' => $dbIsSet,
'directorySet' => $directorySet 'directoryIsSet' => $directoryIsSet,
); );
if(isset($_POST['install']) AND $_POST['install']=='true') { if(isset($_POST['install']) AND $_POST['install']=='true') {

8
core/templates/installation.php
Unescape View File

@ -61,7 +61,7 @@
</p> </p>
</fieldset> </fieldset>
<?php if(!$_['directorySet']): ?> <?php if(!$_['directoryIsSet']): ?>
<fieldset id="datadirField"> <fieldset id="datadirField">
<legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend> <legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
<div id="datadirContent"> <div id="datadirContent">
@ -71,9 +71,9 @@
value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" /> value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" />
</div> </div>
</fieldset> </fieldset>
<?php endif; ?> <?php endif; ?>
<?php if(!$_['dbSet']): ?> <?php if(!$_['dbIsSet']): ?>
<fieldset id='databaseField'> <fieldset id='databaseField'>
<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL']) <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
@ -174,7 +174,7 @@
</div> </div>
<?php endif; ?> <?php endif; ?>
</fieldset> </fieldset>
<?php endif; ?> <?php endif; ?>
<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div> <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div>
</form> </form>

Write Preview
Loading…
Cancel
Save