Fixed review issues
This commit is contained in:
parent
dc382bc9cc
commit
1efbf7774f
|
@ -8,15 +8,15 @@ if( file_exists( $autosetup_file )) {
|
|||
$_POST = array_merge ($_POST, $AUTOCONFIG);
|
||||
}
|
||||
|
||||
$dbSet = isset($_POST['dbtype']);
|
||||
$directorySet = isset($_POST['directory']);
|
||||
$adminAccountSet = isset($_POST['adminlogin']);
|
||||
$dbIsSet = isset($_POST['dbtype']);
|
||||
$directoryIsSet = isset($_POST['directory']);
|
||||
$adminAccountIsSet = isset($_POST['adminlogin']);
|
||||
|
||||
if ($dbSet AND $directorySet AND $adminAccountSet) {
|
||||
$_POST['install'] = 'true';
|
||||
if( file_exists( $autosetup_file )) {
|
||||
unlink($autosetup_file);
|
||||
}
|
||||
if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
|
||||
$_POST['install'] = 'true';
|
||||
if( file_exists( $autosetup_file )) {
|
||||
unlink($autosetup_file);
|
||||
}
|
||||
}
|
||||
|
||||
OC_Util::addScript('setup');
|
||||
|
@ -46,8 +46,8 @@ $opts = array(
|
|||
'htaccessWorking' => OC_Util::isHtAccessWorking(),
|
||||
'vulnerableToNullByte' => $vulnerableToNullByte,
|
||||
'errors' => array(),
|
||||
'dbSet' => $dbSet,
|
||||
'directorySet' => $directorySet
|
||||
'dbIsSet' => $dbIsSet,
|
||||
'directoryIsSet' => $directoryIsSet,
|
||||
);
|
||||
|
||||
if(isset($_POST['install']) AND $_POST['install']=='true') {
|
||||
|
|
|
@ -61,7 +61,7 @@
|
|||
</p>
|
||||
</fieldset>
|
||||
|
||||
<?php if(!$_['directorySet']): ?>
|
||||
<?php if(!$_['directoryIsSet']): ?>
|
||||
<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>
|
||||
<div id="datadirContent">
|
||||
|
@ -71,9 +71,9 @@
|
|||
value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" />
|
||||
</div>
|
||||
</fieldset>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if(!$_['dbSet']): ?>
|
||||
<?php if(!$_['dbIsSet']): ?>
|
||||
<fieldset id='databaseField'>
|
||||
<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
|
||||
$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
|
||||
|
@ -174,7 +174,7 @@
|
|||
</div>
|
||||
<?php endif; ?>
|
||||
</fieldset>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div>
|
||||
</form>
|
||||
|
|
Loading…
Reference in New Issue