summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-01-27 11:23:36 +0100
committerGitHub <noreply@github.com>2018-01-27 11:23:36 +0100
commited59019b0cc4ec61fce65a8eb02f814611b466b4 (patch)
tree29b1618a2618b7d4dba8f51626f5e3474e3d8a9c /core
parent513f70b1c3d342cd2215b6dab9bb0c6d511549ad (diff)
parenta661f043e1a8764cb7c795f50df77b830d3e352b (diff)
downloadnextcloud-server-ed59019b0cc4ec61fce65a8eb02f814611b466b4.tar.gz
nextcloud-server-ed59019b0cc4ec61fce65a8eb02f814611b466b4.zip
Merge pull request #8079 from nextcloud/remove-unneeded-semicolon-and-parentheses
Remove unneeded semicolon and parentheses
Diffstat (limited to 'core')
-rw-r--r--core/Command/App/ListApps.php2
-rw-r--r--core/Command/Base.php2
-rw-r--r--core/Command/Encryption/ChangeKeyStorageRoot.php2
-rw-r--r--core/Command/Maintenance/Install.php2
-rw-r--r--core/Command/User/Info.php2
-rw-r--r--core/templates/layout.base.php2
-rw-r--r--core/templates/layout.guest.php2
-rw-r--r--core/templates/layout.user.php2
-rw-r--r--core/templates/login.php4
9 files changed, 10 insertions, 10 deletions
diff --git a/core/Command/App/ListApps.php b/core/Command/App/ListApps.php
index c933a2519ef..78b7dd40fe3 100644
--- a/core/Command/App/ListApps.php
+++ b/core/Command/App/ListApps.php
@@ -87,7 +87,7 @@ class ListApps extends Base {
sort($enabledApps);
foreach ($enabledApps as $app) {
- $apps['enabled'][$app] = (isset($versions[$app])) ? $versions[$app] : true;
+ $apps['enabled'][$app] = isset($versions[$app]) ? $versions[$app] : true;
}
sort($disabledApps);
diff --git a/core/Command/Base.php b/core/Command/Base.php
index 15878a807d8..536de20711c 100644
--- a/core/Command/Base.php
+++ b/core/Command/Base.php
@@ -121,7 +121,7 @@ class Base extends Command implements CompletionAwareInterface {
} else if ($value === true) {
return 'true';
} else if ($value === null) {
- return ($returnNull) ? null : 'null';
+ return $returnNull ? null : 'null';
} else {
return $value;
}
diff --git a/core/Command/Encryption/ChangeKeyStorageRoot.php b/core/Command/Encryption/ChangeKeyStorageRoot.php
index 97709d54bdd..7c6ad5d6126 100644
--- a/core/Command/Encryption/ChangeKeyStorageRoot.php
+++ b/core/Command/Encryption/ChangeKeyStorageRoot.php
@@ -118,7 +118,7 @@ class ChangeKeyStorageRoot extends Command {
$output->writeln("Start to move keys:");
- if ($this->rootView->is_dir(($oldRoot)) === false) {
+ if ($this->rootView->is_dir($oldRoot) === false) {
$output->writeln("No old keys found: Nothing needs to be moved");
return false;
}
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
index be6a2da22c8..262def99c5f 100644
--- a/core/Command/Maintenance/Install.php
+++ b/core/Command/Maintenance/Install.php
@@ -90,7 +90,7 @@ class Install extends Command {
// ignore the OS X setup warning
if(count($errors) !== 1 ||
- (string)($errors[0]['error']) !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
+ (string)$errors[0]['error'] !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
return 1;
}
}
diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php
index b23ddd942a0..f1b5579eb94 100644
--- a/core/Command/User/Info.php
+++ b/core/Command/User/Info.php
@@ -76,7 +76,7 @@ class Info extends Base {
$data = [
'user_id' => $user->getUID(),
'display_name' => $user->getDisplayName(),
- 'email' => ($user->getEMailAddress()) ? $user->getEMailAddress() : '',
+ 'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
'cloud_id' => $user->getCloudId(),
'enabled' => $user->isEnabled(),
'groups' => $groups,
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 7c1fe79e79d..a5096b87b93 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -17,7 +17,7 @@
<?php print_unescaped($_['headers']); ?>
</head>
<body id="body-public">
- <?php include('layout.noscript.warning.php'); ?>
+ <?php include 'layout.noscript.warning.php'; ?>
<?php print_unescaped($_['content']); ?>
</body>
</html>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 4d06fc294d5..e208af3c507 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -19,7 +19,7 @@
<?php print_unescaped($_['headers']); ?>
</head>
<body id="<?php p($_['bodyid']);?>">
- <?php include('layout.noscript.warning.php'); ?>
+ <?php include 'layout.noscript.warning.php'; ?>
<div class="wrapper">
<div class="v-align">
<?php if ($_['bodyid'] === 'body-login' ): ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 32762e2c240..c6885f692d5 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -26,7 +26,7 @@
<?php print_unescaped($_['headers']); ?>
</head>
<body id="<?php p($_['bodyid']);?>">
- <?php include('layout.noscript.warning.php'); ?>
+ <?php include 'layout.noscript.warning.php'; ?>
<div id="notification-container">
<div id="notification"></div>
</div>
diff --git a/core/templates/login.php b/core/templates/login.php
index 82594481d87..1d9b24901e7 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -10,7 +10,7 @@ script('core', 'merged-login');
<?php if (!empty($_['redirect_url'])) {
print_unescaped('<input type="hidden" name="redirect_url" value="' . \OCP\Util::sanitizeHTML($_['redirect_url']) . '">');
} ?>
- <?php if (isset($_['apacheauthfailed']) && ($_['apacheauthfailed'])): ?>
+ <?php if (isset($_['apacheauthfailed']) && $_['apacheauthfailed']): ?>
<div class="warning">
<?php p($l->t('Server side authentication failed!')); ?><br>
<small><?php p($l->t('Please contact your administrator.')); ?></small>
@@ -21,7 +21,7 @@ script('core', 'merged-login');
<?php p($message); ?><br>
</div>
<?php endforeach; ?>
- <?php if (isset($_['internalexception']) && ($_['internalexception'])): ?>
+ <?php if (isset($_['internalexception']) && $_['internalexception']): ?>
<div class="warning">
<?php p($l->t('An internal error occurred.')); ?><br>
<small><?php p($l->t('Please try again or contact your administrator.')); ?></small>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 08:17:35 +0000