nextcloud / server

apps/user_ldap/templates/settings.php

Braces +10 added lines, -1 removed lines

@@ -97,7 +97,16 @@
 				<p><label for="ldap_group_display_name"><?php p($l->t('Group Display Name Field'));?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" data-default="<?php p($_['ldap_group_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the groups\'s display name.'));?>" /></p>
 				<p><label for="ldap_base_groups"><?php p($l->t('Base Group Tree'));?></label><textarea id="ldap_base_groups" name="ldap_base_groups" placeholder="<?php p($l->t('One Group Base DN per line'));?>" data-default="<?php p($_['ldap_base_groups_default']); ?>" title="<?php p($l->t('Base Group Tree'));?>"></textarea></p>
 				<p><label for="ldap_attributes_for_group_search"><?php p($l->t('Group Search Attributes'));?></label><textarea id="ldap_attributes_for_group_search" name="ldap_attributes_for_group_search" placeholder="<?php p($l->t('Optional; one attribute per line'));?>" data-default="<?php p($_['ldap_attributes_for_group_search_default']); ?>" title="<?php p($l->t('Group Search Attributes'));?>"></textarea></p>
-				<p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association'));?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'uniqueMember')) p(' selected'); ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'memberUid')) p(' selected'); ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'member')) p(' selected'); ?>>member (AD)</option></select></p>
+				<p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association'));?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'uniqueMember')) {
+    p(' selected');
+}
+?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'memberUid')) {
+    p(' selected');
+}
+?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'member')) {
+    p(' selected');
+}
+?>>member (AD)</option></select></p>
 				<p><label for="ldap_dynamic_group_member_url"><?php p($l->t('Dynamic Group Member URL'));?></label><input type="text" id="ldap_dynamic_group_member_url" name="ldap_dynamic_group_member_url" title="<?php p($l->t('The LDAP attribute that on group objects contains an LDAP search URL that determines what objects belong to the group. (An empty setting disables dynamic group membership functionality.)'));?>" data-default="<?php p($_['ldap_dynamic_group_member_url_default']); ?>" /></p>
 				<p><label for="ldap_nested_groups"><?php p($l->t('Nested Groups'));?></label><input type="checkbox" id="ldap_nested_groups" name="ldap_nested_groups" value="1" data-default="<?php p($_['ldap_nested_groups_default']); ?>"  title="<?php p($l->t('When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)'));?>" /></p>
 				<p><label for="ldap_paging_size"><?php p($l->t('Paging chunksize'));?></label><input type="number" id="ldap_paging_size" name="ldap_paging_size" title="<?php p($l->t('Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)'));?>" data-default="<?php p($_['ldap_paging_size_default']); ?>" /></p>

apps/files_trashbin/ajax/delete.php

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
 		$list[] = $folder;
 		$folder = dirname($folder);
 	}
-}
-else {
+} else {
 	$deleteAll = false;
 	$files = (string)$_POST['files'];
 	$list = json_decode($files);

apps/files_versions/ajax/rollbackVersion.php

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
 	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
-}else{
+} else{
 	$l = \OC::$server->getL10N('files_versions');
 	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
 }

core/templates/installation.php

Braces +16 added lines, -6 removed lines

@@ -18,8 +18,11 @@ 
 			<?php if(is_array($err)):?>
 				<?php print_unescaped($err['error']); ?>
 				<span class='hint'><?php print_unescaped($err['hint']); ?></span>
-			<?php else: ?>
-				<?php print_unescaped($err); ?>
+			<?php else {
+    : ?>
+				<?php print_unescaped($err);
+}
+?>
 			<?php endif; ?>
 		</p>
 		<?php endforeach; ?>
@@ -75,8 +78,12 @@ 
 
 	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 	<fieldset id='databaseBackend'>
-		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
-			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
+		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) {
+			$hasOtherDB = true;
+} else {
+			    $hasOtherDB =false;
+			}
+			//other than SQLite ?>
 		<legend><?php p($l->t( 'Configure the database' )); ?></legend>
 		<div id="selectDbType">
 		<?php foreach($_['databases'] as $type => $label): ?>
@@ -88,11 +95,14 @@ 
 				<?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a>
 		</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>">
-		<?php else: ?>
+		<?php else {
+    : ?>
 		<input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>"
 			<?php print_unescaped($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/>
 		<label class="<?php p($type) ?>" for="<?php p($type) ?>"><?php p($label) ?></label>
-		<?php endif; ?>
+		<?php endif;
+}
+?>
 		<?php endforeach; ?>
 		</div>
 	</fieldset>

core/templates/404.php

Braces +5 added lines, -2 removed lines

@@ -14,10 +14,13 @@
 ?>
 <?php if (isset($_['content'])): ?>
 	<?php print_unescaped($_['content']) ?>
-<?php else: ?>
+<?php else {
+    : ?>
 	<ul>
 		<li class="error">
-			<?php p($l->t('File not found')); ?><br>
+			<?php p($l->t('File not found'));
+}
+?><br>
 			<p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></p>
 			<p class="hint"><a href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>"><?php p($l->t('You can click here to return to %s.', array($theme->getName()))); ?></a></p>
 		</li>

core/search/ajax/search.php

Braces +1 added lines, -2 removed lines

@@ -56,7 +56,6 @@
 if($query) {
 	$result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size);
 	OC_JSON::encodedPrint($result);
-}
-else {
+} else {
 	echo 'false';
 }

settings/templates/users/main.php

Braces +20 added lines, -5 removed lines

@@ -46,28 +46,40 @@ 
 			<div id="userlistoptions">
 				<p>
 					<input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation" 
-						class="checkbox" <?php if ($_['show_storage_location'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['show_storage_location'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxStorageLocation">
 						<?php p($l->t('Show storage location')) ?>
 					</label>
 				</p>
 				<p>
 					<input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin"
-						class="checkbox" <?php if ($_['show_last_login'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['show_last_login'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxLastLogin">
 						<?php p($l->t('Show last log in')) ?>
 					</label>
 				</p>
 				<p>
 					<input type="checkbox" name="UserBackend" value="UserBackend" id="CheckboxUserBackend"
-						class="checkbox" <?php if ($_['show_backend'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['show_backend'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxUserBackend">
 						<?php p($l->t('Show user backend')) ?>
 					</label>
 				</p>
 				<p>
 					<input type="checkbox" name="MailOnUserCreate" value="MailOnUserCreate" id="CheckboxMailOnUserCreate"
-						class="checkbox" <?php if ($_['send_email'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['send_email'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxMailOnUserCreate">
 						<?php p($l->t('Send email to new user')) ?>
 					</label>
@@ -77,7 +89,10 @@ 
 				</p>
 				<p>
 					<input type="checkbox" name="EmailAddress" value="EmailAddress" id="CheckboxEmailAddress"
-						class="checkbox" <?php if ($_['show_email'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['show_email'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxEmailAddress">
 						<?php p($l->t('Show email address')) ?>
 					</label>

settings/ajax/setquota.php

Braces +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 // Return Success story
 if($username) {
 	$targetUserObject->setQuota($quota);
-}else{//set the default quota when no username is specified
+} else{//set the default quota when no username is specified
 	if($quota === 'default') {//'default' as default quota makes no sense
 		$quota='none';
 	}

settings/users.php

Braces +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 		];
 	}
 	$subAdmins = $result;
-}else{
+} else{
 	/* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
 	$gids = array();
 	foreach($groups as $group) {