nextcloud / server

apps/files/lib/BackgroundJob/DeleteOrphanedItems.php

Spacing +3 added lines, -3 removed lines

@@ -80,12 +80,12 @@
 		$deletedEntries = 0;
 
 		$query = $this->connection->getQueryBuilder();
-		$query->select('t1.' . $idCol)
+		$query->select('t1.'.$idCol)
 			->from($table, 't1')
 			->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
 			->andWhere($query->expr()->isNull('t2.fileid'))
-			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
-			->groupBy('t1.' . $idCol)
+			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.'.$idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
+			->groupBy('t1.'.$idCol)
 			->setMaxResults(self::CHUNK_SIZE);
 
 		$deleteQuery = $this->connection->getQueryBuilder();

apps/files/lib/Settings/Admin.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		$maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
 
 		$parameters = [
-			'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable ),
+			'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable),
 			'uploadMaxFilesize'            => $maxUploadFilesize,
 			// max possible makes only sense on a 32 bit system
 			'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4,

apps/files/download.php

Spacing +4 added lines, -4 removed lines

@@ -29,15 +29,15 @@ 
 
 $filename = $_GET["file"];
 
-if(!\OC\Files\Filesystem::file_exists($filename)) {
+if (!\OC\Files\Filesystem::file_exists($filename)) {
 	header("HTTP/1.0 404 Not Found");
-	$tmpl = new OCP\Template( '', '404', 'guest' );
+	$tmpl = new OCP\Template('', '404', 'guest');
 	$tmpl->assign('file', $filename);
 	$tmpl->printPage();
 	exit;
 }
 
-$ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename ));
+$ftype = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
 
 header('Content-Type:'.$ftype);
 OCP\Response::setContentDispositionHeader(basename($filename), 'attachment');
@@ -45,4 +45,4 @@ 
 OCP\Response::setContentLengthHeader(\OC\Files\Filesystem::filesize($filename));
 
 OC_Util::obEnd();
-\OC\Files\Filesystem::readfile( $filename );
+\OC\Files\Filesystem::readfile($filename);

apps/user_ldap/templates/part.wizardcontrols.php

Spacing +4 added lines, -4 removed lines

@@ -1,17 +1,17 @@
 <div class="ldapWizardControls">
-	<span class="ldap_saving hidden"><?php p($l->t('Saving'));?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
+	<span class="ldap_saving hidden"><?php p($l->t('Saving')); ?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
 	<span class="ldap_config_state_indicator"></span> <span class="ldap_config_state_indicator_sign"></span>
 	<button class="ldap_action_back invisible" name="ldap_action_back"
 			type="button">
-		<?php p($l->t('Back'));?>
+		<?php p($l->t('Back')); ?>
 	</button>
 	<button class="ldap_action_continue" name="ldap_action_continue" type="button">
-		<?php p($l->t('Continue'));?>
+		<?php p($l->t('Continue')); ?>
 	</button>
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
 		target="_blank" rel="noreferrer">
 		<img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>"
 			style="height:1.75ex" />
-		<span class="ldap_grey"><?php p($l->t('Help'));?></span>
+		<span class="ldap_grey"><?php p($l->t('Help')); ?></span>
 	</a>
 </div>

apps/user_ldap/templates/part.settingcontrols.php

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <div class="ldapSettingControls">
 	<button type="button" class="ldap_action_test_connection" name="ldap_action_test_connection">
-		<?php p($l->t('Test Configuration'));?>
+		<?php p($l->t('Test Configuration')); ?>
 	</button>
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
 		target="_blank" rel="noreferrer">
 		<img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>"
 			style="height:1.75ex" />
-		<?php p($l->t('Help'));?>
+		<?php p($l->t('Help')); ?>
 	</a>
 </div>

apps/user_ldap/templates/part.wizard-groupfilter.php

Spacing +11 added lines, -11 removed lines

@@ -1,11 +1,11 @@ 
 <fieldset id="ldapWizard4">
 	<div>
 		<p>
-			<?php p($l->t('Groups meeting these criteria are available in %s:', $theme->getName()));?>
+			<?php p($l->t('Groups meeting these criteria are available in %s:', $theme->getName())); ?>
 		</p>
 		<p>
 			<label for="ldap_groupfilter_objectclass">
-				<?php p($l->t('Only these object classes:'));?>
+				<?php p($l->t('Only these object classes:')); ?>
 			</label>
 
 			<select id="ldap_groupfilter_objectclass" multiple="multiple"
@@ -14,10 +14,10 @@ 
 		</p>
 		<p>
 			<label for="ldap_groupfilter_groups">
-				<?php p($l->t('Only from these groups:'));?>
+				<?php p($l->t('Only from these groups:')); ?>
 			</label>
 
-			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups'));?>" />
+			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups')); ?>" />
 
 			<select id="ldap_groupfilter_groups" multiple="multiple"
 			 name="ldap_groupfilter_groups" class="multiSelectPlugin">
@@ -27,25 +27,25 @@ 
 		<p class="ldapManyGroupsSupport hidden">
 			<label></label>
 			<select class="ldapGroupList ldapGroupListAvailable" multiple="multiple"
-					title="<?php p($l->t('Available groups'));?>"></select>
+					title="<?php p($l->t('Available groups')); ?>"></select>
 			<span class="buttonSpan">
 				<button class="ldapGroupListSelect" type="button">&gt;</button><br/>
 				<button class="ldapGroupListDeselect" type="button">&lt;</button>
 			</span>
 			<select class="ldapGroupList ldapGroupListSelected" multiple="multiple"
-					title="<?php p($l->t('Selected groups'));?>"></select>
+					title="<?php p($l->t('Selected groups')); ?>"></select>
 		</p>
 		<p>
-			<label><a id='toggleRawGroupFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
+			<label><a id='toggleRawGroupFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label>
 		</p>
 		<p id="ldapReadOnlyGroupFilterContainer" class="hidden ldapReadOnlyFilterContainer">
-			<label><?php p($l->t('LDAP Filter:'));?></label>
+			<label><?php p($l->t('LDAP Filter:')); ?></label>
 			<span class="ldapFilterReadOnlyElement ldapInputColElement"></span>
 		</p>
 		<p id="rawGroupFilterContainer" class="invisible">
 			<textarea type="text" id="ldap_group_filter" name="ldap_group_filter"
-					  placeholder="<?php p($l->t('Edit LDAP Query'));?>"
-					  title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', $theme->getName()));?>">
+					  placeholder="<?php p($l->t('Edit LDAP Query')); ?>"
+					  title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', $theme->getName())); ?>">
 			</textarea>
 		</p>
 		<p>
@@ -53,7 +53,7 @@ 
 		</p>
 		<p class="ldap_count">
 			<button class="ldapGetEntryCount ldapGetGroupCount" name="ldapGetEntryCount" type="button">
-				<?php p($l->t('Verify settings and count groups'));?>
+				<?php p($l->t('Verify settings and count groups')); ?>
 			</button>
 			<span id="ldap_group_count"></span>
 		</p>

apps/user_ldap/templates/part.wizard-userfilter.php

Spacing +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <fieldset id="ldapWizard2">
 	<div>
 		<p>
-			<?php p($l->t('Listing and searching for users is constrained by these criteria:'));?>
+			<?php p($l->t('Listing and searching for users is constrained by these criteria:')); ?>
 		</p>
 		<p>
 			<label for="ldap_userfilter_objectclass">
-				<?php p($l->t('Only these object classes:'));?>
+				<?php p($l->t('Only these object classes:')); ?>
 			</label>
 
 			<select id="ldap_userfilter_objectclass" multiple="multiple"
@@ -14,14 +14,14 @@ 
 		</p>
 		<p>
 			<label></label>
-			<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>
+			<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>
 		</p>
 		<p>
 			<label for="ldap_userfilter_groups">
-				<?php p($l->t('Only from these groups:'));?>
+				<?php p($l->t('Only from these groups:')); ?>
 			</label>
 
-			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups'));?>" />
+			<input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups')); ?>" />
 
 			<select id="ldap_userfilter_groups" multiple="multiple"
 			 name="ldap_userfilter_groups" class="multiSelectPlugin">
@@ -30,26 +30,26 @@ 
 		<p class="ldapManyGroupsSupport hidden">
 			<label></label>
 			<select class="ldapGroupList ldapGroupListAvailable" multiple="multiple"
-					title="<?php p($l->t('Available groups'));?>"></select>
+					title="<?php p($l->t('Available groups')); ?>"></select>
 			<span class="buttonSpan">
 				<button class="ldapGroupListSelect" type="button">&gt;</button><br/>
 				<button class="ldapGroupListDeselect" type="button">&lt;</button>
 			</span>
 			<select class="ldapGroupList ldapGroupListSelected" multiple="multiple"
-					title="<?php p($l->t('Selected groups'));?>"></select>
+					title="<?php p($l->t('Selected groups')); ?>"></select>
 		</p>
 		<p>
-			<label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
+			<label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label>
 		</p>
 		<p id="ldapReadOnlyUserFilterContainer" class="hidden ldapReadOnlyFilterContainer">
-			<label><?php p($l->t('LDAP Filter:'));?></label>
+			<label><?php p($l->t('LDAP Filter:')); ?></label>
 			<span class="ldapFilterReadOnlyElement ldapInputColElement"></span>
 		</p>
 		<p id="rawUserFilterContainer">
 			<textarea type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
 				class="ldapFilterInputElement"
-				placeholder="<?php p($l->t('Edit LDAP Query'));?>"
-				title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName()));?>">
+				placeholder="<?php p($l->t('Edit LDAP Query')); ?>"
+				title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName())); ?>">
 			</textarea>
 		</p>
 		<p>
@@ -57,7 +57,7 @@ 
 		</p>
 		<p class="ldap_count">
 			<button class="ldapGetEntryCount ldapGetUserCount" name="ldapGetEntryCount" type="button">
-				<?php p($l->t('Verify settings and count users'));?>
+				<?php p($l->t('Verify settings and count users')); ?>
 			</button>
 			<span id="ldap_user_count"></span>
 		</p>

apps/user_ldap/templates/part.wizard-server.php

Spacing +21 added lines, -21 removed lines

@@ -8,16 +8,16 @@ 
 <fieldset id="ldapWizard1">
 		<p>
 		<select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
-		<?php if(count($_['serverConfigurationPrefixes']) === 0 ) {
+		<?php if (count($_['serverConfigurationPrefixes']) === 0) {
 			?>
-				<option value="" selected><?php p($l->t('1. Server'));?></option>');
+				<option value="" selected><?php p($l->t('1. Server')); ?></option>');
 			<?php
 		} else {
 			$i = 1;
 			$sel = ' selected';
-			foreach($_['serverConfigurationPrefixes'] as $prefix) {
+			foreach ($_['serverConfigurationPrefixes'] as $prefix) {
 				?>
-				<option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option>
+				<option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++))); ?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option>
 				<?php
 			}
 		}
@@ -25,14 +25,14 @@ 
 		</select>
 		<button type="button" id="ldap_action_add_configuration"
 			name="ldap_action_add_configuration" class="icon-add icon-default-style"
-			title="<?php p($l->t('Add a new and blank configuration'));?>">&nbsp;</button>
+			title="<?php p($l->t('Add a new and blank configuration')); ?>">&nbsp;</button>
 		<button type="button" id="ldap_action_copy_configuration"
 			name="ldap_action_copy_configuration"
 			class="ldapIconCopy icon-default-style"
-			title="<?php p($l->t('Copy current configuration into new directory binding'));?>">&nbsp;</button>
+			title="<?php p($l->t('Copy current configuration into new directory binding')); ?>">&nbsp;</button>
 		<button type="button" id="ldap_action_delete_configuration"
 			name="ldap_action_delete_configuration" class="icon-delete icon-default-style"
-			title="<?php p($l->t('Delete the current configuration'));?>">&nbsp;</button>
+			title="<?php p($l->t('Delete the current configuration')); ?>">&nbsp;</button>
 		</p>
 
 		<div class="hostPortCombinator">
@@ -41,14 +41,14 @@ 
 					<div class="table">
 						<input type="text" class="host" id="ldap_host"
 							name="ldap_host"
-							placeholder="<?php p($l->t('Host'));?>"
-							title="<?php p($l->t('You can omit the protocol, except you require SSL. Then start with ldaps://'));?>"
+							placeholder="<?php p($l->t('Host')); ?>"
+							title="<?php p($l->t('You can omit the protocol, except you require SSL. Then start with ldaps://')); ?>"
 							/>
 						<span class="hostPortCombinatorSpan">
 							<input type="number" id="ldap_port" name="ldap_port"
-								placeholder="<?php p($l->t('Port'));?>" />
+								placeholder="<?php p($l->t('Port')); ?>" />
 							<button class="ldapDetectPort" name="ldapDetectPort" type="button">
-								<?php p($l->t('Detect Port'));?>
+								<?php p($l->t('Detect Port')); ?>
 							</button>
 						</span>
 					</div>
@@ -57,40 +57,40 @@ 
 			<div class="tablerow">
 				<input type="text" id="ldap_dn" name="ldap_dn"
 				class="tablecell"
-				placeholder="<?php p($l->t('User DN'));?>" autocomplete="off"
-				title="<?php p($l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.'));?>"
+				placeholder="<?php p($l->t('User DN')); ?>" autocomplete="off"
+				title="<?php p($l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.')); ?>"
 				/>
 			</div>
 
 			<div class="tablerow">
 				<input type="password" id="ldap_agent_password"
 				class="tablecell" name="ldap_agent_password"
-				placeholder="<?php p($l->t('Password'));?>" autocomplete="off"
-				title="<?php p($l->t('For anonymous access, leave DN and Password empty.'));?>"
+				placeholder="<?php p($l->t('Password')); ?>" autocomplete="off"
+				title="<?php p($l->t('For anonymous access, leave DN and Password empty.')); ?>"
 				/>
 			</div>
 
 			<div class="tablerow">
 				<textarea id="ldap_base" name="ldap_base"
 					class="tablecell"
-					placeholder="<?php p($l->t('One Base DN per line'));?>"
-					title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab'));?>">
+					placeholder="<?php p($l->t('One Base DN per line')); ?>"
+					title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab')); ?>">
 				</textarea>
 				<button class="ldapDetectBase" name="ldapDetectBase" type="button">
-					<?php p($l->t('Detect Base DN'));?>
+					<?php p($l->t('Detect Base DN')); ?>
 				</button>
 				<button class="ldapTestBase" name="ldapTestBase" type="button">
-					<?php p($l->t('Test Base DN'));?>
+					<?php p($l->t('Test Base DN')); ?>
 				</button>
 			</div>
 
 			<div class="tablerow left">
 				<input type="checkbox" id="ldap_experienced_admin" value="1"
 					name="ldap_experienced_admin" class="tablecell"
-					title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>"
+					title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.')); ?>"
 					/>
 				<label for="ldap_experienced_admin" class="tablecell">
-					<?php p($l->t('Manually enter LDAP filters (recommended for large directories)'));?>
+					<?php p($l->t('Manually enter LDAP filters (recommended for large directories)')); ?>
 				</label>
 			</div>
 

apps/user_ldap/templates/part.wizard-loginfilter.php

Spacing +12 added lines, -12 removed lines

@@ -1,29 +1,29 @@ 
 <fieldset id="ldapWizard3">
 	<div>
 		<p>
-			<?php p($l->t('When logging in, %s will find the user based on the following attributes:', $theme->getName()));?>
+			<?php p($l->t('When logging in, %s will find the user based on the following attributes:', $theme->getName())); ?>
 		</p>
 		<p>
 			<label for="ldap_loginfilter_username">
-				<?php p($l->t('LDAP / AD Username:'));?>
+				<?php p($l->t('LDAP / AD Username:')); ?>
 			</label>
 
 			<input type="checkbox" id="ldap_loginfilter_username"
-				   title="<?php p($l->t('Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected.'));?>"
+				   title="<?php p($l->t('Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected.')); ?>"
 				   name="ldap_loginfilter_username" value="1" />
 		</p>
 		<p>
 			<label for="ldap_loginfilter_email">
-				<?php p($l->t('LDAP / AD Email Address:'));?>
+				<?php p($l->t('LDAP / AD Email Address:')); ?>
 			</label>
 
 			<input type="checkbox" id="ldap_loginfilter_email"
-				   title="<?php p($l->t('Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed.'));?>"
+				   title="<?php p($l->t('Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed.')); ?>"
 				   name="ldap_loginfilter_email" value="1" />
 		</p>
 		<p>
 			<label for="ldap_loginfilter_attributes">
-				<?php p($l->t('Other Attributes:'));?>
+				<?php p($l->t('Other Attributes:')); ?>
 			</label>
 
 			<select id="ldap_loginfilter_attributes" multiple="multiple"
@@ -31,17 +31,17 @@ 
 			</select>
 		</p>
 		<p>
-			<label><a id='toggleRawLoginFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label>
+			<label><a id='toggleRawLoginFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label>
 		</p>
 		<p id="ldapReadOnlyLoginFilterContainer" class="hidden ldapReadOnlyFilterContainer">
-			<label><?php p($l->t('LDAP Filter:'));?></label>
+			<label><?php p($l->t('LDAP Filter:')); ?></label>
 			<span class="ldapFilterReadOnlyElement ldapInputColElement"></span>
 		</p>
 		<p id="rawLoginFilterContainer" class="invisible">
 			<textarea type="text" id="ldap_login_filter" name="ldap_login_filter"
 				class="ldapFilterInputElement"
-				placeholder="<?php p($l->t('Edit LDAP Query'));?>"
-				title="<?php p($l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: "uid=%%uid"'));?>">
+				placeholder="<?php p($l->t('Edit LDAP Query')); ?>"
+				title="<?php p($l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: "uid=%%uid"')); ?>">
 			</textarea>
 		</p>
 		<p>
@@ -49,11 +49,11 @@ 
 		</p>
 		<p class="ldap_verify">
 			<input type="text" id="ldap_test_loginname" name="ldap_test_loginname"
-				   placeholder="<?php p($l->t('Test Loginname'));?>"
+				   placeholder="<?php p($l->t('Test Loginname')); ?>"
 				   class="ldapVerifyInput"
 				   title="Attempts to receive a DN for the given loginname and the current login filter"/>
 			<button class="ldapVerifyLoginName" name="ldapTestLoginSettings" type="button" disabled="disabled">
-				<?php p($l->t('Verify settings'));?>
+				<?php p($l->t('Verify settings')); ?>
 			</button>
 		</p>
 		<?php print_unescaped($_['wizardControls']); ?>