nextcloud / server

apps/files_versions/ajax/preview.php

Indentation +19 added lines, -19 removed lines

@@ -26,7 +26,7 @@ 
 \OC_Util::checkLoggedIn();
 
 if(!\OC_App::isEnabled('files_versions')){
-	exit;
+    exit;
 }
 
 $file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : '';
@@ -36,31 +36,31 @@ 
 $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
 
 if($file === '' && $version === '') {
-	\OC_Response::setStatus(400); //400 Bad Request
-	\OCP\Util::writeLog('versions-preview', 'No file parameter was passed', \OCP\Util::DEBUG);
-	exit;
+    \OC_Response::setStatus(400); //400 Bad Request
+    \OCP\Util::writeLog('versions-preview', 'No file parameter was passed', \OCP\Util::DEBUG);
+    exit;
 }
 
 if($maxX === 0 || $maxY === 0) {
-	\OC_Response::setStatus(400); //400 Bad Request
-	\OCP\Util::writeLog('versions-preview', 'x and/or y set to 0', \OCP\Util::DEBUG);
-	exit;
+    \OC_Response::setStatus(400); //400 Bad Request
+    \OCP\Util::writeLog('versions-preview', 'x and/or y set to 0', \OCP\Util::DEBUG);
+    exit;
 }
 
 try {
-	list($user, $file) = \OCA\Files_Versions\Storage::getUidAndFilename($file);
-	$preview = new \OC\Preview($user, 'files_versions', $file.'.v'.$version);
-	$mimetype = \OC::$server->getMimeTypeDetector()->detectPath($file);
-	$preview->setMimetype($mimetype);
-	$preview->setMaxX($maxX);
-	$preview->setMaxY($maxY);
-	$preview->setScalingUp($scalingUp);
+    list($user, $file) = \OCA\Files_Versions\Storage::getUidAndFilename($file);
+    $preview = new \OC\Preview($user, 'files_versions', $file.'.v'.$version);
+    $mimetype = \OC::$server->getMimeTypeDetector()->detectPath($file);
+    $preview->setMimetype($mimetype);
+    $preview->setMaxX($maxX);
+    $preview->setMaxY($maxY);
+    $preview->setScalingUp($scalingUp);
 
-	$preview->showPreview();
+    $preview->showPreview();
 } catch (\OCP\Files\NotFoundException $e) {
-	\OC_Response::setStatus(404);
-	\OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG);
+    \OC_Response::setStatus(404);
+    \OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG);
 } catch (\Exception $e) {
-	\OC_Response::setStatus(500);
-	\OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG);
+    \OC_Response::setStatus(500);
+    \OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG);
 }

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
  */
 \OC_Util::checkLoggedIn();
 
-if(!\OC_App::isEnabled('files_versions')){
+if (!\OC_App::isEnabled('files_versions')) {
 	exit;
 }
 
@@ -35,13 +35,13 @@ 
 $version = array_key_exists('version', $_GET) ? $_GET['version'] : '';
 $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
 
-if($file === '' && $version === '') {
+if ($file === '' && $version === '') {
 	\OC_Response::setStatus(400); //400 Bad Request
 	\OCP\Util::writeLog('versions-preview', 'No file parameter was passed', \OCP\Util::DEBUG);
 	exit;
 }
 
-if($maxX === 0 || $maxY === 0) {
+if ($maxX === 0 || $maxY === 0) {
 	\OC_Response::setStatus(400); //400 Bad Request
 	\OCP\Util::writeLog('versions-preview', 'x and/or y set to 0', \OCP\Util::DEBUG);
 	exit;

apps/files_versions/appinfo/routes.php

Indentation +4 added lines, -4 removed lines

@@ -33,13 +33,13 @@
 /** @var $this \OCP\Route\IRouter */
 $this->create('core_ajax_versions_preview', '/preview')->action(
 function() {
-	require_once __DIR__ . '/../ajax/preview.php';
+    require_once __DIR__ . '/../ajax/preview.php';
 });
 
 $this->create('files_versions_download', 'download.php')
-	->actionInclude('files_versions/download.php');
+    ->actionInclude('files_versions/download.php');
 $this->create('files_versions_ajax_getVersions', 'ajax/getVersions.php')
-	->actionInclude('files_versions/ajax/getVersions.php');
+    ->actionInclude('files_versions/ajax/getVersions.php');
 $this->create('files_versions_ajax_rollbackVersion', 'ajax/rollbackVersion.php')
-	->actionInclude('files_versions/ajax/rollbackVersion.php');
+    ->actionInclude('files_versions/ajax/rollbackVersion.php');
 

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 /** @var $this \OCP\Route\IRouter */
 $this->create('core_ajax_versions_preview', '/preview')->action(
 function() {
-	require_once __DIR__ . '/../ajax/preview.php';
+	require_once __DIR__.'/../ajax/preview.php';
 });
 
 $this->create('files_versions_download', 'download.php')

apps/files_versions/download.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 OCP\JSON::checkLoggedIn();
 
 $file = $_GET['file'];
-$revision=(int)$_GET['revision'];
+$revision = (int) $_GET['revision'];
 
 list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
 

core/templates/internalaltmail.php

Indentation +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link'])));
 if ( isset($_['expiration']) ) {
-	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
-	print_unescaped("\n\n");
+    print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
+    print_unescaped("\n\n");
 }
 // TRANSLATORS term at the end of a mail
 p($l->t("Cheers!"));

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link'])));
-if ( isset($_['expiration']) ) {
+if (isset($_['expiration'])) {
 	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
 	print_unescaped("\n\n");
 }
@@ -9,5 +9,5 @@ 
 ?>
 
 --
-<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
+<?php p($theme->getName().' - '.$theme->getSlogan()); ?>
 <?php print_unescaped("\n".$theme->getBaseUrl());

core/templates/internalmail.php

Indentation +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
 <?php
 print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link'])));
 if ( isset($_['expiration']) ) {
-	p($l->t("The share will expire on %s.", array($_['expiration'])));
-	print_unescaped('<br><br>');
+    p($l->t("The share will expire on %s.", array($_['expiration'])));
+    print_unescaped('<br><br>');
 }
 // TRANSLATORS term at the end of a mail
 p($l->t('Cheers!'));

Spacing +4 added lines, -4 removed lines

@@ -2,8 +2,8 @@ 
 <tr><td>
 <table cellspacing="0" cellpadding="0" border="0" width="600px">
 <tr>
-<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
-<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
+<td bgcolor="<?php p($theme->getMailHeaderColor()); ?>" width="20px">&nbsp;</td>
+<td bgcolor="<?php p($theme->getMailHeaderColor()); ?>">
 <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 </td>
 </tr>
@@ -13,7 +13,7 @@ 
 <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
 <?php
 print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link'])));
-if ( isset($_['expiration']) ) {
+if (isset($_['expiration'])) {
 	p($l->t("The share will expire on %s.", array($_['expiration'])));
 	print_unescaped('<br><br>');
 }
@@ -28,7 +28,7 @@ 
 <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
 <?php p($theme->getName()); ?> -
 <?php p($theme->getSlogan()); ?>
-<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
+<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
 </td>
 </tr>
 <tr>

core/ajax/preview.php

Spacing +5 added lines, -5 removed lines

@@ -27,12 +27,12 @@
 \OC_Util::checkLoggedIn();
 \OC::$server->getSession()->close();
 
-$file = array_key_exists('file', $_GET) ? (string)$_GET['file'] : '';
-$maxX = array_key_exists('x', $_GET) ? (int)$_GET['x'] : '32';
-$maxY = array_key_exists('y', $_GET) ? (int)$_GET['y'] : '32';
-$scalingUp = array_key_exists('scalingup', $_GET) ? (bool)$_GET['scalingup'] : true;
+$file = array_key_exists('file', $_GET) ? (string) $_GET['file'] : '';
+$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '32';
+$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '32';
+$scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
 $keepAspect = array_key_exists('a', $_GET) ? true : false;
-$always = array_key_exists('forceIcon', $_GET) ? (bool)$_GET['forceIcon'] : true;
+$always = array_key_exists('forceIcon', $_GET) ? (bool) $_GET['forceIcon'] : true;
 $mode = array_key_exists('mode', $_GET) ? $_GET['mode'] : 'fill';
 
 if ($file === '') {

Indentation +17 added lines, -17 removed lines

@@ -36,30 +36,30 @@
 $mode = array_key_exists('mode', $_GET) ? $_GET['mode'] : 'fill';
 
 if ($file === '') {
-	//400 Bad Request
-	\OC_Response::setStatus(400);
-	\OCP\Util::writeLog('core-preview', 'No file parameter was passed', \OCP\Util::DEBUG);
-	exit;
+    //400 Bad Request
+    \OC_Response::setStatus(400);
+    \OCP\Util::writeLog('core-preview', 'No file parameter was passed', \OCP\Util::DEBUG);
+    exit;
 }
 
 if ($maxX === 0 || $maxY === 0) {
-	//400 Bad Request
-	\OC_Response::setStatus(400);
-	\OCP\Util::writeLog('core-preview', 'x and/or y set to 0', \OCP\Util::DEBUG);
-	exit;
+    //400 Bad Request
+    \OC_Response::setStatus(400);
+    \OCP\Util::writeLog('core-preview', 'x and/or y set to 0', \OCP\Util::DEBUG);
+    exit;
 }
 
 $info = \OC\Files\Filesystem::getFileInfo($file);
 
 if (!$info instanceof OCP\Files\FileInfo || !$always && !\OC::$server->getPreviewManager()->isAvailable($info)) {
-	\OC_Response::setStatus(404);
+    \OC_Response::setStatus(404);
 } else {
-	$preview = new \OC\Preview(\OC_User::getUser(), 'files');
-	$preview->setFile($file, $info);
-	$preview->setMaxX($maxX);
-	$preview->setMaxY($maxY);
-	$preview->setScalingUp($scalingUp);
-	$preview->setMode($mode);
-	$preview->setKeepAspect($keepAspect);
-	$preview->showPreview();
+    $preview = new \OC\Preview(\OC_User::getUser(), 'files');
+    $preview->setFile($file, $info);
+    $preview->setMaxX($maxX);
+    $preview->setMaxY($maxY);
+    $preview->setScalingUp($scalingUp);
+    $preview->setMode($mode);
+    $preview->setKeepAspect($keepAspect);
+    $preview->showPreview();
 }

core/ajax/appconfig.php

Indentation +24 added lines, -24 removed lines

@@ -29,7 +29,7 @@ 
 $action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
 
 if(isset($_POST['app']) || isset($_GET['app'])) {
-	$app=OC_App::cleanAppId(isset($_POST['app'])? (string)$_POST['app']: (string)$_GET['app']);
+    $app=OC_App::cleanAppId(isset($_POST['app'])? (string)$_POST['app']: (string)$_GET['app']);
 }
 
 // An admin should not be able to add remote and public services
@@ -37,34 +37,34 @@ 
 // This change is due the fact that an admin may not be expected 
 // to execute arbitrary code in every environment.
 if($app === 'core' && isset($_POST['key']) &&(substr((string)$_POST['key'],0,7) === 'remote_' || substr((string)$_POST['key'],0,7) === 'public_')) {
-	OC_JSON::error(array('data' => array('message' => 'Unexpected error!')));
-	return;
+    OC_JSON::error(array('data' => array('message' => 'Unexpected error!')));
+    return;
 }
 
 $result=false;
 $appConfig = \OC::$server->getAppConfig();
 switch($action) {
-	case 'getValue':
-		$result=$appConfig->getValue($app, (string)$_GET['key'], (string)$_GET['defaultValue']);
-		break;
-	case 'setValue':
-		$result=$appConfig->setValue($app, (string)$_POST['key'], (string)$_POST['value']);
-		break;
-	case 'getApps':
-		$result=$appConfig->getApps();
-		break;
-	case 'getKeys':
-		$result=$appConfig->getKeys($app);
-		break;
-	case 'hasKey':
-		$result=$appConfig->hasKey($app, (string)$_GET['key']);
-		break;
-	case 'deleteKey':
-		$result=$appConfig->deleteKey($app, (string)$_POST['key']);
-		break;
-	case 'deleteApp':
-		$result=$appConfig->deleteApp($app);
-		break;
+    case 'getValue':
+        $result=$appConfig->getValue($app, (string)$_GET['key'], (string)$_GET['defaultValue']);
+        break;
+    case 'setValue':
+        $result=$appConfig->setValue($app, (string)$_POST['key'], (string)$_POST['value']);
+        break;
+    case 'getApps':
+        $result=$appConfig->getApps();
+        break;
+    case 'getKeys':
+        $result=$appConfig->getKeys($app);
+        break;
+    case 'hasKey':
+        $result=$appConfig->hasKey($app, (string)$_GET['key']);
+        break;
+    case 'deleteKey':
+        $result=$appConfig->deleteKey($app, (string)$_POST['key']);
+        break;
+    case 'deleteApp':
+        $result=$appConfig->deleteApp($app);
+        break;
 }
 OC_JSON::success(array('data'=>$result));
 

Spacing +13 added lines, -13 removed lines

@@ -26,44 +26,44 @@
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
-$action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
+$action = isset($_POST['action']) ? $_POST['action'] : $_GET['action'];
 
-if(isset($_POST['app']) || isset($_GET['app'])) {
-	$app=OC_App::cleanAppId(isset($_POST['app'])? (string)$_POST['app']: (string)$_GET['app']);
+if (isset($_POST['app']) || isset($_GET['app'])) {
+	$app = OC_App::cleanAppId(isset($_POST['app']) ? (string) $_POST['app'] : (string) $_GET['app']);
 }
 
 // An admin should not be able to add remote and public services
 // on its own. This should only be possible programmatically.
 // This change is due the fact that an admin may not be expected 
 // to execute arbitrary code in every environment.
-if($app === 'core' && isset($_POST['key']) &&(substr((string)$_POST['key'],0,7) === 'remote_' || substr((string)$_POST['key'],0,7) === 'public_')) {
+if ($app === 'core' && isset($_POST['key']) && (substr((string) $_POST['key'], 0, 7) === 'remote_' || substr((string) $_POST['key'], 0, 7) === 'public_')) {
 	OC_JSON::error(array('data' => array('message' => 'Unexpected error!')));
 	return;
 }
 
-$result=false;
+$result = false;
 $appConfig = \OC::$server->getAppConfig();
-switch($action) {
+switch ($action) {
 	case 'getValue':
-		$result=$appConfig->getValue($app, (string)$_GET['key'], (string)$_GET['defaultValue']);
+		$result = $appConfig->getValue($app, (string) $_GET['key'], (string) $_GET['defaultValue']);
 		break;
 	case 'setValue':
-		$result=$appConfig->setValue($app, (string)$_POST['key'], (string)$_POST['value']);
+		$result = $appConfig->setValue($app, (string) $_POST['key'], (string) $_POST['value']);
 		break;
 	case 'getApps':
-		$result=$appConfig->getApps();
+		$result = $appConfig->getApps();
 		break;
 	case 'getKeys':
-		$result=$appConfig->getKeys($app);
+		$result = $appConfig->getKeys($app);
 		break;
 	case 'hasKey':
-		$result=$appConfig->hasKey($app, (string)$_GET['key']);
+		$result = $appConfig->hasKey($app, (string) $_GET['key']);
 		break;
 	case 'deleteKey':
-		$result=$appConfig->deleteKey($app, (string)$_POST['key']);
+		$result = $appConfig->deleteKey($app, (string) $_POST['key']);
 		break;
 	case 'deleteApp':
-		$result=$appConfig->deleteApp($app);
+		$result = $appConfig->deleteApp($app);
 		break;
 }
 OC_JSON::success(array('data'=>$result));

core/js/config.php

Indentation +120 added lines, -120 removed lines

@@ -34,7 +34,7 @@ 
  */
 
 if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
-	die();
+    die();
 }
 
 // Set the content type to Javascript
@@ -53,7 +53,7 @@ 
 // Get the config
 $apps_paths = array();
 foreach(OC_App::getEnabledApps() as $app) {
-	$apps_paths[$app] = OC_App::getAppWebPath($app);
+    $apps_paths[$app] = OC_App::getAppWebPath($app);
 }
 
 $config = \OC::$server->getConfig();
@@ -61,9 +61,9 @@ 
 $defaultExpireDateEnabled = ($value === 'yes') ? true :false;
 $defaultExpireDate = $enforceDefaultExpireDate = null;
 if ($defaultExpireDateEnabled) {
-	$defaultExpireDate = (int) $config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-	$value = $config->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
-	$enforceDefaultExpireDate = ($value === 'yes') ? true : false;
+    $defaultExpireDate = (int) $config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+    $value = $config->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+    $enforceDefaultExpireDate = ($value === 'yes') ? true : false;
 }
 $outgoingServer2serverShareEnabled = $config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
 
@@ -71,123 +71,123 @@ 
 
 $dataLocation = str_replace(OC::$SERVERROOT .'/', '', $config->getSystemValue('datadirectory', ''), $countOfDataLocation);
 if($countOfDataLocation !== 1 || !OC_User::isAdminUser(OC_User::getUser())){
-	$dataLocation = false;
+    $dataLocation = false;
 }
 
 $array = array(
-	"oc_debug" => $config->getSystemValue('debug', false) ? 'true' : 'false',
-	"oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false',
-	"oc_dataURL" => is_string($dataLocation) ? "\"".$dataLocation."\"" : 'false',
-	"oc_webroot" => "\"".OC::$WEBROOT."\"",
-	"oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
-	"datepickerFormatDate" => json_encode($l->l('jsdate', null)),
-	"dayNames" =>  json_encode(
-		array(
-			(string)$l->t('Sunday'),
-			(string)$l->t('Monday'),
-			(string)$l->t('Tuesday'),
-			(string)$l->t('Wednesday'),
-			(string)$l->t('Thursday'),
-			(string)$l->t('Friday'),
-			(string)$l->t('Saturday')
-		)
-	),
-	"dayNamesShort" =>  json_encode(
-		array(
-			(string)$l->t('Sun.'),
-			(string)$l->t('Mon.'),
-			(string)$l->t('Tue.'),
-			(string)$l->t('Wed.'),
-			(string)$l->t('Thu.'),
-			(string)$l->t('Fri.'),
-			(string)$l->t('Sat.')
-		)
-	),
-	"dayNamesMin" =>  json_encode(
-		array(
-			(string)$l->t('Su'),
-			(string)$l->t('Mo'),
-			(string)$l->t('Tu'),
-			(string)$l->t('We'),
-			(string)$l->t('Th'),
-			(string)$l->t('Fr'),
-			(string)$l->t('Sa')
-		)
-	),
-	"monthNames" => json_encode(
-		array(
-			(string)$l->t('January'),
-			(string)$l->t('February'),
-			(string)$l->t('March'),
-			(string)$l->t('April'),
-			(string)$l->t('May'),
-			(string)$l->t('June'),
-			(string)$l->t('July'),
-			(string)$l->t('August'),
-			(string)$l->t('September'),
-			(string)$l->t('October'),
-			(string)$l->t('November'),
-			(string)$l->t('December')
-		)
-	),
-	"monthNamesShort" => json_encode(
-		array(
-			(string)$l->t('Jan.'),
-			(string)$l->t('Feb.'),
-			(string)$l->t('Mar.'),
-			(string)$l->t('Apr.'),
-			(string)$l->t('May.'),
-			(string)$l->t('Jun.'),
-			(string)$l->t('Jul.'),
-			(string)$l->t('Aug.'),
-			(string)$l->t('Sep.'),
-			(string)$l->t('Oct.'),
-			(string)$l->t('Nov.'),
-			(string)$l->t('Dec.')
-		)
-	),
-	"firstDay" => json_encode($l->l('firstday', null)) ,
-	"oc_config" => json_encode(
-		array(
-			'session_lifetime'	=> min(\OCP\Config::getSystemValue('session_lifetime', OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')), OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')),
-			'session_keepalive'	=> \OCP\Config::getSystemValue('session_keepalive', true),
-			'version'			=> implode('.', \OCP\Util::getVersion()),
-			'versionstring'		=> OC_Util::getVersionString(),
-			'enable_avatars'	=> \OC::$server->getConfig()->getSystemValue('enable_avatars', true) === true,
-			'lost_password_link'=> \OC::$server->getConfig()->getSystemValue('lost_password_link', null),
-			'modRewriteWorking'	=> (getenv('front_controller_active') === 'true'),
-		)
-	),
-	"oc_appconfig" => json_encode(
-			array("core" => array(
-				'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
-				'defaultExpireDate' => $defaultExpireDate,
-				'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
-				'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
-				'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(),
-				'resharingAllowed' => \OCP\Share::isResharingAllowed(),
-				'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
-				'federatedCloudShareDoc' => \OC::$server->getURLGenerator()->linkToDocs('user-sharing-federated'),
-				'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing()
-				)
-			)
-	),
-	"oc_defaults" => json_encode(
-		array(
-			'entity' => $defaults->getEntity(),
-			'name' => $defaults->getName(),
-			'title' => $defaults->getTitle(),
-			'baseUrl' => $defaults->getBaseUrl(),
-			'syncClientUrl' => $defaults->getSyncClientUrl(),
-			'docBaseUrl' => $defaults->getDocBaseUrl(),
-			'docPlaceholderUrl' => $defaults->buildDocLinkToKey('PLACEHOLDER'),
-			'slogan' => $defaults->getSlogan(),
-			'logoClaim' => $defaults->getLogoClaim(),
-			'shortFooter' => $defaults->getShortFooter(),
-			'longFooter' => $defaults->getLongFooter(),
-			'folder' => OC_Util::getTheme(),
-		)
-	)
+    "oc_debug" => $config->getSystemValue('debug', false) ? 'true' : 'false',
+    "oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false',
+    "oc_dataURL" => is_string($dataLocation) ? "\"".$dataLocation."\"" : 'false',
+    "oc_webroot" => "\"".OC::$WEBROOT."\"",
+    "oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
+    "datepickerFormatDate" => json_encode($l->l('jsdate', null)),
+    "dayNames" =>  json_encode(
+        array(
+            (string)$l->t('Sunday'),
+            (string)$l->t('Monday'),
+            (string)$l->t('Tuesday'),
+            (string)$l->t('Wednesday'),
+            (string)$l->t('Thursday'),
+            (string)$l->t('Friday'),
+            (string)$l->t('Saturday')
+        )
+    ),
+    "dayNamesShort" =>  json_encode(
+        array(
+            (string)$l->t('Sun.'),
+            (string)$l->t('Mon.'),
+            (string)$l->t('Tue.'),
+            (string)$l->t('Wed.'),
+            (string)$l->t('Thu.'),
+            (string)$l->t('Fri.'),
+            (string)$l->t('Sat.')
+        )
+    ),
+    "dayNamesMin" =>  json_encode(
+        array(
+            (string)$l->t('Su'),
+            (string)$l->t('Mo'),
+            (string)$l->t('Tu'),
+            (string)$l->t('We'),
+            (string)$l->t('Th'),
+            (string)$l->t('Fr'),
+            (string)$l->t('Sa')
+        )
+    ),
+    "monthNames" => json_encode(
+        array(
+            (string)$l->t('January'),
+            (string)$l->t('February'),
+            (string)$l->t('March'),
+            (string)$l->t('April'),
+            (string)$l->t('May'),
+            (string)$l->t('June'),
+            (string)$l->t('July'),
+            (string)$l->t('August'),
+            (string)$l->t('September'),
+            (string)$l->t('October'),
+            (string)$l->t('November'),
+            (string)$l->t('December')
+        )
+    ),
+    "monthNamesShort" => json_encode(
+        array(
+            (string)$l->t('Jan.'),
+            (string)$l->t('Feb.'),
+            (string)$l->t('Mar.'),
+            (string)$l->t('Apr.'),
+            (string)$l->t('May.'),
+            (string)$l->t('Jun.'),
+            (string)$l->t('Jul.'),
+            (string)$l->t('Aug.'),
+            (string)$l->t('Sep.'),
+            (string)$l->t('Oct.'),
+            (string)$l->t('Nov.'),
+            (string)$l->t('Dec.')
+        )
+    ),
+    "firstDay" => json_encode($l->l('firstday', null)) ,
+    "oc_config" => json_encode(
+        array(
+            'session_lifetime'	=> min(\OCP\Config::getSystemValue('session_lifetime', OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')), OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')),
+            'session_keepalive'	=> \OCP\Config::getSystemValue('session_keepalive', true),
+            'version'			=> implode('.', \OCP\Util::getVersion()),
+            'versionstring'		=> OC_Util::getVersionString(),
+            'enable_avatars'	=> \OC::$server->getConfig()->getSystemValue('enable_avatars', true) === true,
+            'lost_password_link'=> \OC::$server->getConfig()->getSystemValue('lost_password_link', null),
+            'modRewriteWorking'	=> (getenv('front_controller_active') === 'true'),
+        )
+    ),
+    "oc_appconfig" => json_encode(
+            array("core" => array(
+                'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
+                'defaultExpireDate' => $defaultExpireDate,
+                'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
+                'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
+                'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(),
+                'resharingAllowed' => \OCP\Share::isResharingAllowed(),
+                'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
+                'federatedCloudShareDoc' => \OC::$server->getURLGenerator()->linkToDocs('user-sharing-federated'),
+                'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing()
+                )
+            )
+    ),
+    "oc_defaults" => json_encode(
+        array(
+            'entity' => $defaults->getEntity(),
+            'name' => $defaults->getName(),
+            'title' => $defaults->getTitle(),
+            'baseUrl' => $defaults->getBaseUrl(),
+            'syncClientUrl' => $defaults->getSyncClientUrl(),
+            'docBaseUrl' => $defaults->getDocBaseUrl(),
+            'docPlaceholderUrl' => $defaults->buildDocLinkToKey('PLACEHOLDER'),
+            'slogan' => $defaults->getSlogan(),
+            'logoClaim' => $defaults->getLogoClaim(),
+            'shortFooter' => $defaults->getShortFooter(),
+            'longFooter' => $defaults->getLongFooter(),
+            'folder' => OC_Util::getTheme(),
+        )
+    )
 );
 
 // Allow hooks to modify the output values
@@ -195,5 +195,5 @@ 
 
 // Echo it
 foreach ($array as  $setting => $value) {
-	echo("var ". $setting ."=".$value.";\n");
+    echo("var ". $setting ."=".$value.";\n");
 }

Spacing +52 added lines, -52 removed lines

@@ -33,7 +33,7 @@ 
  *
  */
 
-if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
+if (!\OC::$server->getRequest()->passesStrictCookieCheck()) {
 	die();
 }
 
@@ -52,13 +52,13 @@ 
 
 // Get the config
 $apps_paths = array();
-foreach(OC_App::getEnabledApps() as $app) {
+foreach (OC_App::getEnabledApps() as $app) {
 	$apps_paths[$app] = OC_App::getAppWebPath($app);
 }
 
 $config = \OC::$server->getConfig();
 $value = $config->getAppValue('core', 'shareapi_default_expire_date', 'no');
-$defaultExpireDateEnabled = ($value === 'yes') ? true :false;
+$defaultExpireDateEnabled = ($value === 'yes') ? true : false;
 $defaultExpireDate = $enforceDefaultExpireDate = null;
 if ($defaultExpireDateEnabled) {
 	$defaultExpireDate = (int) $config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
@@ -69,8 +69,8 @@ 
 
 $countOfDataLocation = 0;
 
-$dataLocation = str_replace(OC::$SERVERROOT .'/', '', $config->getSystemValue('datadirectory', ''), $countOfDataLocation);
-if($countOfDataLocation !== 1 || !OC_User::isAdminUser(OC_User::getUser())){
+$dataLocation = str_replace(OC::$SERVERROOT.'/', '', $config->getSystemValue('datadirectory', ''), $countOfDataLocation);
+if ($countOfDataLocation !== 1 || !OC_User::isAdminUser(OC_User::getUser())) {
 	$dataLocation = false;
 }
 
@@ -83,70 +83,70 @@ 
 	"datepickerFormatDate" => json_encode($l->l('jsdate', null)),
 	"dayNames" =>  json_encode(
 		array(
-			(string)$l->t('Sunday'),
-			(string)$l->t('Monday'),
-			(string)$l->t('Tuesday'),
-			(string)$l->t('Wednesday'),
-			(string)$l->t('Thursday'),
-			(string)$l->t('Friday'),
-			(string)$l->t('Saturday')
+			(string) $l->t('Sunday'),
+			(string) $l->t('Monday'),
+			(string) $l->t('Tuesday'),
+			(string) $l->t('Wednesday'),
+			(string) $l->t('Thursday'),
+			(string) $l->t('Friday'),
+			(string) $l->t('Saturday')
 		)
 	),
 	"dayNamesShort" =>  json_encode(
 		array(
-			(string)$l->t('Sun.'),
-			(string)$l->t('Mon.'),
-			(string)$l->t('Tue.'),
-			(string)$l->t('Wed.'),
-			(string)$l->t('Thu.'),
-			(string)$l->t('Fri.'),
-			(string)$l->t('Sat.')
+			(string) $l->t('Sun.'),
+			(string) $l->t('Mon.'),
+			(string) $l->t('Tue.'),
+			(string) $l->t('Wed.'),
+			(string) $l->t('Thu.'),
+			(string) $l->t('Fri.'),
+			(string) $l->t('Sat.')
 		)
 	),
 	"dayNamesMin" =>  json_encode(
 		array(
-			(string)$l->t('Su'),
-			(string)$l->t('Mo'),
-			(string)$l->t('Tu'),
-			(string)$l->t('We'),
-			(string)$l->t('Th'),
-			(string)$l->t('Fr'),
-			(string)$l->t('Sa')
+			(string) $l->t('Su'),
+			(string) $l->t('Mo'),
+			(string) $l->t('Tu'),
+			(string) $l->t('We'),
+			(string) $l->t('Th'),
+			(string) $l->t('Fr'),
+			(string) $l->t('Sa')
 		)
 	),
 	"monthNames" => json_encode(
 		array(
-			(string)$l->t('January'),
-			(string)$l->t('February'),
-			(string)$l->t('March'),
-			(string)$l->t('April'),
-			(string)$l->t('May'),
-			(string)$l->t('June'),
-			(string)$l->t('July'),
-			(string)$l->t('August'),
-			(string)$l->t('September'),
-			(string)$l->t('October'),
-			(string)$l->t('November'),
-			(string)$l->t('December')
+			(string) $l->t('January'),
+			(string) $l->t('February'),
+			(string) $l->t('March'),
+			(string) $l->t('April'),
+			(string) $l->t('May'),
+			(string) $l->t('June'),
+			(string) $l->t('July'),
+			(string) $l->t('August'),
+			(string) $l->t('September'),
+			(string) $l->t('October'),
+			(string) $l->t('November'),
+			(string) $l->t('December')
 		)
 	),
 	"monthNamesShort" => json_encode(
 		array(
-			(string)$l->t('Jan.'),
-			(string)$l->t('Feb.'),
-			(string)$l->t('Mar.'),
-			(string)$l->t('Apr.'),
-			(string)$l->t('May.'),
-			(string)$l->t('Jun.'),
-			(string)$l->t('Jul.'),
-			(string)$l->t('Aug.'),
-			(string)$l->t('Sep.'),
-			(string)$l->t('Oct.'),
-			(string)$l->t('Nov.'),
-			(string)$l->t('Dec.')
+			(string) $l->t('Jan.'),
+			(string) $l->t('Feb.'),
+			(string) $l->t('Mar.'),
+			(string) $l->t('Apr.'),
+			(string) $l->t('May.'),
+			(string) $l->t('Jun.'),
+			(string) $l->t('Jul.'),
+			(string) $l->t('Aug.'),
+			(string) $l->t('Sep.'),
+			(string) $l->t('Oct.'),
+			(string) $l->t('Nov.'),
+			(string) $l->t('Dec.')
 		)
 	),
-	"firstDay" => json_encode($l->l('firstday', null)) ,
+	"firstDay" => json_encode($l->l('firstday', null)),
 	"oc_config" => json_encode(
 		array(
 			'session_lifetime'	=> min(\OCP\Config::getSystemValue('session_lifetime', OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')), OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')),
@@ -195,5 +195,5 @@ 
 
 // Echo it
 foreach ($array as  $setting => $value) {
-	echo("var ". $setting ."=".$value.";\n");
+	echo("var ".$setting."=".$value.";\n");
 }

settings/templates/email.new_user.php

Indentation +4 added lines, -4 removed lines

@@ -12,11 +12,11 @@
 					<td width="20px">&nbsp;</td>
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
 						<?php
-						print_unescaped($l->t('Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href="%s">%s</a><br><br>', array($theme->getName(), $_['username'], $_['url'], $_['url'])));
+                        print_unescaped($l->t('Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href="%s">%s</a><br><br>', array($theme->getName(), $_['username'], $_['url'], $_['url'])));
 
-						// TRANSLATORS term at the end of a mail
-						p($l->t('Cheers!'));
-						?>
+                        // TRANSLATORS term at the end of a mail
+                        p($l->t('Cheers!'));
+                        ?>
 					</td>
 				</tr>
 				<tr><td colspan="2">&nbsp;</td></tr>

Spacing +3 added lines, -3 removed lines

@@ -6,8 +6,8 @@ 
 	<tr><td>
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
 				<tr>
-					<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
-					<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
+					<td bgcolor="<?php p($theme->getMailHeaderColor()); ?>" width="20px">&nbsp;</td>
+					<td bgcolor="<?php p($theme->getMailHeaderColor()); ?>">
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 					</td>
 				</tr>
@@ -28,7 +28,7 @@ 
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
 						<?php p($theme->getName()); ?> -
 						<?php p($theme->getSlogan()); ?>
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
 					</td>
 				</tr>
 				<tr>