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/public/User/Backend/IPasswordConfirmationBackend.php

Indentation +4 added lines, -4 removed lines

@@ -29,8 +29,8 @@
  */
 interface IPasswordConfirmationBackend {
 
-	/**
-	 * @since 15.0.0
-	 */
-	public function canConfirmPassword(string $uid): bool;
+    /**
+     * @since 15.0.0
+     */
+    public function canConfirmPassword(string $uid): bool;
 }

lib/private/Repair/ClearFrontendCaches.php

Indentation +29 added lines, -29 removed lines

@@ -31,40 +31,40 @@
 
 class ClearFrontendCaches implements IRepairStep {
 
-	/** @var ICacheFactory */
-	protected $cacheFactory;
+    /** @var ICacheFactory */
+    protected $cacheFactory;
 
-	/** @var SCSSCacher */
-	protected $scssCacher;
+    /** @var SCSSCacher */
+    protected $scssCacher;
 
-	/** @var JSCombiner */
-	protected $jsCombiner;
+    /** @var JSCombiner */
+    protected $jsCombiner;
 
-	public function __construct(ICacheFactory $cacheFactory,
-								SCSSCacher $SCSSCacher,
-								JSCombiner $JSCombiner) {
-		$this->cacheFactory = $cacheFactory;
-		$this->scssCacher   = $SCSSCacher;
-		$this->jsCombiner   = $JSCombiner;
-	}
+    public function __construct(ICacheFactory $cacheFactory,
+                                SCSSCacher $SCSSCacher,
+                                JSCombiner $JSCombiner) {
+        $this->cacheFactory = $cacheFactory;
+        $this->scssCacher   = $SCSSCacher;
+        $this->jsCombiner   = $JSCombiner;
+    }
 
-	public function getName() {
-		return 'Clear frontend caches';
-	}
+    public function getName() {
+        return 'Clear frontend caches';
+    }
 
-	public function run(IOutput $output) {
-		try {
-			$c = $this->cacheFactory->createDistributed('imagePath');
-			$c->clear();
-			$output->info('Image cache cleared');
+    public function run(IOutput $output) {
+        try {
+            $c = $this->cacheFactory->createDistributed('imagePath');
+            $c->clear();
+            $output->info('Image cache cleared');
 
-			$this->scssCacher->resetCache();
-			$output->info('SCSS cache cleared');
+            $this->scssCacher->resetCache();
+            $output->info('SCSS cache cleared');
 
-			$this->jsCombiner->resetCache();
-			$output->info('JS cache cleared');
-		} catch (\Exception $e) {
-			$output->warning('Unable to clear the frontend cache');
-		}
-	}
+            $this->jsCombiner->resetCache();
+            $output->info('JS cache cleared');
+        } catch (\Exception $e) {
+            $output->warning('Unable to clear the frontend cache');
+        }
+    }
 }

apps/dav/lib/CalDAV/CachedSubscriptionObject.php

Indentation +25 added lines, -25 removed lines

@@ -33,32 +33,32 @@
  */
 class CachedSubscriptionObject extends \Sabre\CalDAV\CalendarObject {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function get() {
-		// Pre-populating the 'calendardata' is optional, if we don't have it
-		// already we fetch it from the backend.
-		if (!isset($this->objectData['calendardata'])) {
-			$this->objectData = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $this->objectData['uri'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-		}
+    /**
+     * @inheritdoc
+     */
+    public function get() {
+        // Pre-populating the 'calendardata' is optional, if we don't have it
+        // already we fetch it from the backend.
+        if (!isset($this->objectData['calendardata'])) {
+            $this->objectData = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $this->objectData['uri'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+        }
 
-		return $this->objectData['calendardata'];
-	}
+        return $this->objectData['calendardata'];
+    }
 
-	/**
-	 * @param resource|string $calendarData
-	 * @return string|void
-	 * @throws MethodNotAllowed
-	 */
-	public function put($calendarData) {
-		throw new MethodNotAllowed('Creating objects in a cached subscription is not allowed');
-	}
+    /**
+     * @param resource|string $calendarData
+     * @return string|void
+     * @throws MethodNotAllowed
+     */
+    public function put($calendarData) {
+        throw new MethodNotAllowed('Creating objects in a cached subscription is not allowed');
+    }
 
-	/**
-	 * @throws MethodNotAllowed
-	 */
-	public function delete() {
-		throw new MethodNotAllowed('Deleting objects in a cached subscription is not allowed');
-	}
+    /**
+     * @throws MethodNotAllowed
+     */
+    public function delete() {
+        throw new MethodNotAllowed('Deleting objects in a cached subscription is not allowed');
+    }
 }

lib/public/IUser.php

Indentation +174 added lines, -174 removed lines

@@ -36,178 +36,178 @@
  */
 interface IUser {
 
-	/**
-	 * get the user id
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getUID();
-
-	/**
-	 * get the display name for the user, if no specific display name is set it will fallback to the user id
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getDisplayName();
-
-	/**
-	 * set the display name for the user
-	 *
-	 * @param string $displayName
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function setDisplayName($displayName);
-
-	/**
-	 * returns the timestamp of the user's last login or 0 if the user did never
-	 * login
-	 *
-	 * @return int
-	 * @since 8.0.0
-	 */
-	public function getLastLogin();
-
-	/**
-	 * updates the timestamp of the most recent login of this user
-	 * @since 8.0.0
-	 */
-	public function updateLastLoginTimestamp();
-
-	/**
-	 * Delete the user
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function delete();
-
-	/**
-	 * Set the password of the user
-	 *
-	 * @param string $password
-	 * @param string $recoveryPassword for the encryption app to reset encryption keys
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function setPassword($password, $recoveryPassword = null);
-
-	/**
-	 * get the users home folder to mount
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getHome();
-
-	/**
-	 * Get the name of the backend class the user is connected with
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getBackendClassName();
-
-	/**
-	 * Get the backend for the current user object
-	 *
-	 * @return UserInterface
-	 * @since 15.0.0
-	 */
-	public function getBackend();
-
-	/**
-	 * check if the backend allows the user to change his avatar on Personal page
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function canChangeAvatar();
-
-	/**
-	 * check if the backend supports changing passwords
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function canChangePassword();
-
-	/**
-	 * check if the backend supports changing display names
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function canChangeDisplayName();
-
-	/**
-	 * check if the user is enabled
-	 *
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function isEnabled();
-
-	/**
-	 * set the enabled status for the user
-	 *
-	 * @param bool $enabled
-	 * @since 8.0.0
-	 */
-	public function setEnabled(bool $enabled = true);
-
-	/**
-	 * get the users email address
-	 *
-	 * @return string|null
-	 * @since 9.0.0
-	 */
-	public function getEMailAddress();
-
-	/**
-	 * get the avatar image if it exists
-	 *
-	 * @param int $size
-	 * @return IImage|null
-	 * @since 9.0.0
-	 */
-	public function getAvatarImage($size);
-
-	/**
-	 * get the federation cloud id
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getCloudId();
-
-	/**
-	 * set the email address of the user
-	 *
-	 * @param string|null $mailAddress
-	 * @return void
-	 * @since 9.0.0
-	 */
-	public function setEMailAddress($mailAddress);
-
-	/**
-	 * get the users' quota in human readable form. If a specific quota is not
-	 * set for the user, the default value is returned. If a default setting
-	 * was not set otherwise, it is return as 'none', i.e. quota is not limited.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getQuota();
-
-	/**
-	 * set the users' quota
-	 *
-	 * @param string $quota
-	 * @return void
-	 * @since 9.0.0
-	 */
-	public function setQuota($quota);
+    /**
+     * get the user id
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getUID();
+
+    /**
+     * get the display name for the user, if no specific display name is set it will fallback to the user id
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getDisplayName();
+
+    /**
+     * set the display name for the user
+     *
+     * @param string $displayName
+     * @return bool
+     * @since 8.0.0
+     */
+    public function setDisplayName($displayName);
+
+    /**
+     * returns the timestamp of the user's last login or 0 if the user did never
+     * login
+     *
+     * @return int
+     * @since 8.0.0
+     */
+    public function getLastLogin();
+
+    /**
+     * updates the timestamp of the most recent login of this user
+     * @since 8.0.0
+     */
+    public function updateLastLoginTimestamp();
+
+    /**
+     * Delete the user
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function delete();
+
+    /**
+     * Set the password of the user
+     *
+     * @param string $password
+     * @param string $recoveryPassword for the encryption app to reset encryption keys
+     * @return bool
+     * @since 8.0.0
+     */
+    public function setPassword($password, $recoveryPassword = null);
+
+    /**
+     * get the users home folder to mount
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getHome();
+
+    /**
+     * Get the name of the backend class the user is connected with
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getBackendClassName();
+
+    /**
+     * Get the backend for the current user object
+     *
+     * @return UserInterface
+     * @since 15.0.0
+     */
+    public function getBackend();
+
+    /**
+     * check if the backend allows the user to change his avatar on Personal page
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function canChangeAvatar();
+
+    /**
+     * check if the backend supports changing passwords
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function canChangePassword();
+
+    /**
+     * check if the backend supports changing display names
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function canChangeDisplayName();
+
+    /**
+     * check if the user is enabled
+     *
+     * @return bool
+     * @since 8.0.0
+     */
+    public function isEnabled();
+
+    /**
+     * set the enabled status for the user
+     *
+     * @param bool $enabled
+     * @since 8.0.0
+     */
+    public function setEnabled(bool $enabled = true);
+
+    /**
+     * get the users email address
+     *
+     * @return string|null
+     * @since 9.0.0
+     */
+    public function getEMailAddress();
+
+    /**
+     * get the avatar image if it exists
+     *
+     * @param int $size
+     * @return IImage|null
+     * @since 9.0.0
+     */
+    public function getAvatarImage($size);
+
+    /**
+     * get the federation cloud id
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getCloudId();
+
+    /**
+     * set the email address of the user
+     *
+     * @param string|null $mailAddress
+     * @return void
+     * @since 9.0.0
+     */
+    public function setEMailAddress($mailAddress);
+
+    /**
+     * get the users' quota in human readable form. If a specific quota is not
+     * set for the user, the default value is returned. If a default setting
+     * was not set otherwise, it is return as 'none', i.e. quota is not limited.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getQuota();
+
+    /**
+     * set the users' quota
+     *
+     * @param string $quota
+     * @return void
+     * @since 9.0.0
+     */
+    public function setQuota($quota);
 }

apps/updatenotification/lib/UpdateChecker.php

Indentation +50 added lines, -50 removed lines

@@ -29,60 +29,60 @@
 use OC\Updater\VersionCheck;
 
 class UpdateChecker {
-	/** @var VersionCheck */
-	private $updater;
-	/** @var ChangesCheck */
-	private $changesCheck;
+    /** @var VersionCheck */
+    private $updater;
+    /** @var ChangesCheck */
+    private $changesCheck;
 
-	/**
-	 * @param VersionCheck $updater
-	 */
-	public function __construct(VersionCheck $updater, ChangesCheck $changesCheck) {
-		$this->updater = $updater;
-		$this->changesCheck = $changesCheck;
-	}
+    /**
+     * @param VersionCheck $updater
+     */
+    public function __construct(VersionCheck $updater, ChangesCheck $changesCheck) {
+        $this->updater = $updater;
+        $this->changesCheck = $changesCheck;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getUpdateState(): array {
-		$data = $this->updater->check();
-		$result = [];
+    /**
+     * @return array
+     */
+    public function getUpdateState(): array {
+        $data = $this->updater->check();
+        $result = [];
 
-		if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
-			$result['updateAvailable'] = true;
-			$result['updateVersion'] = $data['version'];
-			$result['updateVersionString'] = $data['versionstring'];
-			$result['updaterEnabled'] = $data['autoupdater'] === '1';
-			$result['versionIsEol'] = $data['eol'] === '1';
-			if (strpos($data['web'], 'https://') === 0) {
-				$result['updateLink'] = $data['web'];
-			}
-			if (strpos($data['url'], 'https://') === 0) {
-				$result['downloadLink'] = $data['url'];
-			}
-			if (strpos($data['changes'], 'https://') === 0) {
-				try {
-					$result['changes'] = $this->changesCheck->check($data['changes'], $data['version']);
-				} catch (\Exception $e) {
-					// no info, not a problem
-				}
-			}
+        if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
+            $result['updateAvailable'] = true;
+            $result['updateVersion'] = $data['version'];
+            $result['updateVersionString'] = $data['versionstring'];
+            $result['updaterEnabled'] = $data['autoupdater'] === '1';
+            $result['versionIsEol'] = $data['eol'] === '1';
+            if (strpos($data['web'], 'https://') === 0) {
+                $result['updateLink'] = $data['web'];
+            }
+            if (strpos($data['url'], 'https://') === 0) {
+                $result['downloadLink'] = $data['url'];
+            }
+            if (strpos($data['changes'], 'https://') === 0) {
+                try {
+                    $result['changes'] = $this->changesCheck->check($data['changes'], $data['version']);
+                } catch (\Exception $e) {
+                    // no info, not a problem
+                }
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		return [];
-	}
+        return [];
+    }
 
-	/**
-	 * @param array $data
-	 */
-	public function populateJavaScriptVariables(array $data) {
-		$data['array']['oc_updateState'] =  json_encode([
-			'updateAvailable' => true,
-			'updateVersion' => $this->getUpdateState()['updateVersionString'],
-			'updateLink' => $this->getUpdateState()['updateLink'] ?? '',
-		]);
-	}
+    /**
+     * @param array $data
+     */
+    public function populateJavaScriptVariables(array $data) {
+        $data['array']['oc_updateState'] =  json_encode([
+            'updateAvailable' => true,
+            'updateVersion' => $this->getUpdateState()['updateVersionString'],
+            'updateLink' => $this->getUpdateState()['updateLink'] ?? '',
+        ]);
+    }
 }

lib/private/Files/Type/Loader.php

Indentation +138 added lines, -138 removed lines

@@ -36,143 +36,143 @@
  */
 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)
-			));
-		$row = $fetch->execute()->fetch();
-
-		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');
-		$results = $qb->execute()->fetchAll();
-
-		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)
+            ));
+        $row = $fetch->execute()->fetch();
+
+        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');
+        $results = $qb->execute()->fetchAll();
+
+        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;
+    }
 }