Completed
Pull Request — master (#10023)
by Joas
206:15 queued 184:34
created
lib/private/Mail/Mailer.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 		$mailer = $this->getInstance();
130 130
 
131 131
 		// Enable logger if debug mode is enabled
132
-		if($debugMode) {
132
+		if ($debugMode) {
133 133
 			$mailLogger = new \Swift_Plugins_Loggers_ArrayLogger();
134 134
 			$mailer->registerPlugin(new \Swift_Plugins_LoggerPlugin($mailLogger));
135 135
 		}
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 		// Debugging logging
140 140
 		$logMessage = sprintf('Sent mail to "%s" with subject "%s"', print_r($message->getTo(), true), $message->getSubject());
141 141
 		$this->logger->debug($logMessage, ['app' => 'core']);
142
-		if($debugMode && isset($mailLogger)) {
142
+		if ($debugMode && isset($mailLogger)) {
143 143
 			$this->logger->debug($mailLogger->dump(), ['app' => 'core']);
144 144
 		}
145 145
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 		}
171 171
 
172 172
 		list($name, $domain) = explode('@', $email, 2);
173
-		$domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46);
173
+		$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
174 174
 		return $name.'@'.$domain;
175 175
 	}
176 176
 
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 				break;
241 241
 		}
242 242
 
243
-		return \Swift_SendmailTransport::newInstance($binaryPath . ' -bs');
243
+		return \Swift_SendmailTransport::newInstance($binaryPath.' -bs');
244 244
 	}
245 245
 
246 246
 	/**
Please login to merge, or discard this patch.
lib/private/Route/Route.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@
 block discarded – undo
150 150
 	public function actionInclude($file) {
151 151
 		$function = function($param) use ($file) {
152 152
 			unset($param["_route"]);
153
-			$_GET=array_merge($_GET, $param);
153
+			$_GET = array_merge($_GET, $param);
154 154
 			unset($param);
155 155
 			require_once "$file";
156 156
 		} ;
Please login to merge, or discard this patch.
apps/files_sharing/lib/Controller/ShareInfoController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
122 122
 	protected function addROWrapper() {
123 123
 		// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
124 124
 		$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
125
-		\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
125
+		\OC\Files\Filesystem::addStorageWrapper('readonly', function($mountPoint, $storage) {
126 126
 			return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
127 127
 		});
128 128
 		\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
Please login to merge, or discard this patch.
apps/files_sharing/lib/ExpireSharesJob.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
 			);
68 68
 
69 69
 		$shares = $qb->execute();
70
-		while($share = $shares->fetch()) {
70
+		while ($share = $shares->fetch()) {
71 71
 			\OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
72 72
 		}
73 73
 		$shares->closeCursor();
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Auth/InvalidAuth.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
 		$this
38 38
 			->setIdentifier($invalidId)
39 39
 			->setScheme(self::SCHEME_NULL)
40
-			->setText('Unknown auth mechanism backend ' . $invalidId)
40
+			->setText('Unknown auth mechanism backend '.$invalidId)
41 41
 		;
42 42
 	}
43 43
 
Please login to merge, or discard this patch.
apps/encryption/templates/settings-admin.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -7,17 +7,17 @@  discard block
 block discarded – undo
7 7
 ?>
8 8
 <form id="ocDefaultEncryptionModule" class="sub-section">
9 9
 	<h3><?php p($l->t("Default encryption module")); ?></h3>
10
-	<?php if(!$_["initStatus"] && $_['masterKeyEnabled'] === false): ?>
10
+	<?php if (!$_["initStatus"] && $_['masterKeyEnabled'] === false): ?>
11 11
 		<?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?>
12 12
 	<?php else: ?>
13 13
 		<p id="encryptHomeStorageSetting">
14 14
 			<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
15 15
 				   value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"'); ?> />
16
-			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
17
-			<em><?php p( $l->t( "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" ) ); ?></em>
16
+			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage')); ?></label></br>
17
+			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
18 18
 		</p>
19 19
 		<br />
20
-		<?php if($_['masterKeyEnabled'] === false): ?>
20
+		<?php if ($_['masterKeyEnabled'] === false): ?>
21 21
 			<p id="encryptionSetRecoveryKey">
22 22
 				<?php $_["recoveryEnabled"] === '0' ?  p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
23 23
 				<span class="msg"></span>
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 			</p>
43 43
 			<br/><br/>
44 44
 
45
-			<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
45
+			<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if ($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"'); ?>>
46 46
 				<?php p($l->t("Change recovery key password:")); ?>
47 47
 				<span class="msg"></span>
48 48
 				<br/>
Please login to merge, or discard this patch.
lib/private/Files/Config/CachedMountFileInfo.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,6 +43,6 @@
 block discarded – undo
43 43
 	}
44 44
 
45 45
 	public function getPath() {
46
-		return $this->getMountPoint() . $this->getInternalPath();
46
+		return $this->getMountPoint().$this->getInternalPath();
47 47
 	}
48 48
 }
49 49
\ No newline at end of file
Please login to merge, or discard this patch.
core/Command/Maintenance/Mimetype/UpdateJS.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		$keys = array_filter(array_keys($aliases), function($k) {
57 57
 			return $k[0] === '_';
58 58
 		});
59
-		foreach($keys as $key) {
59
+		foreach ($keys as $key) {
60 60
 			unset($aliases[$key]);
61 61
 		}
62 62
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
65 65
 
66 66
 		$files = [];
67
-		foreach($dir as $fileInfo) {
67
+		foreach ($dir as $fileInfo) {
68 68
 			if ($fileInfo->isFile()) {
69 69
 				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
70 70
 				$files[] = $file;
@@ -78,14 +78,14 @@  discard block
 block discarded – undo
78 78
 		// Fetch all themes!
79 79
 		$themes = [];
80 80
 		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
81
-		foreach($dirs as $dir) {
81
+		foreach ($dirs as $dir) {
82 82
 			//Valid theme dir
83 83
 			if ($dir->isFile() || $dir->isDot()) {
84 84
 				continue;
85 85
 			}
86 86
 
87 87
 			$theme = $dir->getFilename();
88
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
88
+			$themeDir = $dir->getPath().'/'.$theme.'/core/img/filetypes/';
89 89
 			// Check if this theme has its own filetype icons
90 90
 			if (!file_exists($themeDir)) {
91 91
 				continue;
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
 * To regenerate this file run ./occ maintenance:mimetype:update-js
117 117
 */
118 118
 OC.MimeTypeList={
119
-	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . ',
120
-	files: ' . json_encode($files, JSON_PRETTY_PRINT) . ',
121
-	themes: ' . json_encode($themes, JSON_PRETTY_PRINT) . '
119
+	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES).',
120
+	files: ' . json_encode($files, JSON_PRETTY_PRINT).',
121
+	themes: ' . json_encode($themes, JSON_PRETTY_PRINT).'
122 122
 };
123 123
 ';
124 124
 
Please login to merge, or discard this patch.
lib/private/Collaboration/Collaborators/LookupPlugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
 		try {
55 55
 			$client = $this->clientService->newClient();
56 56
 			$response = $client->get(
57
-				$lookupServerUrl . '/users?search=' . urlencode($search),
57
+				$lookupServerUrl.'/users?search='.urlencode($search),
58 58
 				[
59 59
 					'timeout' => 10,
60 60
 					'connect_timeout' => 3,
Please login to merge, or discard this patch.