nextcloud / server

apps/files/lib/Capabilities.php

Indentation +23 added lines, -23 removed lines

@@ -34,29 +34,29 @@
  * @package OCA\Files
  */
 class Capabilities implements ICapability {
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * Capabilities constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * Capabilities constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		return [
-			'files' => [
-				'bigfilechunking' => true,
-				'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']),
-			],
-		];
-	}
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        return [
+            'files' => [
+                'bigfilechunking' => true,
+                'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']),
+            ],
+        ];
+    }
 }

apps/files/lib/BackgroundJob/CleanupFileLocks.php

Indentation +23 added lines, -23 removed lines

@@ -30,29 +30,29 @@
  */
 class CleanupFileLocks extends TimedJob {
 
-	/**
-	 * Default interval in minutes
-	 *
-	 * @var int $defaultIntervalMin
-	 **/
-	protected $defaultIntervalMin = 5;
+    /**
+     * Default interval in minutes
+     *
+     * @var int $defaultIntervalMin
+     **/
+    protected $defaultIntervalMin = 5;
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		$this->interval = $this->defaultIntervalMin * 60;
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        $this->interval = $this->defaultIntervalMin * 60;
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$lockingProvider = \OC::$server->getLockingProvider();
-		if($lockingProvider instanceof DBLockingProvider) {
-			$lockingProvider->cleanExpiredLocks();
-		}
-	}
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $lockingProvider = \OC::$server->getLockingProvider();
+        if($lockingProvider instanceof DBLockingProvider) {
+            $lockingProvider->cleanExpiredLocks();
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 */
 	public function run($argument) {
 		$lockingProvider = \OC::$server->getLockingProvider();
-		if($lockingProvider instanceof DBLockingProvider) {
+		if ($lockingProvider instanceof DBLockingProvider) {
 			$lockingProvider->cleanExpiredLocks();
 		}
 	}

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/user_ldap/ajax/setConfiguration.php

Indentation +4 added lines, -4 removed lines

@@ -36,11 +36,11 @@
 // only legacy checkboxes (Advanced and Expert tab) need to be handled here,
 // the Wizard-like tabs handle it on their own
 $chkboxes = array('ldap_configuration_active', 'ldap_override_main_server',
-				  'ldap_turn_off_cert_check');
+                    'ldap_turn_off_cert_check');
 foreach($chkboxes as $boxid) {
-	if(!isset($_POST[$boxid])) {
-		$_POST[$boxid] = 0;
-	}
+    if(!isset($_POST[$boxid])) {
+        $_POST[$boxid] = 0;
+    }
 }
 
 $ldapWrapper = new OCA\User_LDAP\LDAP();

Spacing +3 added lines, -3 removed lines

@@ -30,15 +30,15 @@
 \OC_JSON::checkAppEnabled('user_ldap');
 \OC_JSON::callCheck();
 
-$prefix = (string)$_POST['ldap_serverconfig_chooser'];
+$prefix = (string) $_POST['ldap_serverconfig_chooser'];
 
 // Checkboxes are not submitted, when they are unchecked. Set them manually.
 // only legacy checkboxes (Advanced and Expert tab) need to be handled here,
 // the Wizard-like tabs handle it on their own
 $chkboxes = array('ldap_configuration_active', 'ldap_override_main_server',
 				  'ldap_turn_off_cert_check');
-foreach($chkboxes as $boxid) {
-	if(!isset($_POST[$boxid])) {
+foreach ($chkboxes as $boxid) {
+	if (!isset($_POST[$boxid])) {
 		$_POST[$boxid] = 0;
 	}
 }

apps/user_ldap/ajax/getNewServerConfigPrefix.php

Indentation +5 added lines, -5 removed lines

@@ -38,12 +38,12 @@
 
 $newConfig = new \OCA\User_LDAP\Configuration($nk, false);
 if(isset($_POST['copyConfig'])) {
-	$originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']);
-	$newConfig->setConfiguration($originalConfig->getConfiguration());
+    $originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']);
+    $newConfig->setConfiguration($originalConfig->getConfiguration());
 } else {
-	$configuration = new \OCA\User_LDAP\Configuration($nk, false);
-	$newConfig->setConfiguration($configuration->getDefaults());
-	$resultData['defaults'] = $configuration->getDefaults();
+    $configuration = new \OCA\User_LDAP\Configuration($nk, false);
+    $newConfig->setConfiguration($configuration->getDefaults());
+    $resultData['defaults'] = $configuration->getDefaults();
 }
 $newConfig->saveConfiguration();
 

Spacing +3 added lines, -3 removed lines

@@ -32,13 +32,13 @@
 $serverConnections = $helper->getServerConfigurationPrefixes();
 sort($serverConnections);
 $lk = array_pop($serverConnections);
-$ln = (int)str_replace('s', '', $lk);
-$nk = 's'.str_pad($ln+1, 2, '0', STR_PAD_LEFT);
+$ln = (int) str_replace('s', '', $lk);
+$nk = 's'.str_pad($ln + 1, 2, '0', STR_PAD_LEFT);
 
 $resultData = array('configPrefix' => $nk);
 
 $newConfig = new \OCA\User_LDAP\Configuration($nk, false);
-if(isset($_POST['copyConfig'])) {
+if (isset($_POST['copyConfig'])) {
 	$originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']);
 	$newConfig->setConfiguration($originalConfig->getConfiguration());
 } else {

apps/user_ldap/lib/WizardResult.php

Indentation +43 added lines, -43 removed lines

@@ -28,52 +28,52 @@
 namespace OCA\User_LDAP;
 
 class WizardResult {
-	protected $changes = array();
-	protected $options = array();
-	protected $markedChange = false;
+    protected $changes = array();
+    protected $options = array();
+    protected $markedChange = false;
 
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function addChange($key, $value) {
-		$this->changes[$key] = $value;
-	}
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function addChange($key, $value) {
+        $this->changes[$key] = $value;
+    }
 
-	/**
-	 *
-	 */
-	public function markChange() {
-		$this->markedChange = true;
-	}
+    /**
+     *
+     */
+    public function markChange() {
+        $this->markedChange = true;
+    }
 
-	/**
-	 * @param string $key
-	 * @param array|string $values
-	 */
-	public function addOptions($key, $values) {
-		if(!is_array($values)) {
-			$values = array($values);
-		}
-		$this->options[$key] = $values;
-	}
+    /**
+     * @param string $key
+     * @param array|string $values
+     */
+    public function addOptions($key, $values) {
+        if(!is_array($values)) {
+            $values = array($values);
+        }
+        $this->options[$key] = $values;
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function hasChanges() {
-		return (count($this->changes) > 0 || $this->markedChange);
-	}
+    /**
+     * @return bool
+     */
+    public function hasChanges() {
+        return (count($this->changes) > 0 || $this->markedChange);
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getResultArray() {
-		$result = array();
-		$result['changes'] = $this->changes;
-		if(count($this->options) > 0) {
-			$result['options'] = $this->options;
-		}
-		return $result;
-	}
+    /**
+     * @return array
+     */
+    public function getResultArray() {
+        $result = array();
+        $result['changes'] = $this->changes;
+        if(count($this->options) > 0) {
+            $result['options'] = $this->options;
+        }
+        return $result;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 	 * @param array|string $values
 	 */
 	public function addOptions($key, $values) {
-		if(!is_array($values)) {
+		if (!is_array($values)) {
 			$values = array($values);
 		}
 		$this->options[$key] = $values;
@@ -71,7 +71,7 @@ 
 	public function getResultArray() {
 		$result = array();
 		$result['changes'] = $this->changes;
-		if(count($this->options) > 0) {
+		if (count($this->options) > 0) {
 			$result['options'] = $this->options;
 		}
 		return $result;

apps/user_ldap/appinfo/routes.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 $application->registerRoutes($this, [
 	'ocs' => [
 		['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
-		['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
+		['name' => 'ConfigAPI#show', 'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
 		['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
 		['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
 	]

Indentation +19 added lines, -19 removed lines

@@ -23,36 +23,36 @@
 
 /** @var $this \OCP\Route\IRouter */
 $this->create('user_ldap_ajax_clearMappings', 'ajax/clearMappings.php')
-	->actionInclude('user_ldap/ajax/clearMappings.php');
+    ->actionInclude('user_ldap/ajax/clearMappings.php');
 $this->create('user_ldap_ajax_deleteConfiguration', 'ajax/deleteConfiguration.php')
-	->actionInclude('user_ldap/ajax/deleteConfiguration.php');
+    ->actionInclude('user_ldap/ajax/deleteConfiguration.php');
 $this->create('user_ldap_ajax_getConfiguration', 'ajax/getConfiguration.php')
-	->actionInclude('user_ldap/ajax/getConfiguration.php');
+    ->actionInclude('user_ldap/ajax/getConfiguration.php');
 $this->create('user_ldap_ajax_getNewServerConfigPrefix', 'ajax/getNewServerConfigPrefix.php')
-	->actionInclude('user_ldap/ajax/getNewServerConfigPrefix.php');
+    ->actionInclude('user_ldap/ajax/getNewServerConfigPrefix.php');
 $this->create('user_ldap_ajax_setConfiguration', 'ajax/setConfiguration.php')
-	->actionInclude('user_ldap/ajax/setConfiguration.php');
+    ->actionInclude('user_ldap/ajax/setConfiguration.php');
 $this->create('user_ldap_ajax_testConfiguration', 'ajax/testConfiguration.php')
-	->actionInclude('user_ldap/ajax/testConfiguration.php');
+    ->actionInclude('user_ldap/ajax/testConfiguration.php');
 $this->create('user_ldap_ajax_wizard', 'ajax/wizard.php')
-	->actionInclude('user_ldap/ajax/wizard.php');
+    ->actionInclude('user_ldap/ajax/wizard.php');
 
 $application = new \OCP\AppFramework\App('user_ldap');
 $application->registerRoutes($this, [
-	'ocs' => [
-		['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
-		['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
-		['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
-		['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
-	]
+    'ocs' => [
+        ['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
+        ['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
+        ['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
+        ['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
+    ]
 ]);
 
 $application = new OCA\User_LDAP\AppInfo\Application();
 $application->registerRoutes($this, [
-	'routes' => [
-		['name' => 'renewPassword#tryRenewPassword', 'url' => '/renewpassword', 'verb' => 'POST'],
-		['name' => 'renewPassword#showRenewPasswordForm', 'url' => '/renewpassword/{user}', 'verb' => 'GET'],
-		['name' => 'renewPassword#cancel', 'url' => '/renewpassword/cancel', 'verb' => 'GET'],
-		['name' => 'renewPassword#showLoginFormInvalidPassword', 'url' => '/renewpassword/invalidlogin/{user}', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'renewPassword#tryRenewPassword', 'url' => '/renewpassword', 'verb' => 'POST'],
+        ['name' => 'renewPassword#showRenewPasswordForm', 'url' => '/renewpassword/{user}', 'verb' => 'GET'],
+        ['name' => 'renewPassword#cancel', 'url' => '/renewpassword/cancel', 'verb' => 'GET'],
+        ['name' => 'renewPassword#showLoginFormInvalidPassword', 'url' => '/renewpassword/invalidlogin/{user}', 'verb' => 'GET'],
+    ]
 ]);

apps/files_external/templates/settings.php

Switch Indentation +18 added lines, -18 removed lines

@@ -41,44 +41,44 @@
 		$is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
 
 		switch ($parameter->getType()) {
-		case DefinitionParameter::VALUE_PASSWORD: ?>
-			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
-			<input type="password"
+		    case DefinitionParameter::VALUE_PASSWORD: ?>
+    			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
+    			<input type="password"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-				data-parameter="<?php p($parameter->getName()); ?>"
+    				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 				placeholder="<?php p($placeholder); ?>"
 			/>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_BOOLEAN: ?>
-			<?php $checkboxId = uniqid("checkbox_"); ?>
+			    break;
+		    case DefinitionParameter::VALUE_BOOLEAN: ?>
+    			<?php $checkboxId = uniqid("checkbox_"); ?>
 			<div>
 			<label>
 			<input type="checkbox"
 				id="<?php p($checkboxId); ?>"
 				<?php if (!empty($classes)): ?> class="checkbox <?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-				data-parameter="<?php p($parameter->getName()); ?>"
+    				data-parameter="<?php p($parameter->getName()); ?>"
 				<?php if ($value === true): ?> checked="checked"<?php endif; ?>
-			/>
+    			/>
 			<?php p($placeholder); ?>
 			</label>
 			</div>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_HIDDEN: ?>
-			<input type="hidden"
+			    break;
+		    case DefinitionParameter::VALUE_HIDDEN: ?>
+    			<input type="hidden"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-				data-parameter="<?php p($parameter->getName()); ?>"
+    				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 			/>
 			<?php
-			break;
-		default: ?>
-			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
-			<input type="text"
+			    break;
+		    default: ?>
+    			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
+    			<input type="text"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-				data-parameter="<?php p($parameter->getName()); ?>"
+    				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 				placeholder="<?php p($placeholder); ?>"
 			/>

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 	<h2><?php p($l->t('No external storage configured or you don\'t have the permission to configure them')); ?></h2>
 </div>
 
-<form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
+<form data-can-create="<?php echo $canCreateMounts ? 'true' : 'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled'] ? 'true' : 'false'; ?>">
 	<h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
 	<p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p>
 	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>

Braces +24 added lines, -6 removed lines

@@ -96,7 +96,10 @@ 
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
 	<h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
 	<p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p>
-	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>
+	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) {
+    print_unescaped(''.$_['dependencies'].'');
+}
+?>
 	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
 		<thead>
 			<tr>
@@ -105,7 +108,10 @@ 
 				<th><?php p($l->t('External storage')); ?></th>
 				<th><?php p($l->t('Authentication')); ?></th>
 				<th><?php p($l->t('Configuration')); ?></th>
-				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?>
+				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) {
+    print_unescaped('<th>'.$l->t('Available for').'</th>');
+}
+?>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
@@ -138,7 +144,10 @@ 
 							});
 						?>
 						<?php foreach ($sortedBackends as $backend): ?>
-							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
+							<?php if ($backend->getDeprecateTo()) {
+    continue;
+}
+// ignore deprecated backends ?>
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
 						<?php endforeach; ?>
 					</select>
@@ -163,7 +172,10 @@ 
 
 	<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?>
 		<input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox"
-			value="1" <?php if ($_['allowUserMounting']) print_unescaped(' checked="checked"'); ?> />
+			value="1" <?php if ($_['allowUserMounting']) {
+    print_unescaped(' checked="checked"');
+}
+?> />
 		<label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
 
 		<p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>>
@@ -175,8 +187,14 @@ 
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
-				<?php else: ?>
-					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
+				<?php else {
+    : ?>
+					<input type="checkbox" id="allowUserMountingBackends<?php p($i);
+}
+?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
+    print_unescaped(' checked="checked"');
+}
+?> />
 					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
 				<?php endif; ?>
 				<?php $i++; ?>

Indentation +60 added lines, -60 removed lines

@@ -1,51 +1,51 @@ 
 <?php
-	use \OCA\Files_External\Lib\Backend\Backend;
-	use \OCA\Files_External\Lib\Auth\AuthMechanism;
-	use \OCA\Files_External\Lib\DefinitionParameter;
-	use \OCA\Files_External\Service\BackendService;
+    use \OCA\Files_External\Lib\Backend\Backend;
+    use \OCA\Files_External\Lib\Auth\AuthMechanism;
+    use \OCA\Files_External\Lib\DefinitionParameter;
+    use \OCA\Files_External\Service\BackendService;
 
-	$canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting'];
+    $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting'];
 
-	$l->t("Enable encryption");
-	$l->t("Enable previews");
-	$l->t("Enable sharing");
-	$l->t("Check for changes");
-	$l->t("Never");
-	$l->t("Once every direct access");
-	$l->t('Read only');
+    $l->t("Enable encryption");
+    $l->t("Enable previews");
+    $l->t("Enable sharing");
+    $l->t("Check for changes");
+    $l->t("Never");
+    $l->t("Once every direct access");
+    $l->t('Read only');
 
-	script('files_external', [
-		'settings',
-		'templates'
-	]);
-	style('files_external', 'settings');
+    script('files_external', [
+        'settings',
+        'templates'
+    ]);
+    style('files_external', 'settings');
 
-	// load custom JS
-	foreach ($_['backends'] as $backend) {
-		/** @var Backend $backend */
-		$scripts = $backend->getCustomJs();
-		foreach ($scripts as $script) {
-			script('files_external', $script);
-		}
-	}
-	foreach ($_['authMechanisms'] as $authMechanism) {
-		/** @var AuthMechanism $authMechanism */
-		$scripts = $authMechanism->getCustomJs();
-		foreach ($scripts as $script) {
-			script('files_external', $script);
-		}
-	}
+    // load custom JS
+    foreach ($_['backends'] as $backend) {
+        /** @var Backend $backend */
+        $scripts = $backend->getCustomJs();
+        foreach ($scripts as $script) {
+            script('files_external', $script);
+        }
+    }
+    foreach ($_['authMechanisms'] as $authMechanism) {
+        /** @var AuthMechanism $authMechanism */
+        $scripts = $authMechanism->getCustomJs();
+        foreach ($scripts as $script) {
+            script('files_external', $script);
+        }
+    }
 
-	function writeParameterInput($parameter, $options, $classes = []) {
-		$value = '';
-		if (isset($options[$parameter->getName()])) {
-			$value = $options[$parameter->getName()];
-		}
-		$placeholder = $parameter->getText();
-		$is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
+    function writeParameterInput($parameter, $options, $classes = []) {
+        $value = '';
+        if (isset($options[$parameter->getName()])) {
+            $value = $options[$parameter->getName()];
+        }
+        $placeholder = $parameter->getText();
+        $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
 
-		switch ($parameter->getType()) {
-		case DefinitionParameter::VALUE_PASSWORD: ?>
+        switch ($parameter->getType()) {
+        case DefinitionParameter::VALUE_PASSWORD: ?>
 			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
 			<input type="password"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
@@ -54,8 +54,8 @@ 
 				placeholder="<?php p($placeholder); ?>"
 			/>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_BOOLEAN: ?>
+            break;
+        case DefinitionParameter::VALUE_BOOLEAN: ?>
 			<?php $checkboxId = uniqid("checkbox_"); ?>
 			<div>
 			<label>
@@ -69,16 +69,16 @@ 
 			</label>
 			</div>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_HIDDEN: ?>
+            break;
+        case DefinitionParameter::VALUE_HIDDEN: ?>
 			<input type="hidden"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
 				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 			/>
 			<?php
-			break;
-		default: ?>
+            break;
+        default: ?>
 			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
 			<input type="text"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
@@ -87,8 +87,8 @@ 
 				placeholder="<?php p($placeholder); ?>"
 			/>
 			<?php
-		}
-	}
+        }
+    }
 ?>
 
 <div id="emptycontent" class="hidden">
@@ -133,13 +133,13 @@ 
 							<?php p($l->t('Add storage')); ?>
 						</option>
 						<?php
-							$sortedBackends = array_filter($_['backends'], function($backend) use ($_) {
-								return $backend->isVisibleFor($_['visibilityType']);
-							});
-							uasort($sortedBackends, function($a, $b) {
-								return strcasecmp($a->getText(), $b->getText());
-							});
-						?>
+                            $sortedBackends = array_filter($_['backends'], function($backend) use ($_) {
+                                return $backend->isVisibleFor($_['visibilityType']);
+                            });
+                            uasort($sortedBackends, function($a, $b) {
+                                return strcasecmp($a->getText(), $b->getText());
+                            });
+                        ?>
 						<?php foreach ($sortedBackends as $backend): ?>
 							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
@@ -171,10 +171,10 @@ 
 
 		<p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>>
 			<?php
-				$userBackends = array_filter($_['backends'], function($backend) {
-					return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
-				});
-			?>
+                $userBackends = array_filter($_['backends'], function($backend) {
+                    return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
+                });
+            ?>
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />