Skip to content
Snippets Groups Projects
Commit 1efbf777 authored by vsapronov's avatar vsapronov
Browse files

Fixed review issues

parent dc382bc9
No related branches found
No related tags found
No related merge requests found
......@@ -8,11 +8,11 @@ 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) {
if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
$_POST['install'] = 'true';
if( file_exists( $autosetup_file )) {
unlink($autosetup_file);
......@@ -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">
......@@ -73,7 +73,7 @@
</fieldset>
<?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 ?>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment