merge master into filesystem

6 files changed, 13 insertions, 13 deletions

diff --git a/settings/admin.php b/settings/admin.php
index 9cb70353f9c..c704704ed33 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -20,22 +20,22 @@ $htaccessworking=OC_Util::ishtaccessworking();
 $entries=OC_Log_Owncloud::getEntries(3);
 $entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
 
-function compareEntries($a,$b) {
+function compareEntries($a, $b) {
 	return $b->time - $a->time;
 }
 usort($entries, 'compareEntries');
 
-$tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
-$tmpl->assign('entries',$entries);
+$tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
+$tmpl->assign('entries', $entries);
 $tmpl->assign('entriesremain', $entriesremain);
-$tmpl->assign('htaccessworking',$htaccessworking);
+$tmpl->assign('htaccessworking', $htaccessworking);
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
 $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
 $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
 $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
-$tmpl->assign('forms',array());
+$tmpl->assign('forms', array());
 foreach($forms as $form) {
-	$tmpl->append('forms',$form);
+	$tmpl->append('forms', $form);
 }
 $tmpl->printPage();
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index 22128ef57b5..273b02e3822 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -10,7 +10,7 @@ OC_JSON::checkAdminUser();
 $count=(isset($_GET['count']))?$_GET['count']:50;
 $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
-$entries=OC_Log_Owncloud::getEntries($count,$offset);
+$entries=OC_Log_Owncloud::getEntries($count, $offset);
 OC_JSON::success(array(
 	"data" => OC_Util::sanitizeHTML($entries), 
 	"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 4b32585b306..845f8ea408c 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -36,5 +36,5 @@ if($username) {
 	}
 	OC_Appconfig::setValue('files', 'default_quota', $quota);
 }
-OC_JSON::success(array("data" => array( "username" => $username ,'quota' => $quota)));
+OC_JSON::success(array("data" => array( "username" => $username , 'quota' => $quota)));
 
diff --git a/settings/personal.php b/settings/personal.php
index ab4bfaaf82a..31ab8b783bd 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -40,11 +40,11 @@ $languages=array();
 foreach($languageCodes as $lang) {
 	$l=OC_L10N::get('settings', $lang);
 	if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
-		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
+		$languages[]=array('code'=>$lang, 'name'=>$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])) {
-		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
+		$languages[]=array('code'=>$lang, 'name'=>$languageNames[$lang]);
 	}else{//fallback to language code
-		$languages[]=array('code'=>$lang,'name'=>$lang);
+		$languages[]=array('code'=>$lang, 'name'=>$lang);
 	}
 }
 
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 35f34489fec..300d6093d6f 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -3,7 +3,7 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
-$levels=array('Debug','Info','Warning','Error','Fatal');
+$levels=array('Debug','Info','Warning','Error', 'Fatal');
 ?>
 
 <?php
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 1e9598de1e3..38e2af8a51a 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -16,7 +16,7 @@
 		data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
 		<a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a>
 		<script type="application/javascript">
-			appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app,false) ?>;
+			appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app, false) ?>;
 		</script>
 		<?php  if(!$app['internal']) echo '<small class="externalapp list">3rd party</small>' ?>
 	</li>