Completed
Push — master ( 886762...abb0a0 )
by Joas
128:26 queued 113:24
created
settings/templates/users/part.createuser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
 		<div class="groups"><div class="groupsListContainer multiselect button" data-placeholder="<?php p($l->t('Groups'))?>"><span class="title groupsList"></span><span class="icon-triangle-s"></span></div></div>
14 14
 		<input type="submit" class="button" value="<?php p($l->t('Create'))?>" />
15 15
 	</form>
16
-	<?php if((bool)$_['recoveryAdminEnabled']): ?>
16
+	<?php if ((bool) $_['recoveryAdminEnabled']): ?>
17 17
 	<div class="recoveryPassword">
18 18
 	<input id="recoveryPassword"
19 19
 		   type="password"
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/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.
apps/files_sharing/lib/Activity/Providers/Base.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@
 block discarded – undo
197 197
 	protected function setSubjects(IEvent $event, $subject, array $parameters) {
198 198
 		$placeholders = $replacements = [];
199 199
 		foreach ($parameters as $placeholder => $parameter) {
200
-			$placeholders[] = '{' . $placeholder . '}';
200
+			$placeholders[] = '{'.$placeholder.'}';
201 201
 			if ($parameter['type'] === 'file') {
202 202
 				$replacements[] = $parameter['path'];
203 203
 			} else {
Please login to merge, or discard this patch.
apps/files_external/lib/Command/Delete.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 		try {
69 69
 			$mount = $this->globalService->getStorage($mountId);
70 70
 		} catch (NotFoundException $e) {
71
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
71
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
72 72
 			return 404;
73 73
 		}
74 74
 
Please login to merge, or discard this patch.
apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@
 block discarded – undo
117 117
 		\OC_Util::setupFS($user);
118 118
 
119 119
 		// Check if this user has a trashbin directory
120
-		$view = new \OC\Files\View('/' . $user);
120
+		$view = new \OC\Files\View('/'.$user);
121 121
 		if (!$view->is_dir('/files_trashbin/files')) {
122 122
 			return false;
123 123
 		}
Please login to merge, or discard this patch.
apps/files_external/templates/list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 		<tr>
18 18
 			<th id='headerName' class="hidden column-name">
19 19
 				<div id="headerName-container">
20
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
20
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
21 21
 				</div>
22 22
 			</th>
23 23
 			<th id="headerBackend" class="hidden column-backend">
Please login to merge, or discard this patch.