diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/Command/Background/Base.php | 2 | ||||
-rw-r--r-- | core/Command/Encryption/DecryptAll.php | 2 | ||||
-rw-r--r-- | core/Command/Encryption/EncryptAll.php | 2 | ||||
-rw-r--r-- | core/Command/TwoFactorAuth/State.php | 2 | ||||
-rw-r--r-- | core/Controller/SetupController.php | 6 | ||||
-rw-r--r-- | core/templates/403.php | 2 | ||||
-rw-r--r-- | core/templates/installation.php | 54 | ||||
-rw-r--r-- | core/templates/layout.guest.php | 2 | ||||
-rw-r--r-- | core/templates/layout.user.php | 4 | ||||
-rw-r--r-- | core/templates/update.admin.php | 2 | ||||
-rw-r--r-- | core/templates/update.use-cli.php | 4 |
11 files changed, 41 insertions, 41 deletions
diff --git a/core/Command/Background/Base.php b/core/Command/Background/Base.php index 48d9edb8c8a..a00a8fe4c51 100644 --- a/core/Command/Background/Base.php +++ b/core/Command/Background/Base.php @@ -71,7 +71,7 @@ abstract class Base extends Command { */ protected function execute(InputInterface $input, OutputInterface $output) { $mode = $this->getMode(); - $this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode ); + $this->config->setAppValue('core', 'backgroundjobs_mode', $mode); $output->writeln("Set mode for background jobs to '$mode'"); } } diff --git a/core/Command/Encryption/DecryptAll.php b/core/Command/Encryption/DecryptAll.php index 4d7b4028396..b4dc3e0160a 100644 --- a/core/Command/Encryption/DecryptAll.php +++ b/core/Command/Encryption/DecryptAll.php @@ -125,7 +125,7 @@ class DecryptAll extends Command { } protected function execute(InputInterface $input, OutputInterface $output) { - if ( !$input->isInteractive() ) { + if (!$input->isInteractive()) { $output->writeln('Invalid TTY.'); $output->writeln('If you are trying to execute the command in a Docker '); $output->writeln("container, do not forget to execute 'docker exec' with"); diff --git a/core/Command/Encryption/EncryptAll.php b/core/Command/Encryption/EncryptAll.php index fecb7778ed8..77c2cb31204 100644 --- a/core/Command/Encryption/EncryptAll.php +++ b/core/Command/Encryption/EncryptAll.php @@ -106,7 +106,7 @@ class EncryptAll extends Command { } protected function execute(InputInterface $input, OutputInterface $output) { - if ( !$input->isInteractive() ) { + if (!$input->isInteractive()) { $output->writeln('Invalid TTY.'); $output->writeln('If you are trying to execute the command in a Docker '); $output->writeln("container, do not forget to execute 'docker exec' with"); diff --git a/core/Command/TwoFactorAuth/State.php b/core/Command/TwoFactorAuth/State.php index 5f658e30507..3ae1884d343 100644 --- a/core/Command/TwoFactorAuth/State.php +++ b/core/Command/TwoFactorAuth/State.php @@ -62,7 +62,7 @@ class State extends Base { $providerStates = $this->registry->getProviderStates($user); $filtered = $this->filterEnabledDisabledUnknownProviders($providerStates); - list ($enabled, $disabled) = $filtered; + list($enabled, $disabled) = $filtered; if (!empty($enabled)) { $output->writeln("Two-factor authentication is enabled for user $uid"); diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php index 7df02dfea0e..d77f6982f3d 100644 --- a/core/Controller/SetupController.php +++ b/core/Controller/SetupController.php @@ -109,7 +109,7 @@ class SetupController { } private function finishSetup(bool $installRecommended) { - if( file_exists( $this->autoConfigFile )) { + if(file_exists($this->autoConfigFile)) { unlink($this->autoConfigFile); } \OC::$server->getIntegrityCodeChecker()->runInstanceVerification(); @@ -130,11 +130,11 @@ class SetupController { } public function loadAutoConfig($post) { - if( file_exists($this->autoConfigFile)) { + if(file_exists($this->autoConfigFile)) { \OCP\Util::writeLog('core', 'Autoconfig file found, setting up Nextcloud…', ILogger::INFO); $AUTOCONFIG = []; include $this->autoConfigFile; - $post = array_merge ($post, $AUTOCONFIG); + $post = array_merge($post, $AUTOCONFIG); } $dbIsSet = isset($post['dbtype']); diff --git a/core/templates/403.php b/core/templates/403.php index 72d5d3e4ae6..d56a63bfe53 100644 --- a/core/templates/403.php +++ b/core/templates/403.php @@ -11,7 +11,7 @@ if(!isset($_)) {//standalone page is not supported anymore - redirect to / ?> <ul> <li class='error'> - <?php p($l->t( 'Access forbidden' )); ?><br> + <?php p($l->t('Access forbidden')); ?><br> <p class='hint'><?php if(isset($_['message'])) p($_['message'])?></p> </li> </ul> diff --git a/core/templates/installation.php b/core/templates/installation.php index fce70cdc3d3..d65d0adb1cb 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -35,35 +35,35 @@ script('core', [ </fieldset> <?php endif; ?> <fieldset id="adminaccount"> - <legend><?php print_unescaped($l->t( 'Create an <strong>admin account</strong>' )); ?></legend> + <legend><?php print_unescaped($l->t('Create an <strong>admin account</strong>')); ?></legend> <p class="grouptop"> <input type="text" name="adminlogin" id="adminlogin" - placeholder="<?php p($l->t( 'Username' )); ?>" + placeholder="<?php p($l->t('Username')); ?>" value="<?php p($_['adminlogin']); ?>" autocomplete="off" autocapitalize="none" autocorrect="off" autofocus required> - <label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label> + <label for="adminlogin" class="infield"><?php p($l->t('Username')); ?></label> </p> <p class="groupbottom"> <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" - placeholder="<?php p($l->t( 'Password' )); ?>" + placeholder="<?php p($l->t('Password')); ?>" value="<?php p($_['adminpass']); ?>" autocomplete="off" autocapitalize="none" autocorrect="off" required> - <label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label> + <label for="adminpass" class="infield"><?php p($l->t('Password')); ?></label> <input type="checkbox" id="show" class="hidden-visually" name="show"> - <label for="show" class="hidden-visually"><?php p($l->t( 'Show password')); ?></label> + <label for="show" class="hidden-visually"><?php p($l->t('Show password')); ?></label> </p> </fieldset> <?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> + <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): ?> <fieldset id="datadirField"> <div id="datadirContent"> - <label for="directory"><?php p($l->t( 'Data folder' )); ?></label> + <label for="directory"><?php p($l->t('Data folder')); ?></label> <input type="text" name="directory" id="directory" placeholder="<?php p(OC::$SERVERROOT.'/data'); ?>" value="<?php p($_['directory']); ?>" @@ -75,16 +75,16 @@ script('core', [ <?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 ?> - <legend><?php p($l->t( 'Configure the database' )); ?></legend> + $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite?> + <legend><?php p($l->t('Configure the database')); ?></legend> <div id="selectDbType"> <?php foreach($_['databases'] as $type => $label): ?> <?php if(count($_['databases']) === 1): ?> <p class="info"> - <?php p($l->t( 'Only %s is available.', [$label] )); ?> - <?php p($l->t( 'Install and activate additional PHP modules to choose other database types.' )); ?><br> + <?php p($l->t('Only %s is available.', [$label])); ?> + <?php p($l->t('Install and activate additional PHP modules to choose other database types.')); ?><br> <a href="<?php print_unescaped(link_to_docs('admin-source_install')); ?>" target="_blank" rel="noreferrer noopener"> - <?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a> + <?php p($l->t('For more details check out the documentation.')); ?> ↗</a> </p> <input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>"> <?php else: ?> @@ -100,25 +100,25 @@ script('core', [ <fieldset id='databaseField'> <div id="use_other_db"> <p class="grouptop"> - <label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label> + <label for="dbuser" class="infield"><?php p($l->t('Database user')); ?></label> <input type="text" name="dbuser" id="dbuser" - placeholder="<?php p($l->t( 'Database user' )); ?>" + placeholder="<?php p($l->t('Database user')); ?>" value="<?php p($_['dbuser']); ?>" autocomplete="off" autocapitalize="none" autocorrect="off"> </p> <p class="groupmiddle"> <input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword-toggle" - placeholder="<?php p($l->t( 'Database password' )); ?>" + placeholder="<?php p($l->t('Database password')); ?>" value="<?php p($_['dbpass']); ?>" autocomplete="off" autocapitalize="none" autocorrect="off"> - <label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label> + <label for="dbpass" class="infield"><?php p($l->t('Database password')); ?></label> <input type="checkbox" id="dbpassword-toggle" class="hidden-visually" name="dbpassword-toggle"> <label for="dbpassword-toggle"></label> </p> <p class="groupmiddle"> - <label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label> + <label for="dbname" class="infield"><?php p($l->t('Database name')); ?></label> <input type="text" name="dbname" id="dbname" - placeholder="<?php p($l->t( 'Database name' )); ?>" + placeholder="<?php p($l->t('Database name')); ?>" value="<?php p($_['dbname']); ?>" autocomplete="off" autocapitalize="none" autocorrect="off" pattern="[0-9a-zA-Z$_-]+"> @@ -126,23 +126,23 @@ script('core', [ <?php if($_['hasOracle']): ?> <div id="use_oracle_db"> <p class="groupmiddle"> - <label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label> + <label for="dbtablespace" class="infield"><?php p($l->t('Database tablespace')); ?></label> <input type="text" name="dbtablespace" id="dbtablespace" - placeholder="<?php p($l->t( 'Database tablespace' )); ?>" + placeholder="<?php p($l->t('Database tablespace')); ?>" value="<?php p($_['dbtablespace']); ?>" autocomplete="off" autocapitalize="none" autocorrect="off"> </p> </div> <?php endif; ?> <p class="groupbottom"> - <label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label> + <label for="dbhost" class="infield"><?php p($l->t('Database host')); ?></label> <input type="text" name="dbhost" id="dbhost" - placeholder="<?php p($l->t( 'Database host' )); ?>" + placeholder="<?php p($l->t('Database host')); ?>" value="<?php p($_['dbhost']); ?>" autocomplete="off" autocapitalize="none" autocorrect="off"> </p> <p class="info"> - <?php p($l->t( 'Please specify the port number along with the host name (e.g., localhost:5432).' )); ?> + <?php p($l->t('Please specify the port number along with the host name (e.g., localhost:5432).')); ?> </p> </div> </fieldset> @@ -162,15 +162,15 @@ script('core', [ <p class="info"> <input type="checkbox" id="install-recommended-apps" name="install-recommended-apps" class="checkbox checkbox--white" checked> <label for="install-recommended-apps"> - <?php p($l->t( 'Install recommended apps' )); ?> - <span><?php p($l->t( 'Calendar, Contacts, Talk, Mail & OnlyOffice' )); ?></span> + <?php p($l->t('Install recommended apps')); ?> + <span><?php p($l->t('Calendar, Contacts, Talk, Mail & OnlyOffice')); ?></span> </label> </p> </fieldset> <div class="icon-loading-dark float-spinner"> </div> - <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>"></div> + <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t('Finish setup')); ?>" data-finishing="<?php p($l->t('Finishing …')); ?>"></div> <p class="info"> <span class="icon-info-white"></span> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 8ba6b0a42b3..6bb6e1c74bd 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -30,7 +30,7 @@ <?php }?> <div class="wrapper"> <div class="v-align"> - <?php if ($_['bodyid'] === 'body-login' ): ?> + <?php if ($_['bodyid'] === 'body-login'): ?> <header role="banner"> <div id="header"> <div class="logo"> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 7712992c9bf..5dbc95e1179 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -84,7 +84,7 @@ <?php foreach($_['navigation'] as $entry): ?> <li data-id="<?php p($entry['id']); ?>"> <a href="<?php print_unescaped($entry['href']); ?>" - <?php if( $entry['active'] ): ?> class="active"<?php endif; ?> + <?php if($entry['active']): ?> class="active"<?php endif; ?> aria-label="<?php p($entry['name']); ?>"> <svg width="16" height="16" viewBox="0 0 16 16" alt=""> <defs><filter id="invertMenuMore-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs> @@ -139,7 +139,7 @@ <?php foreach($_['settingsnavigation'] as $entry):?> <li data-id="<?php p($entry['id']); ?>"> <a href="<?php print_unescaped($entry['href']); ?>" - <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>> + <?php if($entry["active"]): ?> class="active"<?php endif; ?>> <img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"> <?php p($entry['name']) ?> </a> diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php index 4a010c025be..c104e0530c3 100644 --- a/core/templates/update.admin.php +++ b/core/templates/update.admin.php @@ -49,7 +49,7 @@ <p id="update-progress-message-error" class="hidden"></p> <ul id="update-progress-message-warnings" class="hidden"></ul> <p id="update-progress-message"></p> - <a class="update-show-detailed"><?php p($l->t( 'Detailed logs' )); ?> <span class="icon-caret-white"></span></a> + <a class="update-show-detailed"><?php p($l->t('Detailed logs')); ?> <span class="icon-caret-white"></span></a> <div id="update-progress-detailed" class="hidden"></div> </div> </div> diff --git a/core/templates/update.use-cli.php b/core/templates/update.use-cli.php index 30f4169a1db..8cd7e37ffce 100644 --- a/core/templates/update.use-cli.php +++ b/core/templates/update.use-cli.php @@ -14,8 +14,8 @@ <?php if ($_['tooBig']) { ?> <div class="warning updateAnyways"> - <p><?php p($l->t('I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.' )); ?></p> - <a href="?IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup=IAmSuperSureToDoThis" class="button updateAnywaysButton"><?php p($l->t('Upgrade via web on my own risk' )); ?></a> + <p><?php p($l->t('I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.')); ?></p> + <a href="?IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup=IAmSuperSureToDoThis" class="button updateAnywaysButton"><?php p($l->t('Upgrade via web on my own risk')); ?></a> </div> <?php } ?> |