nextcloud / server

lib/public/Remote/IUser.php

Indentation +78 added lines, -78 removed lines

@@ -27,94 +27,94 @@
  * @since 13.0.0
  */
 interface IUser {
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 */
-	public function getUserId();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     */
+    public function getUserId();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 */
-	public function getEmail();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     */
+    public function getEmail();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 */
-	public function getDisplayName();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     */
+    public function getDisplayName();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 */
-	public function getPhone();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     */
+    public function getPhone();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 */
-	public function getAddress();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     */
+    public function getAddress();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 */
-	public function getWebsite();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     */
+    public function getWebsite();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 */
-	public function getTwitter();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     */
+    public function getTwitter();
 
-	/**
-	 * @return string[]
-	 *
-	 * @since 13.0.0
-	 */
-	public function getGroups();
+    /**
+     * @return string[]
+     *
+     * @since 13.0.0
+     */
+    public function getGroups();
 
-	/**
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 */
-	public function getLanguage();
+    /**
+     * @return string
+     *
+     * @since 13.0.0
+     */
+    public function getLanguage();
 
-	/**
-	 * @return int
-	 *
-	 * @since 13.0.0
-	 */
-	public function getUsedSpace();
+    /**
+     * @return int
+     *
+     * @since 13.0.0
+     */
+    public function getUsedSpace();
 
-	/**
-	 * @return int
-	 *
-	 * @since 13.0.0
-	 */
-	public function getFreeSpace();
+    /**
+     * @return int
+     *
+     * @since 13.0.0
+     */
+    public function getFreeSpace();
 
-	/**
-	 * @return int
-	 *
-	 * @since 13.0.0
-	 */
-	public function getTotalSpace();
+    /**
+     * @return int
+     *
+     * @since 13.0.0
+     */
+    public function getTotalSpace();
 
-	/**
-	 * @return int
-	 *
-	 * @since 13.0.0
-	 */
-	public function getQuota();
+    /**
+     * @return int
+     *
+     * @since 13.0.0
+     */
+    public function getQuota();
 }

lib/public/Remote/IInstance.php

Indentation +32 added lines, -32 removed lines

@@ -27,40 +27,40 @@
  * @since 13.0.0
  */
 interface IInstance {
-	/**
-	 * @return string The url of the remote server without protocol
-	 *
-	 * @since 13.0.0
-	 */
-	public function getUrl();
+    /**
+     * @return string The url of the remote server without protocol
+     *
+     * @since 13.0.0
+     */
+    public function getUrl();
 
-	/**
-	 * @return string The of of the remote server with protocol
-	 *
-	 * @since 13.0.0
-	 */
-	public function getFullUrl();
+    /**
+     * @return string The of of the remote server with protocol
+     *
+     * @since 13.0.0
+     */
+    public function getFullUrl();
 
-	/**
-	 * @return string The full version string in '13.1.2.3' format
-	 *
-	 * @since 13.0.0
-	 */
-	public function getVersion();
+    /**
+     * @return string The full version string in '13.1.2.3' format
+     *
+     * @since 13.0.0
+     */
+    public function getVersion();
 
-	/**
-	 * @return string 'http' or 'https'
-	 *
-	 * @since 13.0.0
-	 */
-	public function getProtocol();
+    /**
+     * @return string 'http' or 'https'
+     *
+     * @since 13.0.0
+     */
+    public function getProtocol();
 
-	/**
-	 * Check that the remote server is installed and not in maintenance mode
-	 *
-	 * @since 13.0.0
-	 *
-	 * @return bool
-	 */
-	public function isActive();
+    /**
+     * Check that the remote server is installed and not in maintenance mode
+     *
+     * @since 13.0.0
+     *
+     * @return bool
+     */
+    public function isActive();
 }

lib/public/Collaboration/AutoComplete/IManager.php

Indentation +12 added lines, -12 removed lines

@@ -30,17 +30,17 @@
  * @since 13.0.0
  */
 interface IManager {
-	/**
-	 * @param string $className – class name of the ISorter implementation
-	 * @since 13.0.0
-	 */
-	public function registerSorter($className);
+    /**
+     * @param string $className – class name of the ISorter implementation
+     * @since 13.0.0
+     */
+    public function registerSorter($className);
 
-	/**
-	 * @param array $sorters	list of sorter IDs, seperated by "|"
-	 * @param array $sortArray	array representation of OCP\Collaboration\Collaborators\ISearchResult
-	 * @param array $context	context info of the search, keys: itemType, itemId
-	 * @since 13.0.0
-	 */
-	public function runSorters(array $sorters, array &$sortArray, array $context);
+    /**
+     * @param array $sorters	list of sorter IDs, seperated by "|"
+     * @param array $sortArray	array representation of OCP\Collaboration\Collaborators\ISearchResult
+     * @param array $context	context info of the search, keys: itemType, itemId
+     * @since 13.0.0
+     */
+    public function runSorters(array $sorters, array &$sortArray, array $context);
 }

core/templates/update.use-cli.php

Indentation +5 added lines, -5 removed lines

@@ -3,12 +3,12 @@
 		<h2 class="title"><?php p($l->t('Update needed')) ?></h2>
 		<div class="infogroup">
 			<?php if ($_['tooBig']) {
-				p($l->t('Please use the command line updater because you have a big instance with more than 50 users.'));
-			} else {
-				p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
-			} ?><br><br>
+                p($l->t('Please use the command line updater because you have a big instance with more than 50 users.'));
+            } else {
+                p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
+            } ?><br><br>
 			<?php
-			print_unescaped($l->t('For help, see the  <a target="_blank" rel="noreferrer noopener" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?><br><br>
+            print_unescaped($l->t('For help, see the  <a target="_blank" rel="noreferrer noopener" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?><br><br>
 		</div>
 	</div>
 

core/templates/layout.noscript.warning.php

Indentation +4 added lines, -4 removed lines

@@ -2,10 +2,10 @@
 	<div id="nojavascript">
 		<div>
 			<?php print_unescaped(str_replace(
-					['{linkstart}', '{linkend}'],
-					['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'],
-					$l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.')
-				)); ?>
+                    ['{linkstart}', '{linkend}'],
+                    ['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'],
+                    $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.')
+                )); ?>
 		</div>
 	</div>
 </noscript>

lib/public/Collaboration/AutoComplete/ISorter.php

Indentation +13 added lines, -13 removed lines

@@ -33,18 +33,18 @@
  */
 interface ISorter {
 
-	/**
-	 * @return string The ID of the sorter, e.g. commenters
-	 * @since 13.0.0
-	 */
-	public function getId();
+    /**
+     * @return string The ID of the sorter, e.g. commenters
+     * @since 13.0.0
+     */
+    public function getId();
 
-	/**
-	 * executes the sort action
-	 *
-	 * @param array $sortArray the array to be sorted, provided as reference
-	 * @param array $context carries key 'itemType' and 'itemId' of the source object (e.g. a file)
-	 * @since 13.0.0
-	 */
-	public function sort(array &$sortArray, array $context);
+    /**
+     * executes the sort action
+     *
+     * @param array $sortArray the array to be sorted, provided as reference
+     * @param array $context carries key 'itemType' and 'itemId' of the source object (e.g. a file)
+     * @since 13.0.0
+     */
+    public function sort(array &$sortArray, array $context);
 }

lib/private/Files/Mount/CacheMountProvider.php

Indentation +35 added lines, -35 removed lines

@@ -31,42 +31,42 @@
  * Mount provider for custom cache storages
  */
 class CacheMountProvider implements IMountProvider {
-	/**
-	 * @var IConfig
-	 */
-	private $config;
+    /**
+     * @var IConfig
+     */
+    private $config;
 
-	/**
-	 * ObjectStoreHomeMountProvider constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * ObjectStoreHomeMountProvider constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Get the cache mount for a user
-	 *
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$cacheBaseDir = $this->config->getSystemValue('cache_path', '');
-		if ($cacheBaseDir !== '') {
-			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
-			if (!file_exists($cacheDir)) {
-				mkdir($cacheDir, 0770, true);
-				mkdir($cacheDir . '/uploads', 0770, true);
-			}
+    /**
+     * Get the cache mount for a user
+     *
+     * @param IUser $user
+     * @param IStorageFactory $loader
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $cacheBaseDir = $this->config->getSystemValue('cache_path', '');
+        if ($cacheBaseDir !== '') {
+            $cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
+            if (!file_exists($cacheDir)) {
+                mkdir($cacheDir, 0770, true);
+                mkdir($cacheDir . '/uploads', 0770, true);
+            }
 
-			return [
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]),
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads', $loader])
-			];
-		} else {
-			return [];
-		}
-	}
+            return [
+                new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]),
+                new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads', $loader])
+            ];
+        } else {
+            return [];
+        }
+    }
 }

core/Migrations/Version13000Date20170926101637.php

Indentation +27 added lines, -27 removed lines

@@ -11,32 +11,32 @@
  */
 class Version13000Date20170926101637 extends BigIntMigration {
 
-	/**
-	 * @return array Returns an array with the following structure
-	 * ['table1' => ['column1', 'column2'], ...]
-	 * @since 13.0.0
-	 */
-	protected function getColumnsByTable() {
-		return [
-			'admin_settings' => ['id'],
-			'authtoken' => ['id'],
-			'bruteforce_attempts' => ['id'],
-			'comments' => ['id', 'parent_id', 'topmost_parent_id'],
-			// Disabled for now 'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart'],
-			'file_locks' => ['id'],
-			'jobs' => ['id'],
-			// Disabled for now 'mimetypes' => ['id'],
-			'mounts' => ['id'],
-			'personal_settings' => ['id'],
-			'properties' => ['id'],
-			'share' => ['id', 'parent', 'file_source'],
-			// Disabled for now 'storages' => ['numeric_id'],
-			'systemtag' => ['id'],
-			'systemtag_group' => ['systemtagid'],
-			'systemtag_object_mapping' => ['systemtagid'],
-			'vcategory' => ['id'],
-			'vcategory_to_object' => ['objid', 'categoryid'],
-		];
-	}
+    /**
+     * @return array Returns an array with the following structure
+     * ['table1' => ['column1', 'column2'], ...]
+     * @since 13.0.0
+     */
+    protected function getColumnsByTable() {
+        return [
+            'admin_settings' => ['id'],
+            'authtoken' => ['id'],
+            'bruteforce_attempts' => ['id'],
+            'comments' => ['id', 'parent_id', 'topmost_parent_id'],
+            // Disabled for now 'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart'],
+            'file_locks' => ['id'],
+            'jobs' => ['id'],
+            // Disabled for now 'mimetypes' => ['id'],
+            'mounts' => ['id'],
+            'personal_settings' => ['id'],
+            'properties' => ['id'],
+            'share' => ['id', 'parent', 'file_source'],
+            // Disabled for now 'storages' => ['numeric_id'],
+            'systemtag' => ['id'],
+            'systemtag_group' => ['systemtagid'],
+            'systemtag_object_mapping' => ['systemtagid'],
+            'vcategory' => ['id'],
+            'vcategory_to_object' => ['objid', 'categoryid'],
+        ];
+    }
 
 }

lib/private/DateTimeFormatter.php

Indentation +268 added lines, -268 removed lines

@@ -25,294 +25,294 @@
 namespace OC;
 
 class DateTimeFormatter implements \OCP\IDateTimeFormatter {
-	/** @var \DateTimeZone */
-	protected $defaultTimeZone;
+    /** @var \DateTimeZone */
+    protected $defaultTimeZone;
 
-	/** @var \OCP\IL10N */
-	protected $defaultL10N;
+    /** @var \OCP\IL10N */
+    protected $defaultL10N;
 
-	/**
-	 * Constructor
-	 *
-	 * @param \DateTimeZone $defaultTimeZone Set the timezone for the format
-	 * @param \OCP\IL10N $defaultL10N Set the language for the format
-	 */
-	public function __construct(\DateTimeZone $defaultTimeZone, \OCP\IL10N $defaultL10N) {
-		$this->defaultTimeZone = $defaultTimeZone;
-		$this->defaultL10N = $defaultL10N;
-	}
+    /**
+     * Constructor
+     *
+     * @param \DateTimeZone $defaultTimeZone Set the timezone for the format
+     * @param \OCP\IL10N $defaultL10N Set the language for the format
+     */
+    public function __construct(\DateTimeZone $defaultTimeZone, \OCP\IL10N $defaultL10N) {
+        $this->defaultTimeZone = $defaultTimeZone;
+        $this->defaultL10N = $defaultL10N;
+    }
 
-	/**
-	 * Get TimeZone to use
-	 *
-	 * @param \DateTimeZone $timeZone	The timezone to use
-	 * @return \DateTimeZone		The timezone to use, falling back to the current user's timezone
-	 */
-	protected function getTimeZone($timeZone = null) {
-		if ($timeZone === null) {
-			$timeZone = $this->defaultTimeZone;
-		}
+    /**
+     * Get TimeZone to use
+     *
+     * @param \DateTimeZone $timeZone	The timezone to use
+     * @return \DateTimeZone		The timezone to use, falling back to the current user's timezone
+     */
+    protected function getTimeZone($timeZone = null) {
+        if ($timeZone === null) {
+            $timeZone = $this->defaultTimeZone;
+        }
 
-		return $timeZone;
-	}
+        return $timeZone;
+    }
 
-	/**
-	 * Get \OCP\IL10N to use
-	 *
-	 * @param \OCP\IL10N $l	The locale to use
-	 * @return \OCP\IL10N		The locale to use, falling back to the current user's locale
-	 */
-	protected function getLocale($l = null) {
-		if ($l === null) {
-			$l = $this->defaultL10N;
-		}
+    /**
+     * Get \OCP\IL10N to use
+     *
+     * @param \OCP\IL10N $l	The locale to use
+     * @return \OCP\IL10N		The locale to use, falling back to the current user's locale
+     */
+    protected function getLocale($l = null) {
+        if ($l === null) {
+            $l = $this->defaultL10N;
+        }
 
-		return $l;
-	}
+        return $l;
+    }
 
-	/**
-	 * Generates a DateTime object with the given timestamp and TimeZone
-	 *
-	 * @param mixed $timestamp
-	 * @param \DateTimeZone $timeZone	The timezone to use
-	 * @return \DateTime
-	 */
-	protected function getDateTime($timestamp, \DateTimeZone $timeZone = null) {
-		if ($timestamp === null) {
-			return new \DateTime('now', $timeZone);
-		} else if (!$timestamp instanceof \DateTime) {
-			$dateTime = new \DateTime('now', $timeZone);
-			$dateTime->setTimestamp($timestamp);
-			return $dateTime;
-		}
-		if ($timeZone) {
-			$timestamp->setTimezone($timeZone);
-		}
-		return $timestamp;
-	}
+    /**
+     * Generates a DateTime object with the given timestamp and TimeZone
+     *
+     * @param mixed $timestamp
+     * @param \DateTimeZone $timeZone	The timezone to use
+     * @return \DateTime
+     */
+    protected function getDateTime($timestamp, \DateTimeZone $timeZone = null) {
+        if ($timestamp === null) {
+            return new \DateTime('now', $timeZone);
+        } else if (!$timestamp instanceof \DateTime) {
+            $dateTime = new \DateTime('now', $timeZone);
+            $dateTime->setTimestamp($timestamp);
+            return $dateTime;
+        }
+        if ($timeZone) {
+            $timestamp->setTimezone($timeZone);
+        }
+        return $timestamp;
+    }
 
-	/**
-	 * Formats the date of the given timestamp
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
-	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
-	 * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
-	 * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
-	 * 				The exact format is dependent on the language
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted date string
-	 */
-	public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		return $this->format($timestamp, 'date', $format, $timeZone, $l);
-	}
+    /**
+     * Formats the date of the given timestamp
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
+     * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
+     * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
+     * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
+     * 				The exact format is dependent on the language
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted date string
+     */
+    public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        return $this->format($timestamp, 'date', $format, $timeZone, $l);
+    }
 
-	/**
-	 * Formats the date of the given timestamp
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
-	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
-	 * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
-	 * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
-	 * 				The exact format is dependent on the language
-	 * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted relative date string
-	 */
-	public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		if (substr($format, -1) !== '*' && substr($format, -1) !== '*') {
-			$format .= '^';
-		}
+    /**
+     * Formats the date of the given timestamp
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
+     * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
+     * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
+     * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
+     * 				The exact format is dependent on the language
+     * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted relative date string
+     */
+    public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        if (substr($format, -1) !== '*' && substr($format, -1) !== '*') {
+            $format .= '^';
+        }
 
-		return $this->format($timestamp, 'date', $format, $timeZone, $l);
-	}
+        return $this->format($timestamp, 'date', $format, $timeZone, $l);
+    }
 
-	/**
-	 * Gives the relative date of the timestamp
-	 * Only works for past dates
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
-	 * @return string	Dates returned are:
-	 * 				<  1 month	=> Today, Yesterday, n days ago
-	 * 				< 13 month	=> last month, n months ago
-	 * 				>= 13 month	=> last year, n years ago
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted date span
-	 */
-	public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
-		$l = $this->getLocale($l);
-		$timestamp = $this->getDateTime($timestamp);
-		$timestamp->setTime(0, 0, 0);
+    /**
+     * Gives the relative date of the timestamp
+     * Only works for past dates
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
+     * @return string	Dates returned are:
+     * 				<  1 month	=> Today, Yesterday, n days ago
+     * 				< 13 month	=> last month, n months ago
+     * 				>= 13 month	=> last year, n years ago
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted date span
+     */
+    public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
+        $l = $this->getLocale($l);
+        $timestamp = $this->getDateTime($timestamp);
+        $timestamp->setTime(0, 0, 0);
 
-		if ($baseTimestamp === null) {
-			$baseTimestamp = time();
-		}
-		$baseTimestamp = $this->getDateTime($baseTimestamp);
-		$baseTimestamp->setTime(0, 0, 0);
-		$dateInterval = $timestamp->diff($baseTimestamp);
+        if ($baseTimestamp === null) {
+            $baseTimestamp = time();
+        }
+        $baseTimestamp = $this->getDateTime($baseTimestamp);
+        $baseTimestamp->setTime(0, 0, 0);
+        $dateInterval = $timestamp->diff($baseTimestamp);
 
-		if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 0) {
-			return $l->t('today');
-		} else if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 1) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->t('tomorrow');
-			} else {
-				return $l->t('yesterday');
-			}
-		} else if ($dateInterval->y == 0 && $dateInterval->m == 0) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->n('in %n day', 'in %n days', $dateInterval->d);
-			} else {
-				return $l->n('%n day ago', '%n days ago', $dateInterval->d);
-			}
-		} else if ($dateInterval->y == 0 && $dateInterval->m == 1) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->t('next month');
-			} else {
-				return $l->t('last month');
-			}
-		} else if ($dateInterval->y == 0) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->n('in %n month', 'in %n months', $dateInterval->m);
-			} else {
-				return $l->n('%n month ago', '%n months ago', $dateInterval->m);
-			}
-		} else if ($dateInterval->y == 1) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->t('next year');
-			} else {
-				return $l->t('last year');
-			}
-		}
-		if ($timestamp > $baseTimestamp) {
-			return $l->n('in %n year', 'in %n years', $dateInterval->y);
-		} else {
-			return $l->n('%n year ago', '%n years ago', $dateInterval->y);
-		}
-	}
+        if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 0) {
+            return $l->t('today');
+        } else if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 1) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->t('tomorrow');
+            } else {
+                return $l->t('yesterday');
+            }
+        } else if ($dateInterval->y == 0 && $dateInterval->m == 0) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->n('in %n day', 'in %n days', $dateInterval->d);
+            } else {
+                return $l->n('%n day ago', '%n days ago', $dateInterval->d);
+            }
+        } else if ($dateInterval->y == 0 && $dateInterval->m == 1) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->t('next month');
+            } else {
+                return $l->t('last month');
+            }
+        } else if ($dateInterval->y == 0) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->n('in %n month', 'in %n months', $dateInterval->m);
+            } else {
+                return $l->n('%n month ago', '%n months ago', $dateInterval->m);
+            }
+        } else if ($dateInterval->y == 1) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->t('next year');
+            } else {
+                return $l->t('last year');
+            }
+        }
+        if ($timestamp > $baseTimestamp) {
+            return $l->n('in %n year', 'in %n years', $dateInterval->y);
+        } else {
+            return $l->n('%n year ago', '%n years ago', $dateInterval->y);
+        }
+    }
 
-	/**
-	 * Formats the time of the given timestamp
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'h:mm:ss a zzzz'	=> '11:42:13 AM GMT+0:00'
-	 * 				long:	e.g. 'h:mm:ss a z'		=> '11:42:13 AM GMT'
-	 * 				medium:	e.g. 'h:mm:ss a'		=> '11:42:13 AM'
-	 * 				short:	e.g. 'h:mm a'			=> '11:42 AM'
-	 * 				The exact format is dependent on the language
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted time string
-	 */
-	public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		return $this->format($timestamp, 'time', $format, $timeZone, $l);
-	}
+    /**
+     * Formats the time of the given timestamp
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'h:mm:ss a zzzz'	=> '11:42:13 AM GMT+0:00'
+     * 				long:	e.g. 'h:mm:ss a z'		=> '11:42:13 AM GMT'
+     * 				medium:	e.g. 'h:mm:ss a'		=> '11:42:13 AM'
+     * 				short:	e.g. 'h:mm a'			=> '11:42 AM'
+     * 				The exact format is dependent on the language
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted time string
+     */
+    public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        return $this->format($timestamp, 'time', $format, $timeZone, $l);
+    }
 
-	/**
-	 * Gives the relative past time of the timestamp
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
-	 * @return string	Dates returned are:
-	 * 				< 60 sec	=> seconds ago
-	 * 				<  1 hour	=> n minutes ago
-	 * 				<  1 day	=> n hours ago
-	 * 				<  1 month	=> Yesterday, n days ago
-	 * 				< 13 month	=> last month, n months ago
-	 * 				>= 13 month	=> last year, n years ago
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted time span
-	 */
-	public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
-		$l = $this->getLocale($l);
-		$timestamp = $this->getDateTime($timestamp);
-		if ($baseTimestamp === null) {
-			$baseTimestamp = time();
-		}
-		$baseTimestamp = $this->getDateTime($baseTimestamp);
+    /**
+     * Gives the relative past time of the timestamp
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
+     * @return string	Dates returned are:
+     * 				< 60 sec	=> seconds ago
+     * 				<  1 hour	=> n minutes ago
+     * 				<  1 day	=> n hours ago
+     * 				<  1 month	=> Yesterday, n days ago
+     * 				< 13 month	=> last month, n months ago
+     * 				>= 13 month	=> last year, n years ago
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted time span
+     */
+    public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
+        $l = $this->getLocale($l);
+        $timestamp = $this->getDateTime($timestamp);
+        if ($baseTimestamp === null) {
+            $baseTimestamp = time();
+        }
+        $baseTimestamp = $this->getDateTime($baseTimestamp);
 
-		$diff = $timestamp->diff($baseTimestamp);
-		if ($diff->y > 0 || $diff->m > 0 || $diff->d > 0) {
-			return $this->formatDateSpan($timestamp, $baseTimestamp, $l);
-		}
+        $diff = $timestamp->diff($baseTimestamp);
+        if ($diff->y > 0 || $diff->m > 0 || $diff->d > 0) {
+            return $this->formatDateSpan($timestamp, $baseTimestamp, $l);
+        }
 
-		if ($diff->h > 0) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->n('in %n hour', 'in %n hours', $diff->h);
-			} else {
-				return $l->n('%n hour ago', '%n hours ago', $diff->h);
-			}
-		} else if ($diff->i > 0) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->n('in %n minute', 'in %n minutes', $diff->i);
-			} else {
-				return $l->n('%n minute ago', '%n minutes ago', $diff->i);
-			}
-		}
-		if ($timestamp > $baseTimestamp) {
-			return $l->t('in a few seconds');
-		} else {
-			return $l->t('seconds ago');
-		}
-	}
+        if ($diff->h > 0) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->n('in %n hour', 'in %n hours', $diff->h);
+            } else {
+                return $l->n('%n hour ago', '%n hours ago', $diff->h);
+            }
+        } else if ($diff->i > 0) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->n('in %n minute', 'in %n minutes', $diff->i);
+            } else {
+                return $l->n('%n minute ago', '%n minutes ago', $diff->i);
+            }
+        }
+        if ($timestamp > $baseTimestamp) {
+            return $l->t('in a few seconds');
+        } else {
+            return $l->t('seconds ago');
+        }
+    }
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
-	 * @param string		$formatDate		See formatDate() for description
-	 * @param string		$formatTime		See formatTime() for description
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted date and time string
-	 */
-	public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
-	}
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
+     * @param string		$formatDate		See formatDate() for description
+     * @param string		$formatTime		See formatTime() for description
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted date and time string
+     */
+    public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
+    }
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
-	 * @param string	$formatDate		See formatDate() for description
-	 * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
-	 * @param string	$formatTime		See formatTime() for description
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted relative date and time string
-	 */
-	public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		if (substr($formatDate, -1) !== '^' && substr($formatDate, -1) !== '*') {
-			$formatDate .= '^';
-		}
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
+     * @param string	$formatDate		See formatDate() for description
+     * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+     * @param string	$formatTime		See formatTime() for description
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted relative date and time string
+     */
+    public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        if (substr($formatDate, -1) !== '^' && substr($formatDate, -1) !== '*') {
+            $formatDate .= '^';
+        }
 
-		return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
-	}
+        return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
+    }
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
-	 * @param string		$type		One of 'date', 'datetime' or 'time'
-	 * @param string		$format		Format string
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted date and time string
-	 */
-	protected function format($timestamp, $type, $format, \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		$l = $this->getLocale($l);
-		$timeZone = $this->getTimeZone($timeZone);
-		$timestamp = $this->getDateTime($timestamp, $timeZone);
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
+     * @param string		$type		One of 'date', 'datetime' or 'time'
+     * @param string		$format		Format string
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted date and time string
+     */
+    protected function format($timestamp, $type, $format, \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        $l = $this->getLocale($l);
+        $timeZone = $this->getTimeZone($timeZone);
+        $timestamp = $this->getDateTime($timestamp, $timeZone);
 
-		return $l->l($type, $timestamp, array(
-			'width' => $format,
-		));
-	}
+        return $l->l($type, $timestamp, array(
+            'width' => $format,
+        ));
+    }
 }