nextcloud / server

settings/templates/apps.php

Indentation +14 added lines, -14 removed lines

@@ -1,24 +1,24 @@
 <?php
 style('settings', 'settings');
 vendor_style(
-	'core',
-	[
-		'select2/select2',
-	]
+    'core',
+    [
+        'select2/select2',
+    ]
 );
 vendor_script(
-	'core',
-	[
-		'handlebars/handlebars',
-		'select2/select2'
-	]
+    'core',
+    [
+        'handlebars/handlebars',
+        'select2/select2'
+    ]
 );
 script(
-	'settings',
-	[
-		'settings',
-		'apps',
-	]
+    'settings',
+    [
+        'settings',
+        'apps',
+    ]
 );
 /** @var array $_ */
 ?>

Spacing +12 added lines, -12 removed lines

@@ -29,9 +29,9 @@ 
 	</li>
 {{/each}}
 
-<?php if($_['appstoreEnabled']): ?>
+<?php if ($_['appstoreEnabled']): ?>
 	<li>
-		<a class="app-external" target="_blank" href="https://docs.nextcloud.org/server/9/developer_manual/"><?php p($l->t('Developer documentation'));?> ↗</a>
+		<a class="app-external" target="_blank" href="https://docs.nextcloud.org/server/9/developer_manual/"><?php p($l->t('Developer documentation')); ?> ↗</a>
 	</li>
 <?php endif; ?>
 </script>
@@ -60,7 +60,7 @@ 
 	</h2>
 	<div class="app-version"> {{version}}</div>
 	{{#if profilepage}}<a href="{{profilepage}}" target="_blank" rel="noreferrer">{{/if}}
-	<div class="app-author"><?php p($l->t('by %s', ['{{author}}']));?>
+	<div class="app-author"><?php p($l->t('by %s', ['{{author}}'])); ?>
 		{{#if licence}}
 		(<?php p($l->t('%s-licensed', ['{{licence}}'])); ?>)
 		{{/if}}
@@ -79,23 +79,23 @@ 
 		<!--<div class="app-changed">{{changed}}</div>-->
 		{{#if documentation}}
 		<p class="documentation">
-			<?php p($l->t("Documentation:"));?>
+			<?php p($l->t("Documentation:")); ?>
 			{{#if documentation.user}}
 			<span class="userDocumentation">
-			<a id="userDocumentation" class="appslink" href="{{documentation.user}}" target="_blank"><?php p($l->t('User documentation'));?> ↗</a>
+			<a id="userDocumentation" class="appslink" href="{{documentation.user}}" target="_blank"><?php p($l->t('User documentation')); ?> ↗</a>
 			</span>
 			{{/if}}
 
 			{{#if documentation.admin}}
 			<span class="adminDocumentation">
-			<a id="adminDocumentation" class="appslink" href="{{documentation.admin}}" target="_blank"><?php p($l->t('Admin documentation'));?> ↗</a>
+			<a id="adminDocumentation" class="appslink" href="{{documentation.admin}}" target="_blank"><?php p($l->t('Admin documentation')); ?> ↗</a>
 			</span>
 			{{/if}}
 		</p>
 		{{/if}}
 	</div><!-- end app-description-container -->
-	<div class="app-description-toggle-show"><?php p($l->t("Show description …"));?></div>
-	<div class="app-description-toggle-hide hidden"><?php p($l->t("Hide description …"));?></div>
+	<div class="app-description-toggle-show"><?php p($l->t("Show description …")); ?></div>
+	<div class="app-description-toggle-hide hidden"><?php p($l->t("Hide description …")); ?></div>
 
 	<div class="app-dependencies update hidden">
 		<p><?php p($l->t('This app has an update available.')); ?></p>
@@ -126,7 +126,7 @@ 
 
 	<input class="update hidden" type="submit" value="<?php p($l->t('Update to %s', array('{{update}}'))); ?>" data-appid="{{id}}" />
 	{{#if active}}
-	<input class="enable" type="submit" data-appid="{{id}}" data-active="true" value="<?php p($l->t("Disable"));?>"/>
+	<input class="enable" type="submit" data-appid="{{id}}" data-active="true" value="<?php p($l->t("Disable")); ?>"/>
 	<span class="groups-enable">
 		<input type="checkbox" class="groups-enable__checkbox checkbox" id="groups_enable-{{id}}"/>
 		<label for="groups_enable-{{id}}"><?php p($l->t('Enable only for specific groups')); ?></label>
@@ -134,7 +134,7 @@ 
 	<br />
 	<input type="hidden" id="group_select" title="<?php p($l->t('All')); ?>" style="width: 200px">
 	{{else}}
-	<input class="enable" type="submit" data-appid="{{id}}" data-active="false" {{#unless canInstall}}disabled="disabled"{{/unless}} value="<?php p($l->t("Enable"));?>"/>
+	<input class="enable" type="submit" data-appid="{{id}}" data-active="false" {{#unless canInstall}}disabled="disabled"{{/unless}} value="<?php p($l->t("Enable")); ?>"/>
 	{{/if}}
 	{{#if canUnInstall}}
 	<input class="uninstall" type="submit" value="<?php p($l->t('Uninstall App')); ?>" data-appid="{{id}}" />
@@ -145,7 +145,7 @@ 
 	</div>
 </script>
 
-<div id="app-navigation" class="icon-loading" data-category="<?php p($_['category']);?>">
+<div id="app-navigation" class="icon-loading" data-category="<?php p($_['category']); ?>">
 	<ul id="apps-categories">
 
 	</ul>
@@ -155,7 +155,7 @@ 
 		</div>
 
 		<div id="app-settings-content" class="apps-experimental">
-			<input type="checkbox" id="enable-experimental-apps" <?php if($_['experimentalEnabled']) { print_unescaped('checked="checked"'); }?> class="checkbox">
+			<input type="checkbox" id="enable-experimental-apps" <?php if ($_['experimentalEnabled']) { print_unescaped('checked="checked"'); }?> class="checkbox">
 			<label for="enable-experimental-apps"><?php p($l->t('Enable experimental apps')) ?></label>
 			<p>
 				<small>

settings/templates/users/part.userlist.php

Spacing +16 added lines, -16 removed lines

@@ -1,17 +1,17 @@ 
-<table id="userlist" class="hascontrols grid" data-groups="<?php p($_['allGroups']);?>">
+<table id="userlist" class="hascontrols grid" data-groups="<?php p($_['allGroups']); ?>">
 	<thead>
 		<tr>
 		<?php if ($_['enableAvatars']): ?>
 			<th id="headerAvatar" scope="col"></th>
 		<?php endif; ?>
 			<th id="headerName" scope="col"><?php p($l->t('Username'))?></th>
-			<th id="headerDisplayName" scope="col"><?php p($l->t( 'Full Name' )); ?></th>
-			<th id="headerPassword" scope="col"><?php p($l->t( 'Password' )); ?></th>
-			<th class="mailAddress" scope="col"><?php p($l->t( 'Email' )); ?></th>
-			<th id="headerGroups" scope="col"><?php p($l->t( 'Groups' )); ?></th>
-		<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+			<th id="headerDisplayName" scope="col"><?php p($l->t('Full Name')); ?></th>
+			<th id="headerPassword" scope="col"><?php p($l->t('Password')); ?></th>
+			<th class="mailAddress" scope="col"><?php p($l->t('Email')); ?></th>
+			<th id="headerGroups" scope="col"><?php p($l->t('Groups')); ?></th>
+		<?php if (is_array($_['subadmins']) || $_['subadmins']): ?>
 			<th id="headerSubAdmins" scope="col"><?php p($l->t('Group Admin for')); ?></th>
-		<?php endif;?>
+		<?php endif; ?>
 			<th id="headerQuota" scope="col"><?php p($l->t('Quota')); ?></th>
 			<th class="storageLocation" scope="col"><?php p($l->t('Storage Location')); ?></th>
 			<th class="userBackend" scope="col"><?php p($l->t('User Backend')); ?></th>
@@ -41,26 +41,26 @@ 
 			<td class="groups"><div class="groupsListContainer multiselect button"
 				><span class="title groupsList"></span><span class="icon-triangle-s"></span></div>
 			</td>
-		<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+		<?php if (is_array($_['subadmins']) || $_['subadmins']): ?>
 			<td class="subadmins"><div class="groupsListContainer multiselect button"
 				><span class="title groupsList"></span><span class="icon-triangle-s"></span></div>
 			</td>
-		<?php endif;?>
+		<?php endif; ?>
 			<td class="quota">
 				<select class="quota-user" data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
 					<option	value='default'>
-						<?php p($l->t('Default'));?>
+						<?php p($l->t('Default')); ?>
 					</option>
 					<option value='none'>
-						<?php p($l->t('Unlimited'));?>
+						<?php p($l->t('Unlimited')); ?>
 					</option>
-					<?php foreach($_['quota_preset'] as $preset):?>
-						<option value='<?php p($preset);?>'>
-							<?php p($preset);?>
+					<?php foreach ($_['quota_preset'] as $preset):?>
+						<option value='<?php p($preset); ?>'>
+							<?php p($preset); ?>
 						</option>
-					<?php endforeach;?>
+					<?php endforeach; ?>
 					<option value='other' data-new>
-						<?php p($l->t('Other'));?> ...
+						<?php p($l->t('Other')); ?> ...
 					</option>
 				</select>
 			</td>

settings/templates/personal.php

Indentation +9 added lines, -9 removed lines

@@ -11,12 +11,12 @@ 
 <div id="app-navigation">
 	<ul>
 	<?php foreach($_['forms'] as $form) {
-		if (isset($form['anchor'])) {
-			$anchor = '#' . $form['anchor'];
-			$sectionName = $form['section-name'];
-			print_unescaped(sprintf("<li><a href='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor), \OCP\Util::sanitizeHTML($sectionName)));
-		}
-	}?>
+        if (isset($form['anchor'])) {
+            $anchor = '#' . $form['anchor'];
+            $sectionName = $form['section-name'];
+            print_unescaped(sprintf("<li><a href='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor), \OCP\Util::sanitizeHTML($sectionName)));
+        }
+    }?>
 	</ul>
 </div>
 
@@ -27,7 +27,7 @@ 
 		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
 		<p id="quotatext">
 			<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
-			array($_['usage'], $_['total_space'])));?>
+            array($_['usage'], $_['total_space'])));?>
 		</p>
 	</div>
 </div>
@@ -114,7 +114,7 @@ 
 
 <?php
 if($_['passwordChangeSupported']) {
-	script('jquery-showpassword');
+    script('jquery-showpassword');
 ?>
 <form id="passwordform" class="section">
 	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
@@ -250,7 +250,7 @@ 
 </div>
 
 <?php foreach($_['forms'] as $form) {
-	if (isset($form['form'])) {?>
+    if (isset($form['form'])) {?>
 	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
 	<?php }
 };?>

Spacing +44 added lines, -44 removed lines

@@ -10,9 +10,9 @@ 
 
 <div id="app-navigation">
 	<ul>
-	<?php foreach($_['forms'] as $form) {
+	<?php foreach ($_['forms'] as $form) {
 		if (isset($form['anchor'])) {
-			$anchor = '#' . $form['anchor'];
+			$anchor = '#'.$form['anchor'];
 			$sectionName = $form['section-name'];
 			print_unescaped(sprintf("<li><a href='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor), \OCP\Util::sanitizeHTML($sectionName)));
 		}
@@ -23,11 +23,11 @@ 
 <div id="app-content">
 
 <div id="quota" class="section">
-	<div style="width:<?php p($_['usage_relative']);?>%"
-		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
+	<div style="width:<?php p($_['usage_relative']); ?>%"
+		<?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
 		<p id="quotatext">
 			<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
-			array($_['usage'], $_['total_space'])));?>
+			array($_['usage'], $_['total_space']))); ?>
 		</p>
 	</div>
 </div>
@@ -57,11 +57,11 @@ 
 <?php endif; ?>
 
 <?php
-if($_['displayNameChangeSupported']) {
+if ($_['displayNameChangeSupported']) {
 ?>
 <form id="displaynameform" class="section">
 	<h2>
-		<label for="displayName"><?php echo $l->t('Full name');?></label>
+		<label for="displayName"><?php echo $l->t('Full name'); ?></label>
 	</h2>
 	<input type="text" id="displayName" name="displayName"
 		value="<?php p($_['displayName'])?>"
@@ -73,32 +73,32 @@ 
 } else {
 ?>
 <div id="displaynameform" class="section">
-	<h2><?php echo $l->t('Full name');?></h2>
-	<span><?php if(isset($_['displayName'][0])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
+	<h2><?php echo $l->t('Full name'); ?></h2>
+	<span><?php if (isset($_['displayName'][0])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
 </div>
 <?php
 }
 ?>
 
 <?php
-if($_['displayNameChangeSupported']) {
+if ($_['displayNameChangeSupported']) {
 ?>
 <form id="lostpassword" class="section">
 	<h2>
-		<label for="email"><?php p($l->t('Email'));?></label>
+		<label for="email"><?php p($l->t('Email')); ?></label>
 	</h2>
 	<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
-		placeholder="<?php p($l->t('Your email address'));?>"
+		placeholder="<?php p($l->t('Your email address')); ?>"
 		autocomplete="on" autocapitalize="off" autocorrect="off" />
 	<span class="msg"></span><br />
-	<em><?php p($l->t('For password recovery and notifications'));?></em>
+	<em><?php p($l->t('For password recovery and notifications')); ?></em>
 </form>
 <?php
 } else {
 ?>
 <div id="lostpassword" class="section">
 	<h2><?php echo $l->t('Email'); ?></h2>
-	<span><?php if(isset($_['email'][0])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
+	<span><?php if (isset($_['email'][0])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
 </div>
 <?php
 }
@@ -113,24 +113,24 @@ 
 </div>
 
 <?php
-if($_['passwordChangeSupported']) {
+if ($_['passwordChangeSupported']) {
 	script('jquery-showpassword');
 ?>
 <form id="passwordform" class="section">
-	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
+	<h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
 	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
 	<br>
-	<label for="pass1" class="onlyInIE8"><?php echo $l->t('Current password');?>: </label>
+	<label for="pass1" class="onlyInIE8"><?php echo $l->t('Current password'); ?>: </label>
 	<input type="password" id="pass1" name="oldpassword"
-		placeholder="<?php echo $l->t('Current password');?>"
+		placeholder="<?php echo $l->t('Current password'); ?>"
 		autocomplete="off" autocapitalize="off" autocorrect="off" />
-	<label for="pass2" class="onlyInIE8"><?php echo $l->t('New password');?>: </label>
+	<label for="pass2" class="onlyInIE8"><?php echo $l->t('New password'); ?>: </label>
 	<input type="password" id="pass2" name="personal-password"
-		placeholder="<?php echo $l->t('New password');?>"
+		placeholder="<?php echo $l->t('New password'); ?>"
 		data-typetoggle="#personal-show"
 		autocomplete="off" autocapitalize="off" autocorrect="off" />
 	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show" class="svg"></label>
-	<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
+	<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password'); ?>" />
 	<br/>
 </form>
 <?php
@@ -139,45 +139,45 @@ 
 
 <form id="language" class="section">
 	<h2>
-		<label for="languageinput"><?php p($l->t('Language'));?></label>
+		<label for="languageinput"><?php p($l->t('Language')); ?></label>
 	</h2>
-	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
-		<option value="<?php p($_['activelanguage']['code']);?>">
-			<?php p($_['activelanguage']['name']);?>
+	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
+		<option value="<?php p($_['activelanguage']['code']); ?>">
+			<?php p($_['activelanguage']['name']); ?>
 		</option>
-		<?php foreach($_['commonlanguages'] as $language):?>
-			<option value="<?php p($language['code']);?>">
-				<?php p($language['name']);?>
+		<?php foreach ($_['commonlanguages'] as $language):?>
+			<option value="<?php p($language['code']); ?>">
+				<?php p($language['name']); ?>
 			</option>
-		<?php endforeach;?>
+		<?php endforeach; ?>
 		<optgroup label="––––––––––"></optgroup>
-		<?php foreach($_['languages'] as $language):?>
-			<option value="<?php p($language['code']);?>">
-				<?php p($language['name']);?>
+		<?php foreach ($_['languages'] as $language):?>
+			<option value="<?php p($language['code']); ?>">
+				<?php p($language['name']); ?>
 			</option>
-		<?php endforeach;?>
+		<?php endforeach; ?>
 	</select>
 	<?php if (OC_Util::getEditionString() === ''): ?>
 	<a href="https://www.transifex.com/nextcloud/nextcloud/"
 		target="_blank" rel="noreferrer">
-		<em><?php p($l->t('Help translate'));?></em>
+		<em><?php p($l->t('Help translate')); ?></em>
 	</a>
 	<?php endif; ?>
 </form>
 
 <div id="clientsbox" class="section clientsbox">
-	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
+	<h2><?php p($l->t('Get the apps to sync your files')); ?></h2>
 	<a href="<?php p($_['clients']['desktop']); ?>" target="_blank">
 		<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'desktopapp.svg')); ?>"
-			alt="<?php p($l->t('Desktop client'));?>" />
+			alt="<?php p($l->t('Desktop client')); ?>" />
 	</a>
 	<a href="<?php p($_['clients']['android']); ?>" target="_blank">
 		<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'googleplay.png')); ?>"
-			alt="<?php p($l->t('Android app'));?>" />
+			alt="<?php p($l->t('Android app')); ?>" />
 	</a>
 	<a href="<?php p($_['clients']['ios']); ?>" target="_blank">
 		<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'appstore.svg')); ?>"
-			alt="<?php p($l->t('iOS app'));?>" />
+			alt="<?php p($l->t('iOS app')); ?>" />
 	</a>
 
 	<?php if (OC_Util::getEditionString() === ''): ?>
@@ -187,23 +187,23 @@ 
 			target="_blank" rel="noreferrer">join development</a>
 		or
 		<a href="https://help.nextcloud.com/"
-			target="_blank" rel="noreferrer">help other users</a>!'));?>
+			target="_blank" rel="noreferrer">help other users</a>!')); ?>
 	</p>
 	<?php endif; ?>
 
-	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
-	<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p>
+	<?php if (OC_APP::isEnabled('firstrunwizard')) {?>
+	<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again')); ?></a></p>
 	<?php }?>
 </div>
 
-<?php foreach($_['forms'] as $form) {
+<?php foreach ($_['forms'] as $form) {
 	if (isset($form['form'])) {?>
-	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
+	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p(''); ?>"><?php print_unescaped($form['form']); ?></div>
 	<?php }
 };?>
 
 <div class="section">
-	<h2><?php p($l->t('Version'));?></h2>
+	<h2><?php p($l->t('Version')); ?></h2>
 	<p><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></p>
 	<p><?php include('settings.development.notice.php'); ?></p>
 </div>

Braces +5 added lines, -2 removed lines

@@ -44,8 +44,11 @@
 		<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
 		<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
 		<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
-		<?php else: ?>
-		<?php p($l->t('Picture provided by original account')); ?>
+		<?php else {
+    : ?>
+		<?php p($l->t('Picture provided by original account'));
+}
+?>
 		<?php endif; ?>
 	</div>
 

settings/ajax/setlanguage.php

Indentation +9 added lines, -9 removed lines

@@ -33,14 +33,14 @@
 
 // Get data
 if( isset( $_POST['lang'] ) ) {
-	$languageCodes = \OC::$server->getL10NFactory()->findAvailableLanguages();
-	$lang = (string)$_POST['lang'];
-	if(array_search($lang, $languageCodes) or $lang === 'en') {
-		\OC::$server->getConfig()->setUserValue( OC_User::getUser(), 'core', 'lang', $lang );
-		OC_JSON::success(array("data" => array( "message" => $l->t("Language changed") )));
-	}else{
-		OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
-	}
+    $languageCodes = \OC::$server->getL10NFactory()->findAvailableLanguages();
+    $lang = (string)$_POST['lang'];
+    if(array_search($lang, $languageCodes) or $lang === 'en') {
+        \OC::$server->getConfig()->setUserValue( OC_User::getUser(), 'core', 'lang', $lang );
+        OC_JSON::success(array("data" => array( "message" => $l->t("Language changed") )));
+    }else{
+        OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
+    }
 }else{
-	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
+    OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
 }

Spacing +9 added lines, -9 removed lines

@@ -32,15 +32,15 @@
 
 
 // Get data
-if( isset( $_POST['lang'] ) ) {
+if (isset($_POST['lang'])) {
 	$languageCodes = \OC::$server->getL10NFactory()->findAvailableLanguages();
-	$lang = (string)$_POST['lang'];
-	if(array_search($lang, $languageCodes) or $lang === 'en') {
-		\OC::$server->getConfig()->setUserValue( OC_User::getUser(), 'core', 'lang', $lang );
-		OC_JSON::success(array("data" => array( "message" => $l->t("Language changed") )));
-	}else{
-		OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
+	$lang = (string) $_POST['lang'];
+	if (array_search($lang, $languageCodes) or $lang === 'en') {
+		\OC::$server->getConfig()->setUserValue(OC_User::getUser(), 'core', 'lang', $lang);
+		OC_JSON::success(array("data" => array("message" => $l->t("Language changed"))));
+	} else {
+		OC_JSON::error(array("data" => array("message" => $l->t("Invalid request"))));
 	}
-}else{
-	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
+} else {
+	OC_JSON::error(array("data" => array("message" => $l->t("Invalid request"))));
 }

Braces +2 added lines, -2 removed lines

@@ -38,9 +38,9 @@
 	if(array_search($lang, $languageCodes) or $lang === 'en') {
 		\OC::$server->getConfig()->setUserValue( OC_User::getUser(), 'core', 'lang', $lang );
 		OC_JSON::success(array("data" => array( "message" => $l->t("Language changed") )));
-	}else{
+	} else{
 		OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
 	}
-}else{
+} else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
 }

settings/ajax/togglesubadmins.php

Indentation +3 added lines, -3 removed lines

@@ -33,14 +33,14 @@
 
 $isSubAdminOfGroup = false;
 if($targetUserObject !== null && $targetUserObject !== null) {
-	$isSubAdminOfGroup = $subAdminManager->isSubAdminofGroup($targetUserObject, $targetGroupObject);
+    $isSubAdminOfGroup = $subAdminManager->isSubAdminofGroup($targetUserObject, $targetGroupObject);
 }
 
 // Toggle group
 if($isSubAdminOfGroup) {
-	$subAdminManager->deleteSubAdmin($targetUserObject, $targetGroupObject);
+    $subAdminManager->deleteSubAdmin($targetUserObject, $targetGroupObject);
 } else {
-	$subAdminManager->createSubAdmin($targetUserObject, $targetGroupObject);
+    $subAdminManager->createSubAdmin($targetUserObject, $targetGroupObject);
 }
 
 OC_JSON::success();

Spacing +4 added lines, -4 removed lines

@@ -24,20 +24,20 @@
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
-$username = (string)$_POST['username'];
-$group = (string)$_POST['group'];
+$username = (string) $_POST['username'];
+$group = (string) $_POST['group'];
 
 $subAdminManager = \OC::$server->getGroupManager()->getSubAdmin();
 $targetUserObject = \OC::$server->getUserManager()->get($username);
 $targetGroupObject = \OC::$server->getGroupManager()->get($group);
 
 $isSubAdminOfGroup = false;
-if($targetUserObject !== null && $targetUserObject !== null) {
+if ($targetUserObject !== null && $targetUserObject !== null) {
 	$isSubAdminOfGroup = $subAdminManager->isSubAdminofGroup($targetUserObject, $targetGroupObject);
 }
 
 // Toggle group
-if($isSubAdminOfGroup) {
+if ($isSubAdminOfGroup) {
 	$subAdminManager->deleteSubAdmin($targetUserObject, $targetGroupObject);
 } else {
 	$subAdminManager->createSubAdmin($targetUserObject, $targetGroupObject);

settings/ajax/disableapp.php

Indentation +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
 OCP\JSON::callCheck();
 
 if (!array_key_exists('appid', $_POST)) {
-	OC_JSON::error();
-	exit;
+    OC_JSON::error();
+    exit;
 }
 
 $appId = (string)$_POST['appid'];

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	exit;
 }
 
-$appId = (string)$_POST['appid'];
+$appId = (string) $_POST['appid'];
 $appId = OC_App::cleanAppId($appId);
 
 OC_App::disable($appId);

settings/ajax/enableapp.php

Indentation +5 added lines, -5 removed lines

@@ -31,10 +31,10 @@
 $groups = isset($_POST['groups']) ? (array)$_POST['groups'] : null;
 
 try {
-	$app = OC_App::cleanAppId((string)$_POST['appid']);
-	OC_App::enable($app, $groups);
-	OC_JSON::success(['data' => ['update_required' => \OC_App::shouldUpgrade($app)]]);
+    $app = OC_App::cleanAppId((string)$_POST['appid']);
+    OC_App::enable($app, $groups);
+    OC_JSON::success(['data' => ['update_required' => \OC_App::shouldUpgrade($app)]]);
 } catch (Exception $e) {
-	\OCP\Util::writeLog('core', $e->getMessage(), \OCP\Util::ERROR);
-	OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
+    \OCP\Util::writeLog('core', $e->getMessage(), \OCP\Util::ERROR);
+    OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
 }

Spacing +3 added lines, -3 removed lines

@@ -28,13 +28,13 @@
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
-$groups = isset($_POST['groups']) ? (array)$_POST['groups'] : null;
+$groups = isset($_POST['groups']) ? (array) $_POST['groups'] : null;
 
 try {
-	$app = OC_App::cleanAppId((string)$_POST['appid']);
+	$app = OC_App::cleanAppId((string) $_POST['appid']);
 	OC_App::enable($app, $groups);
 	OC_JSON::success(['data' => ['update_required' => \OC_App::shouldUpgrade($app)]]);
 } catch (Exception $e) {
 	\OCP\Util::writeLog('core', $e->getMessage(), \OCP\Util::ERROR);
-	OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
+	OC_JSON::error(array("data" => array("message" => $e->getMessage())));
 }

settings/ajax/togglegroups.php

Indentation +18 added lines, -18 removed lines

@@ -33,9 +33,9 @@ 
 $group = (string)$_POST['group'];
 
 if($username === OC_User::getUser() && $group === "admin" &&  OC_User::isAdminUser($username)) {
-	$l = \OC::$server->getL10N('core');
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
-	exit();
+    $l = \OC::$server->getL10N('core');
+    OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
+    exit();
 }
 
 $isUserAccessible = false;
@@ -44,20 +44,20 @@ 
 $targetUserObject = \OC::$server->getUserManager()->get($username);
 $targetGroupObject = \OC::$server->getGroupManager()->get($group);
 if($targetUserObject !== null && $currentUserObject !== null && $targetGroupObject !== null) {
-	$isUserAccessible = \OC::$server->getGroupManager()->getSubAdmin()->isUserAccessible($currentUserObject, $targetUserObject);
-	$isGroupAccessible = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdminofGroup($currentUserObject, $targetGroupObject);
+    $isUserAccessible = \OC::$server->getGroupManager()->getSubAdmin()->isUserAccessible($currentUserObject, $targetUserObject);
+    $isGroupAccessible = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdminofGroup($currentUserObject, $targetGroupObject);
 }
 
 if(!OC_User::isAdminUser(OC_User::getUser())
-	&& (!$isUserAccessible
-		|| !$isGroupAccessible)) {
-	$l = \OC::$server->getL10N('core');
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
-	exit();
+    && (!$isUserAccessible
+        || !$isGroupAccessible)) {
+    $l = \OC::$server->getL10N('core');
+    OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+    exit();
 }
 
 if(!OC_Group::groupExists($group)) {
-	OC_Group::createGroup($group);
+    OC_Group::createGroup($group);
 }
 
 $l = \OC::$server->getL10N('settings');
@@ -67,19 +67,19 @@ 
 
 // Toggle group
 if( OC_Group::inGroup( $username, $group )) {
-	$action = "remove";
-	$error = $l->t("Unable to remove user from group %s", $group);
-	$success = OC_Group::removeFromGroup( $username, $group );
-	$usersInGroup=OC_Group::usersInGroup($group);
+    $action = "remove";
+    $error = $l->t("Unable to remove user from group %s", $group);
+    $success = OC_Group::removeFromGroup( $username, $group );
+    $usersInGroup=OC_Group::usersInGroup($group);
 }
 else{
-	$success = OC_Group::addToGroup( $username, $group );
+    $success = OC_Group::addToGroup( $username, $group );
 }
 
 // Return Success story
 if( $success ) {
-	OC_JSON::success(array("data" => array( "username" => $username, "action" => $action, "groupname" => $group )));
+    OC_JSON::success(array("data" => array( "username" => $username, "action" => $action, "groupname" => $group )));
 }
 else{
-	OC_JSON::error(array("data" => array( "message" => $error )));
+    OC_JSON::error(array("data" => array( "message" => $error )));
 }

Spacing +17 added lines, -17 removed lines

@@ -29,12 +29,12 @@ 
 OCP\JSON::callCheck();
 
 $success = true;
-$username = (string)$_POST['username'];
-$group = (string)$_POST['group'];
+$username = (string) $_POST['username'];
+$group = (string) $_POST['group'];
 
-if($username === OC_User::getUser() && $group === "admin" &&  OC_User::isAdminUser($username)) {
+if ($username === OC_User::getUser() && $group === "admin" && OC_User::isAdminUser($username)) {
 	$l = \OC::$server->getL10N('core');
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
+	OC_JSON::error(array('data' => array('message' => $l->t('Admins can\'t remove themself from the admin group'))));
 	exit();
 }
 
@@ -43,20 +43,20 @@ 
 $currentUserObject = \OC::$server->getUserSession()->getUser();
 $targetUserObject = \OC::$server->getUserManager()->get($username);
 $targetGroupObject = \OC::$server->getGroupManager()->get($group);
-if($targetUserObject !== null && $currentUserObject !== null && $targetGroupObject !== null) {
+if ($targetUserObject !== null && $currentUserObject !== null && $targetGroupObject !== null) {
 	$isUserAccessible = \OC::$server->getGroupManager()->getSubAdmin()->isUserAccessible($currentUserObject, $targetUserObject);
 	$isGroupAccessible = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdminofGroup($currentUserObject, $targetGroupObject);
 }
 
-if(!OC_User::isAdminUser(OC_User::getUser())
+if (!OC_User::isAdminUser(OC_User::getUser())
 	&& (!$isUserAccessible
 		|| !$isGroupAccessible)) {
 	$l = \OC::$server->getL10N('core');
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	OC_JSON::error(array('data' => array('message' => $l->t('Authentication error'))));
 	exit();
 }
 
-if(!OC_Group::groupExists($group)) {
+if (!OC_Group::groupExists($group)) {
 	OC_Group::createGroup($group);
 }
 
@@ -66,20 +66,20 @@ 
 $action = "add";
 
 // Toggle group
-if( OC_Group::inGroup( $username, $group )) {
+if (OC_Group::inGroup($username, $group)) {
 	$action = "remove";
 	$error = $l->t("Unable to remove user from group %s", $group);
-	$success = OC_Group::removeFromGroup( $username, $group );
-	$usersInGroup=OC_Group::usersInGroup($group);
+	$success = OC_Group::removeFromGroup($username, $group);
+	$usersInGroup = OC_Group::usersInGroup($group);
 }
-else{
-	$success = OC_Group::addToGroup( $username, $group );
+else {
+	$success = OC_Group::addToGroup($username, $group);
 }
 
 // Return Success story
-if( $success ) {
-	OC_JSON::success(array("data" => array( "username" => $username, "action" => $action, "groupname" => $group )));
+if ($success) {
+	OC_JSON::success(array("data" => array("username" => $username, "action" => $action, "groupname" => $group)));
 }
-else{
-	OC_JSON::error(array("data" => array( "message" => $error )));
+else {
+	OC_JSON::error(array("data" => array("message" => $error)));
 }

Braces +2 added lines, -4 removed lines

@@ -71,15 +71,13 @@
 	$error = $l->t("Unable to remove user from group %s", $group);
 	$success = OC_Group::removeFromGroup( $username, $group );
 	$usersInGroup=OC_Group::usersInGroup($group);
-}
-else{
+} else{
 	$success = OC_Group::addToGroup( $username, $group );
 }
 
 // Return Success story
 if( $success ) {
 	OC_JSON::success(array("data" => array( "username" => $username, "action" => $action, "groupname" => $group )));
-}
-else{
+} else{
 	OC_JSON::error(array("data" => array( "message" => $error )));
 }

settings/ajax/installapp.php

Indentation +8 added lines, -8 removed lines

@@ -25,8 +25,8 @@ 
 OCP\JSON::callCheck();
 
 if (!array_key_exists('appid', $_POST)) {
-	OC_JSON::error();
-	exit;
+    OC_JSON::error();
+    exit;
 }
 
 $appId = (string)$_POST['appid'];
@@ -34,11 +34,11 @@ 
 
 $result = OC_App::installApp($appId);
 if($result !== false) {
-	// FIXME: Clear the cache - move that into some sane helper method
-	\OC::$server->getMemCacheFactory()->create('settings')->remove('listApps-0');
-	\OC::$server->getMemCacheFactory()->create('settings')->remove('listApps-1');
-	OC_JSON::success(array('data' => array('appid' => $appId)));
+    // FIXME: Clear the cache - move that into some sane helper method
+    \OC::$server->getMemCacheFactory()->create('settings')->remove('listApps-0');
+    \OC::$server->getMemCacheFactory()->create('settings')->remove('listApps-1');
+    OC_JSON::success(array('data' => array('appid' => $appId)));
 } else {
-	$l = \OC::$server->getL10N('settings');
-	OC_JSON::error(array("data" => array( "message" => $l->t("Couldn't remove app.") )));
+    $l = \OC::$server->getL10N('settings');
+    OC_JSON::error(array("data" => array( "message" => $l->t("Couldn't remove app.") )));
 }

Spacing +3 added lines, -3 removed lines

@@ -29,16 +29,16 @@
 	exit;
 }
 
-$appId = (string)$_POST['appid'];
+$appId = (string) $_POST['appid'];
 $appId = OC_App::cleanAppId($appId);
 
 $result = OC_App::installApp($appId);
-if($result !== false) {
+if ($result !== false) {
 	// FIXME: Clear the cache - move that into some sane helper method
 	\OC::$server->getMemCacheFactory()->create('settings')->remove('listApps-0');
 	\OC::$server->getMemCacheFactory()->create('settings')->remove('listApps-1');
 	OC_JSON::success(array('data' => array('appid' => $appId)));
 } else {
 	$l = \OC::$server->getL10N('settings');
-	OC_JSON::error(array("data" => array( "message" => $l->t("Couldn't remove app.") )));
+	OC_JSON::error(array("data" => array("message" => $l->t("Couldn't remove app."))));
 }