Completed
Pull Request — master (#5231)
by Morris
16:38
created
apps/files/lib/AppInfo/Application.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 use OCA\Files\Controller\ViewController;
32 32
 
33 33
 class Application extends App {
34
-	public function __construct(array $urlParams=array()) {
34
+	public function __construct(array $urlParams = array()) {
35 35
 		parent::__construct('files', $urlParams);
36 36
 		$container = $this->getContainer();
37 37
 		$server = $container->getServer();
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 		/**
40 40
 		 * Controllers
41 41
 		 */
42
-		$container->registerService('APIController', function (IContainer $c) use ($server) {
42
+		$container->registerService('APIController', function(IContainer $c) use ($server) {
43 43
 			return new ApiController(
44 44
 				$c->query('AppName'),
45 45
 				$c->query('Request'),
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 			);
53 53
 		});
54 54
 
55
-		$container->registerService('ViewController', function (IContainer $c) use ($server) {
55
+		$container->registerService('ViewController', function(IContainer $c) use ($server) {
56 56
 			return new ViewController(
57 57
 				$c->query('AppName'),
58 58
 				$c->query('Request'),
@@ -76,10 +76,10 @@  discard block
 block discarded – undo
76 76
 		/**
77 77
 		 * Services
78 78
 		 */
79
-		$container->registerService('Tagger', function(IContainer $c)  {
79
+		$container->registerService('Tagger', function(IContainer $c) {
80 80
 			return $c->query('ServerContainer')->getTagManager()->load('files');
81 81
 		});
82
-		$container->registerService('TagService', function(IContainer $c)  {
82
+		$container->registerService('TagService', function(IContainer $c) {
83 83
 			$homeFolder = $c->query('ServerContainer')->getUserFolder();
84 84
 			return new TagService(
85 85
 				$c->query('ServerContainer')->getUserSession(),
Please login to merge, or discard this patch.
apps/files/lib/BackgroundJob/CleanupFileLocks.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
 	 */
52 52
 	public function run($argument) {
53 53
 		$lockingProvider = \OC::$server->getLockingProvider();
54
-		if($lockingProvider instanceof DBLockingProvider) {
54
+		if ($lockingProvider instanceof DBLockingProvider) {
55 55
 			$lockingProvider->cleanExpiredLocks();
56 56
 		}
57 57
 	}
Please login to merge, or discard this patch.
apps/files/lib/BackgroundJob/DeleteOrphanedItems.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -80,12 +80,12 @@
 block discarded – undo
80 80
 		$deletedEntries = 0;
81 81
 
82 82
 		$query = $this->connection->getQueryBuilder();
83
-		$query->select('t1.' . $idCol)
83
+		$query->select('t1.'.$idCol)
84 84
 			->from($table, 't1')
85 85
 			->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
86 86
 			->andWhere($query->expr()->isNull('t2.fileid'))
87
-			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
88
-			->groupBy('t1.' . $idCol)
87
+			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.'.$idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
88
+			->groupBy('t1.'.$idCol)
89 89
 			->setMaxResults(self::CHUNK_SIZE);
90 90
 
91 91
 		$deleteQuery = $this->connection->getQueryBuilder();
Please login to merge, or discard this patch.
apps/files/lib/Settings/Admin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 		$maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
56 56
 
57 57
 		$parameters = [
58
-			'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable ),
58
+			'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable),
59 59
 			'uploadMaxFilesize'            => $maxUploadFilesize,
60 60
 			// max possible makes only sense on a 32 bit system
61 61
 			'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4,
Please login to merge, or discard this patch.
apps/files/download.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -29,15 +29,15 @@  discard block
 block discarded – undo
29 29
 
30 30
 $filename = $_GET["file"];
31 31
 
32
-if(!\OC\Files\Filesystem::file_exists($filename)) {
32
+if (!\OC\Files\Filesystem::file_exists($filename)) {
33 33
 	header("HTTP/1.0 404 Not Found");
34
-	$tmpl = new OCP\Template( '', '404', 'guest' );
34
+	$tmpl = new OCP\Template('', '404', 'guest');
35 35
 	$tmpl->assign('file', $filename);
36 36
 	$tmpl->printPage();
37 37
 	exit;
38 38
 }
39 39
 
40
-$ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename ));
40
+$ftype = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
41 41
 
42 42
 header('Content-Type:'.$ftype);
43 43
 OCP\Response::setContentDispositionHeader(basename($filename), 'attachment');
@@ -45,4 +45,4 @@  discard block
 block discarded – undo
45 45
 OCP\Response::setContentLengthHeader(\OC\Files\Filesystem::filesize($filename));
46 46
 
47 47
 OC_Util::obEnd();
48
-\OC\Files\Filesystem::readfile( $filename );
48
+\OC\Files\Filesystem::readfile($filename);
Please login to merge, or discard this patch.
apps/files/appinfo/app.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
39 39
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
40 40
 
41
-\OCA\Files\App::getNavigationManager()->add(function () use ($l) {
41
+\OCA\Files\App::getNavigationManager()->add(function() use ($l) {
42 42
 	return [
43 43
 		'id' => 'files',
44 44
 		'appname' => 'files',
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	];
49 49
 });
50 50
 
51
-\OCA\Files\App::getNavigationManager()->add(function () use ($l) {
51
+\OCA\Files\App::getNavigationManager()->add(function() use ($l) {
52 52
 	return [
53 53
 		'id' => 'recent',
54 54
 		'appname' => 'files',
Please login to merge, or discard this patch.
apps/user_ldap/templates/part.wizardcontrols.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <div class="ldapWizardControls">
2
-	<span class="ldap_saving hidden"><?php p($l->t('Saving'));?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
2
+	<span class="ldap_saving hidden"><?php p($l->t('Saving')); ?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
3 3
 	<span class="ldap_config_state_indicator"></span> <span class="ldap_config_state_indicator_sign"></span>
4 4
 	<button class="ldap_action_back invisible" name="ldap_action_back"
5 5
 			type="button">
6
-		<?php p($l->t('Back'));?>
6
+		<?php p($l->t('Back')); ?>
7 7
 	</button>
8 8
 	<button class="ldap_action_continue" name="ldap_action_continue" type="button">
9
-		<?php p($l->t('Continue'));?>
9
+		<?php p($l->t('Continue')); ?>
10 10
 	</button>
11 11
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
12 12
 		target="_blank" rel="noreferrer">
13 13
 		<img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>"
14 14
 			style="height:1.75ex" />
15
-		<span class="ldap_grey"><?php p($l->t('Help'));?></span>
15
+		<span class="ldap_grey"><?php p($l->t('Help')); ?></span>
16 16
 	</a>
17 17
 </div>
Please login to merge, or discard this patch.
apps/user_ldap/templates/part.settingcontrols.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <div class="ldapSettingControls">
2 2
 	<button type="button" class="ldap_action_test_connection" name="ldap_action_test_connection">
3
-		<?php p($l->t('Test Configuration'));?>
3
+		<?php p($l->t('Test Configuration')); ?>
4 4
 	</button>
5 5
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
6 6
 		target="_blank" rel="noreferrer">
7 7
 		<img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>"
8 8
 			style="height:1.75ex" />
9
-		<?php p($l->t('Help'));?>
9
+		<?php p($l->t('Help')); ?>
10 10
 	</a>
11 11
 </div>
Please login to merge, or discard this patch.
apps/user_ldap/templates/part.wizard-userfilter.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <fieldset id="ldapWizard2">
2 2
 	<div>
3 3
 		<p>
4
-			<?php p($l->t('Listing and searching for users is constrained by these criteria:'));?>
4
+			<?php p($l->t('Listing and searching for users is constrained by these criteria:')); ?>
5 5
 		</p>
6 6
 		<p>
7 7
 			<label for="ldap_userfilter_objectclass">
8
-				<?php p($l->t('Only these object classes:'));?>
8
+				<?php p($l->t('Only these object classes:')); ?>
9 9
 			</label>
10 10
 
11 11
 			<select id="ldap_userfilter_objectclass" multiple="multiple"
@@ -14,14 +14,14 @@  discard block
 block discarded – undo
14 14
 		</p>
15 15
 		<p>
16 16
 			<label></label>
17
-			<span class="ldapInputColElement"><?php p($l->t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.'));?></span>
17
+			<span class="ldapInputColElement"><?php p($l->t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.')); ?></span>
18 18
 		</p>
19 19
 		<p>
20 20
 			<label for="ldap_userfilter_groups">
21
-				<?php p($l->t('Only from these groups:'));?>
21
+				<?php p($l->t('Only from these groups:')); ?>
22 22
 			</label>
23 23
 
24
-			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups'));?>" />
24
+			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups')); ?>" />
25 25
 
26 26
 			<select id="ldap_userfilter_groups" multiple="multiple"
27 27
 			 name="ldap_userfilter_groups" class="multiSelectPlugin">
@@ -30,26 +30,26 @@  discard block
 block discarded – undo
30 30
 		<p class="ldapManyGroupsSupport hidden">
31 31
 			<label></label>
32 32
 			<select class="ldapGroupList ldapGroupListAvailable" multiple="multiple"
33
-					title="<?php p($l->t('Available groups'));?>"></select>
33
+					title="<?php p($l->t('Available groups')); ?>"></select>
34 34
 			<span class="buttonSpan">
35 35
 				<button class="ldapGroupListSelect" type="button">&gt;</button><br/>
36 36
 				<button class="ldapGroupListDeselect" type="button">&lt;</button>
37 37
 			</span>
38 38
 			<select class="ldapGroupList ldapGroupListSelected" multiple="multiple"
39
-					title="<?php p($l->t('Selected groups'));?>"></select>
39
+					title="<?php p($l->t('Selected groups')); ?>"></select>
40 40
 		</p>
41 41
 		<p>
42
-			<label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
42
+			<label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label>
43 43
 		</p>
44 44
 		<p id="ldapReadOnlyUserFilterContainer" class="hidden ldapReadOnlyFilterContainer">
45
-			<label><?php p($l->t('LDAP Filter:'));?></label>
45
+			<label><?php p($l->t('LDAP Filter:')); ?></label>
46 46
 			<span class="ldapFilterReadOnlyElement ldapInputColElement"></span>
47 47
 		</p>
48 48
 		<p id="rawUserFilterContainer">
49 49
 			<textarea type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
50 50
 				class="ldapFilterInputElement"
51
-				placeholder="<?php p($l->t('Edit LDAP Query'));?>"
52
-				title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName()));?>">
51
+				placeholder="<?php p($l->t('Edit LDAP Query')); ?>"
52
+				title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName())); ?>">
53 53
 			</textarea>
54 54
 		</p>
55 55
 		<p>
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		</p>
58 58
 		<p class="ldap_count">
59 59
 			<button class="ldapGetEntryCount ldapGetUserCount" name="ldapGetEntryCount" type="button">
60
-				<?php p($l->t('Verify settings and count users'));?>
60
+				<?php p($l->t('Verify settings and count users')); ?>
61 61
 			</button>
62 62
 			<span id="ldap_user_count"></span>
63 63
 		</p>
Please login to merge, or discard this patch.