Completed
Push — stable10 ( e55881...b0ab3b )
by Joas
36:13 queued 35:48
created
settings/templates/email.new_user_plain_text.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,5 +6,5 @@
 block discarded – undo
6 6
 ?>
7 7
 
8 8
 	--
9
-<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
9
+<?php p($theme->getName().' - '.$theme->getSlogan()); ?>
10 10
 <?php print_unescaped("\n".$theme->getBaseUrl());
Please login to merge, or discard this patch.
settings/templates/help.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <div id="app-navigation">
2 2
 	<ul>
3
-	<?php if($_['admin']) { ?>
3
+	<?php if ($_['admin']) { ?>
4 4
 		<li>
5 5
 			<a class="<?php p($_['style1']); ?>"
6 6
 				href="<?php print_unescaped($_['url1']); ?>">
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 			</a>
27 27
 		</li>
28 28
 
29
-	<?php if($_['admin']) { ?>
29
+	<?php if ($_['admin']) { ?>
30 30
 		<li>
31 31
 			<a href="https://nextcloud.com/support/" target="_blank" rel="noreferrer">
32 32
 				<?php p($l->t('Getting help')); ?> ↗
Please login to merge, or discard this patch.
settings/Controller/EncryptionController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@
 block discarded – undo
130 130
 		} catch (\Exception $e) {
131 131
 			return [
132 132
 				'data' => [
133
-					'message' => (string)$this->l10n->t('A problem occurred, please check your log files (Error: %s)', [$e->getMessage()]),
133
+					'message' => (string) $this->l10n->t('A problem occurred, please check your log files (Error: %s)', [$e->getMessage()]),
134 134
 				],
135 135
 				'status' => 'error',
136 136
 			];
Please login to merge, or discard this patch.
settings/Controller/GroupsController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -100,15 +100,15 @@  discard block
 block discarded – undo
100 100
 	 * @return DataResponse
101 101
 	 */
102 102
 	public function create($id) {
103
-		if($this->groupManager->groupExists($id)) {
103
+		if ($this->groupManager->groupExists($id)) {
104 104
 			return new DataResponse(
105 105
 				array(
106
-					'message' => (string)$this->l10n->t('Group already exists.')
106
+					'message' => (string) $this->l10n->t('Group already exists.')
107 107
 				),
108 108
 				Http::STATUS_CONFLICT
109 109
 			);
110 110
 		}
111
-		if($this->groupManager->createGroup($id)) {
111
+		if ($this->groupManager->createGroup($id)) {
112 112
 			return new DataResponse(
113 113
 				array(
114 114
 					'groupname' => $id
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 			array(
122 122
 				'status' => 'error',
123 123
 				'data' => array(
124
-					'message' => (string)$this->l10n->t('Unable to add group.')
124
+					'message' => (string) $this->l10n->t('Unable to add group.')
125 125
 				)
126 126
 			),
127 127
 			Http::STATUS_FORBIDDEN
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 			array(
153 153
 				'status' => 'error',
154 154
 				'data' => array(
155
-					'message' => (string)$this->l10n->t('Unable to delete group.')
155
+					'message' => (string) $this->l10n->t('Unable to delete group.')
156 156
 				),
157 157
 			),
158 158
 			Http::STATUS_FORBIDDEN
Please login to merge, or discard this patch.
settings/Controller/MailSettingsController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@
 block discarded – undo
97 97
 
98 98
 		$params = get_defined_vars();
99 99
 		$configs = [];
100
-		foreach($params as $key => $value) {
100
+		foreach ($params as $key => $value) {
101 101
 			$configs[$key] = (empty($value)) ? null : $value;
102 102
 		}
103 103
 
Please login to merge, or discard this patch.
settings/Middleware/SubadminMiddleware.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -59,8 +59,8 @@  discard block
 block discarded – undo
59 59
 	 * @throws \Exception
60 60
 	 */
61 61
 	public function beforeController($controller, $methodName) {
62
-		if(!$this->reflector->hasAnnotation('NoSubadminRequired')) {
63
-			if(!$this->isSubAdmin) {
62
+		if (!$this->reflector->hasAnnotation('NoSubadminRequired')) {
63
+			if (!$this->isSubAdmin) {
64 64
 				throw new NotAdminException('Logged in user must be a subadmin');
65 65
 			}
66 66
 		}
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	 * @throws \Exception
76 76
 	 */
77 77
 	public function afterException($controller, $methodName, \Exception $exception) {
78
-		if($exception instanceof NotAdminException) {
78
+		if ($exception instanceof NotAdminException) {
79 79
 			$response = new TemplateResponse('core', '403', array(), 'guest');
80 80
 			$response->setStatus(Http::STATUS_FORBIDDEN);
81 81
 			return $response;
Please login to merge, or discard this patch.
settings/users.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
 list($adminGroup, $groups) = $groupsInfo->get();
70 70
 
71 71
 $recoveryAdminEnabled = OC_App::isEnabled('encryption') &&
72
-					    $config->getAppValue( 'encryption', 'recoveryAdminEnabled', null );
72
+					    $config->getAppValue('encryption', 'recoveryAdminEnabled', null);
73 73
 
74
-if($isAdmin) {
74
+if ($isAdmin) {
75 75
 	$subAdmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins();
76 76
 	// New class returns IUser[] so convert back
77 77
 	$result = [];
@@ -82,10 +82,10 @@  discard block
 block discarded – undo
82 82
 		];
83 83
 	}
84 84
 	$subAdmins = $result;
85
-}else{
85
+} else {
86 86
 	/* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
87 87
 	$gids = array();
88
-	foreach($groups as $group) {
88
+	foreach ($groups as $group) {
89 89
 		if (isset($group['id'])) {
90 90
 			$gids[] = $group['id'];
91 91
 		}
@@ -94,16 +94,16 @@  discard block
 block discarded – undo
94 94
 }
95 95
 
96 96
 // load preset quotas
97
-$quotaPreset=$config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
98
-$quotaPreset=explode(',', $quotaPreset);
99
-foreach($quotaPreset as &$preset) {
100
-	$preset=trim($preset);
97
+$quotaPreset = $config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
98
+$quotaPreset = explode(',', $quotaPreset);
99
+foreach ($quotaPreset as &$preset) {
100
+	$preset = trim($preset);
101 101
 }
102
-$quotaPreset=array_diff($quotaPreset, array('default', 'none'));
102
+$quotaPreset = array_diff($quotaPreset, array('default', 'none'));
103 103
 
104
-$defaultQuota=$config->getAppValue('files', 'default_quota', 'none');
105
-$defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false
106
-	&& array_search($defaultQuota, array('none', 'default'))===false;
104
+$defaultQuota = $config->getAppValue('files', 'default_quota', 'none');
105
+$defaultQuotaIsUserDefined = array_search($defaultQuota, $quotaPreset) === false
106
+	&& array_search($defaultQuota, array('none', 'default')) === false;
107 107
 
108 108
 \OC::$server->getEventDispatcher()->dispatch('OC\Settings\Users::loadAdditionalScripts');
109 109
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 $tmpl->assign('groups', $groups);
112 112
 $tmpl->assign('sortGroups', $sortGroupsBy);
113 113
 $tmpl->assign('adminGroup', $adminGroup);
114
-$tmpl->assign('isAdmin', (int)$isAdmin);
114
+$tmpl->assign('isAdmin', (int) $isAdmin);
115 115
 $tmpl->assign('subadmins', $subAdmins);
116 116
 $tmpl->assign('numofgroups', count($groups) + count($adminGroup));
117 117
 $tmpl->assign('quota_preset', $quotaPreset);
Please login to merge, or discard this patch.
settings/help.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -31,28 +31,28 @@
 block discarded – undo
31 31
 OC_Util::checkLoggedIn();
32 32
 
33 33
 // Load the files we need
34
-OC_Util::addStyle( "settings", "settings" );
34
+OC_Util::addStyle("settings", "settings");
35 35
 \OC::$server->getNavigationManager()->setActiveEntry('help');
36 36
 
37 37
 
38
-if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
39
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
40
-	$style1='';
41
-	$style2=' active';
42
-}else{
43
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
44
-	$style1=' active';
45
-	$style2='';
38
+if (isset($_GET['mode']) and $_GET['mode'] === 'admin') {
39
+	$url = \OCP\Util::linkToAbsolute('core', 'doc/admin/index.html');
40
+	$style1 = '';
41
+	$style2 = ' active';
42
+} else {
43
+	$url = \OCP\Util::linkToAbsolute('core', 'doc/user/index.html');
44
+	$style1 = ' active';
45
+	$style2 = '';
46 46
 }
47 47
 
48
-$url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';
49
-$url2=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin';
48
+$url1 = \OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';
49
+$url2 = \OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin';
50 50
 
51
-$tmpl = new OC_Template( "settings", "help", "user" );
52
-$tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser()));
53
-$tmpl->assign( "url", $url );
54
-$tmpl->assign( "url1", $url1 );
55
-$tmpl->assign( "url2", $url2 );
56
-$tmpl->assign( "style1", $style1 );
57
-$tmpl->assign( "style2", $style2 );
51
+$tmpl = new OC_Template("settings", "help", "user");
52
+$tmpl->assign("admin", OC_User::isAdminUser(OC_User::getUser()));
53
+$tmpl->assign("url", $url);
54
+$tmpl->assign("url1", $url1);
55
+$tmpl->assign("url2", $url2);
56
+$tmpl->assign("style1", $style1);
57
+$tmpl->assign("style2", $style2);
58 58
 $tmpl->printPage();
Please login to merge, or discard this patch.
lib/public/AppFramework/Db/DoesNotExistException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 	 * @param string $msg the error message
38 38
 	 * @since 7.0.0
39 39
 	 */
40
-	public function __construct($msg){
40
+	public function __construct($msg) {
41 41
 		parent::__construct($msg);
42 42
 	}
43 43
 
Please login to merge, or discard this patch.