summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-01-26 23:46:40 +0100
committerMorris Jobke <hey@morrisjobke.de>2018-01-26 23:46:40 +0100
commita661f043e1a8764cb7c795f50df77b830d3e352b (patch)
tree77a06311ffb5e59c86def06bbb618335da1f2b6a /settings
parent9be6050cc42c2760bd2276942a24ba3db288b551 (diff)
downloadnextcloud-server-a661f043e1a8764cb7c795f50df77b830d3e352b.tar.gz
nextcloud-server-a661f043e1a8764cb7c795f50df77b830d3e352b.zip
Remove unneeded semicolon and parentheses
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'settings')
-rw-r--r--settings/Controller/MailSettingsController.php2
-rw-r--r--settings/Controller/UsersController.php2
-rw-r--r--settings/templates/certificates.php2
-rw-r--r--settings/templates/settings.php2
-rw-r--r--settings/templates/settings/additional.php2
-rw-r--r--settings/templates/settings/admin/server.development.notice.php2
-rw-r--r--settings/templates/settings/admin/server.php2
7 files changed, 7 insertions, 7 deletions
diff --git a/settings/Controller/MailSettingsController.php b/settings/Controller/MailSettingsController.php
index 02bd51e843e..22e2662a216 100644
--- a/settings/Controller/MailSettingsController.php
+++ b/settings/Controller/MailSettingsController.php
@@ -101,7 +101,7 @@ class MailSettingsController extends Controller {
$params = get_defined_vars();
$configs = [];
foreach($params as $key => $value) {
- $configs[$key] = (empty($value)) ? null : $value;
+ $configs[$key] = empty($value) ? null : $value;
}
// Delete passwords from config in case no auth is specified
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index c373cb0d521..7b18eda6833 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -254,7 +254,7 @@ class UsersController extends Controller {
return [
'name' => $user->getUID(),
'displayname' => $user->getDisplayName(),
- 'groups' => (empty($userGroups)) ? $this->groupManager->getUserGroupIds($user) : $userGroups,
+ 'groups' => empty($userGroups) ? $this->groupManager->getUserGroupIds($user) : $userGroups,
'subadmin' => $subAdminGroups,
'quota' => $user->getQuota(),
'quota_bytes' => Util::computerFileSize($user->getQuota()),
diff --git a/settings/templates/certificates.php b/settings/templates/certificates.php
index ac0a2293800..d9587f97946 100644
--- a/settings/templates/certificates.php
+++ b/settings/templates/certificates.php
@@ -10,7 +10,7 @@
</thead>
<tbody>
<?php foreach ($_['certs'] as $rootCert): /**@var \OCP\ICertificate $rootCert */ ?>
- <tr class="<?php echo ($rootCert->isExpired()) ? 'expired' : 'valid' ?>"
+ <tr class="<?php echo $rootCert->isExpired() ? 'expired' : 'valid' ?>"
data-name="<?php p($rootCert->getName()) ?>">
<td class="rootCert"
title="<?php p($rootCert->getOrganization()) ?>">
diff --git a/settings/templates/settings.php b/settings/templates/settings.php
index 48b4e6b3234..44011af2884 100644
--- a/settings/templates/settings.php
+++ b/settings/templates/settings.php
@@ -6,4 +6,4 @@
<?php foreach($_['forms'] as $form) {
print_unescaped($form);
-};
+}
diff --git a/settings/templates/settings/additional.php b/settings/templates/settings/additional.php
index 2ad2c5af4e5..3af78adde71 100644
--- a/settings/templates/settings/additional.php
+++ b/settings/templates/settings/additional.php
@@ -30,4 +30,4 @@
if (isset($form['form'])) {?>
<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
<?php }
-};?>
+} ?>
diff --git a/settings/templates/settings/admin/server.development.notice.php b/settings/templates/settings/admin/server.development.notice.php
index d1af82bc9a9..42599c54459 100644
--- a/settings/templates/settings/admin/server.development.notice.php
+++ b/settings/templates/settings/admin/server.development.notice.php
@@ -1,3 +1,3 @@
<div class="section">
- <p><?php include(__DIR__ . '/../../settings.development.notice.php'); ?></p>
+ <p><?php include __DIR__ . '/../../settings.development.notice.php'; ?></p>
</div>
diff --git a/settings/templates/settings/admin/server.php b/settings/templates/settings/admin/server.php
index 2805eb72ce1..4350a7105c8 100644
--- a/settings/templates/settings/admin/server.php
+++ b/settings/templates/settings/admin/server.php
@@ -132,7 +132,7 @@
<ol>
<?php foreach(json_decode($_['cronErrors']) as $error) { if(isset($error->error)) {?>
<li><?php p($error->error) ?> <?php p($error->hint) ?></li>
- <?php }};?>
+ <?php }} ?>
</ol>
</li>
<?php