diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2020-04-09 17:25:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 17:25:14 +0300 |
| commit | 64510932b8bd7d4d1d490f7da7fb9ebcf21e31c2 (patch) | |
| tree | 37fbf7544cbf60faaa4a5935ab1c477d05dfd028 /core | |
| parent | c56a273b39186c509c57ef6bec221d3c4e3d81d3 (diff) | |
| parent | 36b3bc8148648eaadcc3769b1624fe1dd4c8bf93 (diff) | |
Merge pull request #20384 from nextcloud/techdebt/lowercase-keywords
Use php keywords in lowercase
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/SetupController.php | 4 | ||||
| -rw-r--r-- | core/templates/installation.php | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php index 7449717831b..7df02dfea0e 100644 --- a/core/Controller/SetupController.php +++ b/core/Controller/SetupController.php @@ -70,7 +70,7 @@ class SetupController { return; } - if(isset($post['install']) AND $post['install']=='true') { + if(isset($post['install']) and $post['install']=='true') { // We have to launch the installation process : $e = $this->setupHelper->install($post); $errors = ['errors' => $e]; @@ -141,7 +141,7 @@ class SetupController { $directoryIsSet = isset($post['directory']); $adminAccountIsSet = isset($post['adminlogin']); - if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) { + if ($dbIsSet and $directoryIsSet and $adminAccountIsSet) { $post['install'] = 'true'; } $post['dbIsSet'] = $dbIsSet; diff --git a/core/templates/installation.php b/core/templates/installation.php index 25052782e6f..fce70cdc3d3 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -54,13 +54,13 @@ script('core', [ </p> </fieldset> - <?php if(!$_['directoryIsSet'] OR !$_['dbIsSet'] OR count($_['errors']) > 0): ?> + <?php if(!$_['directoryIsSet'] or !$_['dbIsSet'] or count($_['errors']) > 0): ?> <fieldset id="advancedHeader"> <legend><a id="showAdvanced" tabindex="0" href="#"><?php p($l->t( 'Storage & database' )); ?><img src="<?php print_unescaped(image_path('', 'actions/caret-white.svg')); ?>" /></a></legend> </fieldset> <?php endif; ?> - <?php if(!$_['directoryIsSet'] OR count($_['errors']) > 0): ?> + <?php if(!$_['directoryIsSet'] or count($_['errors']) > 0): ?> <fieldset id="datadirField"> <div id="datadirContent"> <label for="directory"><?php p($l->t( 'Data folder' )); ?></label> @@ -72,7 +72,7 @@ script('core', [ </fieldset> <?php endif; ?> - <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> + <?php if(!$_['dbIsSet'] or count($_['errors']) > 0): ?> <fieldset id='databaseBackend'> <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> @@ -149,7 +149,7 @@ script('core', [ <?php endif; ?> <?php endif; ?> - <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> + <?php if(!$_['dbIsSet'] or count($_['errors']) > 0): ?> <fieldset id="sqliteInformation" class="warning"> <legend><?php p($l->t('Performance warning'));?></legend> <p><?php p($l->t('You chose SQLite as database.'));?></p> |