nextcloud / server

apps/files/lib/BackgroundJob/DeleteOrphanedItems.php

Indentation +118 added lines, -118 removed lines

@@ -32,123 +32,123 @@
  */
 class DeleteOrphanedItems extends TimedJob {
 
-	const CHUNK_SIZE = 200;
-
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/** @var \OCP\ILogger */
-	protected $logger;
-
-	/**
-	 * Default interval in minutes
-	 *
-	 * @var int $defaultIntervalMin
-	 **/
-	protected $defaultIntervalMin = 60;
-
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		$this->interval = $this->defaultIntervalMin * 60;
-		$this->connection = \OC::$server->getDatabaseConnection();
-		$this->logger = \OC::$server->getLogger();
-	}
-
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$this->cleanSystemTags();
-		$this->cleanUserTags();
-		$this->cleanComments();
-		$this->cleanCommentMarkers();
-	}
-
-	/**
-	 * Deleting orphaned system tag mappings
-	 *
-	 * @param string $table
-	 * @param string $idCol
-	 * @param string $typeCol
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanUp($table, $idCol, $typeCol) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('t1.' . $idCol)
-			->from($table, 't1')
-			->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
-			->andWhere($query->expr()->isNull('t2.fileid'))
-			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
-			->groupBy('t1.' . $idCol)
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete($table)
-			->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$result = $query->execute();
-			$deletedInLastChunk = 0;
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned system tag mappings
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanSystemTags() {
-		$deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype');
-		$this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned user tag mappings
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanUserTags() {
-		$deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type');
-		$this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned comments
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanComments() {
-		$deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type');
-		$this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
-
-	/**
-	 * Deleting orphaned comment read markers
-	 *
-	 * @return int Number of deleted entries
-	 */
-	protected function cleanCommentMarkers() {
-		$deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type');
-		$this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']);
-		return $deletedEntries;
-	}
+    const CHUNK_SIZE = 200;
+
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /** @var \OCP\ILogger */
+    protected $logger;
+
+    /**
+     * Default interval in minutes
+     *
+     * @var int $defaultIntervalMin
+     **/
+    protected $defaultIntervalMin = 60;
+
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        $this->interval = $this->defaultIntervalMin * 60;
+        $this->connection = \OC::$server->getDatabaseConnection();
+        $this->logger = \OC::$server->getLogger();
+    }
+
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $this->cleanSystemTags();
+        $this->cleanUserTags();
+        $this->cleanComments();
+        $this->cleanCommentMarkers();
+    }
+
+    /**
+     * Deleting orphaned system tag mappings
+     *
+     * @param string $table
+     * @param string $idCol
+     * @param string $typeCol
+     * @return int Number of deleted entries
+     */
+    protected function cleanUp($table, $idCol, $typeCol) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('t1.' . $idCol)
+            ->from($table, 't1')
+            ->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
+            ->andWhere($query->expr()->isNull('t2.fileid'))
+            ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
+            ->groupBy('t1.' . $idCol)
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete($table)
+            ->where($deleteQuery->expr()->eq($idCol, $deleteQuery->createParameter('objectid')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $result = $query->execute();
+            $deletedInLastChunk = 0;
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row[$idCol])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned system tag mappings
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanSystemTags() {
+        $deletedEntries = $this->cleanUp('systemtag_object_mapping', 'objectid', 'objecttype');
+        $this->logger->debug("$deletedEntries orphaned system tag relations deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned user tag mappings
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanUserTags() {
+        $deletedEntries = $this->cleanUp('vcategory_to_object', 'objid', 'type');
+        $this->logger->debug("$deletedEntries orphaned user tag relations deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned comments
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanComments() {
+        $deletedEntries = $this->cleanUp('comments', 'object_id', 'object_type');
+        $this->logger->debug("$deletedEntries orphaned comments deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
+
+    /**
+     * Deleting orphaned comment read markers
+     *
+     * @return int Number of deleted entries
+     */
+    protected function cleanCommentMarkers() {
+        $deletedEntries = $this->cleanUp('comments_read_markers', 'object_id', 'object_type');
+        $this->logger->debug("$deletedEntries orphaned comment read marks deleted", ['app' => 'DeleteOrphanedItems']);
+        return $deletedEntries;
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -80,12 +80,12 @@
 		$deletedEntries = 0;
 
 		$query = $this->connection->getQueryBuilder();
-		$query->select('t1.' . $idCol)
+		$query->select('t1.'.$idCol)
 			->from($table, 't1')
 			->where($query->expr()->eq($typeCol, $query->expr()->literal('files')))
 			->andWhere($query->expr()->isNull('t2.fileid'))
-			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
-			->groupBy('t1.' . $idCol)
+			->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.'.$idCol, IQueryBuilder::PARAM_INT), 't2.fileid'))
+			->groupBy('t1.'.$idCol)
 			->setMaxResults(self::CHUNK_SIZE);
 
 		$deleteQuery = $this->connection->getQueryBuilder();

apps/files/lib/BackgroundJob/ScanFiles.php

Indentation +69 added lines, -69 removed lines

@@ -36,80 +36,80 @@
  * @package OCA\Files\BackgroundJob
  */
 class ScanFiles extends \OC\BackgroundJob\TimedJob {
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IDBConnection */
-	private $dbConnection;
-	/** @var ILogger */
-	private $logger;
-	/** Amount of users that should get scanned per execution */
-	const USERS_PER_SESSION = 500;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IDBConnection */
+    private $dbConnection;
+    /** @var ILogger */
+    private $logger;
+    /** Amount of users that should get scanned per execution */
+    const USERS_PER_SESSION = 500;
 
-	/**
-	 * @param IConfig|null $config
-	 * @param IUserManager|null $userManager
-	 * @param IDBConnection|null $dbConnection
-	 * @param ILogger|null $logger
-	 */
-	public function __construct(IConfig $config = null,
-								IUserManager $userManager = null,
-								IDBConnection $dbConnection = null,
-								ILogger $logger = null) {
-		// Run once per 10 minutes
-		$this->setInterval(60 * 10);
+    /**
+     * @param IConfig|null $config
+     * @param IUserManager|null $userManager
+     * @param IDBConnection|null $dbConnection
+     * @param ILogger|null $logger
+     */
+    public function __construct(IConfig $config = null,
+                                IUserManager $userManager = null,
+                                IDBConnection $dbConnection = null,
+                                ILogger $logger = null) {
+        // Run once per 10 minutes
+        $this->setInterval(60 * 10);
 
-		if (is_null($userManager) || is_null($config)) {
-			$this->fixDIForJobs();
-		} else {
-			$this->config = $config;
-			$this->userManager = $userManager;
-			$this->logger = $logger;
-		}
-	}
+        if (is_null($userManager) || is_null($config)) {
+            $this->fixDIForJobs();
+        } else {
+            $this->config = $config;
+            $this->userManager = $userManager;
+            $this->logger = $logger;
+        }
+    }
 
-	protected function fixDIForJobs() {
-		$this->config = \OC::$server->getConfig();
-		$this->userManager = \OC::$server->getUserManager();
-		$this->logger = \OC::$server->getLogger();
-	}
+    protected function fixDIForJobs() {
+        $this->config = \OC::$server->getConfig();
+        $this->userManager = \OC::$server->getUserManager();
+        $this->logger = \OC::$server->getLogger();
+    }
 
-	/**
-	 * @param IUser $user
-	 */
-	protected function runScanner(IUser $user) {
-		try {
-			$scanner = new Scanner(
-					$user->getUID(),
-					$this->dbConnection,
-					$this->logger
-			);
-			$scanner->backgroundScan('');
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'files']);
-		}
-		\OC_Util::tearDownFS();
-	}
+    /**
+     * @param IUser $user
+     */
+    protected function runScanner(IUser $user) {
+        try {
+            $scanner = new Scanner(
+                    $user->getUID(),
+                    $this->dbConnection,
+                    $this->logger
+            );
+            $scanner->backgroundScan('');
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'files']);
+        }
+        \OC_Util::tearDownFS();
+    }
 
-	/**
-	 * @param $argument
-	 * @throws \Exception
-	 */
-	protected function run($argument) {
-		$offset = $this->config->getAppValue('files', 'cronjob_scan_files', 0);
-		$users = $this->userManager->search('', self::USERS_PER_SESSION, $offset);
-		if (!count($users)) {
-			// No users found, reset offset and retry
-			$offset = 0;
-			$users = $this->userManager->search('', self::USERS_PER_SESSION);
-		}
+    /**
+     * @param $argument
+     * @throws \Exception
+     */
+    protected function run($argument) {
+        $offset = $this->config->getAppValue('files', 'cronjob_scan_files', 0);
+        $users = $this->userManager->search('', self::USERS_PER_SESSION, $offset);
+        if (!count($users)) {
+            // No users found, reset offset and retry
+            $offset = 0;
+            $users = $this->userManager->search('', self::USERS_PER_SESSION);
+        }
 
-		$offset += self::USERS_PER_SESSION;
-		$this->config->setAppValue('files', 'cronjob_scan_files', $offset);
+        $offset += self::USERS_PER_SESSION;
+        $this->config->setAppValue('files', 'cronjob_scan_files', $offset);
 
-		foreach ($users as $user) {
-			$this->runScanner($user);
-		}
-	}
+        foreach ($users as $user) {
+            $this->runScanner($user);
+        }
+    }
 }

apps/files/lib/Settings/Admin.php

Indentation +43 added lines, -43 removed lines

@@ -31,56 +31,56 @@
 
 class Admin implements ISettings {
 
-	/** @var IniGetWrapper */
-	private $iniWrapper;
+    /** @var IniGetWrapper */
+    private $iniWrapper;
 
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	public function __construct(IniGetWrapper $iniWrapper, IRequest $request) {
-		$this->iniWrapper = $iniWrapper;
-		$this->request = $request;
-	}
+    public function __construct(IniGetWrapper $iniWrapper, IRequest $request) {
+        $this->iniWrapper = $iniWrapper;
+        $this->request = $request;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$htaccessWorking  = (getenv('htaccessWorking') == 'true');
-		$htaccessWritable = is_writable(\OC::$SERVERROOT.'/.htaccess');
-		$userIniWritable  = is_writable(\OC::$SERVERROOT.'/.user.ini');
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $htaccessWorking  = (getenv('htaccessWorking') == 'true');
+        $htaccessWritable = is_writable(\OC::$SERVERROOT.'/.htaccess');
+        $userIniWritable  = is_writable(\OC::$SERVERROOT.'/.user.ini');
 
-		$upload_max_filesize = $this->iniWrapper->getBytes('upload_max_filesize');
-		$post_max_size = $this->iniWrapper->getBytes('post_max_size');
-		$maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
+        $upload_max_filesize = $this->iniWrapper->getBytes('upload_max_filesize');
+        $post_max_size = $this->iniWrapper->getBytes('post_max_size');
+        $maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
 
-		$parameters = [
-			'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable ),
-			'uploadMaxFilesize'            => $maxUploadFilesize,
-			// max possible makes only sense on a 32 bit system
-			'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4,
-			'maxPossibleUploadSize'        => Util::humanFileSize(PHP_INT_MAX),
-		];
+        $parameters = [
+            'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable ),
+            'uploadMaxFilesize'            => $maxUploadFilesize,
+            // max possible makes only sense on a 32 bit system
+            'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4,
+            'maxPossibleUploadSize'        => Util::humanFileSize(PHP_INT_MAX),
+        ];
 
-		return new TemplateResponse('files', 'admin', $parameters, '');
-	}
+        return new TemplateResponse('files', 'admin', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'additional';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'additional';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 5;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 5;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		$maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
 
 		$parameters = [
-			'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable ),
+			'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable),
 			'uploadMaxFilesize'            => $maxUploadFilesize,
 			// max possible makes only sense on a 32 bit system
 			'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4,

apps/files/download.php

Indentation +5 added lines, -5 removed lines

@@ -30,11 +30,11 @@
 $filename = $_GET["file"];
 
 if(!\OC\Files\Filesystem::file_exists($filename)) {
-	header("HTTP/1.0 404 Not Found");
-	$tmpl = new OCP\Template( '', '404', 'guest' );
-	$tmpl->assign('file', $filename);
-	$tmpl->printPage();
-	exit;
+    header("HTTP/1.0 404 Not Found");
+    $tmpl = new OCP\Template( '', '404', 'guest' );
+    $tmpl->assign('file', $filename);
+    $tmpl->printPage();
+    exit;
 }
 
 $ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename ));

Spacing +4 added lines, -4 removed lines

@@ -29,15 +29,15 @@ 
 
 $filename = $_GET["file"];
 
-if(!\OC\Files\Filesystem::file_exists($filename)) {
+if (!\OC\Files\Filesystem::file_exists($filename)) {
 	header("HTTP/1.0 404 Not Found");
-	$tmpl = new OCP\Template( '', '404', 'guest' );
+	$tmpl = new OCP\Template('', '404', 'guest');
 	$tmpl->assign('file', $filename);
 	$tmpl->printPage();
 	exit;
 }
 
-$ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename ));
+$ftype = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
 
 header('Content-Type:'.$ftype);
 OCP\Response::setContentDispositionHeader(basename($filename), 'attachment');
@@ -45,4 +45,4 @@ 
 OCP\Response::setContentLengthHeader(\OC\Files\Filesystem::filesize($filename));
 
 OC_Util::obEnd();
-\OC\Files\Filesystem::readfile( $filename );
+\OC\Files\Filesystem::readfile($filename);

apps/files/appinfo/update.php

Indentation +37 added lines, -37 removed lines

@@ -51,48 +51,48 @@
  * @param \OCP\IDBConnection $conn
  */
 function owncloud_reset_encrypted_flag(\OCP\IDBConnection $conn) {
-	$conn->executeUpdate('UPDATE `*PREFIX*filecache` SET `encrypted` = 0 WHERE `encrypted` = 1');
+    $conn->executeUpdate('UPDATE `*PREFIX*filecache` SET `encrypted` = 0 WHERE `encrypted` = 1');
 }
 
 // Current version of ownCloud before the update is 8.1.0 or 8.2.0.(0-2)
 if ($installedVersion === '1.1.9' && (
-		// 8.1.0.x
-		(((int) $ocVersion[0]) === 8 && ((int) $ocVersion[1]) === 1 && ((int) $ocVersion[2]) === 0)
-		||
-		// < 8.2.0.3
-		(((int) $ocVersion[0]) === 8 && ((int) $ocVersion[1]) === 2 && ((int) $ocVersion[2]) === 0 && ((int) $ocVersion[3]) < 3)
-	)) {
+        // 8.1.0.x
+        (((int) $ocVersion[0]) === 8 && ((int) $ocVersion[1]) === 1 && ((int) $ocVersion[2]) === 0)
+        ||
+        // < 8.2.0.3
+        (((int) $ocVersion[0]) === 8 && ((int) $ocVersion[1]) === 2 && ((int) $ocVersion[2]) === 0 && ((int) $ocVersion[3]) < 3)
+    )) {
 
-	// Encryption is not enabled
-	if (!\OC::$server->getEncryptionManager()->isEnabled()) {
-		$conn = \OC::$server->getDatabaseConnection();
+    // Encryption is not enabled
+    if (!\OC::$server->getEncryptionManager()->isEnabled()) {
+        $conn = \OC::$server->getDatabaseConnection();
 
-		// Old encryption is not known in app config
-		$oldEncryption = \OC::$server->getConfig()->getAppKeys('files_encryption');
-		if (empty($oldEncryption)) {
-			owncloud_reset_encrypted_flag($conn);
-		} else {
-			$query = $conn->prepare('SELECT * FROM `*PREFIX*filecache` WHERE `encrypted` = 1 AND `unencrypted_size` > 0', 1);
-			$query->execute();
-			$empty = $query->fetch();
+        // Old encryption is not known in app config
+        $oldEncryption = \OC::$server->getConfig()->getAppKeys('files_encryption');
+        if (empty($oldEncryption)) {
+            owncloud_reset_encrypted_flag($conn);
+        } else {
+            $query = $conn->prepare('SELECT * FROM `*PREFIX*filecache` WHERE `encrypted` = 1 AND `unencrypted_size` > 0', 1);
+            $query->execute();
+            $empty = $query->fetch();
 
-			if (empty($empty)) {
-				owncloud_reset_encrypted_flag($conn);
-			} else {
-				/**
-				 * Sorry in case you are a false positive, but we are not 100% that
-				 * you don't have any encrypted files anymore, so we can not reset
-				 * the value safely
-				 */
-				\OC::$server->getLogger()->warning(
-					'If you have a problem with files not being accessible and '
-					. 'you are not using encryption, please have a look at the following'
-					. 'issue: {issue}',
-					[
-						'issue' => 'https://github.com/owncloud/core/issues/17846',
-					]
-				);
-			}
-		}
-	}
+            if (empty($empty)) {
+                owncloud_reset_encrypted_flag($conn);
+            } else {
+                /**
+                 * Sorry in case you are a false positive, but we are not 100% that
+                 * you don't have any encrypted files anymore, so we can not reset
+                 * the value safely
+                 */
+                \OC::$server->getLogger()->warning(
+                    'If you have a problem with files not being accessible and '
+                    . 'you are not using encryption, please have a look at the following'
+                    . 'issue: {issue}',
+                    [
+                        'issue' => 'https://github.com/owncloud/core/issues/17846',
+                    ]
+                );
+            }
+        }
+    }
 }

apps/files/appinfo/routes.php

Indentation +47 added lines, -47 removed lines

@@ -29,60 +29,60 @@
 
 $application = new Application();
 $application->registerRoutes(
-	$this,
-	array(
-		'routes' => array(
-			array(
-				'name' => 'API#getThumbnail',
-				'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
-				'verb' => 'GET',
-				'requirements' => array('file' => '.+')
-			),
-			array(
-				'name' => 'API#updateFileTags',
-				'url' => '/api/v1/files/{path}',
-				'verb' => 'POST',
-				'requirements' => array('path' => '.+'),
-			),
-			array(
-				'name' => 'API#getRecentFiles',
-				'url' => '/api/v1/recent/',
-				'verb' => 'GET'
-			),
-			array(
-				'name' => 'API#updateFileSorting',
-				'url' => '/api/v1/sorting',
-				'verb' => 'POST'
-			),
-			array(
-				'name' => 'API#showHiddenFiles',
-				'url' => '/api/v1/showhidden',
-				'verb' => 'POST'
-			),
-			[
-				'name' => 'view#index',
-				'url' => '/',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'settings#setMaxUploadSize',
-				'url' => '/settings/maxUpload',
-				'verb' => 'POST',
-			]
-		)
-	)
+    $this,
+    array(
+        'routes' => array(
+            array(
+                'name' => 'API#getThumbnail',
+                'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
+                'verb' => 'GET',
+                'requirements' => array('file' => '.+')
+            ),
+            array(
+                'name' => 'API#updateFileTags',
+                'url' => '/api/v1/files/{path}',
+                'verb' => 'POST',
+                'requirements' => array('path' => '.+'),
+            ),
+            array(
+                'name' => 'API#getRecentFiles',
+                'url' => '/api/v1/recent/',
+                'verb' => 'GET'
+            ),
+            array(
+                'name' => 'API#updateFileSorting',
+                'url' => '/api/v1/sorting',
+                'verb' => 'POST'
+            ),
+            array(
+                'name' => 'API#showHiddenFiles',
+                'url' => '/api/v1/showhidden',
+                'verb' => 'POST'
+            ),
+            [
+                'name' => 'view#index',
+                'url' => '/',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'settings#setMaxUploadSize',
+                'url' => '/settings/maxUpload',
+                'verb' => 'POST',
+            ]
+        )
+    )
 );
 
 /** @var $this \OC\Route\Router */
 
 $this->create('files_ajax_download', 'ajax/download.php')
-	->actionInclude('files/ajax/download.php');
+    ->actionInclude('files/ajax/download.php');
 $this->create('files_ajax_getstoragestats', 'ajax/getstoragestats.php')
-	->actionInclude('files/ajax/getstoragestats.php');
+    ->actionInclude('files/ajax/getstoragestats.php');
 $this->create('files_ajax_list', 'ajax/list.php')
-	->actionInclude('files/ajax/list.php');
+    ->actionInclude('files/ajax/list.php');
 
 $this->create('download', 'download{file}')
-	->requirements(array('file' => '.*'))
-	->actionInclude('files/download.php');
+    ->requirements(array('file' => '.*'))
+    ->actionInclude('files/download.php');
 

apps/files/appinfo/app.php

Indentation +14 added lines, -14 removed lines

@@ -39,21 +39,21 @@
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
 
 \OCA\Files\App::getNavigationManager()->add(function () use ($l) {
-	return [
-		'id' => 'files',
-		'appname' => 'files',
-		'script' => 'list.php',
-		'order' => 0,
-		'name' => $l->t('All files'),
-	];
+    return [
+        'id' => 'files',
+        'appname' => 'files',
+        'script' => 'list.php',
+        'order' => 0,
+        'name' => $l->t('All files'),
+    ];
 });
 
 \OCA\Files\App::getNavigationManager()->add(function () use ($l) {
-	return [
-		'id' => 'recent',
-		'appname' => 'files',
-		'script' => 'recentlist.php',
-		'order' => 2,
-		'name' => $l->t('Recent'),
-	];
+    return [
+        'id' => 'recent',
+        'appname' => 'files',
+        'script' => 'recentlist.php',
+        'order' => 2,
+        'name' => $l->t('Recent'),
+    ];
 });

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
 
-\OCA\Files\App::getNavigationManager()->add(function () use ($l) {
+\OCA\Files\App::getNavigationManager()->add(function() use ($l) {
 	return [
 		'id' => 'files',
 		'appname' => 'files',
@@ -48,7 +48,7 @@ 
 	];
 });
 
-\OCA\Files\App::getNavigationManager()->add(function () use ($l) {
+\OCA\Files\App::getNavigationManager()->add(function() use ($l) {
 	return [
 		'id' => 'recent',
 		'appname' => 'files',

apps/lookup_server_connector/lib/UpdateLookupServer.php

Indentation +90 added lines, -90 removed lines

@@ -38,99 +38,99 @@
  * @package OCA\LookupServerConnector
  */
 class UpdateLookupServer {
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var IConfig */
-	private $config;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var IClientService */
-	private $clientService;
-	/** @var Manager */
-	private $keyManager;
-	/** @var Signer */
-	private $signer;
-	/** @var IJobList */
-	private $jobList;
-	/** @var string URL point to lookup server */
-	private $lookupServer = 'https://lookup.nextcloud.com/users';
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var IConfig */
+    private $config;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var IClientService */
+    private $clientService;
+    /** @var Manager */
+    private $keyManager;
+    /** @var Signer */
+    private $signer;
+    /** @var IJobList */
+    private $jobList;
+    /** @var string URL point to lookup server */
+    private $lookupServer = 'https://lookup.nextcloud.com/users';
 
-	/**
-	 * @param AccountManager $accountManager
-	 * @param IConfig $config
-	 * @param ISecureRandom $secureRandom
-	 * @param IClientService $clientService
-	 * @param Manager $manager
-	 * @param Signer $signer
-	 * @param IJobList $jobList
-	 */
-	public function __construct(AccountManager $accountManager,
-								IConfig $config,
-								ISecureRandom $secureRandom,
-								IClientService $clientService,
-								Manager $manager,
-								Signer $signer,
-								IJobList $jobList) {
-		$this->accountManager = $accountManager;
-		$this->config = $config;
-		$this->secureRandom = $secureRandom;
-		$this->clientService = $clientService;
-		$this->keyManager = $manager;
-		$this->signer = $signer;
-		$this->jobList = $jobList;
-	}
+    /**
+     * @param AccountManager $accountManager
+     * @param IConfig $config
+     * @param ISecureRandom $secureRandom
+     * @param IClientService $clientService
+     * @param Manager $manager
+     * @param Signer $signer
+     * @param IJobList $jobList
+     */
+    public function __construct(AccountManager $accountManager,
+                                IConfig $config,
+                                ISecureRandom $secureRandom,
+                                IClientService $clientService,
+                                Manager $manager,
+                                Signer $signer,
+                                IJobList $jobList) {
+        $this->accountManager = $accountManager;
+        $this->config = $config;
+        $this->secureRandom = $secureRandom;
+        $this->clientService = $clientService;
+        $this->keyManager = $manager;
+        $this->signer = $signer;
+        $this->jobList = $jobList;
+    }
 
-	/**
-	 * @param IUser $user
-	 */
-	public function userUpdated(IUser $user) {
-		$userData = $this->accountManager->getUser($user);
-		$publicData = [];
+    /**
+     * @param IUser $user
+     */
+    public function userUpdated(IUser $user) {
+        $userData = $this->accountManager->getUser($user);
+        $publicData = [];
 
-		foreach ($userData as $key => $data) {
-			if ($data['scope'] === AccountManager::VISIBILITY_PUBLIC) {
-				$publicData[$key] = $data;
-			}
-		}
+        foreach ($userData as $key => $data) {
+            if ($data['scope'] === AccountManager::VISIBILITY_PUBLIC) {
+                $publicData[$key] = $data;
+            }
+        }
 
-		if (!empty($publicData)) {
-			$this->sendToLookupServer($user, $publicData);
-		}
-	}
+        if (!empty($publicData)) {
+            $this->sendToLookupServer($user, $publicData);
+        }
+    }
 
-	/**
-	 * send public user data to the lookup server
-	 *
-	 * @param IUser $user
-	 * @param array $publicData
-	 */
-	protected function sendToLookupServer(IUser $user, array $publicData) {
-		$dataArray = [
-			'federationId' => $user->getCloudId(),
-			'name' => isset($publicData[AccountManager::PROPERTY_DISPLAYNAME]) ? $publicData[AccountManager::PROPERTY_DISPLAYNAME]['value'] : '',
-			'email' => isset($publicData[AccountManager::PROPERTY_EMAIL]) ? $publicData[AccountManager::PROPERTY_EMAIL]['value'] : '',
-			'address' => isset($publicData[AccountManager::PROPERTY_ADDRESS]) ? $publicData[AccountManager::PROPERTY_ADDRESS]['value'] : '',
-			'website' => isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : '',
-			'twitter' => isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : '',
-			'phone' => isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : '',
-		];
-		$dataArray = $this->signer->sign('lookupserver', $dataArray, $user);
-		$httpClient = $this->clientService->newClient();
-		try {
-			$httpClient->post($this->lookupServer,
-				[
-					'body' => json_encode($dataArray),
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
-		} catch (\Exception $e) {
-			$this->jobList->add(RetryJob::class,
-				[
-					'dataArray' => $dataArray,
-					'retryNo' => 0,
-				]
-			);
-		}
-	}
+    /**
+     * send public user data to the lookup server
+     *
+     * @param IUser $user
+     * @param array $publicData
+     */
+    protected function sendToLookupServer(IUser $user, array $publicData) {
+        $dataArray = [
+            'federationId' => $user->getCloudId(),
+            'name' => isset($publicData[AccountManager::PROPERTY_DISPLAYNAME]) ? $publicData[AccountManager::PROPERTY_DISPLAYNAME]['value'] : '',
+            'email' => isset($publicData[AccountManager::PROPERTY_EMAIL]) ? $publicData[AccountManager::PROPERTY_EMAIL]['value'] : '',
+            'address' => isset($publicData[AccountManager::PROPERTY_ADDRESS]) ? $publicData[AccountManager::PROPERTY_ADDRESS]['value'] : '',
+            'website' => isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : '',
+            'twitter' => isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : '',
+            'phone' => isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : '',
+        ];
+        $dataArray = $this->signer->sign('lookupserver', $dataArray, $user);
+        $httpClient = $this->clientService->newClient();
+        try {
+            $httpClient->post($this->lookupServer,
+                [
+                    'body' => json_encode($dataArray),
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
+        } catch (\Exception $e) {
+            $this->jobList->add(RetryJob::class,
+                [
+                    'dataArray' => $dataArray,
+                    'retryNo' => 0,
+                ]
+            );
+        }
+    }
 }

apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php

Indentation +45 added lines, -45 removed lines

@@ -28,54 +28,54 @@
 use OCP\Http\Client\IClientService;
 
 class RetryJob extends Job {
-	/** @var IClientService */
-	private $clientService;
-	/** @var IJobList */
-	private $jobList;
-	/** @var string */
-	private $lookupServer = 'https://lookup.nextcloud.com/users';
+    /** @var IClientService */
+    private $clientService;
+    /** @var IJobList */
+    private $jobList;
+    /** @var string */
+    private $lookupServer = 'https://lookup.nextcloud.com/users';
 
-	/**
-	 * @param IClientService|null $clientService
-	 * @param IJobList|null $jobList
-	 */
-	public function __construct(IClientService $clientService = null,
-								IJobList $jobList = null) {
-		if($clientService !== null) {
-			$this->clientService = $clientService;
-		} else {
-			$this->clientService = \OC::$server->getHTTPClientService();
-		}
-		if($jobList !== null) {
-			$this->jobList = $jobList;
-		} else {
-			$this->jobList = \OC::$server->getJobList();
-		}
-	}
+    /**
+     * @param IClientService|null $clientService
+     * @param IJobList|null $jobList
+     */
+    public function __construct(IClientService $clientService = null,
+                                IJobList $jobList = null) {
+        if($clientService !== null) {
+            $this->clientService = $clientService;
+        } else {
+            $this->clientService = \OC::$server->getHTTPClientService();
+        }
+        if($jobList !== null) {
+            $this->jobList = $jobList;
+        } else {
+            $this->jobList = \OC::$server->getJobList();
+        }
+    }
 
-	protected function run($argument) {
-		if($argument['retryNo'] === 5) {
-			return;
-		}
+    protected function run($argument) {
+        if($argument['retryNo'] === 5) {
+            return;
+        }
 
-		$client = $this->clientService->newClient();
+        $client = $this->clientService->newClient();
 
-		try {
-			$client->post($this->lookupServer,
-				[
-					'body' => json_encode($argument['dataArray']),
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
-		} catch (\Exception $e) {
-			$this->jobList->add(RetryJob::class,
-				[
-					'dataArray' => $argument['dataArray'],
-					'retryNo' => $argument['retryNo'] + 1,
-				]
-			);
+        try {
+            $client->post($this->lookupServer,
+                [
+                    'body' => json_encode($argument['dataArray']),
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
+        } catch (\Exception $e) {
+            $this->jobList->add(RetryJob::class,
+                [
+                    'dataArray' => $argument['dataArray'],
+                    'retryNo' => $argument['retryNo'] + 1,
+                ]
+            );
 
-		}
-	}
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -41,12 +41,12 @@ 
 	 */
 	public function __construct(IClientService $clientService = null,
 								IJobList $jobList = null) {
-		if($clientService !== null) {
+		if ($clientService !== null) {
 			$this->clientService = $clientService;
 		} else {
 			$this->clientService = \OC::$server->getHTTPClientService();
 		}
-		if($jobList !== null) {
+		if ($jobList !== null) {
 			$this->jobList = $jobList;
 		} else {
 			$this->jobList = \OC::$server->getJobList();
@@ -54,7 +54,7 @@ 
 	}
 
 	protected function run($argument) {
-		if($argument['retryNo'] === 5) {
+		if ($argument['retryNo'] === 5) {
 			return;
 		}