Completed
Pull Request — master (#3590)
by Individual IT
11:38
created
cron.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -33,13 +33,13 @@  discard block
 block discarded – undo
33 33
 // Show warning if a PHP version below 5.6.0 is used
34 34
 if (version_compare(PHP_VERSION, '5.6.0') === -1) {
35 35
 	echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>';
36
-	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
36
+	echo 'You are currently running '.PHP_VERSION.'. Please update your PHP version.';
37 37
 	return;
38 38
 }
39 39
 
40 40
 try {
41 41
 
42
-	require_once __DIR__ . '/lib/base.php';
42
+	require_once __DIR__.'/lib/base.php';
43 43
 
44 44
 	if (\OCP\Util::needUpgrade()) {
45 45
 		\OCP\Util::writeLog('cron', 'Update required, skipping cron', \OCP\Util::DEBUG);
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 	$appMode = \OCP\BackgroundJob::getExecutionType();
81 81
 	if ($appMode == 'none') {
82 82
 		if (OC::$CLI) {
83
-			echo 'Background Jobs are disabled!' . PHP_EOL;
83
+			echo 'Background Jobs are disabled!'.PHP_EOL;
84 84
 		} else {
85 85
 			OC_JSON::error(array('data' => array('message' => 'Background jobs disabled!')));
86 86
 		}
@@ -93,15 +93,15 @@  discard block
 block discarded – undo
93 93
 
94 94
 		// the cron job must be executed with the right user
95 95
 		if (!function_exists('posix_getuid')) {
96
-			echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
96
+			echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php".PHP_EOL;
97 97
 			exit(0);
98 98
 		}
99 99
 		$user = posix_getpwuid(posix_getuid());
100
-		$configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
100
+		$configUser = posix_getpwuid(fileowner(OC::$configDir.'config.php'));
101 101
 		if ($user['name'] !== $configUser['name']) {
102
-			echo "Console has to be executed with the same user as the web server is operated" . PHP_EOL;
103
-			echo "Current user: " . $user['name'] . PHP_EOL;
104
-			echo "Web server user: " . $configUser['name'] . PHP_EOL;
102
+			echo "Console has to be executed with the same user as the web server is operated".PHP_EOL;
103
+			echo "Current user: ".$user['name'].PHP_EOL;
104
+			echo "Web server user: ".$configUser['name'].PHP_EOL;
105 105
 			exit(0);
106 106
 		}
107 107
 
@@ -124,11 +124,11 @@  discard block
 block discarded – undo
124 124
 				break;
125 125
 			}
126 126
 
127
-			$logger->debug('Run ' . get_class($job) . ' job with ID ' . $job->getId(), ['app' => 'cron']);
127
+			$logger->debug('Run '.get_class($job).' job with ID '.$job->getId(), ['app' => 'cron']);
128 128
 			$job->execute($jobList, $logger);
129 129
 			// clean up after unclean jobs
130 130
 			\OC_Util::tearDownFS();
131
-			$logger->debug('Finished ' . get_class($job) . ' job with ID ' . $job->getId(), ['app' => 'cron']);
131
+			$logger->debug('Finished '.get_class($job).' job with ID '.$job->getId(), ['app' => 'cron']);
132 132
 
133 133
 			$jobList->setLastJob($job);
134 134
 			$executedJobs[$job->getId()] = true;
Please login to merge, or discard this patch.
apps/files/templates/admin.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,17 +2,17 @@
 block discarded – undo
2 2
 
3 3
 	<div class="section">
4 4
 		<h2><?php p($l->t('File handling')); ?></h2>
5
-		<label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label>
5
+		<label for="maxUploadSize"><?php p($l->t('Maximum upload size')); ?> </label>
6 6
 		<span id="maxUploadSizeSettingsMsg" class="msg"></span>
7 7
 		<br />
8
-		<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if(!$_['uploadChangable']) { p('disabled'); } ?> />
9
-		<?php if($_['displayMaxPossibleUploadSize']):?>
8
+		<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if (!$_['uploadChangable']) { p('disabled'); } ?> />
9
+		<?php if ($_['displayMaxPossibleUploadSize']):?>
10 10
 			(<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>)
11
-		<?php endif;?>
11
+		<?php endif; ?>
12 12
 		<input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" />
13
-		<?php if($_['uploadChangable']): ?>
13
+		<?php if ($_['uploadChangable']): ?>
14 14
 			<input type="submit" id="submitMaxUpload"
15
-				   value="<?php p($l->t( 'Save' )); ?>"/>
15
+				   value="<?php p($l->t('Save')); ?>"/>
16 16
 			<p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p>
17 17
 		<?php else: ?>
18 18
 			<p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p>
Please login to merge, or discard this patch.
apps/files/templates/list.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 		<div class="actions creatable hidden">
3 3
 			<div id="uploadprogresswrapper">
4 4
 				<div id="uploadprogressbar">
5
-					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading...'));?></span><span class="mobile"><?php p($l->t('...'));?></span></em>
5
+					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading...')); ?></span><span class="mobile"><?php p($l->t('...')); ?></span></em>
6 6
 				</div>
7 7
 				<input type="button" class="stop icon-close" style="display:none" value="" />
8 8
 			</div>
@@ -16,10 +16,10 @@  discard block
 block discarded – undo
16 16
 	*/ ?>
17 17
 	<input type="hidden" name="permissions" value="" id="permissions">
18 18
 	<input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
19
-	<?php if(isset($_['dirToken'])):?>
19
+	<?php if (isset($_['dirToken'])):?>
20 20
 	<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
21 21
 	<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
22
-	<?php endif;?>
22
+	<?php endif; ?>
23 23
 	<input type="hidden" class="max_human_file_size"
24 24
 		   value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
25 25
 </div>
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 					<label for="select_all_files">
46 46
 						<span class="hidden-visually"><?php p($l->t('Select all'))?></span>
47 47
 					</label>
48
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
48
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
49 49
 					<span id="selectedActionsList" class="selectedActions">
50 50
 						<a href="" class="download">
51 51
 							<span class="icon icon-download"></span>
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
59 59
 			</th>
60 60
 			<th id="headerDate" class="hidden column-mtime">
61
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
61
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
62 62
 					<span class="selectedActions"><a href="" class="delete-selected">
63 63
 						<span><?php p($l->t('Delete'))?></span>
64 64
 						<span class="icon icon-delete"></span>
@@ -78,6 +78,6 @@  discard block
 block discarded – undo
78 78
 <div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
79 79
 <div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
80 80
 	<p>
81
-	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?>
81
+	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.')); ?>
82 82
 	</p>
83 83
 </div>
Please login to merge, or discard this patch.
apps/files/templates/simplelist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@
 block discarded – undo
19 19
 		<tr>
20 20
 			<th id='headerName' class="hidden column-name">
21 21
 				<div id="headerName-container">
22
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
22
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
23 23
 				</div>
24 24
 			</th>
25 25
 			<th id="headerSize" class="hidden column-size">
26 26
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
27 27
 			</th>
28 28
 			<th id="headerDate" class="hidden column-mtime">
29
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
29
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
30 30
 					<span class="selectedActions"><a href="" class="delete-selected">
31 31
 						<?php p($l->t('Delete'))?>
32 32
 						<img class="svg" alt="<?php p($l->t('Delete'))?>"
Please login to merge, or discard this patch.
apps/files/templates/appnavigation.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 		<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?>">
5 5
 			<a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"
6 6
 				class="nav-icon-<?php p($item['icon'] !== '' ? $item['icon'] : $item['id']) ?> svg">
7
-				<?php p($item['name']);?>
7
+				<?php p($item['name']); ?>
8 8
 			</a>
9 9
 		</li>
10 10
 		<?php } ?>
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 	<div id="app-settings">
13 13
 		<div id="app-settings-header">
14 14
 			<button class="settings-button" data-apps-slide-toggle="#app-settings-content">
15
-				<?php p($l->t('Settings'));?>
15
+				<?php p($l->t('Settings')); ?>
16 16
 			</button>
17 17
 		</div>
18 18
 		<div id="app-settings-content">
@@ -20,9 +20,9 @@  discard block
 block discarded – undo
20 20
 				<input class="checkbox" id="showhiddenfilesToggle" checked="checked" type="checkbox">
21 21
 				<label for="showhiddenfilesToggle"><?php p($l->t('Show hidden files')); ?></label>
22 22
 			</div>
23
-			<label for="webdavurl"><?php p($l->t('WebDAV'));?></label>
23
+			<label for="webdavurl"><?php p($l->t('WebDAV')); ?></label>
24 24
 			<input id="webdavurl" type="text" readonly="readonly" value="<?php p(\OCP\Util::linkToRemote('webdav')); ?>" />
25
-			<em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank" rel="noreferrer">access your Files via WebDAV</a>', array(link_to_docs('user-webdav'))));?></em>
25
+			<em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank" rel="noreferrer">access your Files via WebDAV</a>', array(link_to_docs('user-webdav')))); ?></em>
26 26
 		</div>
27 27
 	</div>
28 28
 </div>
Please login to merge, or discard this patch.
apps/files/ajax/getstoragestats.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 $dir = '/';
27 27
 
28 28
 if (isset($_GET['dir'])) {
29
-	$dir = (string)$_GET['dir'];
29
+	$dir = (string) $_GET['dir'];
30 30
 }
31 31
 
32 32
 OCP\JSON::checkLoggedIn();
Please login to merge, or discard this patch.
apps/files/ajax/list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 $l = \OC::$server->getL10N('files');
29 29
 
30 30
 // Load the files
31
-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
31
+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
32 32
 $dir = \OC\Files\Filesystem::normalizePath($dir);
33 33
 
34 34
 try {
@@ -39,11 +39,11 @@  discard block
 block discarded – undo
39 39
 	}
40 40
 
41 41
 	$data = array();
42
-	$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
42
+	$baseUrl = OCP\Util::linkTo('files', 'index.php').'?dir=';
43 43
 
44 44
 	$permissions = $dirInfo->getPermissions();
45 45
 
46
-	$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
46
+	$sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name';
47 47
 	$sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
48 48
 	$mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
49 49
 
Please login to merge, or discard this patch.
apps/files/ajax/download.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
 OCP\User::checkLoggedIn();
32 32
 \OC::$server->getSession()->close();
33 33
 
34
-$files = isset($_GET['files']) ? (string)$_GET['files'] : '';
35
-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
34
+$files = isset($_GET['files']) ? (string) $_GET['files'] : '';
35
+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
36 36
 
37 37
 $files_list = json_decode($files);
38 38
 // in case we get only a single file
@@ -45,13 +45,13 @@  discard block
 block discarded – undo
45 45
  * the content must not be longer than 32 characters and must only contain
46 46
  * alphanumeric characters
47 47
  */
48
-if(isset($_GET['downloadStartSecret'])
48
+if (isset($_GET['downloadStartSecret'])
49 49
 	&& !isset($_GET['downloadStartSecret'][32])
50 50
 	&& preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
51 51
 	setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
52 52
 }
53 53
 
54
-$server_params = array( 'head' => \OC::$server->getRequest()->getMethod() == 'HEAD' );
54
+$server_params = array('head' => \OC::$server->getRequest()->getMethod() == 'HEAD');
55 55
 
56 56
 /**
57 57
  * Http range requests support
Please login to merge, or discard this patch.
apps/files/lib/Activity/Provider.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.