nextcloud / server

lib/private/Migration/BackgroundRepair.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 	 */
 	public function execute($jobList, ILogger $logger = null) {
 		// add an interval of 15 mins
-		$this->setInterval(15*60);
+		$this->setInterval(15 * 60);
 
 		$this->jobList = $jobList;
 		$this->logger = $logger;
@@ -90,7 +90,7 @@ 
 		try {
 			$repair->addStep($step);
 		} catch (\Exception $ex) {
-			$this->logger->logException($ex,[
+			$this->logger->logException($ex, [
 				'app' => 'migration'
 			]);
 

Indentation +66 added lines, -66 removed lines

@@ -37,81 +37,81 @@
  */
 class BackgroundRepair extends TimedJob {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/** @var EventDispatcher */
-	private $dispatcher;
+    /** @var EventDispatcher */
+    private $dispatcher;
 
-	public function setDispatcher(EventDispatcher $dispatcher) {
-		$this->dispatcher = $dispatcher;
-	}
-	/**
-	 * run the job, then remove it from the job list
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		// add an interval of 15 mins
-		$this->setInterval(15*60);
+    public function setDispatcher(EventDispatcher $dispatcher) {
+        $this->dispatcher = $dispatcher;
+    }
+    /**
+     * run the job, then remove it from the job list
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        // add an interval of 15 mins
+        $this->setInterval(15*60);
 
-		$this->jobList = $jobList;
-		$this->logger = $logger;
-		parent::execute($jobList, $logger);
-	}
+        $this->jobList = $jobList;
+        $this->logger = $logger;
+        parent::execute($jobList, $logger);
+    }
 
-	/**
-	 * @param array $argument
-	 * @throws \Exception
-	 * @throws \OC\NeedsUpdateException
-	 */
-	protected function run($argument) {
-		if (!isset($argument['app']) || !isset($argument['step'])) {
-			// remove the job - we can never execute it
-			$this->jobList->remove($this, $this->argument);
-			return;
-		}
-		$app = $argument['app'];
+    /**
+     * @param array $argument
+     * @throws \Exception
+     * @throws \OC\NeedsUpdateException
+     */
+    protected function run($argument) {
+        if (!isset($argument['app']) || !isset($argument['step'])) {
+            // remove the job - we can never execute it
+            $this->jobList->remove($this, $this->argument);
+            return;
+        }
+        $app = $argument['app'];
 
-		try {
-			$this->loadApp($app);
-		} catch (NeedsUpdateException $ex) {
-			// as long as the app is not yet done with it's offline migration
-			// we better not start with the live migration
-			return;
-		}
+        try {
+            $this->loadApp($app);
+        } catch (NeedsUpdateException $ex) {
+            // as long as the app is not yet done with it's offline migration
+            // we better not start with the live migration
+            return;
+        }
 
-		$step = $argument['step'];
-		$repair = new Repair([], $this->dispatcher);
-		try {
-			$repair->addStep($step);
-		} catch (\Exception $ex) {
-			$this->logger->logException($ex,[
-				'app' => 'migration'
-			]);
+        $step = $argument['step'];
+        $repair = new Repair([], $this->dispatcher);
+        try {
+            $repair->addStep($step);
+        } catch (\Exception $ex) {
+            $this->logger->logException($ex,[
+                'app' => 'migration'
+            ]);
 
-			// remove the job - we can never execute it
-			$this->jobList->remove($this, $this->argument);
-			return;
-		}
+            // remove the job - we can never execute it
+            $this->jobList->remove($this, $this->argument);
+            return;
+        }
 
-		// execute the repair step
-		$repair->run();
+        // execute the repair step
+        $repair->run();
 
-		// remove the job once executed successfully
-		$this->jobList->remove($this, $this->argument);
-	}
+        // remove the job once executed successfully
+        $this->jobList->remove($this, $this->argument);
+    }
 
-	/**
-	 * @codeCoverageIgnore
-	 * @param $app
-	 * @throws NeedsUpdateException
-	 */
-	protected function loadApp($app) {
-		OC_App::loadApp($app);
-	}
+    /**
+     * @codeCoverageIgnore
+     * @param $app
+     * @throws NeedsUpdateException
+     */
+    protected function loadApp($app) {
+        OC_App::loadApp($app);
+    }
 }

lib/private/Command/QueueBus.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		if ($command instanceof ICommand) {
 			// ensure the command can be serialized
 			$serialized = serialize($command);
-			if(strlen($serialized) > 4000) {
+			if (strlen($serialized) > 4000) {
 				throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)');
 			}
 			$unserialized = unserialize($serialized);

Indentation +40 added lines, -40 removed lines

@@ -26,48 +26,48 @@
 use OCP\Command\ICommand;
 
 class QueueBus implements IBus {
-	/**
-	 * @var ICommand[]|callable[]
-	 */
-	private $queue = [];
+    /**
+     * @var ICommand[]|callable[]
+     */
+    private $queue = [];
 
-	/**
-	 * Schedule a command to be fired
-	 *
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	public function push($command) {
-		$this->queue[] = $command;
-	}
+    /**
+     * Schedule a command to be fired
+     *
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    public function push($command) {
+        $this->queue[] = $command;
+    }
 
-	/**
-	 * Require all commands using a trait to be run synchronous
-	 *
-	 * @param string $trait
-	 */
-	public function requireSync($trait) {
-	}
+    /**
+     * Require all commands using a trait to be run synchronous
+     *
+     * @param string $trait
+     */
+    public function requireSync($trait) {
+    }
 
-	/**
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	private function runCommand($command) {
-		if ($command instanceof ICommand) {
-			// ensure the command can be serialized
-			$serialized = serialize($command);
-			if(strlen($serialized) > 4000) {
-				throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)');
-			}
-			$unserialized = unserialize($serialized);
-			$unserialized->handle();
-		} else {
-			$command();
-		}
-	}
+    /**
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    private function runCommand($command) {
+        if ($command instanceof ICommand) {
+            // ensure the command can be serialized
+            $serialized = serialize($command);
+            if(strlen($serialized) > 4000) {
+                throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)');
+            }
+            $unserialized = unserialize($serialized);
+            $unserialized->handle();
+        } else {
+            $command();
+        }
+    }
 
-	public function run() {
-		while ($command = array_shift($this->queue)) {
-			$this->runCommand($command);
-		}
-	}
+    public function run() {
+        while ($command = array_shift($this->queue)) {
+            $this->runCommand($command);
+        }
+    }
 }

lib/private/Command/CallableJob.php

Indentation +8 added lines, -8 removed lines

@@ -25,12 +25,12 @@
 use OC\BackgroundJob\QueuedJob;
 
 class CallableJob extends QueuedJob {
-	protected function run($serializedCallable) {
-		$callable = unserialize($serializedCallable);
-		if (is_callable($callable)) {
-			$callable();
-		} else {
-			throw new \InvalidArgumentException('Invalid serialized callable');
-		}
-	}
+    protected function run($serializedCallable) {
+        $callable = unserialize($serializedCallable);
+        if (is_callable($callable)) {
+            $callable();
+        } else {
+            throw new \InvalidArgumentException('Invalid serialized callable');
+        }
+    }
 }

lib/private/Command/ClosureJob.php

Indentation +9 added lines, -9 removed lines

@@ -26,13 +26,13 @@
 use SuperClosure\Serializer;
 
 class ClosureJob extends QueuedJob {
-	protected function run($serializedCallable) {
-		$serializer = new Serializer();
-		$callable = $serializer->unserialize($serializedCallable);
-		if (is_callable($callable)) {
-			$callable();
-		} else {
-			throw new \InvalidArgumentException('Invalid serialized callable');
-		}
-	}
+    protected function run($serializedCallable) {
+        $serializer = new Serializer();
+        $callable = $serializer->unserialize($serializedCallable);
+        if (is_callable($callable)) {
+            $callable();
+        } else {
+            throw new \InvalidArgumentException('Invalid serialized callable');
+        }
+    }
 }

lib/private/Command/FileAccess.php

Indentation +7 added lines, -7 removed lines

@@ -25,12 +25,12 @@
 use OCP\IUser;
 
 trait FileAccess {
-	protected function setupFS(IUser $user){
-		\OC_Util::setupFS($user->getUID());
-	}
+    protected function setupFS(IUser $user){
+        \OC_Util::setupFS($user->getUID());
+    }
 
-	protected function getUserFolder(IUser $user) {
-		$this->setupFS($user);
-		return \OC::$server->getUserFolder($user->getUID());
-	}
+    protected function getUserFolder(IUser $user) {
+        $this->setupFS($user);
+        return \OC::$server->getUserFolder($user->getUID());
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 use OCP\IUser;
 
 trait FileAccess {
-	protected function setupFS(IUser $user){
+	protected function setupFS(IUser $user) {
 		\OC_Util::setupFS($user->getUID());
 	}
 

lib/private/Command/CommandJob.php

Indentation +8 added lines, -8 removed lines

@@ -29,12 +29,12 @@
  * Wrap a command in the background job interface
  */
 class CommandJob extends QueuedJob {
-	protected function run($serializedCommand) {
-		$command = unserialize($serializedCommand);
-		if ($command instanceof ICommand) {
-			$command->handle();
-		} else {
-			throw new \InvalidArgumentException('Invalid serialized command');
-		}
-	}
+    protected function run($serializedCommand) {
+        $command = unserialize($serializedCommand);
+        if ($command instanceof ICommand) {
+            $command->handle();
+        } else {
+            throw new \InvalidArgumentException('Invalid serialized command');
+        }
+    }
 }

lib/private/Template/JSConfigHelper.php

Spacing +51 added lines, -51 removed lines

@@ -108,7 +108,7 @@ 
 			$apps = $this->appManager->getEnabledAppsForUser($this->currentUser);
 		}
 
-		foreach($apps as $app) {
+		foreach ($apps as $app) {
 			$apps_paths[$app] = \OC_App::getAppWebPath($app);
 		}
 
@@ -121,8 +121,8 @@ 
 		$outgoingServer2serverShareEnabled = $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
 
 		$countOfDataLocation = 0;
-		$dataLocation = str_replace(\OC::$SERVERROOT .'/', '', $this->config->getSystemValue('datadirectory', ''), $countOfDataLocation);
-		if($countOfDataLocation !== 1 || !$this->groupManager->isAdmin($uid)) {
+		$dataLocation = str_replace(\OC::$SERVERROOT.'/', '', $this->config->getSystemValue('datadirectory', ''), $countOfDataLocation);
+		if ($countOfDataLocation !== 1 || !$this->groupManager->isAdmin($uid)) {
 			$dataLocation = false;
 		}
 
@@ -144,61 +144,61 @@ 
 			"datepickerFormatDate" => json_encode($this->l->l('jsdate', null)),
 			'nc_lastLogin' => $lastConfirmTimestamp,
 			"dayNames" =>  json_encode([
-				(string)$this->l->t('Sunday'),
-				(string)$this->l->t('Monday'),
-				(string)$this->l->t('Tuesday'),
-				(string)$this->l->t('Wednesday'),
-				(string)$this->l->t('Thursday'),
-				(string)$this->l->t('Friday'),
-				(string)$this->l->t('Saturday')
+				(string) $this->l->t('Sunday'),
+				(string) $this->l->t('Monday'),
+				(string) $this->l->t('Tuesday'),
+				(string) $this->l->t('Wednesday'),
+				(string) $this->l->t('Thursday'),
+				(string) $this->l->t('Friday'),
+				(string) $this->l->t('Saturday')
 			]),
 			"dayNamesShort" =>  json_encode([
-				(string)$this->l->t('Sun.'),
-				(string)$this->l->t('Mon.'),
-				(string)$this->l->t('Tue.'),
-				(string)$this->l->t('Wed.'),
-				(string)$this->l->t('Thu.'),
-				(string)$this->l->t('Fri.'),
-				(string)$this->l->t('Sat.')
+				(string) $this->l->t('Sun.'),
+				(string) $this->l->t('Mon.'),
+				(string) $this->l->t('Tue.'),
+				(string) $this->l->t('Wed.'),
+				(string) $this->l->t('Thu.'),
+				(string) $this->l->t('Fri.'),
+				(string) $this->l->t('Sat.')
 			]),
 			"dayNamesMin" =>  json_encode([
-				(string)$this->l->t('Su'),
-				(string)$this->l->t('Mo'),
-				(string)$this->l->t('Tu'),
-				(string)$this->l->t('We'),
-				(string)$this->l->t('Th'),
-				(string)$this->l->t('Fr'),
-				(string)$this->l->t('Sa')
+				(string) $this->l->t('Su'),
+				(string) $this->l->t('Mo'),
+				(string) $this->l->t('Tu'),
+				(string) $this->l->t('We'),
+				(string) $this->l->t('Th'),
+				(string) $this->l->t('Fr'),
+				(string) $this->l->t('Sa')
 			]),
 			"monthNames" => json_encode([
-				(string)$this->l->t('January'),
-				(string)$this->l->t('February'),
-				(string)$this->l->t('March'),
-				(string)$this->l->t('April'),
-				(string)$this->l->t('May'),
-				(string)$this->l->t('June'),
-				(string)$this->l->t('July'),
-				(string)$this->l->t('August'),
-				(string)$this->l->t('September'),
-				(string)$this->l->t('October'),
-				(string)$this->l->t('November'),
-				(string)$this->l->t('December')
+				(string) $this->l->t('January'),
+				(string) $this->l->t('February'),
+				(string) $this->l->t('March'),
+				(string) $this->l->t('April'),
+				(string) $this->l->t('May'),
+				(string) $this->l->t('June'),
+				(string) $this->l->t('July'),
+				(string) $this->l->t('August'),
+				(string) $this->l->t('September'),
+				(string) $this->l->t('October'),
+				(string) $this->l->t('November'),
+				(string) $this->l->t('December')
 			]),
 			"monthNamesShort" => json_encode([
-				(string)$this->l->t('Jan.'),
-				(string)$this->l->t('Feb.'),
-				(string)$this->l->t('Mar.'),
-				(string)$this->l->t('Apr.'),
-				(string)$this->l->t('May.'),
-				(string)$this->l->t('Jun.'),
-				(string)$this->l->t('Jul.'),
-				(string)$this->l->t('Aug.'),
-				(string)$this->l->t('Sep.'),
-				(string)$this->l->t('Oct.'),
-				(string)$this->l->t('Nov.'),
-				(string)$this->l->t('Dec.')
+				(string) $this->l->t('Jan.'),
+				(string) $this->l->t('Feb.'),
+				(string) $this->l->t('Mar.'),
+				(string) $this->l->t('Apr.'),
+				(string) $this->l->t('May.'),
+				(string) $this->l->t('Jun.'),
+				(string) $this->l->t('Jul.'),
+				(string) $this->l->t('Aug.'),
+				(string) $this->l->t('Sep.'),
+				(string) $this->l->t('Oct.'),
+				(string) $this->l->t('Nov.'),
+				(string) $this->l->t('Dec.')
 			]),
-			"firstDay" => json_encode($this->l->l('firstday', null)) ,
+			"firstDay" => json_encode($this->l->l('firstday', null)),
 			"oc_config" => json_encode([
 				'session_lifetime'	=> min($this->config->getSystemValue('session_lifetime', $this->iniWrapper->getNumeric('session.gc_maxlifetime')), $this->iniWrapper->getNumeric('session.gc_maxlifetime')),
 				'session_keepalive'	=> $this->config->getSystemValue('session_keepalive', true),
@@ -240,7 +240,7 @@ 
 		if ($this->currentUser !== null) {
 			$array['oc_userconfig'] = json_encode([
 				'avatar' => [
-					'version' => (int)$this->config->getUserValue($uid, 'avatar', 'version', 0),
+					'version' => (int) $this->config->getUserValue($uid, 'avatar', 'version', 0),
 				]
 			]);
 		}
@@ -252,7 +252,7 @@ 
 
 		// Echo it
 		foreach ($array as  $setting => $value) {
-			$result .= 'var '. $setting . '='. $value . ';' . PHP_EOL;
+			$result .= 'var '.$setting.'='.$value.';'.PHP_EOL;
 		}
 
 		return $result;

Indentation +207 added lines, -207 removed lines

@@ -34,235 +34,235 @@
 
 class JSConfigHelper {
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/** @var Defaults */
-	private $defaults;
+    /** @var Defaults */
+    private $defaults;
 
-	/** @var IAppManager */
-	private $appManager;
+    /** @var IAppManager */
+    private $appManager;
 
-	/** @var ISession */
-	private $session;
+    /** @var ISession */
+    private $session;
 
-	/** @var IUser|null */
-	private $currentUser;
+    /** @var IUser|null */
+    private $currentUser;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var IGroupManager */
-	private $groupManager;
+    /** @var IGroupManager */
+    private $groupManager;
 
-	/** @var IniGetWrapper */
-	private $iniWrapper;
+    /** @var IniGetWrapper */
+    private $iniWrapper;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param IL10N $l
-	 * @param Defaults $defaults
-	 * @param IAppManager $appManager
-	 * @param ISession $session
-	 * @param IUser|null $currentUser
-	 * @param IConfig $config
-	 * @param IGroupManager $groupManager
-	 * @param IniGetWrapper $iniWrapper
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(IL10N $l,
-								Defaults $defaults,
-								IAppManager $appManager,
-								ISession $session,
-								$currentUser,
-								IConfig $config,
-								IGroupManager $groupManager,
-								IniGetWrapper $iniWrapper,
-								IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->defaults = $defaults;
-		$this->appManager = $appManager;
-		$this->session = $session;
-		$this->currentUser = $currentUser;
-		$this->config = $config;
-		$this->groupManager = $groupManager;
-		$this->iniWrapper = $iniWrapper;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param IL10N $l
+     * @param Defaults $defaults
+     * @param IAppManager $appManager
+     * @param ISession $session
+     * @param IUser|null $currentUser
+     * @param IConfig $config
+     * @param IGroupManager $groupManager
+     * @param IniGetWrapper $iniWrapper
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(IL10N $l,
+                                Defaults $defaults,
+                                IAppManager $appManager,
+                                ISession $session,
+                                $currentUser,
+                                IConfig $config,
+                                IGroupManager $groupManager,
+                                IniGetWrapper $iniWrapper,
+                                IURLGenerator $urlGenerator) {
+        $this->l = $l;
+        $this->defaults = $defaults;
+        $this->appManager = $appManager;
+        $this->session = $session;
+        $this->currentUser = $currentUser;
+        $this->config = $config;
+        $this->groupManager = $groupManager;
+        $this->iniWrapper = $iniWrapper;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	public function getConfig() {
+    public function getConfig() {
 
-		if ($this->currentUser !== null) {
-			$uid = $this->currentUser->getUID();
-		} else {
-			$uid = null;
-		}
+        if ($this->currentUser !== null) {
+            $uid = $this->currentUser->getUID();
+        } else {
+            $uid = null;
+        }
 
-		// Get the config
-		$apps_paths = [];
+        // Get the config
+        $apps_paths = [];
 
-		if ($this->currentUser === null) {
-			$apps = $this->appManager->getInstalledApps();
-		} else {
-			$apps = $this->appManager->getEnabledAppsForUser($this->currentUser);
-		}
+        if ($this->currentUser === null) {
+            $apps = $this->appManager->getInstalledApps();
+        } else {
+            $apps = $this->appManager->getEnabledAppsForUser($this->currentUser);
+        }
 
-		foreach($apps as $app) {
-			$apps_paths[$app] = \OC_App::getAppWebPath($app);
-		}
+        foreach($apps as $app) {
+            $apps_paths[$app] = \OC_App::getAppWebPath($app);
+        }
 
 
-		$enableLinkPasswordByDefault = $this->config->getAppValue('core', 'shareapi_enable_link_password_by_default', 'no');
-		$enableLinkPasswordByDefault = ($enableLinkPasswordByDefault === 'yes') ? true : false;
-		$defaultExpireDateEnabled = $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
-		$defaultExpireDate = $enforceDefaultExpireDate = null;
-		if ($defaultExpireDateEnabled) {
-			$defaultExpireDate = (int) $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-			$enforceDefaultExpireDate = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
-		}
-		$outgoingServer2serverShareEnabled = $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
+        $enableLinkPasswordByDefault = $this->config->getAppValue('core', 'shareapi_enable_link_password_by_default', 'no');
+        $enableLinkPasswordByDefault = ($enableLinkPasswordByDefault === 'yes') ? true : false;
+        $defaultExpireDateEnabled = $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
+        $defaultExpireDate = $enforceDefaultExpireDate = null;
+        if ($defaultExpireDateEnabled) {
+            $defaultExpireDate = (int) $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+            $enforceDefaultExpireDate = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
+        }
+        $outgoingServer2serverShareEnabled = $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
 
-		$countOfDataLocation = 0;
-		$dataLocation = str_replace(\OC::$SERVERROOT .'/', '', $this->config->getSystemValue('datadirectory', ''), $countOfDataLocation);
-		if($countOfDataLocation !== 1 || !$this->groupManager->isAdmin($uid)) {
-			$dataLocation = false;
-		}
+        $countOfDataLocation = 0;
+        $dataLocation = str_replace(\OC::$SERVERROOT .'/', '', $this->config->getSystemValue('datadirectory', ''), $countOfDataLocation);
+        if($countOfDataLocation !== 1 || !$this->groupManager->isAdmin($uid)) {
+            $dataLocation = false;
+        }
 
-		if ($this->currentUser instanceof IUser) {
-			$lastConfirmTimestamp = $this->session->get('last-password-confirm');
-			if (!is_int($lastConfirmTimestamp)) {
-				$lastConfirmTimestamp = 0;
-			}
-		} else {
-			$lastConfirmTimestamp = 0;
-		}
+        if ($this->currentUser instanceof IUser) {
+            $lastConfirmTimestamp = $this->session->get('last-password-confirm');
+            if (!is_int($lastConfirmTimestamp)) {
+                $lastConfirmTimestamp = 0;
+            }
+        } else {
+            $lastConfirmTimestamp = 0;
+        }
 
-		$array = [
-			"oc_debug" => $this->config->getSystemValue('debug', false) ? 'true' : 'false',
-			"oc_isadmin" => $this->groupManager->isAdmin($uid) ? '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($this->l->l('jsdate', null)),
-			'nc_lastLogin' => $lastConfirmTimestamp,
-			"dayNames" =>  json_encode([
-				(string)$this->l->t('Sunday'),
-				(string)$this->l->t('Monday'),
-				(string)$this->l->t('Tuesday'),
-				(string)$this->l->t('Wednesday'),
-				(string)$this->l->t('Thursday'),
-				(string)$this->l->t('Friday'),
-				(string)$this->l->t('Saturday')
-			]),
-			"dayNamesShort" =>  json_encode([
-				(string)$this->l->t('Sun.'),
-				(string)$this->l->t('Mon.'),
-				(string)$this->l->t('Tue.'),
-				(string)$this->l->t('Wed.'),
-				(string)$this->l->t('Thu.'),
-				(string)$this->l->t('Fri.'),
-				(string)$this->l->t('Sat.')
-			]),
-			"dayNamesMin" =>  json_encode([
-				(string)$this->l->t('Su'),
-				(string)$this->l->t('Mo'),
-				(string)$this->l->t('Tu'),
-				(string)$this->l->t('We'),
-				(string)$this->l->t('Th'),
-				(string)$this->l->t('Fr'),
-				(string)$this->l->t('Sa')
-			]),
-			"monthNames" => json_encode([
-				(string)$this->l->t('January'),
-				(string)$this->l->t('February'),
-				(string)$this->l->t('March'),
-				(string)$this->l->t('April'),
-				(string)$this->l->t('May'),
-				(string)$this->l->t('June'),
-				(string)$this->l->t('July'),
-				(string)$this->l->t('August'),
-				(string)$this->l->t('September'),
-				(string)$this->l->t('October'),
-				(string)$this->l->t('November'),
-				(string)$this->l->t('December')
-			]),
-			"monthNamesShort" => json_encode([
-				(string)$this->l->t('Jan.'),
-				(string)$this->l->t('Feb.'),
-				(string)$this->l->t('Mar.'),
-				(string)$this->l->t('Apr.'),
-				(string)$this->l->t('May.'),
-				(string)$this->l->t('Jun.'),
-				(string)$this->l->t('Jul.'),
-				(string)$this->l->t('Aug.'),
-				(string)$this->l->t('Sep.'),
-				(string)$this->l->t('Oct.'),
-				(string)$this->l->t('Nov.'),
-				(string)$this->l->t('Dec.')
-			]),
-			"firstDay" => json_encode($this->l->l('firstday', null)) ,
-			"oc_config" => json_encode([
-				'session_lifetime'	=> min($this->config->getSystemValue('session_lifetime', $this->iniWrapper->getNumeric('session.gc_maxlifetime')), $this->iniWrapper->getNumeric('session.gc_maxlifetime')),
-				'session_keepalive'	=> $this->config->getSystemValue('session_keepalive', true),
-				'version'			=> implode('.', \OCP\Util::getVersion()),
-				'versionstring'		=> \OC_Util::getVersionString(),
-				'enable_avatars'	=> true, // here for legacy reasons - to not crash existing code that relies on this value
-				'lost_password_link'=> $this->config->getSystemValue('lost_password_link', null),
-				'modRewriteWorking'	=> ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'),
-				'sharing.maxAutocompleteResults' => intval($this->config->getSystemValue('sharing.maxAutocompleteResults', 0)),
-				'sharing.minSearchStringLength' => intval($this->config->getSystemValue('sharing.minSearchStringLength', 0)),
-				'blacklist_files_regex' => \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX,
-			]),
-			"oc_appconfig" => json_encode([
-				'core' => [
-					'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
-					'defaultExpireDate' => $defaultExpireDate,
-					'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
-					'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
-					'enableLinkPasswordByDefault' => $enableLinkPasswordByDefault,
-					'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(),
-					'resharingAllowed' => \OC\Share\Share::isResharingAllowed(),
-					'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
-					'federatedCloudShareDoc' => $this->urlGenerator->linkToDocs('user-sharing-federated'),
-					'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing()
-				]
-			]),
-			"oc_defaults" => json_encode([
-				'entity' => $this->defaults->getEntity(),
-				'name' => $this->defaults->getName(),
-				'title' => $this->defaults->getTitle(),
-				'baseUrl' => $this->defaults->getBaseUrl(),
-				'syncClientUrl' => $this->defaults->getSyncClientUrl(),
-				'docBaseUrl' => $this->defaults->getDocBaseUrl(),
-				'docPlaceholderUrl' => $this->defaults->buildDocLinkToKey('PLACEHOLDER'),
-				'slogan' => $this->defaults->getSlogan(),
-				'logoClaim' => '',
-				'shortFooter' => $this->defaults->getShortFooter(),
-				'longFooter' => $this->defaults->getLongFooter(),
-				'folder' => \OC_Util::getTheme(),
-			]),
-		];
+        $array = [
+            "oc_debug" => $this->config->getSystemValue('debug', false) ? 'true' : 'false',
+            "oc_isadmin" => $this->groupManager->isAdmin($uid) ? '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($this->l->l('jsdate', null)),
+            'nc_lastLogin' => $lastConfirmTimestamp,
+            "dayNames" =>  json_encode([
+                (string)$this->l->t('Sunday'),
+                (string)$this->l->t('Monday'),
+                (string)$this->l->t('Tuesday'),
+                (string)$this->l->t('Wednesday'),
+                (string)$this->l->t('Thursday'),
+                (string)$this->l->t('Friday'),
+                (string)$this->l->t('Saturday')
+            ]),
+            "dayNamesShort" =>  json_encode([
+                (string)$this->l->t('Sun.'),
+                (string)$this->l->t('Mon.'),
+                (string)$this->l->t('Tue.'),
+                (string)$this->l->t('Wed.'),
+                (string)$this->l->t('Thu.'),
+                (string)$this->l->t('Fri.'),
+                (string)$this->l->t('Sat.')
+            ]),
+            "dayNamesMin" =>  json_encode([
+                (string)$this->l->t('Su'),
+                (string)$this->l->t('Mo'),
+                (string)$this->l->t('Tu'),
+                (string)$this->l->t('We'),
+                (string)$this->l->t('Th'),
+                (string)$this->l->t('Fr'),
+                (string)$this->l->t('Sa')
+            ]),
+            "monthNames" => json_encode([
+                (string)$this->l->t('January'),
+                (string)$this->l->t('February'),
+                (string)$this->l->t('March'),
+                (string)$this->l->t('April'),
+                (string)$this->l->t('May'),
+                (string)$this->l->t('June'),
+                (string)$this->l->t('July'),
+                (string)$this->l->t('August'),
+                (string)$this->l->t('September'),
+                (string)$this->l->t('October'),
+                (string)$this->l->t('November'),
+                (string)$this->l->t('December')
+            ]),
+            "monthNamesShort" => json_encode([
+                (string)$this->l->t('Jan.'),
+                (string)$this->l->t('Feb.'),
+                (string)$this->l->t('Mar.'),
+                (string)$this->l->t('Apr.'),
+                (string)$this->l->t('May.'),
+                (string)$this->l->t('Jun.'),
+                (string)$this->l->t('Jul.'),
+                (string)$this->l->t('Aug.'),
+                (string)$this->l->t('Sep.'),
+                (string)$this->l->t('Oct.'),
+                (string)$this->l->t('Nov.'),
+                (string)$this->l->t('Dec.')
+            ]),
+            "firstDay" => json_encode($this->l->l('firstday', null)) ,
+            "oc_config" => json_encode([
+                'session_lifetime'	=> min($this->config->getSystemValue('session_lifetime', $this->iniWrapper->getNumeric('session.gc_maxlifetime')), $this->iniWrapper->getNumeric('session.gc_maxlifetime')),
+                'session_keepalive'	=> $this->config->getSystemValue('session_keepalive', true),
+                'version'			=> implode('.', \OCP\Util::getVersion()),
+                'versionstring'		=> \OC_Util::getVersionString(),
+                'enable_avatars'	=> true, // here for legacy reasons - to not crash existing code that relies on this value
+                'lost_password_link'=> $this->config->getSystemValue('lost_password_link', null),
+                'modRewriteWorking'	=> ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'),
+                'sharing.maxAutocompleteResults' => intval($this->config->getSystemValue('sharing.maxAutocompleteResults', 0)),
+                'sharing.minSearchStringLength' => intval($this->config->getSystemValue('sharing.minSearchStringLength', 0)),
+                'blacklist_files_regex' => \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX,
+            ]),
+            "oc_appconfig" => json_encode([
+                'core' => [
+                    'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
+                    'defaultExpireDate' => $defaultExpireDate,
+                    'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
+                    'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
+                    'enableLinkPasswordByDefault' => $enableLinkPasswordByDefault,
+                    'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(),
+                    'resharingAllowed' => \OC\Share\Share::isResharingAllowed(),
+                    'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
+                    'federatedCloudShareDoc' => $this->urlGenerator->linkToDocs('user-sharing-federated'),
+                    'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing()
+                ]
+            ]),
+            "oc_defaults" => json_encode([
+                'entity' => $this->defaults->getEntity(),
+                'name' => $this->defaults->getName(),
+                'title' => $this->defaults->getTitle(),
+                'baseUrl' => $this->defaults->getBaseUrl(),
+                'syncClientUrl' => $this->defaults->getSyncClientUrl(),
+                'docBaseUrl' => $this->defaults->getDocBaseUrl(),
+                'docPlaceholderUrl' => $this->defaults->buildDocLinkToKey('PLACEHOLDER'),
+                'slogan' => $this->defaults->getSlogan(),
+                'logoClaim' => '',
+                'shortFooter' => $this->defaults->getShortFooter(),
+                'longFooter' => $this->defaults->getLongFooter(),
+                'folder' => \OC_Util::getTheme(),
+            ]),
+        ];
 
-		if ($this->currentUser !== null) {
-			$array['oc_userconfig'] = json_encode([
-				'avatar' => [
-					'version' => (int)$this->config->getUserValue($uid, 'avatar', 'version', 0),
-				]
-			]);
-		}
+        if ($this->currentUser !== null) {
+            $array['oc_userconfig'] = json_encode([
+                'avatar' => [
+                    'version' => (int)$this->config->getUserValue($uid, 'avatar', 'version', 0),
+                ]
+            ]);
+        }
 
-		// Allow hooks to modify the output values
-		\OC_Hook::emit('\OCP\Config', 'js', array('array' => &$array));
+        // Allow hooks to modify the output values
+        \OC_Hook::emit('\OCP\Config', 'js', array('array' => &$array));
 
-		$result = '';
+        $result = '';
 
-		// Echo it
-		foreach ($array as  $setting => $value) {
-			$result .= 'var '. $setting . '='. $value . ';' . PHP_EOL;
-		}
+        // Echo it
+        foreach ($array as  $setting => $value) {
+            $result .= 'var '. $setting . '='. $value . ';' . PHP_EOL;
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 }

lib/private/Template/ResourceNotFoundException.php

Indentation +17 added lines, -17 removed lines

@@ -24,23 +24,23 @@
 namespace OC\Template;
 
 class ResourceNotFoundException extends \LogicException {
-	protected $resource;
-	protected $webPath;
+    protected $resource;
+    protected $webPath;
 
-	/**
-	 * @param string $resource
-	 * @param string $webPath
-	 */
-	public function __construct($resource, $webPath) {
-		parent::__construct('Resource not found');
-		$this->resource = $resource;
-		$this->webPath = $webPath;
-	}
+    /**
+     * @param string $resource
+     * @param string $webPath
+     */
+    public function __construct($resource, $webPath) {
+        parent::__construct('Resource not found');
+        $this->resource = $resource;
+        $this->webPath = $webPath;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getResourcePath() {
-		return $this->webPath . '/' . $this->resource;
-	}
+    /**
+     * @return string
+     */
+    public function getResourcePath() {
+        return $this->webPath . '/' . $this->resource;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -41,6 +41,6 @@
 	 * @return string
 	 */
 	public function getResourcePath() {
-		return $this->webPath . '/' . $this->resource;
+		return $this->webPath.'/'.$this->resource;
 	}
 }

lib/private/Template/TemplateFileLocator.php

Indentation +29 added lines, -29 removed lines

@@ -26,37 +26,37 @@
 namespace OC\Template;
 
 class TemplateFileLocator {
-	protected $dirs;
-	private $path;
+    protected $dirs;
+    private $path;
 
-	/**
-	 * @param string[] $dirs
-	 */
-	public function __construct( $dirs ) {
-		$this->dirs = $dirs;
-	}
+    /**
+     * @param string[] $dirs
+     */
+    public function __construct( $dirs ) {
+        $this->dirs = $dirs;
+    }
 
-	/**
-	 * @param string $template
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function find( $template ) {
-		if ($template === '') {
-			throw new \InvalidArgumentException('Empty template name');
-		}
+    /**
+     * @param string $template
+     * @return string
+     * @throws \Exception
+     */
+    public function find( $template ) {
+        if ($template === '') {
+            throw new \InvalidArgumentException('Empty template name');
+        }
 
-		foreach($this->dirs as $dir) {
-			$file = $dir.$template.'.php';
-			if (is_file($file)) {
-				$this->path = $dir;
-				return $file;
-			}
-		}
-		throw new \Exception('template file not found: template:'.$template);
-	}
+        foreach($this->dirs as $dir) {
+            $file = $dir.$template.'.php';
+            if (is_file($file)) {
+                $this->path = $dir;
+                return $file;
+            }
+        }
+        throw new \Exception('template file not found: template:'.$template);
+    }
 
-	public function getPath() {
-		return $this->path;
-	}
+    public function getPath() {
+        return $this->path;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 * @param string[] $dirs
 	 */
-	public function __construct( $dirs ) {
+	public function __construct($dirs) {
 		$this->dirs = $dirs;
 	}
 
@@ -41,12 +41,12 @@ 
 	 * @return string
 	 * @throws \Exception
 	 */
-	public function find( $template ) {
+	public function find($template) {
 		if ($template === '') {
 			throw new \InvalidArgumentException('Empty template name');
 		}
 
-		foreach($this->dirs as $dir) {
+		foreach ($this->dirs as $dir) {
 			$file = $dir.$template.'.php';
 			if (is_file($file)) {
 				$this->path = $dir;