nextcloud / server

lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php

Indentation +52 added lines, -52 removed lines

@@ -32,60 +32,60 @@
 use OCP\User\Backend\IPasswordConfirmationBackend;
 
 class PasswordConfirmationMiddleware extends Middleware {
-	/** @var ControllerMethodReflector */
-	private $reflector;
-	/** @var ISession */
-	private $session;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var array */
-	private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
+    /** @var ControllerMethodReflector */
+    private $reflector;
+    /** @var ISession */
+    private $session;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var array */
+    private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
 
-	/**
-	 * PasswordConfirmationMiddleware constructor.
-	 *
-	 * @param ControllerMethodReflector $reflector
-	 * @param ISession $session
-	 * @param IUserSession $userSession
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(ControllerMethodReflector $reflector,
-								ISession $session,
-								IUserSession $userSession,
-								ITimeFactory $timeFactory) {
-		$this->reflector = $reflector;
-		$this->session = $session;
-		$this->userSession = $userSession;
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * PasswordConfirmationMiddleware constructor.
+     *
+     * @param ControllerMethodReflector $reflector
+     * @param ISession $session
+     * @param IUserSession $userSession
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(ControllerMethodReflector $reflector,
+                                ISession $session,
+                                IUserSession $userSession,
+                                ITimeFactory $timeFactory) {
+        $this->reflector = $reflector;
+        $this->session = $session;
+        $this->userSession = $userSession;
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @throws NotConfirmedException
-	 */
-	public function beforeController($controller, $methodName) {
-		if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) {
-			$user = $this->userSession->getUser();
-			$backendClassName = '';
-			if ($user !== null) {
-				$backend = $user->getBackend();
-				if ($backend instanceof IPasswordConfirmationBackend) {
-					if (!$backend->canConfirmPassword($user->getUID())) {
-						return;
-					}
-				}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @throws NotConfirmedException
+     */
+    public function beforeController($controller, $methodName) {
+        if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) {
+            $user = $this->userSession->getUser();
+            $backendClassName = '';
+            if ($user !== null) {
+                $backend = $user->getBackend();
+                if ($backend instanceof IPasswordConfirmationBackend) {
+                    if (!$backend->canConfirmPassword($user->getUID())) {
+                        return;
+                    }
+                }
 
-				$backendClassName = $user->getBackendClassName();
-			}
+                $backendClassName = $user->getBackendClassName();
+            }
 
-			$lastConfirm = (int) $this->session->get('last-password-confirm');
-			// we can't check the password against a SAML backend, so skip password confirmation in this case
-			if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
-				throw new NotConfirmedException();
-			}
-		}
-	}
+            $lastConfirm = (int) $this->session->get('last-password-confirm');
+            // we can't check the password against a SAML backend, so skip password confirmation in this case
+            if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
+                throw new NotConfirmedException();
+            }
+        }
+    }
 }

lib/private/Files/Type/Loader.php

Spacing +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 			))
 			->andWhere($update->expr()->like(
 				$update->func()->lower('name'),
-				$update->createNamedParameter('%' . $this->dbConnection->escapeLikeParameter('.' . $ext))
+				$update->createNamedParameter('%'.$this->dbConnection->escapeLikeParameter('.'.$ext))
 			));
 		return $update->execute();
 	}

Indentation +144 added lines, -144 removed lines

@@ -33,148 +33,148 @@
  * @package OC\Files\Type
  */
 class Loader implements IMimeTypeLoader {
-	/** @var IDBConnection */
-	private $dbConnection;
-
-	/** @var array [id => mimetype] */
-	protected $mimetypes;
-
-	/** @var array [mimetype => id] */
-	protected $mimetypeIds;
-
-	/**
-	 * @param IDBConnection $dbConnection
-	 */
-	public function __construct(IDBConnection $dbConnection) {
-		$this->dbConnection = $dbConnection;
-		$this->mimetypes = [];
-		$this->mimetypeIds = [];
-	}
-
-	/**
-	 * Get a mimetype from its ID
-	 *
-	 * @param int $id
-	 * @return string|null
-	 */
-	public function getMimetypeById($id) {
-		if (!$this->mimetypes) {
-			$this->loadMimetypes();
-		}
-		if (isset($this->mimetypes[$id])) {
-			return $this->mimetypes[$id];
-		}
-		return null;
-	}
-
-	/**
-	 * Get a mimetype ID, adding the mimetype to the DB if it does not exist
-	 *
-	 * @param string $mimetype
-	 * @return int
-	 */
-	public function getId($mimetype) {
-		if (!$this->mimetypeIds) {
-			$this->loadMimetypes();
-		}
-		if (isset($this->mimetypeIds[$mimetype])) {
-			return $this->mimetypeIds[$mimetype];
-		}
-		return $this->store($mimetype);
-	}
-
-	/**
-	 * Test if a mimetype exists in the database
-	 *
-	 * @param string $mimetype
-	 * @return bool
-	 */
-	public function exists($mimetype) {
-		if (!$this->mimetypeIds) {
-			$this->loadMimetypes();
-		}
-		return isset($this->mimetypeIds[$mimetype]);
-	}
-
-	/**
-	 * Clear all loaded mimetypes, allow for re-loading
-	 */
-	public function reset() {
-		$this->mimetypes = [];
-		$this->mimetypeIds = [];
-	}
-
-	/**
-	 * Store a mimetype in the DB
-	 *
-	 * @param string $mimetype
-	 * @param int inserted ID
-	 */
-	protected function store($mimetype) {
-		$this->dbConnection->insertIfNotExist('*PREFIX*mimetypes', [
-			'mimetype' => $mimetype
-		]);
-
-		$fetch = $this->dbConnection->getQueryBuilder();
-		$fetch->select('id')
-			->from('mimetypes')
-			->where(
-				$fetch->expr()->eq('mimetype', $fetch->createNamedParameter($mimetype)
-				));
-
-		$result = $fetch->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if (!$row) {
-			throw new \Exception("Failed to get mimetype id for $mimetype after trying to store it");
-		}
-
-		$this->mimetypes[$row['id']] = $mimetype;
-		$this->mimetypeIds[$mimetype] = $row['id'];
-		return $row['id'];
-	}
-
-	/**
-	 * Load all mimetypes from DB
-	 */
-	private function loadMimetypes() {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('id', 'mimetype')
-			->from('mimetypes');
-
-		$result = $qb->execute();
-		$results = $result->fetchAll();
-		$result->closeCursor();
-
-		foreach ($results as $row) {
-			$this->mimetypes[$row['id']] = $row['mimetype'];
-			$this->mimetypeIds[$row['mimetype']] = $row['id'];
-		}
-	}
-
-	/**
-	 * Update filecache mimetype based on file extension
-	 *
-	 * @param string $ext file extension
-	 * @param int $mimeTypeId
-	 * @return int number of changed rows
-	 */
-	public function updateFilecache($ext, $mimeTypeId) {
-		$folderMimeTypeId = $this->getId('httpd/unix-directory');
-		$update = $this->dbConnection->getQueryBuilder();
-		$update->update('filecache')
-			->set('mimetype', $update->createNamedParameter($mimeTypeId))
-			->where($update->expr()->neq(
-				'mimetype', $update->createNamedParameter($mimeTypeId)
-			))
-			->andWhere($update->expr()->neq(
-				'mimetype', $update->createNamedParameter($folderMimeTypeId)
-			))
-			->andWhere($update->expr()->like(
-				$update->func()->lower('name'),
-				$update->createNamedParameter('%' . $this->dbConnection->escapeLikeParameter('.' . $ext))
-			));
-		return $update->execute();
-	}
+    /** @var IDBConnection */
+    private $dbConnection;
+
+    /** @var array [id => mimetype] */
+    protected $mimetypes;
+
+    /** @var array [mimetype => id] */
+    protected $mimetypeIds;
+
+    /**
+     * @param IDBConnection $dbConnection
+     */
+    public function __construct(IDBConnection $dbConnection) {
+        $this->dbConnection = $dbConnection;
+        $this->mimetypes = [];
+        $this->mimetypeIds = [];
+    }
+
+    /**
+     * Get a mimetype from its ID
+     *
+     * @param int $id
+     * @return string|null
+     */
+    public function getMimetypeById($id) {
+        if (!$this->mimetypes) {
+            $this->loadMimetypes();
+        }
+        if (isset($this->mimetypes[$id])) {
+            return $this->mimetypes[$id];
+        }
+        return null;
+    }
+
+    /**
+     * Get a mimetype ID, adding the mimetype to the DB if it does not exist
+     *
+     * @param string $mimetype
+     * @return int
+     */
+    public function getId($mimetype) {
+        if (!$this->mimetypeIds) {
+            $this->loadMimetypes();
+        }
+        if (isset($this->mimetypeIds[$mimetype])) {
+            return $this->mimetypeIds[$mimetype];
+        }
+        return $this->store($mimetype);
+    }
+
+    /**
+     * Test if a mimetype exists in the database
+     *
+     * @param string $mimetype
+     * @return bool
+     */
+    public function exists($mimetype) {
+        if (!$this->mimetypeIds) {
+            $this->loadMimetypes();
+        }
+        return isset($this->mimetypeIds[$mimetype]);
+    }
+
+    /**
+     * Clear all loaded mimetypes, allow for re-loading
+     */
+    public function reset() {
+        $this->mimetypes = [];
+        $this->mimetypeIds = [];
+    }
+
+    /**
+     * Store a mimetype in the DB
+     *
+     * @param string $mimetype
+     * @param int inserted ID
+     */
+    protected function store($mimetype) {
+        $this->dbConnection->insertIfNotExist('*PREFIX*mimetypes', [
+            'mimetype' => $mimetype
+        ]);
+
+        $fetch = $this->dbConnection->getQueryBuilder();
+        $fetch->select('id')
+            ->from('mimetypes')
+            ->where(
+                $fetch->expr()->eq('mimetype', $fetch->createNamedParameter($mimetype)
+                ));
+
+        $result = $fetch->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if (!$row) {
+            throw new \Exception("Failed to get mimetype id for $mimetype after trying to store it");
+        }
+
+        $this->mimetypes[$row['id']] = $mimetype;
+        $this->mimetypeIds[$mimetype] = $row['id'];
+        return $row['id'];
+    }
+
+    /**
+     * Load all mimetypes from DB
+     */
+    private function loadMimetypes() {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('id', 'mimetype')
+            ->from('mimetypes');
+
+        $result = $qb->execute();
+        $results = $result->fetchAll();
+        $result->closeCursor();
+
+        foreach ($results as $row) {
+            $this->mimetypes[$row['id']] = $row['mimetype'];
+            $this->mimetypeIds[$row['mimetype']] = $row['id'];
+        }
+    }
+
+    /**
+     * Update filecache mimetype based on file extension
+     *
+     * @param string $ext file extension
+     * @param int $mimeTypeId
+     * @return int number of changed rows
+     */
+    public function updateFilecache($ext, $mimeTypeId) {
+        $folderMimeTypeId = $this->getId('httpd/unix-directory');
+        $update = $this->dbConnection->getQueryBuilder();
+        $update->update('filecache')
+            ->set('mimetype', $update->createNamedParameter($mimeTypeId))
+            ->where($update->expr()->neq(
+                'mimetype', $update->createNamedParameter($mimeTypeId)
+            ))
+            ->andWhere($update->expr()->neq(
+                'mimetype', $update->createNamedParameter($folderMimeTypeId)
+            ))
+            ->andWhere($update->expr()->like(
+                $update->func()->lower('name'),
+                $update->createNamedParameter('%' . $this->dbConnection->escapeLikeParameter('.' . $ext))
+            ));
+        return $update->execute();
+    }
 }

apps/dav/lib/Migration/Version1008Date20181105112049.php

Indentation +13 added lines, -13 removed lines

@@ -32,18 +32,18 @@
 
 class Version1008Date20181105112049 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		$table = $schema->getTable('calendarsubscriptions');
-		$table->dropColumn('source_copy');
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        $table = $schema->getTable('calendarsubscriptions');
+        $table->dropColumn('source_copy');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/Migration/Version1008Date20181105104833.php

Indentation +13 added lines, -13 removed lines

@@ -32,18 +32,18 @@
 
 class Version1008Date20181105104833 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		$table = $schema->getTable('calendarsubscriptions');
-		$table->dropColumn('source');
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        $table = $schema->getTable('calendarsubscriptions');
+        $table->dropColumn('source');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/Migration/Version1008Date20181114084440.php

Indentation +23 added lines, -23 removed lines

@@ -33,27 +33,27 @@
 class Version1008Date20181114084440 extends SimpleMigrationStep {
 
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		if ($schema->hasTable('calendarchanges')) {
-			$calendarChangesTable = $schema->getTable('calendarchanges');
-			if ($calendarChangesTable->hasIndex('calendarid_calendartype_synctoken')) {
-				$calendarChangesTable->dropIndex('calendarid_calendartype_synctoken');
-			}
-
-			if (!$calendarChangesTable->hasIndex('calid_type_synctoken')) {
-				$calendarChangesTable->addIndex(['calendarid', 'calendartype', 'synctoken'], 'calid_type_synctoken');
-			}
-		}
-
-		return $schema;
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        if ($schema->hasTable('calendarchanges')) {
+            $calendarChangesTable = $schema->getTable('calendarchanges');
+            if ($calendarChangesTable->hasIndex('calendarid_calendartype_synctoken')) {
+                $calendarChangesTable->dropIndex('calendarid_calendartype_synctoken');
+            }
+
+            if (!$calendarChangesTable->hasIndex('calid_type_synctoken')) {
+                $calendarChangesTable->addIndex(['calendarid', 'calendartype', 'synctoken'], 'calid_type_synctoken');
+            }
+        }
+
+        return $schema;
+    }
 }

apps/oauth2/lib/Migration/Version010401Date20181207190718.php

Indentation +62 added lines, -62 removed lines

@@ -31,68 +31,68 @@
 
 class Version010401Date20181207190718 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('oauth2_clients')) {
-			$table = $schema->createTable('oauth2_clients');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'unsigned' => true,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('redirect_uri', 'string', [
-				'notnull' => true,
-				'length' => 2000,
-			]);
-			$table->addColumn('client_identifier', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('secret', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['client_identifier'], 'oauth2_client_id_idx');
-		}
+        if (!$schema->hasTable('oauth2_clients')) {
+            $table = $schema->createTable('oauth2_clients');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('redirect_uri', 'string', [
+                'notnull' => true,
+                'length' => 2000,
+            ]);
+            $table->addColumn('client_identifier', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('secret', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['client_identifier'], 'oauth2_client_id_idx');
+        }
 
-		if (!$schema->hasTable('oauth2_access_tokens')) {
-			$table = $schema->createTable('oauth2_access_tokens');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'unsigned' => true,
-			]);
-			$table->addColumn('token_id', 'integer', [
-				'notnull' => true,
-			]);
-			$table->addColumn('client_id', 'integer', [
-				'notnull' => true,
-			]);
-			$table->addColumn('hashed_code', 'string', [
-				'notnull' => true,
-				'length' => 128,
-			]);
-			$table->addColumn('encrypted_token', 'string', [
-				'notnull' => true,
-				'length' => 786,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['hashed_code'], 'oauth2_access_hash_idx');
-			$table->addIndex(['client_id'], 'oauth2_access_client_id_idx');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('oauth2_access_tokens')) {
+            $table = $schema->createTable('oauth2_access_tokens');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('token_id', 'integer', [
+                'notnull' => true,
+            ]);
+            $table->addColumn('client_id', 'integer', [
+                'notnull' => true,
+            ]);
+            $table->addColumn('hashed_code', 'string', [
+                'notnull' => true,
+                'length' => 128,
+            ]);
+            $table->addColumn('encrypted_token', 'string', [
+                'notnull' => true,
+                'length' => 786,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['hashed_code'], 'oauth2_access_hash_idx');
+            $table->addIndex(['client_id'], 'oauth2_access_client_id_idx');
+        }
+        return $schema;
+    }
 }

apps/user_ldap/lib/Command/ShowRemnants.php

Spacing +2 added lines, -2 removed lines

@@ -89,8 +89,8 @@
 				'displayName' => $user->getDisplayName(),
 				'uid' => $user->getUID(),
 				'dn' => $user->getDN(),
-				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
-				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
+				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool) $input->getOption('short-date')),
+				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool) $input->getOption('short-date')),
 				'homePath' => $user->getHomePath(),
 				'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
 			];

Indentation +63 added lines, -63 removed lines

@@ -36,73 +36,73 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ShowRemnants extends Command {
-	/** @var \OCA\User_LDAP\User\DeletedUsersIndex */
-	protected $dui;
+    /** @var \OCA\User_LDAP\User\DeletedUsersIndex */
+    protected $dui;
 
-	/** @var \OCP\IDateTimeFormatter */
-	protected $dateFormatter;
+    /** @var \OCP\IDateTimeFormatter */
+    protected $dateFormatter;
 
-	/**
-	 * @param DeletedUsersIndex $dui
-	 * @param IDateTimeFormatter $dateFormatter
-	 */
-	public function __construct(DeletedUsersIndex $dui, IDateTimeFormatter $dateFormatter) {
-		$this->dui = $dui;
-		$this->dateFormatter = $dateFormatter;
-		parent::__construct();
-	}
+    /**
+     * @param DeletedUsersIndex $dui
+     * @param IDateTimeFormatter $dateFormatter
+     */
+    public function __construct(DeletedUsersIndex $dui, IDateTimeFormatter $dateFormatter) {
+        $this->dui = $dui;
+        $this->dateFormatter = $dateFormatter;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('ldap:show-remnants')
-			->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.')
-			->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.')
-			->addOption('short-date', null, InputOption::VALUE_NONE, 'show dates in Y-m-d format');
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:show-remnants')
+            ->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.')
+            ->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.')
+            ->addOption('short-date', null, InputOption::VALUE_NONE, 'show dates in Y-m-d format');
+    }
 
-	protected function formatDate(int $timestamp, string $default, bool $showShortDate) {
-		if (!($timestamp > 0)) {
-			return $default;
-		}
-		if ($showShortDate) {
-			return date('Y-m-d', $timestamp);
-		}
-		return $this->dateFormatter->formatDate($timestamp);
-	}
+    protected function formatDate(int $timestamp, string $default, bool $showShortDate) {
+        if (!($timestamp > 0)) {
+            return $default;
+        }
+        if ($showShortDate) {
+            return date('Y-m-d', $timestamp);
+        }
+        return $this->dateFormatter->formatDate($timestamp);
+    }
 
-	/**
-	 * executes the command, i.e. creates and outputs a table of LDAP users marked as deleted
-	 *
-	 * {@inheritdoc}
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		/** @var \Symfony\Component\Console\Helper\Table $table */
-		$table = new Table($output);
-		$table->setHeaders([
-			'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
-			'Detected on', 'Dir', 'Sharer'
-		]);
-		$rows = [];
-		$resultSet = $this->dui->getUsers();
-		foreach ($resultSet as $user) {
-			$rows[] = [
-				'ocName' => $user->getOCName(),
-				'displayName' => $user->getDisplayName(),
-				'uid' => $user->getUID(),
-				'dn' => $user->getDN(),
-				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
-				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
-				'homePath' => $user->getHomePath(),
-				'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
-			];
-		}
+    /**
+     * executes the command, i.e. creates and outputs a table of LDAP users marked as deleted
+     *
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        /** @var \Symfony\Component\Console\Helper\Table $table */
+        $table = new Table($output);
+        $table->setHeaders([
+            'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
+            'Detected on', 'Dir', 'Sharer'
+        ]);
+        $rows = [];
+        $resultSet = $this->dui->getUsers();
+        foreach ($resultSet as $user) {
+            $rows[] = [
+                'ocName' => $user->getOCName(),
+                'displayName' => $user->getDisplayName(),
+                'uid' => $user->getUID(),
+                'dn' => $user->getDN(),
+                'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
+                'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
+                'homePath' => $user->getHomePath(),
+                'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
+            ];
+        }
 
-		if ($input->getOption('json')) {
-			$output->writeln(json_encode($rows));
-		} else {
-			$table->setRows($rows);
-			$table->render();
-		}
-		return 0;
-	}
+        if ($input->getOption('json')) {
+            $output->writeln(json_encode($rows));
+        } else {
+            $table->setRows($rows);
+            $table->render();
+        }
+        return 0;
+    }
 }

apps/dav/lib/Migration/ChunkCleanup.php

Indentation +47 added lines, -47 removed lines

@@ -37,59 +37,59 @@
 
 class ChunkCleanup implements IRepairStep {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IJobList */
-	private $jobList;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IConfig $config,
-								IUserManager $userManager,
-								IRootFolder $rootFolder,
-								IJobList $jobList) {
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-		$this->jobList = $jobList;
-	}
+    public function __construct(IConfig $config,
+                                IUserManager $userManager,
+                                IRootFolder $rootFolder,
+                                IJobList $jobList) {
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+        $this->jobList = $jobList;
+    }
 
-	public function getName(): string {
-		return 'Chunk cleanup scheduler';
-	}
+    public function getName(): string {
+        return 'Chunk cleanup scheduler';
+    }
 
-	public function run(IOutput $output) {
-		// If we already ran this onec there is no need to run it again
-		if ($this->config->getAppValue('dav', 'chunks_migrated', '0') === '1') {
-			$output->info('Cleanup not required');
-		}
+    public function run(IOutput $output) {
+        // If we already ran this onec there is no need to run it again
+        if ($this->config->getAppValue('dav', 'chunks_migrated', '0') === '1') {
+            $output->info('Cleanup not required');
+        }
 
-		$output->startProgress();
-		// Loop over all seen users
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
-			try {
-				$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-				$userRoot = $userFolder->getParent();
-				/** @var Folder $uploadFolder */
-				$uploadFolder = $userRoot->get('uploads');
-			} catch (NotFoundException $e) {
-				// No folder so skipping
-				return;
-			}
+        $output->startProgress();
+        // Loop over all seen users
+        $this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+            try {
+                $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+                $userRoot = $userFolder->getParent();
+                /** @var Folder $uploadFolder */
+                $uploadFolder = $userRoot->get('uploads');
+            } catch (NotFoundException $e) {
+                // No folder so skipping
+                return;
+            }
 
-			// Insert a cleanup job for each folder we find
-			$uploads = $uploadFolder->getDirectoryListing();
-			foreach ($uploads as $upload) {
-				$this->jobList->add(UploadCleanup::class, ['uid' => $user->getUID(), 'folder' => $upload->getName()]);
-			}
-			$output->advance();
-		});
-		$output->finishProgress();
+            // Insert a cleanup job for each folder we find
+            $uploads = $uploadFolder->getDirectoryListing();
+            foreach ($uploads as $upload) {
+                $this->jobList->add(UploadCleanup::class, ['uid' => $user->getUID(), 'folder' => $upload->getName()]);
+            }
+            $output->advance();
+        });
+        $output->finishProgress();
 
 
-		$this->config->setAppValue('dav', 'chunks_migrated', '1');
-	}
+        $this->config->setAppValue('dav', 'chunks_migrated', '1');
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
 		$output->startProgress();
 		// Loop over all seen users
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+		$this->userManager->callForSeenUsers(function(IUser $user) use ($output) {
 			try {
 				$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 				$userRoot = $userFolder->getParent();

apps/dav/lib/Upload/CleanupService.php

Indentation +14 added lines, -14 removed lines

@@ -29,21 +29,21 @@
 use OCP\IUserSession;
 
 class CleanupService {
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IJobList */
-	private $jobList;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IUserSession $userSession, IJobList $jobList) {
-		$this->userSession = $userSession;
-		$this->jobList = $jobList;
-	}
+    public function __construct(IUserSession $userSession, IJobList $jobList) {
+        $this->userSession = $userSession;
+        $this->jobList = $jobList;
+    }
 
-	public function addJob(string $folder) {
-		$this->jobList->add(UploadCleanup::class, ['uid' => $this->userSession->getUser()->getUID(), 'folder' => $folder]);
-	}
+    public function addJob(string $folder) {
+        $this->jobList->add(UploadCleanup::class, ['uid' => $this->userSession->getUser()->getUID(), 'folder' => $folder]);
+    }
 
-	public function removeJob(string $folder) {
-		$this->jobList->remove(UploadCleanup::class, ['uid' => $this->userSession->getUser()->getUID(), 'folder' => $folder]);
-	}
+    public function removeJob(string $folder) {
+        $this->jobList->remove(UploadCleanup::class, ['uid' => $this->userSession->getUser()->getUID(), 'folder' => $folder]);
+    }
 }