Completed
Pull Request — master (#4890)
by Blizzz
17:06
created
settings/Controller/CommonSettingsTrait.php 3 patches
Doc Comments   +12 added lines patch added patch discarded remove patch
@@ -51,6 +51,9 @@  discard block
 block discarded – undo
51 51
 		];
52 52
 	}
53 53
 
54
+	/**
55
+	 * @param string $type
56
+	 */
54 57
 	protected function formatSections($sections, $currentSection, $type) {
55 58
 		$templateParameters = [];
56 59
 		/** @var \OCP\Settings\ISection[] $prioritizedSections */
@@ -81,6 +84,9 @@  discard block
 block discarded – undo
81 84
 		return $templateParameters;
82 85
 	}
83 86
 
87
+	/**
88
+	 * @param string $currentSections
89
+	 */
84 90
 	protected function formatPersonalSections($currentSections) {
85 91
 		$sections = $this->settingsManager->getPersonalSections();
86 92
 		$templateParameters = $this->formatSections($sections, $currentSections, 'personal');
@@ -88,6 +94,9 @@  discard block
 block discarded – undo
88 94
 		return $templateParameters;
89 95
 	}
90 96
 
97
+	/**
98
+	 * @param string $currentSections
99
+	 */
91 100
 	protected function formatAdminSections($currentSections) {
92 101
 		$sections = $this->settingsManager->getAdminSections();
93 102
 		$templateParameters = $this->formatSections($sections, $currentSections, 'admin');
@@ -111,6 +120,9 @@  discard block
 block discarded – undo
111 120
 		return ['content' => $html];
112 121
 	}
113 122
 
123
+	/**
124
+	 * @param string $section
125
+	 */
114 126
 	private function getIndexResponse($section) {
115 127
 		$templateParams = [];
116 128
 		$templateParams = array_merge($templateParams, $this->getNavigationParameters($section));
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 use OCP\Settings\IIconSection;
29 29
 use OCP\Settings\ISettings;
30 30
 
31
-trait CommonSettingsTrait  {
31
+trait CommonSettingsTrait {
32 32
 	/** @var ISettingsManager */
33 33
 	private $settingsManager;
34 34
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 			'admin' => []
43 43
 		];
44 44
 
45
-		if(\OC_User::isAdminUser(\OC_User::getUser())) {
45
+		if (\OC_User::isAdminUser(\OC_User::getUser())) {
46 46
 			$templateParameters['admin'] = $this->formatAdminSections($currentSection);
47 47
 		}
48 48
 
@@ -54,11 +54,11 @@  discard block
 block discarded – undo
54 54
 	protected function formatSections($sections, $currentSection, $type) {
55 55
 		$templateParameters = [];
56 56
 		/** @var \OCP\Settings\ISection[] $prioritizedSections */
57
-		foreach($sections as $prioritizedSections) {
57
+		foreach ($sections as $prioritizedSections) {
58 58
 			foreach ($prioritizedSections as $section) {
59
-				if($type === 'admin') {
59
+				if ($type === 'admin') {
60 60
 					$settings = $this->settingsManager->getAdminSettings($section->getID());
61
-				} else if($type === 'personal') {
61
+				} else if ($type === 'personal') {
62 62
 					$settings = $this->settingsManager->getPersonalSettings($section->getID());
63 63
 				}
64 64
 				if (empty($settings)) {
Please login to merge, or discard this patch.
Indentation   +91 added lines, -91 removed lines patch added patch discarded remove patch
@@ -29,95 +29,95 @@
 block discarded – undo
29 29
 use OCP\Settings\ISettings;
30 30
 
31 31
 trait CommonSettingsTrait  {
32
-	/** @var ISettingsManager */
33
-	private $settingsManager;
34
-
35
-	/**
36
-	 * @param string $currentSection
37
-	 * @return array
38
-	 */
39
-	private function getNavigationParameters($currentSection) {
40
-		$templateParameters = [
41
-			'personal' => $this->formatPersonalSections($currentSection),
42
-			'admin' => []
43
-		];
44
-
45
-		if(\OC_User::isAdminUser(\OC_User::getUser())) {
46
-			$templateParameters['admin'] = $this->formatAdminSections($currentSection);
47
-		}
48
-
49
-		return [
50
-			'forms' => $templateParameters
51
-		];
52
-	}
53
-
54
-	protected function formatSections($sections, $currentSection, $type) {
55
-		$templateParameters = [];
56
-		/** @var \OCP\Settings\ISection[] $prioritizedSections */
57
-		foreach($sections as $prioritizedSections) {
58
-			foreach ($prioritizedSections as $section) {
59
-				if($type === 'admin') {
60
-					$settings = $this->settingsManager->getAdminSettings($section->getID());
61
-				} else if($type === 'personal') {
62
-					$settings = $this->settingsManager->getPersonalSettings($section->getID());
63
-				}
64
-				if (empty($settings)) {
65
-					continue;
66
-				}
67
-
68
-				$icon = '';
69
-				if ($section instanceof IIconSection) {
70
-					$icon = $section->getIcon();
71
-				}
72
-
73
-				$templateParameters[] = [
74
-					'anchor'       => $section->getID(),
75
-					'section-name' => $section->getName(),
76
-					'active'       => $section->getID() === $currentSection,
77
-					'icon'         => $icon,
78
-				];
79
-			}
80
-		}
81
-		return $templateParameters;
82
-	}
83
-
84
-	protected function formatPersonalSections($currentSections) {
85
-		$sections = $this->settingsManager->getPersonalSections();
86
-		$templateParameters = $this->formatSections($sections, $currentSections, 'personal');
87
-
88
-		return $templateParameters;
89
-	}
90
-
91
-	protected function formatAdminSections($currentSections) {
92
-		$sections = $this->settingsManager->getAdminSections();
93
-		$templateParameters = $this->formatSections($sections, $currentSections, 'admin');
94
-
95
-		return $templateParameters;
96
-	}
97
-
98
-	/**
99
-	 * @param ISettings[] $settings
100
-	 * @return array
101
-	 */
102
-	private function formatSettings($settings) {
103
-		$html = '';
104
-		foreach ($settings as $prioritizedSettings) {
105
-			foreach ($prioritizedSettings as $setting) {
106
-				/** @var \OCP\Settings\ISettings $setting */
107
-				$form = $setting->getForm();
108
-				$html .= $form->renderAs('')->render();
109
-			}
110
-		}
111
-		return ['content' => $html];
112
-	}
113
-
114
-	private function getIndexResponse($section) {
115
-		$templateParams = [];
116
-		$templateParams = array_merge($templateParams, $this->getNavigationParameters($section));
117
-		$templateParams = array_merge($templateParams, $this->getSettings($section));
118
-
119
-		return new TemplateResponse('settings', 'settings/frame', $templateParams);
120
-	}
121
-
122
-	abstract protected function getSettings($section);
32
+    /** @var ISettingsManager */
33
+    private $settingsManager;
34
+
35
+    /**
36
+     * @param string $currentSection
37
+     * @return array
38
+     */
39
+    private function getNavigationParameters($currentSection) {
40
+        $templateParameters = [
41
+            'personal' => $this->formatPersonalSections($currentSection),
42
+            'admin' => []
43
+        ];
44
+
45
+        if(\OC_User::isAdminUser(\OC_User::getUser())) {
46
+            $templateParameters['admin'] = $this->formatAdminSections($currentSection);
47
+        }
48
+
49
+        return [
50
+            'forms' => $templateParameters
51
+        ];
52
+    }
53
+
54
+    protected function formatSections($sections, $currentSection, $type) {
55
+        $templateParameters = [];
56
+        /** @var \OCP\Settings\ISection[] $prioritizedSections */
57
+        foreach($sections as $prioritizedSections) {
58
+            foreach ($prioritizedSections as $section) {
59
+                if($type === 'admin') {
60
+                    $settings = $this->settingsManager->getAdminSettings($section->getID());
61
+                } else if($type === 'personal') {
62
+                    $settings = $this->settingsManager->getPersonalSettings($section->getID());
63
+                }
64
+                if (empty($settings)) {
65
+                    continue;
66
+                }
67
+
68
+                $icon = '';
69
+                if ($section instanceof IIconSection) {
70
+                    $icon = $section->getIcon();
71
+                }
72
+
73
+                $templateParameters[] = [
74
+                    'anchor'       => $section->getID(),
75
+                    'section-name' => $section->getName(),
76
+                    'active'       => $section->getID() === $currentSection,
77
+                    'icon'         => $icon,
78
+                ];
79
+            }
80
+        }
81
+        return $templateParameters;
82
+    }
83
+
84
+    protected function formatPersonalSections($currentSections) {
85
+        $sections = $this->settingsManager->getPersonalSections();
86
+        $templateParameters = $this->formatSections($sections, $currentSections, 'personal');
87
+
88
+        return $templateParameters;
89
+    }
90
+
91
+    protected function formatAdminSections($currentSections) {
92
+        $sections = $this->settingsManager->getAdminSections();
93
+        $templateParameters = $this->formatSections($sections, $currentSections, 'admin');
94
+
95
+        return $templateParameters;
96
+    }
97
+
98
+    /**
99
+     * @param ISettings[] $settings
100
+     * @return array
101
+     */
102
+    private function formatSettings($settings) {
103
+        $html = '';
104
+        foreach ($settings as $prioritizedSettings) {
105
+            foreach ($prioritizedSettings as $setting) {
106
+                /** @var \OCP\Settings\ISettings $setting */
107
+                $form = $setting->getForm();
108
+                $html .= $form->renderAs('')->render();
109
+            }
110
+        }
111
+        return ['content' => $html];
112
+    }
113
+
114
+    private function getIndexResponse($section) {
115
+        $templateParams = [];
116
+        $templateParams = array_merge($templateParams, $this->getNavigationParameters($section));
117
+        $templateParams = array_merge($templateParams, $this->getSettings($section));
118
+
119
+        return new TemplateResponse('settings', 'settings/frame', $templateParams);
120
+    }
121
+
122
+    abstract protected function getSettings($section);
123 123
 }
Please login to merge, or discard this patch.
lib/private/Settings/Personal/PersonalInfo.php 3 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
135 135
 				$ln = array('code' => $lang, 'name' => $potentialName);
136 136
 			} elseif ($lang === 'en') {
137 137
 				$ln = ['code' => $lang, 'name' => 'English (US)'];
138
-			}else{//fallback to language code
138
+			} else{//fallback to language code
139 139
 				$ln=array('code'=>$lang, 'name'=>$lang);
140 140
 			}
141 141
 
Please login to merge, or discard this patch.
Indentation   +210 added lines, -210 removed lines patch added patch discarded remove patch
@@ -39,237 +39,237 @@
 block discarded – undo
39 39
 use OCP\Settings\ISettings;
40 40
 
41 41
 class PersonalInfo implements ISettings {
42
-	/** @var IConfig */
43
-	private $config;
44
-	/** @var IUserManager */
45
-	private $userManager;
46
-	/** @var AccountManager */
47
-	private $accountManager;
48
-	/** @var IGroupManager */
49
-	private $groupManager;
50
-	/** @var IAppManager */
51
-	private $appManager;
52
-	/** @var IFactory */
53
-	private $l10nFactory;
42
+    /** @var IConfig */
43
+    private $config;
44
+    /** @var IUserManager */
45
+    private $userManager;
46
+    /** @var AccountManager */
47
+    private $accountManager;
48
+    /** @var IGroupManager */
49
+    private $groupManager;
50
+    /** @var IAppManager */
51
+    private $appManager;
52
+    /** @var IFactory */
53
+    private $l10nFactory;
54 54
 
55
-	const COMMON_LANGUAGE_CODES = [
56
-		'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it',
57
-		'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
58
-	];
55
+    const COMMON_LANGUAGE_CODES = [
56
+        'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it',
57
+        'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
58
+    ];
59 59
 
60
-	/** @var IL10N */
61
-	private $l;
60
+    /** @var IL10N */
61
+    private $l;
62 62
 
63
-	/**
64
-	 * @param IConfig $config
65
-	 * @param IUserManager $userManager
66
-	 * @param IGroupManager $groupManager
67
-	 * @param AccountManager $accountManager
68
-	 * @param IFactory $l10nFactory
69
-	 * @param IL10N $l
70
-	 */
71
-	public function __construct(
72
-		IConfig $config,
73
-		IUserManager $userManager,
74
-		IGroupManager $groupManager,
75
-		AccountManager $accountManager,
76
-		IAppManager $appManager,
77
-		IFactory $l10nFactory,
78
-		IL10N $l
79
-	) {
80
-		$this->config = $config;
81
-		$this->userManager = $userManager;
82
-		$this->accountManager = $accountManager;
83
-		$this->groupManager = $groupManager;
84
-		$this->appManager = $appManager;
85
-		$this->l10nFactory = $l10nFactory;
86
-		$this->l = $l;
87
-	}
63
+    /**
64
+     * @param IConfig $config
65
+     * @param IUserManager $userManager
66
+     * @param IGroupManager $groupManager
67
+     * @param AccountManager $accountManager
68
+     * @param IFactory $l10nFactory
69
+     * @param IL10N $l
70
+     */
71
+    public function __construct(
72
+        IConfig $config,
73
+        IUserManager $userManager,
74
+        IGroupManager $groupManager,
75
+        AccountManager $accountManager,
76
+        IAppManager $appManager,
77
+        IFactory $l10nFactory,
78
+        IL10N $l
79
+    ) {
80
+        $this->config = $config;
81
+        $this->userManager = $userManager;
82
+        $this->accountManager = $accountManager;
83
+        $this->groupManager = $groupManager;
84
+        $this->appManager = $appManager;
85
+        $this->l10nFactory = $l10nFactory;
86
+        $this->l = $l;
87
+    }
88 88
 
89
-	/**
90
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
91
-	 * @since 9.1
92
-	 */
93
-	public function getForm() {
94
-		$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
95
-		$lookupServerUploadEnabled = false;
96
-		if($federatedFileSharingEnabled) {
97
-			$federatedFileSharing = new Application();
98
-			$shareProvider = $federatedFileSharing->getFederatedShareProvider();
99
-			$lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
100
-		}
89
+    /**
90
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
91
+     * @since 9.1
92
+     */
93
+    public function getForm() {
94
+        $federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
95
+        $lookupServerUploadEnabled = false;
96
+        if($federatedFileSharingEnabled) {
97
+            $federatedFileSharing = new Application();
98
+            $shareProvider = $federatedFileSharing->getFederatedShareProvider();
99
+            $lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
100
+        }
101 101
 
102
-		$uid = \OC_User::getUser();
103
-		$user = $this->userManager->get($uid);
104
-		$userData = $this->accountManager->getUser($user);
102
+        $uid = \OC_User::getUser();
103
+        $user = $this->userManager->get($uid);
104
+        $userData = $this->accountManager->getUser($user);
105 105
 
106
-		$storageInfo = \OC_Helper::getStorageInfo('/');
107
-		if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
108
-			$totalSpace = $this->l->t('Unlimited');
109
-		} else {
110
-			$totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
111
-		}
106
+        $storageInfo = \OC_Helper::getStorageInfo('/');
107
+        if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
108
+            $totalSpace = $this->l->t('Unlimited');
109
+        } else {
110
+            $totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
111
+        }
112 112
 
113
-		list($activeLanguage, $commonLanguages, $languages) = $this->getLanguages($user);
114
-		$messageParameters = $this->getMessageParameters($userData);
113
+        list($activeLanguage, $commonLanguages, $languages) = $this->getLanguages($user);
114
+        $messageParameters = $this->getMessageParameters($userData);
115 115
 
116
-		$parameters = [
117
-			'total_space' => $totalSpace,
118
-			'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
119
-			'usage_relative' => $storageInfo['relative'],
120
-			'quota' => $storageInfo['quota'],
121
-			'avatarChangeSupported' => \OC_User::canUserChangeAvatar($uid),
122
-			'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
123
-			'avatarScope' => $userData[AccountManager::PROPERTY_AVATAR]['scope'],
124
-			'displayNameChangeSupported' => \OC_User::canUserChangeDisplayName($uid),
125
-			'displayName' => $userData[AccountManager::PROPERTY_DISPLAYNAME]['value'],
126
-			'displayNameScope' => $userData[AccountManager::PROPERTY_DISPLAYNAME]['scope'],
127
-			'email' => $userData[AccountManager::PROPERTY_EMAIL]['value'],
128
-			'emailScope' => $userData[AccountManager::PROPERTY_EMAIL]['scope'],
129
-			'emailVerification' => $userData[AccountManager::PROPERTY_EMAIL]['verified'],
130
-			'phone' => $userData[AccountManager::PROPERTY_PHONE]['value'],
131
-			'phoneScope' => $userData[AccountManager::PROPERTY_PHONE]['scope'],
132
-			'address' => $userData[AccountManager::PROPERTY_ADDRESS]['value'],
133
-			'addressScope' => $userData[AccountManager::PROPERTY_ADDRESS]['scope'],
134
-			'website' =>  $userData[AccountManager::PROPERTY_WEBSITE]['value'],
135
-			'websiteScope' =>  $userData[AccountManager::PROPERTY_WEBSITE]['scope'],
136
-			'websiteVerification' => $userData[AccountManager::PROPERTY_WEBSITE]['verified'],
137
-			'twitter' => $userData[AccountManager::PROPERTY_TWITTER]['value'],
138
-			'twitterScope' => $userData[AccountManager::PROPERTY_TWITTER]['scope'],
139
-			'twitterVerification' => $userData[AccountManager::PROPERTY_TWITTER]['verified'],
140
-			'groups' => $this->getGroups($user),
141
-			'passwordChangeSupported' => \OC_User::canUserChangePassword($uid),
142
-			'activelanguage' => $activeLanguage,
143
-			'commonlanguages' => $commonLanguages,
144
-			'languages' => $languages,
145
-		] + $messageParameters;
116
+        $parameters = [
117
+            'total_space' => $totalSpace,
118
+            'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
119
+            'usage_relative' => $storageInfo['relative'],
120
+            'quota' => $storageInfo['quota'],
121
+            'avatarChangeSupported' => \OC_User::canUserChangeAvatar($uid),
122
+            'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
123
+            'avatarScope' => $userData[AccountManager::PROPERTY_AVATAR]['scope'],
124
+            'displayNameChangeSupported' => \OC_User::canUserChangeDisplayName($uid),
125
+            'displayName' => $userData[AccountManager::PROPERTY_DISPLAYNAME]['value'],
126
+            'displayNameScope' => $userData[AccountManager::PROPERTY_DISPLAYNAME]['scope'],
127
+            'email' => $userData[AccountManager::PROPERTY_EMAIL]['value'],
128
+            'emailScope' => $userData[AccountManager::PROPERTY_EMAIL]['scope'],
129
+            'emailVerification' => $userData[AccountManager::PROPERTY_EMAIL]['verified'],
130
+            'phone' => $userData[AccountManager::PROPERTY_PHONE]['value'],
131
+            'phoneScope' => $userData[AccountManager::PROPERTY_PHONE]['scope'],
132
+            'address' => $userData[AccountManager::PROPERTY_ADDRESS]['value'],
133
+            'addressScope' => $userData[AccountManager::PROPERTY_ADDRESS]['scope'],
134
+            'website' =>  $userData[AccountManager::PROPERTY_WEBSITE]['value'],
135
+            'websiteScope' =>  $userData[AccountManager::PROPERTY_WEBSITE]['scope'],
136
+            'websiteVerification' => $userData[AccountManager::PROPERTY_WEBSITE]['verified'],
137
+            'twitter' => $userData[AccountManager::PROPERTY_TWITTER]['value'],
138
+            'twitterScope' => $userData[AccountManager::PROPERTY_TWITTER]['scope'],
139
+            'twitterVerification' => $userData[AccountManager::PROPERTY_TWITTER]['verified'],
140
+            'groups' => $this->getGroups($user),
141
+            'passwordChangeSupported' => \OC_User::canUserChangePassword($uid),
142
+            'activelanguage' => $activeLanguage,
143
+            'commonlanguages' => $commonLanguages,
144
+            'languages' => $languages,
145
+        ] + $messageParameters;
146 146
 
147 147
 
148
-		return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
149
-	}
148
+        return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
149
+    }
150 150
 
151
-	/**
152
-	 * @return string the section ID, e.g. 'sharing'
153
-	 * @since 9.1
154
-	 */
155
-	public function getSection() {
156
-		return 'personal-info';
157
-	}
151
+    /**
152
+     * @return string the section ID, e.g. 'sharing'
153
+     * @since 9.1
154
+     */
155
+    public function getSection() {
156
+        return 'personal-info';
157
+    }
158 158
 
159
-	/**
160
-	 * @return int whether the form should be rather on the top or bottom of
161
-	 * the admin section. The forms are arranged in ascending order of the
162
-	 * priority values. It is required to return a value between 0 and 100.
163
-	 *
164
-	 * E.g.: 70
165
-	 * @since 9.1
166
-	 */
167
-	public function getPriority() {
168
-		return 10;
169
-	}
159
+    /**
160
+     * @return int whether the form should be rather on the top or bottom of
161
+     * the admin section. The forms are arranged in ascending order of the
162
+     * priority values. It is required to return a value between 0 and 100.
163
+     *
164
+     * E.g.: 70
165
+     * @since 9.1
166
+     */
167
+    public function getPriority() {
168
+        return 10;
169
+    }
170 170
 
171
-	/**
172
-	 * returns a sorted list of the user's group GIDs
173
-	 *
174
-	 * @param IUser $user
175
-	 * @return array
176
-	 */
177
-	private function getGroups(IUser $user) {
178
-		$groups = array_map(
179
-			function(IGroup $group) {
180
-				return $group->getGID();
181
-			},
182
-			$this->groupManager->getUserGroups($user)
183
-		);
184
-		sort($groups);
171
+    /**
172
+     * returns a sorted list of the user's group GIDs
173
+     *
174
+     * @param IUser $user
175
+     * @return array
176
+     */
177
+    private function getGroups(IUser $user) {
178
+        $groups = array_map(
179
+            function(IGroup $group) {
180
+                return $group->getGID();
181
+            },
182
+            $this->groupManager->getUserGroups($user)
183
+        );
184
+        sort($groups);
185 185
 
186
-		return $groups;
187
-	}
186
+        return $groups;
187
+    }
188 188
 
189
-	/**
190
-	 * returns the user language, common language and other languages in an
191
-	 * associative array
192
-	 *
193
-	 * @param IUser $user
194
-	 * @return array
195
-	 */
196
-	private function getLanguages(IUser $user) {
197
-		$uid = $user->getUID();
189
+    /**
190
+     * returns the user language, common language and other languages in an
191
+     * associative array
192
+     *
193
+     * @param IUser $user
194
+     * @return array
195
+     */
196
+    private function getLanguages(IUser $user) {
197
+        $uid = $user->getUID();
198 198
 
199
-		$commonLanguages = [];
200
-		$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
201
-		$languageCodes = $this->l10nFactory->findAvailableLanguages();
202
-		foreach($languageCodes as $lang) {
203
-			$l = \OC::$server->getL10N('settings', $lang);
204
-			// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
205
-			$potentialName = (string) $l->t('__language_name__');
206
-			if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
207
-				$ln = array('code' => $lang, 'name' => $potentialName);
208
-			} elseif ($lang === 'en') {
209
-				$ln = ['code' => $lang, 'name' => 'English (US)'];
210
-			}else{//fallback to language code
211
-				$ln=array('code'=>$lang, 'name'=>$lang);
212
-			}
199
+        $commonLanguages = [];
200
+        $userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
201
+        $languageCodes = $this->l10nFactory->findAvailableLanguages();
202
+        foreach($languageCodes as $lang) {
203
+            $l = \OC::$server->getL10N('settings', $lang);
204
+            // TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
205
+            $potentialName = (string) $l->t('__language_name__');
206
+            if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
207
+                $ln = array('code' => $lang, 'name' => $potentialName);
208
+            } elseif ($lang === 'en') {
209
+                $ln = ['code' => $lang, 'name' => 'English (US)'];
210
+            }else{//fallback to language code
211
+                $ln=array('code'=>$lang, 'name'=>$lang);
212
+            }
213 213
 
214
-			// put appropriate languages into appropriate arrays, to print them sorted
215
-			// used language -> common languages -> divider -> other languages
216
-			if ($lang === $userLang) {
217
-				$userLang = $ln;
218
-			} elseif (in_array($lang, self::COMMON_LANGUAGE_CODES)) {
219
-				$commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)]=$ln;
220
-			} else {
221
-				$languages[]=$ln;
222
-			}
223
-		}
214
+            // put appropriate languages into appropriate arrays, to print them sorted
215
+            // used language -> common languages -> divider -> other languages
216
+            if ($lang === $userLang) {
217
+                $userLang = $ln;
218
+            } elseif (in_array($lang, self::COMMON_LANGUAGE_CODES)) {
219
+                $commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)]=$ln;
220
+            } else {
221
+                $languages[]=$ln;
222
+            }
223
+        }
224 224
 
225
-		// if user language is not available but set somehow: show the actual code as name
226
-		if (!is_array($userLang)) {
227
-			$userLang = [
228
-				'code' => $userLang,
229
-				'name' => $userLang,
230
-			];
231
-		}
225
+        // if user language is not available but set somehow: show the actual code as name
226
+        if (!is_array($userLang)) {
227
+            $userLang = [
228
+                'code' => $userLang,
229
+                'name' => $userLang,
230
+            ];
231
+        }
232 232
 
233
-		ksort($commonLanguages);
233
+        ksort($commonLanguages);
234 234
 
235
-		// sort now by displayed language not the iso-code
236
-		usort( $languages, function ($a, $b) {
237
-			if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
238
-				// If a doesn't have a name, but b does, list b before a
239
-				return 1;
240
-			}
241
-			if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
242
-				// If a does have a name, but b doesn't, list a before b
243
-				return -1;
244
-			}
245
-			// Otherwise compare the names
246
-			return strcmp($a['name'], $b['name']);
247
-		});
235
+        // sort now by displayed language not the iso-code
236
+        usort( $languages, function ($a, $b) {
237
+            if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
238
+                // If a doesn't have a name, but b does, list b before a
239
+                return 1;
240
+            }
241
+            if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
242
+                // If a does have a name, but b doesn't, list a before b
243
+                return -1;
244
+            }
245
+            // Otherwise compare the names
246
+            return strcmp($a['name'], $b['name']);
247
+        });
248 248
 
249
-		return [$userLang, $commonLanguages, $languages];
250
-	}
249
+        return [$userLang, $commonLanguages, $languages];
250
+    }
251 251
 
252
-	/**
253
-	 * @param array $userData
254
-	 * @return array
255
-	 */
256
-	private function getMessageParameters(array $userData) {
257
-		$needVerifyMessage = [AccountManager::PROPERTY_EMAIL, AccountManager::PROPERTY_WEBSITE, AccountManager::PROPERTY_TWITTER];
258
-		$messageParameters = [];
259
-		foreach ($needVerifyMessage as $property) {
260
-			switch ($userData[$property]['verified']) {
261
-				case AccountManager::VERIFIED:
262
-					$message = $this->l->t('Verifying');
263
-					break;
264
-				case AccountManager::VERIFICATION_IN_PROGRESS:
265
-					$message = $this->l->t('Verifying …');
266
-					break;
267
-				default:
268
-					$message = $this->l->t('Verify');
269
-			}
270
-			$messageParameters[$property . 'Message'] = $message;
271
-		}
272
-		return $messageParameters;
273
-	}
252
+    /**
253
+     * @param array $userData
254
+     * @return array
255
+     */
256
+    private function getMessageParameters(array $userData) {
257
+        $needVerifyMessage = [AccountManager::PROPERTY_EMAIL, AccountManager::PROPERTY_WEBSITE, AccountManager::PROPERTY_TWITTER];
258
+        $messageParameters = [];
259
+        foreach ($needVerifyMessage as $property) {
260
+            switch ($userData[$property]['verified']) {
261
+                case AccountManager::VERIFIED:
262
+                    $message = $this->l->t('Verifying');
263
+                    break;
264
+                case AccountManager::VERIFICATION_IN_PROGRESS:
265
+                    $message = $this->l->t('Verifying …');
266
+                    break;
267
+                default:
268
+                    $message = $this->l->t('Verify');
269
+            }
270
+            $messageParameters[$property . 'Message'] = $message;
271
+        }
272
+        return $messageParameters;
273
+    }
274 274
 
275 275
 }
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	public function getForm() {
94 94
 		$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
95 95
 		$lookupServerUploadEnabled = false;
96
-		if($federatedFileSharingEnabled) {
96
+		if ($federatedFileSharingEnabled) {
97 97
 			$federatedFileSharing = new Application();
98 98
 			$shareProvider = $federatedFileSharing->getFederatedShareProvider();
99 99
 			$lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
@@ -199,16 +199,16 @@  discard block
 block discarded – undo
199 199
 		$commonLanguages = [];
200 200
 		$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
201 201
 		$languageCodes = $this->l10nFactory->findAvailableLanguages();
202
-		foreach($languageCodes as $lang) {
202
+		foreach ($languageCodes as $lang) {
203 203
 			$l = \OC::$server->getL10N('settings', $lang);
204 204
 			// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
205 205
 			$potentialName = (string) $l->t('__language_name__');
206
-			if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
206
+			if ($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
207 207
 				$ln = array('code' => $lang, 'name' => $potentialName);
208 208
 			} elseif ($lang === 'en') {
209 209
 				$ln = ['code' => $lang, 'name' => 'English (US)'];
210
-			}else{//fallback to language code
211
-				$ln=array('code'=>$lang, 'name'=>$lang);
210
+			} else {//fallback to language code
211
+				$ln = array('code'=>$lang, 'name'=>$lang);
212 212
 			}
213 213
 
214 214
 			// put appropriate languages into appropriate arrays, to print them sorted
@@ -216,9 +216,9 @@  discard block
 block discarded – undo
216 216
 			if ($lang === $userLang) {
217 217
 				$userLang = $ln;
218 218
 			} elseif (in_array($lang, self::COMMON_LANGUAGE_CODES)) {
219
-				$commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)]=$ln;
219
+				$commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)] = $ln;
220 220
 			} else {
221
-				$languages[]=$ln;
221
+				$languages[] = $ln;
222 222
 			}
223 223
 		}
224 224
 
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 		ksort($commonLanguages);
234 234
 
235 235
 		// sort now by displayed language not the iso-code
236
-		usort( $languages, function ($a, $b) {
236
+		usort($languages, function($a, $b) {
237 237
 			if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
238 238
 				// If a doesn't have a name, but b does, list b before a
239 239
 				return 1;
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 				default:
268 268
 					$message = $this->l->t('Verify');
269 269
 			}
270
-			$messageParameters[$property . 'Message'] = $message;
270
+			$messageParameters[$property.'Message'] = $message;
271 271
 		}
272 272
 		return $messageParameters;
273 273
 	}
Please login to merge, or discard this patch.
settings/templates/settings/frame.php 2 patches
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -32,13 +32,13 @@  discard block
 block discarded – undo
32 32
 	<ul>
33 33
 		<li class="settings-caption">Personal</li>
34 34
 		<?php
35
-		foreach($_['forms']['personal'] as $form) {
36
-			if (isset($form['anchor'])) {
37
-				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]);
38
-				$class = 'nav-icon-' . $form['anchor'];
39
-				$sectionName = $form['section-name'];
40
-				$active = $form['active'] ? ' class="active"' : '';
41
-				?>
35
+        foreach($_['forms']['personal'] as $form) {
36
+            if (isset($form['anchor'])) {
37
+                $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]);
38
+                $class = 'nav-icon-' . $form['anchor'];
39
+                $sectionName = $form['section-name'];
40
+                $active = $form['active'] ? ' class="active"' : '';
41
+                ?>
42 42
 				<li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?>>
43 43
 					<a href="<?php p($anchor); ?>">
44 44
 						<?php if (!empty($form['icon'])) { ?>
@@ -50,24 +50,24 @@  discard block
 block discarded – undo
50 50
 					</a>
51 51
 				</li>
52 52
 				<?php
53
-			}
54
-		}
55
-		?>
53
+            }
54
+        }
55
+        ?>
56 56
 
57 57
 		<?php
58
-		if(!empty($_['forms']['admin'])) {
59
-			?>
58
+        if(!empty($_['forms']['admin'])) {
59
+            ?>
60 60
 			<li class="settings-caption">Administration</li>
61 61
 			<?php
62
-		}
63
-		foreach($_['forms']['admin'] as $form) {
64
-			if (isset($form['anchor'])) {
62
+        }
63
+        foreach($_['forms']['admin'] as $form) {
64
+            if (isset($form['anchor'])) {
65 65
 
66
-				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]);
67
-				$class = 'nav-icon-' . $form['anchor'];
68
-				$sectionName = $form['section-name'];
69
-				$active = $form['active'] ? ' class="active"' : '';
70
-		?>
66
+                $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]);
67
+                $class = 'nav-icon-' . $form['anchor'];
68
+                $sectionName = $form['section-name'];
69
+                $active = $form['active'] ? ' class="active"' : '';
70
+        ?>
71 71
 				<li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?>>
72 72
 					<a href="<?php p($anchor); ?>">
73 73
 						<?php if (!empty($form['icon'])) { ?>
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
 					</a>
80 80
 				</li>
81 81
 		<?php
82
-			}
83
-		}
84
-		?>
82
+            }
83
+        }
84
+        ?>
85 85
 	</ul>
86 86
 </div>
87 87
 
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
  */
23 23
 
24 24
 style('settings', 'settings');
25
-script('settings', [ 'settings', 'admin', 'log', 'certificates'] );
25
+script('settings', ['settings', 'admin', 'log', 'certificates']);
26 26
 script('core', ['multiselect', 'setupchecks']);
27 27
 script('files', 'jquery.fileupload');
28 28
 
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
32 32
 	<ul>
33 33
 		<li class="settings-caption">Personal</li>
34 34
 		<?php
35
-		foreach($_['forms']['personal'] as $form) {
35
+		foreach ($_['forms']['personal'] as $form) {
36 36
 			if (isset($form['anchor'])) {
37 37
 				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]);
38
-				$class = 'nav-icon-' . $form['anchor'];
38
+				$class = 'nav-icon-'.$form['anchor'];
39 39
 				$sectionName = $form['section-name'];
40 40
 				$active = $form['active'] ? ' class="active"' : '';
41 41
 				?>
@@ -55,16 +55,16 @@  discard block
 block discarded – undo
55 55
 		?>
56 56
 
57 57
 		<?php
58
-		if(!empty($_['forms']['admin'])) {
58
+		if (!empty($_['forms']['admin'])) {
59 59
 			?>
60 60
 			<li class="settings-caption">Administration</li>
61 61
 			<?php
62 62
 		}
63
-		foreach($_['forms']['admin'] as $form) {
63
+		foreach ($_['forms']['admin'] as $form) {
64 64
 			if (isset($form['anchor'])) {
65 65
 
66 66
 				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]);
67
-				$class = 'nav-icon-' . $form['anchor'];
67
+				$class = 'nav-icon-'.$form['anchor'];
68 68
 				$sectionName = $form['section-name'];
69 69
 				$active = $form['active'] ? ' class="active"' : '';
70 70
 		?>
Please login to merge, or discard this patch.
settings/routes.php 1 patch
Indentation   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -36,77 +36,77 @@
 block discarded – undo
36 36
 
37 37
 $application = new Application();
38 38
 $application->registerRoutes($this, [
39
-	'resources' => [
40
-		'users' => ['url' => '/settings/users/users'],
41
-		'AuthSettings' => ['url' => '/settings/personal/authtokens'],
42
-	],
43
-	'routes' => [
44
-		['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'],
45
-		['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'],
46
-		['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'],
47
-		['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'],
48
-		['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'],
49
-		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'],
50
-		['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
51
-		['name' => 'SecuritySettings#trustedDomains', 'url' => '/settings/admin/security/trustedDomains', 'verb' => 'POST'],
52
-		['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'],
53
-		['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'],
54
-		['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'],
55
-		['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'],
56
-		['name' => 'Users#setEnabled', 'url' => '/settings/users/{id}/setEnabled', 'verb' => 'POST'],
57
-		['name' => 'Users#stats', 'url' => '/settings/users/stats', 'verb' => 'GET'],
58
-		['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'],
59
-		['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'],
60
-		['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'],
61
-		['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET'],
62
-		['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET'],
63
-		['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'],
64
-		['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'],
65
-		['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
66
-		['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'],
67
-		['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
68
-		['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info']],
69
-		['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']],
70
-		['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'],
71
-		['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'],
72
-		['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'],
73
-		['name' => 'Personal#setLanguage', 'url' => '/settings/ajax/setlanguage.php', 'verb' => 'POST'],
74
-		['name' => 'Groups#index', 'url' => '/settings/users/groups', 'verb' => 'GET'],
75
-		['name' => 'Groups#show', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'GET'],
76
-		['name' => 'Groups#create', 'url' => '/settings/users/groups', 'verb' => 'POST'],
77
-		['name' => 'Groups#update', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'PUT'],
78
-		['name' => 'Groups#destroy', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'DELETE'],
79
-	]
39
+    'resources' => [
40
+        'users' => ['url' => '/settings/users/users'],
41
+        'AuthSettings' => ['url' => '/settings/personal/authtokens'],
42
+    ],
43
+    'routes' => [
44
+        ['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'],
45
+        ['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'],
46
+        ['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'],
47
+        ['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'],
48
+        ['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'],
49
+        ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'],
50
+        ['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
51
+        ['name' => 'SecuritySettings#trustedDomains', 'url' => '/settings/admin/security/trustedDomains', 'verb' => 'POST'],
52
+        ['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'],
53
+        ['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'],
54
+        ['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'],
55
+        ['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'],
56
+        ['name' => 'Users#setEnabled', 'url' => '/settings/users/{id}/setEnabled', 'verb' => 'POST'],
57
+        ['name' => 'Users#stats', 'url' => '/settings/users/stats', 'verb' => 'GET'],
58
+        ['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'],
59
+        ['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'],
60
+        ['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'],
61
+        ['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET'],
62
+        ['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET'],
63
+        ['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'],
64
+        ['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'],
65
+        ['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
66
+        ['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'],
67
+        ['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
68
+        ['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info']],
69
+        ['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']],
70
+        ['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'],
71
+        ['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'],
72
+        ['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'],
73
+        ['name' => 'Personal#setLanguage', 'url' => '/settings/ajax/setlanguage.php', 'verb' => 'POST'],
74
+        ['name' => 'Groups#index', 'url' => '/settings/users/groups', 'verb' => 'GET'],
75
+        ['name' => 'Groups#show', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'GET'],
76
+        ['name' => 'Groups#create', 'url' => '/settings/users/groups', 'verb' => 'POST'],
77
+        ['name' => 'Groups#update', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'PUT'],
78
+        ['name' => 'Groups#destroy', 'url' => '/settings/users/groups/{id}', 'requirements' => ['id' => '[^?]*'], 'verb' => 'DELETE'],
79
+    ]
80 80
 ]);
81 81
 
82 82
 /** @var $this \OCP\Route\IRouter */
83 83
 
84 84
 // Settings pages
85 85
 $this->create('settings_help', '/settings/help')
86
-	->actionInclude('settings/help.php');
86
+    ->actionInclude('settings/help.php');
87 87
 $this->create('settings_users', '/settings/users')
88
-	->actionInclude('settings/users.php');
88
+    ->actionInclude('settings/users.php');
89 89
 // Settings ajax actions
90 90
 // users
91 91
 $this->create('settings_ajax_setquota', '/settings/ajax/setquota.php')
92
-	->actionInclude('settings/ajax/setquota.php');
92
+    ->actionInclude('settings/ajax/setquota.php');
93 93
 $this->create('settings_ajax_togglegroups', '/settings/ajax/togglegroups.php')
94
-	->actionInclude('settings/ajax/togglegroups.php');
94
+    ->actionInclude('settings/ajax/togglegroups.php');
95 95
 $this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.php')
96
-	->actionInclude('settings/ajax/togglesubadmins.php');
96
+    ->actionInclude('settings/ajax/togglesubadmins.php');
97 97
 $this->create('settings_ajax_changegorupname', '/settings/ajax/changegroupname.php')
98
-	->actionInclude('settings/ajax/changegroupname.php');
98
+    ->actionInclude('settings/ajax/changegroupname.php');
99 99
 // apps
100 100
 $this->create('settings_ajax_enableapp', '/settings/ajax/enableapp.php')
101
-	->actionInclude('settings/ajax/enableapp.php');
101
+    ->actionInclude('settings/ajax/enableapp.php');
102 102
 $this->create('settings_ajax_disableapp', '/settings/ajax/disableapp.php')
103
-	->actionInclude('settings/ajax/disableapp.php');
103
+    ->actionInclude('settings/ajax/disableapp.php');
104 104
 $this->create('settings_ajax_updateapp', '/settings/ajax/updateapp.php')
105
-	->actionInclude('settings/ajax/updateapp.php');
105
+    ->actionInclude('settings/ajax/updateapp.php');
106 106
 $this->create('settings_ajax_uninstallapp', '/settings/ajax/uninstallapp.php')
107
-	->actionInclude('settings/ajax/uninstallapp.php');
107
+    ->actionInclude('settings/ajax/uninstallapp.php');
108 108
 $this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php')
109
-	->actionInclude('settings/ajax/navigationdetect.php');
109
+    ->actionInclude('settings/ajax/navigationdetect.php');
110 110
 // admin
111 111
 $this->create('settings_ajax_excludegroups', '/settings/ajax/excludegroups.php')
112
-	->actionInclude('settings/ajax/excludegroups.php');
112
+    ->actionInclude('settings/ajax/excludegroups.php');
Please login to merge, or discard this patch.
lib/private/Settings/Personal/SyncClients.php 2 patches
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -30,56 +30,56 @@
 block discarded – undo
30 30
 
31 31
 class SyncClients implements ISettings {
32 32
 
33
-	/** @var IConfig */
34
-	private $config;
35
-	/** @var \OC_Defaults */
36
-	private $defaults;
33
+    /** @var IConfig */
34
+    private $config;
35
+    /** @var \OC_Defaults */
36
+    private $defaults;
37 37
 
38
-	public function __construct(IConfig $config, \OC_Defaults $defaults) {
39
-		$this->config = $config;
40
-		$this->defaults = $defaults;
41
-	}
38
+    public function __construct(IConfig $config, \OC_Defaults $defaults) {
39
+        $this->config = $config;
40
+        $this->defaults = $defaults;
41
+    }
42 42
 
43
-	/**
44
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
45
-	 * @since 9.1
46
-	 */
47
-	public function getForm() {
48
-		$parameters = [ 'clients' => $this->getClientLinks() ];
49
-		return new TemplateResponse('settings', 'settings/personal/sync-clients', $parameters);
50
-	}
43
+    /**
44
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
45
+     * @since 9.1
46
+     */
47
+    public function getForm() {
48
+        $parameters = [ 'clients' => $this->getClientLinks() ];
49
+        return new TemplateResponse('settings', 'settings/personal/sync-clients', $parameters);
50
+    }
51 51
 
52
-	/**
53
-	 * @return string the section ID, e.g. 'sharing'
54
-	 * @since 9.1
55
-	 */
56
-	public function getSection() {
57
-		return 'sync-clients';
58
-	}
52
+    /**
53
+     * @return string the section ID, e.g. 'sharing'
54
+     * @since 9.1
55
+     */
56
+    public function getSection() {
57
+        return 'sync-clients';
58
+    }
59 59
 
60
-	/**
61
-	 * @return int whether the form should be rather on the top or bottom of
62
-	 * the admin section. The forms are arranged in ascending order of the
63
-	 * priority values. It is required to return a value between 0 and 100.
64
-	 *
65
-	 * E.g.: 70
66
-	 * @since 9.1
67
-	 */
68
-	public function getPriority() {
69
-		return 20;
70
-	}
60
+    /**
61
+     * @return int whether the form should be rather on the top or bottom of
62
+     * the admin section. The forms are arranged in ascending order of the
63
+     * priority values. It is required to return a value between 0 and 100.
64
+     *
65
+     * E.g.: 70
66
+     * @since 9.1
67
+     */
68
+    public function getPriority() {
69
+        return 20;
70
+    }
71 71
 
72
-	/**
73
-	 * returns an array containing links to the various clients
74
-	 *
75
-	 * @return array
76
-	 */
77
-	private function getClientLinks() {
78
-		$clients = [
79
-			'desktop' => $this->config->getSystemValue('customclient_desktop', $this->defaults->getSyncClientUrl()),
80
-			'android' => $this->config->getSystemValue('customclient_android', $this->defaults->getAndroidClientUrl()),
81
-			'ios' => $this->config->getSystemValue('customclient_ios', $this->defaults->getiOSClientUrl())
82
-		];
83
-		return $clients;
84
-	}
72
+    /**
73
+     * returns an array containing links to the various clients
74
+     *
75
+     * @return array
76
+     */
77
+    private function getClientLinks() {
78
+        $clients = [
79
+            'desktop' => $this->config->getSystemValue('customclient_desktop', $this->defaults->getSyncClientUrl()),
80
+            'android' => $this->config->getSystemValue('customclient_android', $this->defaults->getAndroidClientUrl()),
81
+            'ios' => $this->config->getSystemValue('customclient_ios', $this->defaults->getiOSClientUrl())
82
+        ];
83
+        return $clients;
84
+    }
85 85
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 	 * @since 9.1
46 46
 	 */
47 47
 	public function getForm() {
48
-		$parameters = [ 'clients' => $this->getClientLinks() ];
48
+		$parameters = ['clients' => $this->getClientLinks()];
49 49
 		return new TemplateResponse('settings', 'settings/personal/sync-clients', $parameters);
50 50
 	}
51 51
 
Please login to merge, or discard this patch.
lib/private/NavigationManager.php 1 patch
Indentation   +218 added lines, -218 removed lines patch added patch discarded remove patch
@@ -41,241 +41,241 @@
 block discarded – undo
41 41
  */
42 42
 
43 43
 class NavigationManager implements INavigationManager {
44
-	protected $entries = [];
45
-	protected $closureEntries = [];
46
-	protected $activeEntry;
47
-	/** @var bool */
48
-	protected $init = false;
49
-	/** @var IAppManager|AppManager */
50
-	protected $appManager;
51
-	/** @var IURLGenerator */
52
-	private $urlGenerator;
53
-	/** @var IFactory */
54
-	private $l10nFac;
55
-	/** @var IUserSession */
56
-	private $userSession;
57
-	/** @var IGroupManager|Manager */
58
-	private $groupManager;
59
-	/** @var IConfig */
60
-	private $config;
44
+    protected $entries = [];
45
+    protected $closureEntries = [];
46
+    protected $activeEntry;
47
+    /** @var bool */
48
+    protected $init = false;
49
+    /** @var IAppManager|AppManager */
50
+    protected $appManager;
51
+    /** @var IURLGenerator */
52
+    private $urlGenerator;
53
+    /** @var IFactory */
54
+    private $l10nFac;
55
+    /** @var IUserSession */
56
+    private $userSession;
57
+    /** @var IGroupManager|Manager */
58
+    private $groupManager;
59
+    /** @var IConfig */
60
+    private $config;
61 61
 
62
-	public function __construct(IAppManager $appManager,
63
-						 IURLGenerator $urlGenerator,
64
-						 IFactory $l10nFac,
65
-						 IUserSession $userSession,
66
-						 IGroupManager $groupManager,
67
-						 IConfig $config) {
68
-		$this->appManager = $appManager;
69
-		$this->urlGenerator = $urlGenerator;
70
-		$this->l10nFac = $l10nFac;
71
-		$this->userSession = $userSession;
72
-		$this->groupManager = $groupManager;
73
-		$this->config = $config;
74
-	}
62
+    public function __construct(IAppManager $appManager,
63
+                            IURLGenerator $urlGenerator,
64
+                            IFactory $l10nFac,
65
+                            IUserSession $userSession,
66
+                            IGroupManager $groupManager,
67
+                            IConfig $config) {
68
+        $this->appManager = $appManager;
69
+        $this->urlGenerator = $urlGenerator;
70
+        $this->l10nFac = $l10nFac;
71
+        $this->userSession = $userSession;
72
+        $this->groupManager = $groupManager;
73
+        $this->config = $config;
74
+    }
75 75
 
76
-	/**
77
-	 * Creates a new navigation entry
78
-	 *
79
-	 * @param array|\Closure $entry Array containing: id, name, order, icon and href key
80
-	 *					The use of a closure is preferred, because it will avoid
81
-	 * 					loading the routing of your app, unless required.
82
-	 * @return void
83
-	 */
84
-	public function add($entry) {
85
-		if ($entry instanceof \Closure) {
86
-			$this->closureEntries[] = $entry;
87
-			return;
88
-		}
76
+    /**
77
+     * Creates a new navigation entry
78
+     *
79
+     * @param array|\Closure $entry Array containing: id, name, order, icon and href key
80
+     *					The use of a closure is preferred, because it will avoid
81
+     * 					loading the routing of your app, unless required.
82
+     * @return void
83
+     */
84
+    public function add($entry) {
85
+        if ($entry instanceof \Closure) {
86
+            $this->closureEntries[] = $entry;
87
+            return;
88
+        }
89 89
 
90
-		$entry['active'] = false;
91
-		if(!isset($entry['icon'])) {
92
-			$entry['icon'] = '';
93
-		}
94
-		if(!isset($entry['type'])) {
95
-			$entry['type'] = 'link';
96
-		}
97
-		$this->entries[] = $entry;
98
-	}
90
+        $entry['active'] = false;
91
+        if(!isset($entry['icon'])) {
92
+            $entry['icon'] = '';
93
+        }
94
+        if(!isset($entry['type'])) {
95
+            $entry['type'] = 'link';
96
+        }
97
+        $this->entries[] = $entry;
98
+    }
99 99
 
100
-	/**
101
-	 * returns all the added Menu entries
102
-	 * @param string $type
103
-	 * @return array an array of the added entries
104
-	 */
105
-	public function getAll($type = 'link') {
106
-		$this->init();
107
-		foreach ($this->closureEntries as $c) {
108
-			$this->add($c());
109
-		}
110
-		$this->closureEntries = array();
100
+    /**
101
+     * returns all the added Menu entries
102
+     * @param string $type
103
+     * @return array an array of the added entries
104
+     */
105
+    public function getAll($type = 'link') {
106
+        $this->init();
107
+        foreach ($this->closureEntries as $c) {
108
+            $this->add($c());
109
+        }
110
+        $this->closureEntries = array();
111 111
 
112
-		if ($type === 'all') {
113
-			return $this->entries;
114
-		}
112
+        if ($type === 'all') {
113
+            return $this->entries;
114
+        }
115 115
 
116
-		return array_filter($this->entries, function($entry) use ($type) {
117
-			return $entry['type'] === $type;
118
-		});
119
-	}
116
+        return array_filter($this->entries, function($entry) use ($type) {
117
+            return $entry['type'] === $type;
118
+        });
119
+    }
120 120
 
121
-	/**
122
-	 * removes all the entries
123
-	 */
124
-	public function clear($loadDefaultLinks = true) {
125
-		$this->entries = [];
126
-		$this->closureEntries = [];
127
-		$this->init = !$loadDefaultLinks;
128
-	}
121
+    /**
122
+     * removes all the entries
123
+     */
124
+    public function clear($loadDefaultLinks = true) {
125
+        $this->entries = [];
126
+        $this->closureEntries = [];
127
+        $this->init = !$loadDefaultLinks;
128
+    }
129 129
 
130
-	/**
131
-	 * Sets the current navigation entry of the currently running app
132
-	 * @param string $id of the app entry to activate (from added $entry)
133
-	 */
134
-	public function setActiveEntry($id) {
135
-		$this->activeEntry = $id;
136
-	}
130
+    /**
131
+     * Sets the current navigation entry of the currently running app
132
+     * @param string $id of the app entry to activate (from added $entry)
133
+     */
134
+    public function setActiveEntry($id) {
135
+        $this->activeEntry = $id;
136
+    }
137 137
 
138
-	/**
139
-	 * gets the active Menu entry
140
-	 * @return string id or empty string
141
-	 *
142
-	 * This function returns the id of the active navigation entry (set by
143
-	 * setActiveEntry
144
-	 */
145
-	public function getActiveEntry() {
146
-		return $this->activeEntry;
147
-	}
138
+    /**
139
+     * gets the active Menu entry
140
+     * @return string id or empty string
141
+     *
142
+     * This function returns the id of the active navigation entry (set by
143
+     * setActiveEntry
144
+     */
145
+    public function getActiveEntry() {
146
+        return $this->activeEntry;
147
+    }
148 148
 
149
-	private function init() {
150
-		if ($this->init) {
151
-			return;
152
-		}
153
-		$this->init = true;
149
+    private function init() {
150
+        if ($this->init) {
151
+            return;
152
+        }
153
+        $this->init = true;
154 154
 
155
-		$l = $this->l10nFac->get('lib');
156
-		if ($this->config->getSystemValue('knowledgebaseenabled', true)) {
157
-			$this->add([
158
-				'type' => 'settings',
159
-				'id' => 'help',
160
-				'order' => 5,
161
-				'href' => $this->urlGenerator->linkToRoute('settings_help'),
162
-				'name' => $l->t('Help'),
163
-				'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
164
-			]);
165
-		}
155
+        $l = $this->l10nFac->get('lib');
156
+        if ($this->config->getSystemValue('knowledgebaseenabled', true)) {
157
+            $this->add([
158
+                'type' => 'settings',
159
+                'id' => 'help',
160
+                'order' => 5,
161
+                'href' => $this->urlGenerator->linkToRoute('settings_help'),
162
+                'name' => $l->t('Help'),
163
+                'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
164
+            ]);
165
+        }
166 166
 
167
-		if ($this->userSession->isLoggedIn()) {
168
-			if ($this->isAdmin()) {
169
-				// App management
170
-				$this->add([
171
-					'type' => 'settings',
172
-					'id' => 'core_apps',
173
-					'order' => 3,
174
-					'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
175
-					'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
176
-					'name' => $l->t('Apps'),
177
-				]);
178
-			}
167
+        if ($this->userSession->isLoggedIn()) {
168
+            if ($this->isAdmin()) {
169
+                // App management
170
+                $this->add([
171
+                    'type' => 'settings',
172
+                    'id' => 'core_apps',
173
+                    'order' => 3,
174
+                    'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
175
+                    'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
176
+                    'name' => $l->t('Apps'),
177
+                ]);
178
+            }
179 179
 
180
-			// Personal and (if applicable) admin settings
181
-			$this->add([
182
-				'type' => 'settings',
183
-				'id' => 'settings',
184
-				'order' => 1,
185
-				'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
186
-				'name' => $l->t('Settings'),
187
-				'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
188
-			]);
180
+            // Personal and (if applicable) admin settings
181
+            $this->add([
182
+                'type' => 'settings',
183
+                'id' => 'settings',
184
+                'order' => 1,
185
+                'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
186
+                'name' => $l->t('Settings'),
187
+                'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
188
+            ]);
189 189
 
190
-			// Logout
191
-			$this->add([
192
-				'type' => 'settings',
193
-				'id' => 'logout',
194
-				'order' => 99999,
195
-				'href' => $this->urlGenerator->linkToRouteAbsolute(
196
-					'core.login.logout',
197
-					['requesttoken' => \OCP\Util::callRegister()]
198
-				),
199
-				'name' => $l->t('Log out'),
200
-				'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
201
-			]);
190
+            // Logout
191
+            $this->add([
192
+                'type' => 'settings',
193
+                'id' => 'logout',
194
+                'order' => 99999,
195
+                'href' => $this->urlGenerator->linkToRouteAbsolute(
196
+                    'core.login.logout',
197
+                    ['requesttoken' => \OCP\Util::callRegister()]
198
+                ),
199
+                'name' => $l->t('Log out'),
200
+                'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
201
+            ]);
202 202
 
203
-			if ($this->isSubadmin()) {
204
-				// User management
205
-				$this->add([
206
-					'type' => 'settings',
207
-					'id' => 'core_users',
208
-					'order' => 4,
209
-					'href' => $this->urlGenerator->linkToRoute('settings_users'),
210
-					'name' => $l->t('Users'),
211
-					'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
212
-				]);
213
-			}
214
-		}
203
+            if ($this->isSubadmin()) {
204
+                // User management
205
+                $this->add([
206
+                    'type' => 'settings',
207
+                    'id' => 'core_users',
208
+                    'order' => 4,
209
+                    'href' => $this->urlGenerator->linkToRoute('settings_users'),
210
+                    'name' => $l->t('Users'),
211
+                    'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
212
+                ]);
213
+            }
214
+        }
215 215
 
216
-		if ($this->appManager === 'null') {
217
-			return;
218
-		}
219
-		foreach ($this->appManager->getInstalledApps() as $app) {
220
-			// load plugins and collections from info.xml
221
-			$info = $this->appManager->getAppInfo($app);
222
-			if (empty($info['navigations'])) {
223
-				continue;
224
-			}
225
-			foreach ($info['navigations'] as $nav) {
226
-				if (!isset($nav['name'])) {
227
-					continue;
228
-				}
229
-				if (!isset($nav['route'])) {
230
-					continue;
231
-				}
232
-				$role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
233
-				if ($role === 'admin' && !$this->isAdmin()) {
234
-					continue;
235
-				}
236
-				$l = $this->l10nFac->get($app);
237
-				$id = isset($nav['id']) ? $nav['id'] : $app;
238
-				$order = isset($nav['order']) ? $nav['order'] : 100;
239
-				$type = isset($nav['type']) ? $nav['type'] : 'link';
240
-				$route = $this->urlGenerator->linkToRoute($nav['route']);
241
-				$icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg';
242
-				foreach ([$icon, "$app.svg"] as $i) {
243
-					try {
244
-						$icon = $this->urlGenerator->imagePath($app, $i);
245
-						break;
246
-					} catch (\RuntimeException $ex) {
247
-						// no icon? - ignore it then
248
-					}
249
-				}
250
-				if ($icon === null) {
251
-					$icon = $this->urlGenerator->imagePath('core', 'default-app-icon');
252
-				}
216
+        if ($this->appManager === 'null') {
217
+            return;
218
+        }
219
+        foreach ($this->appManager->getInstalledApps() as $app) {
220
+            // load plugins and collections from info.xml
221
+            $info = $this->appManager->getAppInfo($app);
222
+            if (empty($info['navigations'])) {
223
+                continue;
224
+            }
225
+            foreach ($info['navigations'] as $nav) {
226
+                if (!isset($nav['name'])) {
227
+                    continue;
228
+                }
229
+                if (!isset($nav['route'])) {
230
+                    continue;
231
+                }
232
+                $role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
233
+                if ($role === 'admin' && !$this->isAdmin()) {
234
+                    continue;
235
+                }
236
+                $l = $this->l10nFac->get($app);
237
+                $id = isset($nav['id']) ? $nav['id'] : $app;
238
+                $order = isset($nav['order']) ? $nav['order'] : 100;
239
+                $type = isset($nav['type']) ? $nav['type'] : 'link';
240
+                $route = $this->urlGenerator->linkToRoute($nav['route']);
241
+                $icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg';
242
+                foreach ([$icon, "$app.svg"] as $i) {
243
+                    try {
244
+                        $icon = $this->urlGenerator->imagePath($app, $i);
245
+                        break;
246
+                    } catch (\RuntimeException $ex) {
247
+                        // no icon? - ignore it then
248
+                    }
249
+                }
250
+                if ($icon === null) {
251
+                    $icon = $this->urlGenerator->imagePath('core', 'default-app-icon');
252
+                }
253 253
 
254
-				$this->add([
255
-					'id' => $id,
256
-					'order' => $order,
257
-					'href' => $route,
258
-					'icon' => $icon,
259
-					'type' => $type,
260
-					'name' => $l->t($nav['name']),
261
-				]);
262
-			}
263
-		}
264
-	}
254
+                $this->add([
255
+                    'id' => $id,
256
+                    'order' => $order,
257
+                    'href' => $route,
258
+                    'icon' => $icon,
259
+                    'type' => $type,
260
+                    'name' => $l->t($nav['name']),
261
+                ]);
262
+            }
263
+        }
264
+    }
265 265
 
266
-	private function isAdmin() {
267
-		$user = $this->userSession->getUser();
268
-		if ($user !== null) {
269
-			return $this->groupManager->isAdmin($user->getUID());
270
-		}
271
-		return false;
272
-	}
266
+    private function isAdmin() {
267
+        $user = $this->userSession->getUser();
268
+        if ($user !== null) {
269
+            return $this->groupManager->isAdmin($user->getUID());
270
+        }
271
+        return false;
272
+    }
273 273
 
274
-	private function isSubadmin() {
275
-		$user = $this->userSession->getUser();
276
-		if ($user !== null) {
277
-			return $this->groupManager->getSubAdmin()->isSubAdmin($user);
278
-		}
279
-		return false;
280
-	}
274
+    private function isSubadmin() {
275
+        $user = $this->userSession->getUser();
276
+        if ($user !== null) {
277
+            return $this->groupManager->getSubAdmin()->isSubAdmin($user);
278
+        }
279
+        return false;
280
+    }
281 281
 }
Please login to merge, or discard this patch.
lib/public/Settings/IManager.php 2 patches
Indentation   +85 added lines, -85 removed lines patch added patch discarded remove patch
@@ -27,99 +27,99 @@
 block discarded – undo
27 27
  * @since 9.1
28 28
  */
29 29
 interface IManager {
30
-	/**
31
-	 * @since 9.1.0
32
-	 */
33
-	const KEY_ADMIN_SETTINGS = 'admin';
30
+    /**
31
+     * @since 9.1.0
32
+     */
33
+    const KEY_ADMIN_SETTINGS = 'admin';
34 34
 
35
-	/**
36
-	 * @since 9.1.0
37
-	 */
38
-	const KEY_ADMIN_SECTION  = 'admin-section';
35
+    /**
36
+     * @since 9.1.0
37
+     */
38
+    const KEY_ADMIN_SECTION  = 'admin-section';
39 39
 
40
-	/**
41
-	 * @since 12.0.0
42
-	 */
43
-	const KEY_PERSONAL_SETTINGS = 'personal';
40
+    /**
41
+     * @since 12.0.0
42
+     */
43
+    const KEY_PERSONAL_SETTINGS = 'personal';
44 44
 
45
-	/**
46
-	 * @since 12.0.0
47
-	 */
48
-	const KEY_PERSONAL_SECTION  = 'personal-section';
45
+    /**
46
+     * @since 12.0.0
47
+     */
48
+    const KEY_PERSONAL_SECTION  = 'personal-section';
49 49
 
50
-	/**
51
-	 * sets up settings according to data specified by an apps info.xml, within
52
-	 * the <settings> element.
53
-	 *
54
-	 * @param array $settings an associative array, allowed keys are as specified
55
-	 *                        by the KEY_ constant of  this interface. The value
56
-	 *                        must always be a class name, implement either
57
-	 *                        IAdmin or ISection. I.e. only one section and admin
58
-	 *                        setting can be configured per app.
59
-	 * @since 9.1.0
60
-	 */
61
-	public function setupSettings(array $settings);
50
+    /**
51
+     * sets up settings according to data specified by an apps info.xml, within
52
+     * the <settings> element.
53
+     *
54
+     * @param array $settings an associative array, allowed keys are as specified
55
+     *                        by the KEY_ constant of  this interface. The value
56
+     *                        must always be a class name, implement either
57
+     *                        IAdmin or ISection. I.e. only one section and admin
58
+     *                        setting can be configured per app.
59
+     * @since 9.1.0
60
+     */
61
+    public function setupSettings(array $settings);
62 62
 
63
-	/**
64
-	 * attempts to remove an apps section and/or settings entry. A listener is
65
-	 * added centrally making sure that this method is called ones an app was
66
-	 * disabled.
67
-	 *
68
-	 * What this does not help with is when applications change their settings
69
-	 * or section classes during their life time. New entries will be added,
70
-	 * but inactive ones will still reside in the database.
71
-	 *
72
-	 * @param string $appId
73
-	 * @since 9.1.0
74
-	 */
75
-	public function onAppDisabled($appId);
63
+    /**
64
+     * attempts to remove an apps section and/or settings entry. A listener is
65
+     * added centrally making sure that this method is called ones an app was
66
+     * disabled.
67
+     *
68
+     * What this does not help with is when applications change their settings
69
+     * or section classes during their life time. New entries will be added,
70
+     * but inactive ones will still reside in the database.
71
+     *
72
+     * @param string $appId
73
+     * @since 9.1.0
74
+     */
75
+    public function onAppDisabled($appId);
76 76
 
77
-	/**
78
-	 * The method should check all registered classes whether they are still
79
-	 * instantiable and remove them, if not. This method is called by a
80
-	 * background job once, after one or more apps were updated.
81
-	 *
82
-	 * An app`s info.xml can change during an update and make it unknown whether
83
-	 * a registered class name was changed or not. An old one would just stay
84
-	 * registered. Another case is if an admin takes a radical approach and
85
-	 * simply removes an app from the app folder. These unregular checks will
86
-	 * take care of such situations.
87
-	 *
88
-	 * @since 9.1.0
89
-	 */
90
-	public function checkForOrphanedClassNames();
77
+    /**
78
+     * The method should check all registered classes whether they are still
79
+     * instantiable and remove them, if not. This method is called by a
80
+     * background job once, after one or more apps were updated.
81
+     *
82
+     * An app`s info.xml can change during an update and make it unknown whether
83
+     * a registered class name was changed or not. An old one would just stay
84
+     * registered. Another case is if an admin takes a radical approach and
85
+     * simply removes an app from the app folder. These unregular checks will
86
+     * take care of such situations.
87
+     *
88
+     * @since 9.1.0
89
+     */
90
+    public function checkForOrphanedClassNames();
91 91
 
92
-	/**
93
-	 * returns a list of the admin sections
94
-	 *
95
-	 * @return array array of ISection[] where key is the priority
96
-	 * @since 9.1.0
97
-	 */
98
-	public function getAdminSections();
92
+    /**
93
+     * returns a list of the admin sections
94
+     *
95
+     * @return array array of ISection[] where key is the priority
96
+     * @since 9.1.0
97
+     */
98
+    public function getAdminSections();
99 99
 
100
-	/**
101
-	 * returns a list of the personal sections
102
-	 *
103
-	 * @return array array of ISection[] where key is the priority
104
-	 * @since 12.0.0
105
-	 */
106
-	public function getPersonalSections();
100
+    /**
101
+     * returns a list of the personal sections
102
+     *
103
+     * @return array array of ISection[] where key is the priority
104
+     * @since 12.0.0
105
+     */
106
+    public function getPersonalSections();
107 107
 
108
-	/**
109
-	 * returns a list of the admin settings
110
-	 *
111
-	 * @param string $section the section id for which to load the settings
112
-	 * @return array array of IAdmin[] where key is the priority
113
-	 * @since 9.1.0
114
-	 */
115
-	public function getAdminSettings($section);
108
+    /**
109
+     * returns a list of the admin settings
110
+     *
111
+     * @param string $section the section id for which to load the settings
112
+     * @return array array of IAdmin[] where key is the priority
113
+     * @since 9.1.0
114
+     */
115
+    public function getAdminSettings($section);
116 116
 
117
-	/**
118
-	 * returns a list of the personal  settings
119
-	 *
120
-	 * @param string $section the section id for which to load the settings
121
-	 * @return array array of IPersonal[] where key is the priority
122
-	 * @since 12.0.0
123
-	 */
124
-	public function getPersonalSettings($section);
117
+    /**
118
+     * returns a list of the personal  settings
119
+     *
120
+     * @param string $section the section id for which to load the settings
121
+     * @return array array of IPersonal[] where key is the priority
122
+     * @since 12.0.0
123
+     */
124
+    public function getPersonalSettings($section);
125 125
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	/**
36 36
 	 * @since 9.1.0
37 37
 	 */
38
-	const KEY_ADMIN_SECTION  = 'admin-section';
38
+	const KEY_ADMIN_SECTION = 'admin-section';
39 39
 
40 40
 	/**
41 41
 	 * @since 12.0.0
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	/**
46 46
 	 * @since 12.0.0
47 47
 	 */
48
-	const KEY_PERSONAL_SECTION  = 'personal-section';
48
+	const KEY_PERSONAL_SECTION = 'personal-section';
49 49
 
50 50
 	/**
51 51
 	 * sets up settings according to data specified by an apps info.xml, within
Please login to merge, or discard this patch.
settings/templates/settings/personal/personal.info.php 3 patches
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@  discard block
 block discarded – undo
25 25
 /** @var array $_ */
26 26
 
27 27
 script('settings', [
28
-	'usersettings',
29
-	'federationsettingsview',
30
-	'federationscopemenu',
31
-	'settings/personalInfo',
28
+    'usersettings',
29
+    'federationsettingsview',
30
+    'federationscopemenu',
31
+    'settings/personalInfo',
32 32
 ]);
33 33
 vendor_script('strengthify/jquery.strengthify');
34 34
 vendor_style('strengthify/strengthify');
@@ -46,10 +46,10 @@  discard block
 block discarded – undo
46 46
 		<p id="quotatext">
47 47
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
48 48
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
49
-					[$_['usage'], $_['total_space']]));?>
49
+                    [$_['usage'], $_['total_space']]));?>
50 50
 			<?php else: ?>
51 51
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
52
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
52
+                    [$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
53 53
 			<?php endif ?>
54 54
 		</p>
55 55
 	</div>
@@ -118,17 +118,17 @@  discard block
 block discarded – undo
118 118
 				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
119 119
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
120 120
 				<?php
121
-					switch($_['emailVerification']) {
122
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
123
-							p(image_path('core', 'actions/verifying.svg'));
124
-							break;
125
-						case \OC\Accounts\AccountManager::VERIFIED:
126
-							p(image_path('core', 'actions/verified.svg'));
127
-							break;
128
-						default:
129
-							p(image_path('core', 'actions/verify.svg'));
130
-					}
131
-					?>">
121
+                    switch($_['emailVerification']) {
122
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
123
+                            p(image_path('core', 'actions/verifying.svg'));
124
+                            break;
125
+                        case \OC\Accounts\AccountManager::VERIFIED:
126
+                            p(image_path('core', 'actions/verified.svg'));
127
+                            break;
128
+                        default:
129
+                            p(image_path('core', 'actions/verify.svg'));
130
+                    }
131
+                    ?>">
132 132
 				</div>
133 133
 				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
134 134
 					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
@@ -185,17 +185,17 @@  discard block
 block discarded – undo
185 185
 					<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
186 186
 						<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
187 187
 				<?php
188
-						switch($_['websiteVerification']) {
189
-							case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
190
-								p(image_path('core', 'actions/verifying.svg'));
191
-								break;
192
-							case \OC\Accounts\AccountManager::VERIFIED:
193
-								p(image_path('core', 'actions/verified.svg'));
194
-								break;
195
-							default:
196
-								p(image_path('core', 'actions/verify.svg'));
197
-						}
198
-						?>"
188
+                        switch($_['websiteVerification']) {
189
+                            case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
190
+                                p(image_path('core', 'actions/verifying.svg'));
191
+                                break;
192
+                            case \OC\Accounts\AccountManager::VERIFIED:
193
+                                p(image_path('core', 'actions/verified.svg'));
194
+                                break;
195
+                            default:
196
+                                p(image_path('core', 'actions/verify.svg'));
197
+                        }
198
+                        ?>"
199 199
 							<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
200 200
 						>
201 201
 						<div class="verification-dialog popovermenu bubble menu">
@@ -222,17 +222,17 @@  discard block
 block discarded – undo
222 222
 					<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
223 223
 						<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
224 224
 				<?php
225
-						switch($_['twitterVerification']) {
226
-							case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
227
-								p(image_path('core', 'actions/verifying.svg'));
228
-								break;
229
-							case \OC\Accounts\AccountManager::VERIFIED:
230
-								p(image_path('core', 'actions/verified.svg'));
231
-								break;
232
-							default:
233
-								p(image_path('core', 'actions/verify.svg'));
234
-						}
235
-						?>"
225
+                        switch($_['twitterVerification']) {
226
+                            case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
227
+                                p(image_path('core', 'actions/verifying.svg'));
228
+                                break;
229
+                            case \OC\Accounts\AccountManager::VERIFIED:
230
+                                p(image_path('core', 'actions/verified.svg'));
231
+                                break;
232
+                            default:
233
+                                p(image_path('core', 'actions/verify.svg'));
234
+                        }
235
+                        ?>"
236 236
 							<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
237 237
 						>
238 238
 						<div class="verification-dialog popovermenu bubble menu">
@@ -265,8 +265,8 @@  discard block
 block discarded – undo
265 265
 
266 266
 <?php
267 267
 if($_['passwordChangeSupported']) {
268
-	script('jquery-showpassword');
269
-	?>
268
+    script('jquery-showpassword');
269
+    ?>
270 270
 	<form id="passwordform" class="section">
271 271
 		<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
272 272
 		<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
Please login to merge, or discard this patch.
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -41,15 +41,15 @@  discard block
 block discarded – undo
41 41
 ?>
42 42
 
43 43
 <div id="quota" class="section">
44
-	<div style="width:<?php p($_['usage_relative']);?>%"
45
-		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
44
+	<div style="width:<?php p($_['usage_relative']); ?>%"
45
+		<?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
46 46
 		<p id="quotatext">
47 47
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
48 48
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
49
-					[$_['usage'], $_['total_space']]));?>
49
+					[$_['usage'], $_['total_space']])); ?>
50 50
 			<?php else: ?>
51 51
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
52
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
52
+					[$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
53 53
 			<?php endif ?>
54 54
 		</p>
55 55
 	</div>
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 				</div>
84 84
 			</div>
85 85
 			<span class="icon-checkmark hidden"/>
86
-			<?php if($_['lookupServerUploadEnabled']) { ?>
86
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
87 87
 				<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
88 88
 			<?php } ?>
89 89
 		</form>
@@ -97,14 +97,14 @@  discard block
 block discarded – undo
97 97
 					<span class="icon-password"/>
98 98
 				</h2>
99 99
 				<input type="text" id="displayname" name="displayname"
100
-					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
100
+					<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
101 101
 					   value="<?php p($_['displayName']) ?>"
102 102
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
103
-				<?php if(!$_['displayNameChangeSupported']) { ?>
104
-					<span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
103
+				<?php if (!$_['displayNameChangeSupported']) { ?>
104
+					<span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
105 105
 				<?php } ?>
106 106
 				<span class="icon-checkmark hidden"/>
107
-				<?php if($_['lookupServerUploadEnabled']) { ?>
107
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
108 108
 					<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
109 109
 				<?php } ?>
110 110
 			</form>
@@ -115,10 +115,10 @@  discard block
 block discarded – undo
115 115
 					<label for="email"><?php p($l->t('Email')); ?></label>
116 116
 					<span class="icon-password"/>
117 117
 				</h2>
118
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
118
+				<div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') p('hidden'); ?>">
119 119
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
120 120
 				<?php
121
-					switch($_['emailVerification']) {
121
+					switch ($_['emailVerification']) {
122 122
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
123 123
 							p(image_path('core', 'actions/verifying.svg'));
124 124
 							break;
@@ -131,23 +131,23 @@  discard block
 block discarded – undo
131 131
 					?>">
132 132
 				</div>
133 133
 				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
134
-					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
134
+					<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
135 135
 					   placeholder="<?php p($l->t('Your email address')); ?>"
136 136
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
137
-				<?php if(!$_['displayNameChangeSupported']) { ?>
138
-					<span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
137
+				<?php if (!$_['displayNameChangeSupported']) { ?>
138
+					<span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
139 139
 				<?php } ?>
140
-				<?php if($_['displayNameChangeSupported']) { ?>
140
+				<?php if ($_['displayNameChangeSupported']) { ?>
141 141
 					<br />
142 142
 					<em><?php p($l->t('For password reset and notifications')); ?></em>
143 143
 				<?php } ?>
144 144
 				<span class="icon-checkmark hidden"/>
145
-				<?php if($_['lookupServerUploadEnabled']) { ?>
145
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
146 146
 					<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
147 147
 				<?php } ?>
148 148
 			</form>
149 149
 		</div>
150
-		<?php if($_['lookupServerUploadEnabled']) { ?>
150
+		<?php if ($_['lookupServerUploadEnabled']) { ?>
151 151
 			<div class="personal-settings-setting-box">
152 152
 				<form id="phoneform" class="section">
153 153
 					<h2>
@@ -182,10 +182,10 @@  discard block
 block discarded – undo
182 182
 						<label for="website"><?php p($l->t('Website')); ?></label>
183 183
 						<span class="icon-password"/>
184 184
 					</h2>
185
-					<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
185
+					<div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') p('hidden'); ?>">
186 186
 						<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
187 187
 				<?php
188
-						switch($_['websiteVerification']) {
188
+						switch ($_['websiteVerification']) {
189 189
 							case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
190 190
 								p(image_path('core', 'actions/verifying.svg'));
191 191
 								break;
@@ -196,13 +196,13 @@  discard block
 block discarded – undo
196 196
 								p(image_path('core', 'actions/verify.svg'));
197 197
 						}
198 198
 						?>"
199
-							<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
199
+							<?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
200 200
 						>
201 201
 						<div class="verification-dialog popovermenu bubble menu">
202 202
 							<div class="verification-dialog-content">
203 203
 								<p class="explainVerification"></p>
204 204
 								<p class="verificationCode"></p>
205
-								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
205
+								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
206 206
 							</div>
207 207
 						</div>
208 208
 					</div>
@@ -219,10 +219,10 @@  discard block
 block discarded – undo
219 219
 						<label for="twitter"><?php p($l->t('Twitter')); ?></label>
220 220
 						<span class="icon-password"/>
221 221
 					</h2>
222
-					<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
222
+					<div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') p('hidden'); ?>">
223 223
 						<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
224 224
 				<?php
225
-						switch($_['twitterVerification']) {
225
+						switch ($_['twitterVerification']) {
226 226
 							case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
227 227
 								p(image_path('core', 'actions/verifying.svg'));
228 228
 								break;
@@ -233,13 +233,13 @@  discard block
 block discarded – undo
233 233
 								p(image_path('core', 'actions/verify.svg'));
234 234
 						}
235 235
 						?>"
236
-							<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
236
+							<?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
237 237
 						>
238 238
 						<div class="verification-dialog popovermenu bubble menu">
239 239
 							<div class="verification-dialog-content">
240 240
 								<p class="explainVerification"></p>
241 241
 								<p class="verificationCode"></p>
242
-								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
242
+								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
243 243
 							</div>
244 244
 						</div>
245 245
 					</div>
@@ -264,19 +264,19 @@  discard block
 block discarded – undo
264 264
 </div>
265 265
 
266 266
 <?php
267
-if($_['passwordChangeSupported']) {
267
+if ($_['passwordChangeSupported']) {
268 268
 	script('jquery-showpassword');
269 269
 	?>
270 270
 	<form id="passwordform" class="section">
271
-		<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
271
+		<h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
272 272
 		<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
273 273
 		<br>
274 274
 		<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
275 275
 		<input type="password" id="pass1" name="oldpassword"
276
-			   placeholder="<?php p($l->t('Current password'));?>"
276
+			   placeholder="<?php p($l->t('Current password')); ?>"
277 277
 			   autocomplete="off" autocapitalize="none" autocorrect="off" />
278 278
 		<div class="personal-show-container">
279
-			<label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
279
+			<label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
280 280
 			<input type="password" id="pass2" name="newpassword"
281 281
 				   placeholder="<?php p($l->t('New password')); ?>"
282 282
 				   data-typetoggle="#personal-show"
@@ -292,26 +292,26 @@  discard block
 block discarded – undo
292 292
 
293 293
 <form id="language" class="section">
294 294
 	<h2>
295
-		<label for="languageinput"><?php p($l->t('Language'));?></label>
295
+		<label for="languageinput"><?php p($l->t('Language')); ?></label>
296 296
 	</h2>
297
-	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
298
-		<option value="<?php p($_['activelanguage']['code']);?>">
299
-			<?php p($_['activelanguage']['name']);?>
297
+	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
298
+		<option value="<?php p($_['activelanguage']['code']); ?>">
299
+			<?php p($_['activelanguage']['name']); ?>
300 300
 		</option>
301
-		<?php foreach($_['commonlanguages'] as $language):?>
302
-			<option value="<?php p($language['code']);?>">
303
-				<?php p($language['name']);?>
301
+		<?php foreach ($_['commonlanguages'] as $language):?>
302
+			<option value="<?php p($language['code']); ?>">
303
+				<?php p($language['name']); ?>
304 304
 			</option>
305
-		<?php endforeach;?>
305
+		<?php endforeach; ?>
306 306
 		<optgroup label="––––––––––"></optgroup>
307
-		<?php foreach($_['languages'] as $language):?>
308
-			<option value="<?php p($language['code']);?>">
309
-				<?php p($language['name']);?>
307
+		<?php foreach ($_['languages'] as $language):?>
308
+			<option value="<?php p($language['code']); ?>">
309
+				<?php p($language['name']); ?>
310 310
 			</option>
311
-		<?php endforeach;?>
311
+		<?php endforeach; ?>
312 312
 	</select>
313 313
 	<a href="https://www.transifex.com/nextcloud/nextcloud/"
314 314
 	   target="_blank" rel="noreferrer">
315
-		<em><?php p($l->t('Help translate'));?></em>
315
+		<em><?php p($l->t('Help translate')); ?></em>
316 316
 	</a>
317 317
 </form>
Please login to merge, or discard this patch.
Braces   +32 added lines, -11 removed lines patch added patch discarded remove patch
@@ -47,9 +47,12 @@  discard block
 block discarded – undo
47 47
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
48 48
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
49 49
 					[$_['usage'], $_['total_space']]));?>
50
-			<?php else: ?>
50
+			<?php else {
51
+    : ?>
51 52
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
52
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
53
+					[$_['usage'], $_['total_space'],  $_['usage_relative']]));
54
+}
55
+?>
53 56
 			<?php endif ?>
54 57
 		</p>
55 58
 	</div>
@@ -71,8 +74,11 @@  discard block
 block discarded – undo
71 74
 					<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
72 75
 					<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
73 76
 					<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
74
-				<?php else: ?>
75
-					<?php p($l->t('Picture provided by original account')); ?>
77
+				<?php else {
78
+    : ?>
79
+					<?php p($l->t('Picture provided by original account'));
80
+}
81
+?>
76 82
 				<?php endif; ?>
77 83
 			</div>
78 84
 
@@ -115,7 +121,10 @@  discard block
 block discarded – undo
115 121
 					<label for="email"><?php p($l->t('Email')); ?></label>
116 122
 					<span class="icon-password"/>
117 123
 				</h2>
118
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
124
+				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
125
+    p('hidden');
126
+}
127
+?>">
119 128
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
120 129
 				<?php
121 130
 					switch($_['emailVerification']) {
@@ -182,7 +191,10 @@  discard block
 block discarded – undo
182 191
 						<label for="website"><?php p($l->t('Website')); ?></label>
183 192
 						<span class="icon-password"/>
184 193
 					</h2>
185
-					<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
194
+					<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
195
+    p('hidden');
196
+}
197
+?>">
186 198
 						<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
187 199
 				<?php
188 200
 						switch($_['websiteVerification']) {
@@ -196,13 +208,16 @@  discard block
 block discarded – undo
196 208
 								p(image_path('core', 'actions/verify.svg'));
197 209
 						}
198 210
 						?>"
199
-							<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
211
+							<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
212
+    print_unescaped(' class="verify-action"') ?>
200 213
 						>
201 214
 						<div class="verification-dialog popovermenu bubble menu">
202 215
 							<div class="verification-dialog-content">
203 216
 								<p class="explainVerification"></p>
204 217
 								<p class="verificationCode"></p>
205
-								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
218
+								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
219
+}
220
+?></p>
206 221
 							</div>
207 222
 						</div>
208 223
 					</div>
@@ -219,7 +234,10 @@  discard block
 block discarded – undo
219 234
 						<label for="twitter"><?php p($l->t('Twitter')); ?></label>
220 235
 						<span class="icon-password"/>
221 236
 					</h2>
222
-					<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
237
+					<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
238
+    p('hidden');
239
+}
240
+?>">
223 241
 						<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
224 242
 				<?php
225 243
 						switch($_['twitterVerification']) {
@@ -233,13 +251,16 @@  discard block
 block discarded – undo
233 251
 								p(image_path('core', 'actions/verify.svg'));
234 252
 						}
235 253
 						?>"
236
-							<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
254
+							<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
255
+    print_unescaped(' class="verify-action"') ?>
237 256
 						>
238 257
 						<div class="verification-dialog popovermenu bubble menu">
239 258
 							<div class="verification-dialog-content">
240 259
 								<p class="explainVerification"></p>
241 260
 								<p class="verificationCode"></p>
242
-								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
261
+								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
262
+}
263
+?></p>
243 264
 							</div>
244 265
 						</div>
245 266
 					</div>
Please login to merge, or discard this patch.
settings/templates/settings/personal/sync-clients.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -42,15 +42,15 @@
 block discarded – undo
42 42
 
43 43
 	<p>
44 44
 		<?php print_unescaped(str_replace(
45
-			[
46
-				'{contributeopen}',
47
-				'{linkclose}',
48
-			],
49
-			[
50
-				'<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
51
-				'</a>',
52
-			],
53
-			$l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
45
+            [
46
+                '{contributeopen}',
47
+                '{linkclose}',
48
+            ],
49
+            [
50
+                '<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
51
+                '</a>',
52
+            ],
53
+            $l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
54 54
 	</p>
55 55
 
56 56
 	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,18 +26,18 @@  discard block
 block discarded – undo
26 26
 ?>
27 27
 
28 28
 <div id="clientsbox" class="section clientsbox">
29
-	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
29
+	<h2><?php p($l->t('Get the apps to sync your files')); ?></h2>
30 30
 	<a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank">
31 31
 		<img src="<?php print_unescaped(image_path('core', 'desktopapp.svg')); ?>"
32
-			 alt="<?php p($l->t('Desktop client'));?>" />
32
+			 alt="<?php p($l->t('Desktop client')); ?>" />
33 33
 	</a>
34 34
 	<a href="<?php p($_['clients']['android']); ?>" rel="noreferrer" target="_blank">
35 35
 		<img src="<?php print_unescaped(image_path('core', 'googleplay.png')); ?>"
36
-			 alt="<?php p($l->t('Android app'));?>" />
36
+			 alt="<?php p($l->t('Android app')); ?>" />
37 37
 	</a>
38 38
 	<a href="<?php p($_['clients']['ios']); ?>" rel="noreferrer" target="_blank">
39 39
 		<img src="<?php print_unescaped(image_path('core', 'appstore.svg')); ?>"
40
-			 alt="<?php p($l->t('iOS app'));?>" />
40
+			 alt="<?php p($l->t('iOS app')); ?>" />
41 41
 	</a>
42 42
 
43 43
 	<p>
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 			$l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
54 54
 	</p>
55 55
 
56
-	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
57
-		<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p>
56
+	<?php if (OC_APP::isEnabled('firstrunwizard')) {?>
57
+		<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again')); ?></a></p>
58 58
 	<?php }?>
59 59
 </div>
Please login to merge, or discard this patch.