diff options
| author | vsapronov <vladimir.sapronov@gmail.com> | 2013-09-29 20:16:32 -0400 |
|---|---|---|
| committer | vsapronov <vladimir.sapronov@gmail.com> | 2013-09-29 20:16:32 -0400 |
| commit | 1efbf7774fe4eceeef2e40bf212c89c3ee76052c (patch) | |
| tree | 6345763444cdd9fa2fc2979266942143f097aa62 | |
| parent | dc382bc9ccb0735ebc63b8bc8d43ff8512ac171a (diff) | |
| download | nextcloud-server-1efbf7774fe4eceeef2e40bf212c89c3ee76052c.tar.gz nextcloud-server-1efbf7774fe4eceeef2e40bf212c89c3ee76052c.zip | |
Fixed review issues
| -rw-r--r-- | core/setup.php | 20 | ||||
| -rw-r--r-- | core/templates/installation.php | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/core/setup.php b/core/setup.php index d18b1d54c2b..4026a748453 100644 --- a/core/setup.php +++ b/core/setup.php @@ -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') { diff --git a/core/templates/installation.php b/core/templates/installation.php index ed8057452bd..342383fdb28 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -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> |