diff options
author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-04-10 10:35:09 +0200 |
---|---|---|
committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-04-10 10:35:09 +0200 |
commit | 14c996d98256de958da367297c3313e0fa7ef9a8 (patch) | |
tree | 27074d5403b67cbaf59d7b7181481ebe70af5d9e /apps/settings | |
parent | d6e17fb01777866674129a5883c03642f4bfd4a5 (diff) | |
download | nextcloud-server-14c996d98256de958da367297c3313e0fa7ef9a8.tar.gz nextcloud-server-14c996d98256de958da367297c3313e0fa7ef9a8.zip |
Use elseif instead of else if
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'apps/settings')
-rw-r--r-- | apps/settings/lib/Activity/GroupProvider.php | 4 | ||||
-rw-r--r-- | apps/settings/lib/Activity/Provider.php | 20 | ||||
-rw-r--r-- | apps/settings/lib/Controller/CommonSettingsTrait.php | 2 | ||||
-rw-r--r-- | apps/settings/templates/settings/admin/server.php | 2 | ||||
-rw-r--r-- | apps/settings/templates/settings/empty.php | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/apps/settings/lib/Activity/GroupProvider.php b/apps/settings/lib/Activity/GroupProvider.php index 5ad2cce0325..65ca2627775 100644 --- a/apps/settings/lib/Activity/GroupProvider.php +++ b/apps/settings/lib/Activity/GroupProvider.php @@ -96,7 +96,7 @@ class GroupProvider implements IProvider { } else { $subject = $l->t('{actor} added {user} to group {group}'); } - } else if ($this->activityManager->getCurrentUserId() === $params['user']) { + } elseif ($this->activityManager->getCurrentUserId() === $params['user']) { $subject = $l->t('An administrator added you to group {group}'); } else { $subject = $l->t('An administrator added {user} to group {group}'); @@ -111,7 +111,7 @@ class GroupProvider implements IProvider { } else { $subject = $l->t('{actor} removed {user} from group {group}'); } - } else if ($this->activityManager->getCurrentUserId() === $params['user']) { + } elseif ($this->activityManager->getCurrentUserId() === $params['user']) { $subject = $l->t('An administrator removed you from group {group}'); } else { $subject = $l->t('An administrator removed {user} from group {group}'); diff --git a/apps/settings/lib/Activity/Provider.php b/apps/settings/lib/Activity/Provider.php index d21d7a9198a..ecf653eb0e4 100644 --- a/apps/settings/lib/Activity/Provider.php +++ b/apps/settings/lib/Activity/Provider.php @@ -102,27 +102,27 @@ class Provider implements IProvider { if ($event->getSubject() === self::PASSWORD_CHANGED_BY) { $subject = $this->l->t('{actor} changed your password'); - } else if ($event->getSubject() === self::PASSWORD_CHANGED_SELF) { + } elseif ($event->getSubject() === self::PASSWORD_CHANGED_SELF) { $subject = $this->l->t('You changed your password'); - } else if ($event->getSubject() === self::PASSWORD_RESET) { + } elseif ($event->getSubject() === self::PASSWORD_RESET) { $subject = $this->l->t('Your password was reset by an administrator'); - } else if ($event->getSubject() === self::EMAIL_CHANGED_BY) { + } elseif ($event->getSubject() === self::EMAIL_CHANGED_BY) { $subject = $this->l->t('{actor} changed your email address'); - } else if ($event->getSubject() === self::EMAIL_CHANGED_SELF) { + } elseif ($event->getSubject() === self::EMAIL_CHANGED_SELF) { $subject = $this->l->t('You changed your email address'); - } else if ($event->getSubject() === self::EMAIL_CHANGED) { + } elseif ($event->getSubject() === self::EMAIL_CHANGED) { $subject = $this->l->t('Your email address was changed by an administrator'); - } else if ($event->getSubject() === self::APP_TOKEN_CREATED) { + } elseif ($event->getSubject() === self::APP_TOKEN_CREATED) { $subject = $this->l->t('You created app password "{token}"'); - } else if ($event->getSubject() === self::APP_TOKEN_DELETED) { + } elseif ($event->getSubject() === self::APP_TOKEN_DELETED) { $subject = $this->l->t('You deleted app password "{token}"'); - } else if ($event->getSubject() === self::APP_TOKEN_RENAMED) { + } elseif ($event->getSubject() === self::APP_TOKEN_RENAMED) { $subject = $this->l->t('You renamed app password "{token}" to "{newToken}"'); - } else if ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_GRANTED) { + } elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_GRANTED) { $subject = $this->l->t('You granted filesystem access to app password "{token}"'); - } else if ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_REVOKED) { + } elseif ($event->getSubject() === self::APP_TOKEN_FILESYSTEM_REVOKED) { $subject = $this->l->t('You revoked filesystem access from app password "{token}"'); } else { diff --git a/apps/settings/lib/Controller/CommonSettingsTrait.php b/apps/settings/lib/Controller/CommonSettingsTrait.php index da102d2ed20..7aa202429eb 100644 --- a/apps/settings/lib/Controller/CommonSettingsTrait.php +++ b/apps/settings/lib/Controller/CommonSettingsTrait.php @@ -89,7 +89,7 @@ trait CommonSettingsTrait { foreach ($prioritizedSections as $section) { if($type === 'admin') { $settings = $this->settingsManager->getAdminSettings($section->getID(), $subAdminOnly); - } else if($type === 'personal') { + } elseif($type === 'personal') { $settings = $this->settingsManager->getPersonalSettings($section->getID()); } if (empty($settings) && !($section->getID() === 'additional' && count(\OC_App::getForms('admin')) > 0)) { diff --git a/apps/settings/templates/settings/admin/server.php b/apps/settings/templates/settings/admin/server.php index 513e82ece5a..bde4423f67f 100644 --- a/apps/settings/templates/settings/admin/server.php +++ b/apps/settings/templates/settings/admin/server.php @@ -41,7 +41,7 @@ <span class="crondate" title="<?php p($absolute_time);?>"> <?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?> </span> - <?php } else if (time() - $_['cronMaxAge'] > 12*3600) { + <?php } elseif (time() - $_['cronMaxAge'] > 12*3600) { if ($_['backgroundjobs_mode'] === 'cron') { ?> <span class="status warning"></span> <span class="crondate" title="<?php p($maxAgeAbsoluteTime);?>"> diff --git a/apps/settings/templates/settings/empty.php b/apps/settings/templates/settings/empty.php index e8999f5f07e..63ebc6f44a1 100644 --- a/apps/settings/templates/settings/empty.php +++ b/apps/settings/templates/settings/empty.php @@ -21,4 +21,4 @@ * */ - # used for Personal/Additional settings as fallback for legacy settings
\ No newline at end of file + # used for Personal/Additional settings as fallback for legacy settings |