nextcloud / server

settings/Controller/PersonalSettingsController.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 	protected function getSettings($section) {
 		$settings = $this->settingsManager->getPersonalSettings($section);
 		$formatted = $this->formatSettings($settings);
-		if($section === 'additional') {
+		if ($section === 'additional') {
 			$formatted['content'] .= $this->getLegacyForms();
 		}
 		return $formatted;
@@ -79,9 +79,9 @@ 
 	private function getLegacyForms() {
 		$forms = \OC_App::getForms('personal');
 
-		$forms = array_map(function ($form) {
+		$forms = array_map(function($form) {
 			if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
-				$sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
+				$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
 				$sectionName = str_replace('</h2>', '', $sectionName);
 				$anchor = strtolower($sectionName);
 				$anchor = str_replace(' ', '-', $anchor);

Indentation +59 added lines, -59 removed lines

@@ -32,72 +32,72 @@
 use OCP\Template;
 
 class PersonalSettingsController extends Controller {
-	use CommonSettingsTrait;
+    use CommonSettingsTrait;
 
-	public function __construct(
-		$appName,
-		IRequest $request,
-		INavigationManager $navigationManager,
-		ISettingsManager $settingsManager
-	) {
-		parent::__construct($appName, $request);
-		$this->navigationManager = $navigationManager;
-		$this->settingsManager = $settingsManager;
-	}
+    public function __construct(
+        $appName,
+        IRequest $request,
+        INavigationManager $navigationManager,
+        ISettingsManager $settingsManager
+    ) {
+        parent::__construct($appName, $request);
+        $this->navigationManager = $navigationManager;
+        $this->settingsManager = $settingsManager;
+    }
 
-	/**
-	 * @param string $section
-	 * @return TemplateResponse
-	 *
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 */
-	public function index($section) {
-		return $this->getIndexResponse('personal', $section);
+    /**
+     * @param string $section
+     * @return TemplateResponse
+     *
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     */
+    public function index($section) {
+        return $this->getIndexResponse('personal', $section);
 
-	}
+    }
 
-	/**
-	 * @param string $section
-	 * @return array
-	 */
-	protected function getSettings($section) {
-		$settings = $this->settingsManager->getPersonalSettings($section);
-		$formatted = $this->formatSettings($settings);
-		if($section === 'additional') {
-			$formatted['content'] .= $this->getLegacyForms();
-		}
-		return $formatted;
-	}
+    /**
+     * @param string $section
+     * @return array
+     */
+    protected function getSettings($section) {
+        $settings = $this->settingsManager->getPersonalSettings($section);
+        $formatted = $this->formatSettings($settings);
+        if($section === 'additional') {
+            $formatted['content'] .= $this->getLegacyForms();
+        }
+        return $formatted;
+    }
 
-	/**
-	 * @return bool|string
-	 */
-	private function getLegacyForms() {
-		$forms = \OC_App::getForms('personal');
+    /**
+     * @return bool|string
+     */
+    private function getLegacyForms() {
+        $forms = \OC_App::getForms('personal');
 
-		$forms = array_map(function ($form) {
-			if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
-				$sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
-				$sectionName = str_replace('</h2>', '', $sectionName);
-				$anchor = strtolower($sectionName);
-				$anchor = str_replace(' ', '-', $anchor);
+        $forms = array_map(function ($form) {
+            if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
+                $sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
+                $sectionName = str_replace('</h2>', '', $sectionName);
+                $anchor = strtolower($sectionName);
+                $anchor = str_replace(' ', '-', $anchor);
 
-				return array(
-					'anchor' => $anchor,
-					'section-name' => $sectionName,
-					'form' => $form
-				);
-			}
-			return array(
-				'form' => $form
-			);
-		}, $forms);
+                return array(
+                    'anchor' => $anchor,
+                    'section-name' => $sectionName,
+                    'form' => $form
+                );
+            }
+            return array(
+                'form' => $form
+            );
+        }, $forms);
 
-		$out = new Template('settings', 'settings/additional');
-		$out->assign('forms', $forms);
+        $out = new Template('settings', 'settings/additional');
+        $out->assign('forms', $forms);
 
-		return $out->fetchPage();
-	}
+        return $out->fetchPage();
+    }
 }

settings/Controller/AdminSettingsController.php

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
 	protected function getSettings($section) {
 		$settings = $this->settingsManager->getAdminSettings($section);
 		$formatted = $this->formatSettings($settings);
-		if($section === 'additional') {
+		if ($section === 'additional') {
 			$formatted['content'] .= $this->getLegacyForms();
 		}
 		return $formatted;
@@ -89,9 +89,9 @@ 
 	private function getLegacyForms() {
 		$forms = \OC_App::getForms('admin');
 
-		$forms = array_map(function ($form) {
+		$forms = array_map(function($form) {
 			if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
-				$sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
+				$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
 				$sectionName = str_replace('</h2>', '', $sectionName);
 				$anchor = strtolower($sectionName);
 				$anchor = str_replace(' ', '-', $anchor);

Indentation +63 added lines, -63 removed lines

@@ -36,77 +36,77 @@
  * @package OC\Settings\Controller
  */
 class AdminSettingsController extends Controller {
-	use CommonSettingsTrait;
+    use CommonSettingsTrait;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param INavigationManager $navigationManager
-	 * @param ISettingsManager $settingsManager
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		INavigationManager $navigationManager,
-		ISettingsManager $settingsManager
-	) {
-		parent::__construct($appName, $request);
-		$this->navigationManager = $navigationManager;
-		$this->settingsManager = $settingsManager;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param INavigationManager $navigationManager
+     * @param ISettingsManager $settingsManager
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        INavigationManager $navigationManager,
+        ISettingsManager $settingsManager
+    ) {
+        parent::__construct($appName, $request);
+        $this->navigationManager = $navigationManager;
+        $this->settingsManager = $settingsManager;
+    }
 
-	/**
-	 * @param string $section
-	 * @return TemplateResponse
-	 *
-	 * @NoCSRFRequired
-	 */
-	public function index($section) {
-		return $this->getIndexResponse('admin', $section);
-	}
+    /**
+     * @param string $section
+     * @return TemplateResponse
+     *
+     * @NoCSRFRequired
+     */
+    public function index($section) {
+        return $this->getIndexResponse('admin', $section);
+    }
 
-	/**
-	 * @param string $section
-	 * @return array
-	 */
-	protected function getSettings($section) {
-		$settings = $this->settingsManager->getAdminSettings($section);
-		$formatted = $this->formatSettings($settings);
-		if($section === 'additional') {
-			$formatted['content'] .= $this->getLegacyForms();
-		}
-		return $formatted;
-	}
+    /**
+     * @param string $section
+     * @return array
+     */
+    protected function getSettings($section) {
+        $settings = $this->settingsManager->getAdminSettings($section);
+        $formatted = $this->formatSettings($settings);
+        if($section === 'additional') {
+            $formatted['content'] .= $this->getLegacyForms();
+        }
+        return $formatted;
+    }
 
-	/**
-	 * @return bool|string
-	 */
-	private function getLegacyForms() {
-		$forms = \OC_App::getForms('admin');
+    /**
+     * @return bool|string
+     */
+    private function getLegacyForms() {
+        $forms = \OC_App::getForms('admin');
 
-		$forms = array_map(function ($form) {
-			if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
-				$sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
-				$sectionName = str_replace('</h2>', '', $sectionName);
-				$anchor = strtolower($sectionName);
-				$anchor = str_replace(' ', '-', $anchor);
+        $forms = array_map(function ($form) {
+            if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
+                $sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
+                $sectionName = str_replace('</h2>', '', $sectionName);
+                $anchor = strtolower($sectionName);
+                $anchor = str_replace(' ', '-', $anchor);
 
-				return array(
-					'anchor' => $anchor,
-					'section-name' => $sectionName,
-					'form' => $form
-				);
-			}
-			return array(
-				'form' => $form
-			);
-		}, $forms);
+                return array(
+                    'anchor' => $anchor,
+                    'section-name' => $sectionName,
+                    'form' => $form
+                );
+            }
+            return array(
+                'form' => $form
+            );
+        }, $forms);
 
-		$out = new Template('settings', 'settings/additional');
-		$out->assign('forms', $forms);
+        $out = new Template('settings', 'settings/additional');
+        $out->assign('forms', $forms);
 
-		return $out->fetchPage();
-	}
+        return $out->fetchPage();
+    }
 
 
 }

lib/private/User/User.php

Spacing +11 added lines, -11 removed lines

@@ -84,7 +84,7 @@ 
 		$this->uid = $uid;
 		$this->backend = $backend;
 		$this->emitter = $emitter;
-		if(is_null($config)) {
+		if (is_null($config)) {
 			$config = \OC::$server->getConfig();
 		}
 		$this->config = $config;
@@ -160,12 +160,12 @@ 
 	 */
 	public function setEMailAddress($mailAddress) {
 		$oldMailAddress = $this->getEMailAddress();
-		if($mailAddress === '') {
+		if ($mailAddress === '') {
 			$this->config->deleteUserValue($this->uid, 'settings', 'email');
 		} else {
 			$this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress);
 		}
-		if($oldMailAddress !== $mailAddress) {
+		if ($oldMailAddress !== $mailAddress) {
 			$this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);
 		}
 	}
@@ -229,7 +229,7 @@ 
 			}
 
 			// Delete the users entry in the storage table
-			Storage::remove('home::' . $this->uid);
+			Storage::remove('home::'.$this->uid);
 
 			\OC::$server->getCommentsManager()->deleteReferencesOfActor('users', $this->uid);
 			\OC::$server->getCommentsManager()->deleteReadMarksFromUser($this);
@@ -281,9 +281,9 @@ 
 			if ($this->backend->implementsActions(Backend::GET_HOME) and $home = $this->backend->getHome($this->uid)) {
 				$this->home = $home;
 			} elseif ($this->config) {
-				$this->home = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $this->uid;
+				$this->home = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/'.$this->uid;
 			} else {
-				$this->home = \OC::$SERVERROOT . '/data/' . $this->uid;
+				$this->home = \OC::$SERVERROOT.'/data/'.$this->uid;
 			}
 		}
 		return $this->home;
@@ -295,7 +295,7 @@ 
 	 * @return string
 	 */
 	public function getBackendClassName() {
-		if($this->backend instanceof IUserBackend) {
+		if ($this->backend instanceof IUserBackend) {
 			return $this->backend->getBackendName();
 		}
 		return get_class($this->backend);
@@ -376,7 +376,7 @@ 
 	 */
 	public function getQuota() {
 		$quota = $this->config->getUserValue($this->uid, 'files', 'quota', 'default');
-		if($quota === 'default') {
+		if ($quota === 'default') {
 			$quota = $this->config->getAppValue('files', 'default_quota', 'none');
 		}
 		return $quota;
@@ -391,12 +391,12 @@ 
 	 */
 	public function setQuota($quota) {
 		$oldQuota = $this->config->getUserValue($this->uid, 'files', 'quota', '');
-		if($quota !== 'none' and $quota !== 'default') {
+		if ($quota !== 'none' and $quota !== 'default') {
 			$quota = OC_Helper::computerFileSize($quota);
 			$quota = OC_Helper::humanFileSize($quota);
 		}
 		$this->config->setUserValue($this->uid, 'files', 'quota', $quota);
-		if($quota !== $oldQuota) {
+		if ($quota !== $oldQuota) {
 			$this->triggerChange('quota', $quota);
 		}
 	}
@@ -432,7 +432,7 @@ 
 	public function getCloudId() {
 		$uid = $this->getUID();
 		$server = $this->urlGenerator->getAbsoluteURL('/');
-		$server =  rtrim( $this->removeProtocolFromUrl($server), '/');
+		$server = rtrim($this->removeProtocolFromUrl($server), '/');
 		return \OC::$server->getCloudIdManager()->getCloudId($uid, $server)->getId();
 	}
 

Doc Comments +4 added lines

@@ -450,6 +450,10 @@
 		return $url;
 	}
 
+	/**
+	 * @param string $feature
+	 * @param string $oldValue
+	 */
 	public function triggerChange($feature, $value = null, $oldValue = null) {
 		if ($this->emitter) {
 			$this->emitter->emit('\OC\User', 'changeUser', array($this, $feature, $value, $oldValue));

Indentation +411 added lines, -411 removed lines

@@ -44,415 +44,415 @@
 use \OCP\IUserBackend;
 
 class User implements IUser {
-	/** @var string $uid */
-	private $uid;
-
-	/** @var string $displayName */
-	private $displayName;
-
-	/** @var UserInterface $backend */
-	private $backend;
-
-	/** @var bool $enabled */
-	private $enabled;
-
-	/** @var Emitter|Manager $emitter */
-	private $emitter;
-
-	/** @var string $home */
-	private $home;
-
-	/** @var int $lastLogin */
-	private $lastLogin;
-
-	/** @var \OCP\IConfig $config */
-	private $config;
-
-	/** @var IAvatarManager */
-	private $avatarManager;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/**
-	 * @param string $uid
-	 * @param UserInterface $backend
-	 * @param \OC\Hooks\Emitter $emitter
-	 * @param IConfig|null $config
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct($uid, $backend, $emitter = null, IConfig $config = null, $urlGenerator = null) {
-		$this->uid = $uid;
-		$this->backend = $backend;
-		$this->emitter = $emitter;
-		if(is_null($config)) {
-			$config = \OC::$server->getConfig();
-		}
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-		$enabled = $this->config->getUserValue($uid, 'core', 'enabled', 'true');
-		$this->enabled = ($enabled === 'true');
-		$this->lastLogin = $this->config->getUserValue($uid, 'login', 'lastLogin', 0);
-		if (is_null($this->urlGenerator)) {
-			$this->urlGenerator = \OC::$server->getURLGenerator();
-		}
-	}
-
-	/**
-	 * get the user id
-	 *
-	 * @return string
-	 */
-	public function getUID() {
-		return $this->uid;
-	}
-
-	/**
-	 * get the display name for the user, if no specific display name is set it will fallback to the user id
-	 *
-	 * @return string
-	 */
-	public function getDisplayName() {
-		if (!isset($this->displayName)) {
-			$displayName = '';
-			if ($this->backend and $this->backend->implementsActions(Backend::GET_DISPLAYNAME)) {
-				// get display name and strip whitespace from the beginning and end of it
-				$backendDisplayName = $this->backend->getDisplayName($this->uid);
-				if (is_string($backendDisplayName)) {
-					$displayName = trim($backendDisplayName);
-				}
-			}
-
-			if (!empty($displayName)) {
-				$this->displayName = $displayName;
-			} else {
-				$this->displayName = $this->uid;
-			}
-		}
-		return $this->displayName;
-	}
-
-	/**
-	 * set the displayname for the user
-	 *
-	 * @param string $displayName
-	 * @return bool
-	 */
-	public function setDisplayName($displayName) {
-		$displayName = trim($displayName);
-		if ($this->backend->implementsActions(Backend::SET_DISPLAYNAME) && !empty($displayName)) {
-			$result = $this->backend->setDisplayName($this->uid, $displayName);
-			if ($result) {
-				$this->displayName = $displayName;
-				$this->triggerChange('displayName', $displayName);
-			}
-			return $result !== false;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * set the email address of the user
-	 *
-	 * @param string|null $mailAddress
-	 * @return void
-	 * @since 9.0.0
-	 */
-	public function setEMailAddress($mailAddress) {
-		$oldMailAddress = $this->getEMailAddress();
-		if($mailAddress === '') {
-			$this->config->deleteUserValue($this->uid, 'settings', 'email');
-		} else {
-			$this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress);
-		}
-		if($oldMailAddress !== $mailAddress) {
-			$this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);
-		}
-	}
-
-	/**
-	 * returns the timestamp of the user's last login or 0 if the user did never
-	 * login
-	 *
-	 * @return int
-	 */
-	public function getLastLogin() {
-		return $this->lastLogin;
-	}
-
-	/**
-	 * updates the timestamp of the most recent login of this user
-	 */
-	public function updateLastLoginTimestamp() {
-		$firstTimeLogin = ($this->lastLogin === 0);
-		$this->lastLogin = time();
-		$this->config->setUserValue(
-			$this->uid, 'login', 'lastLogin', $this->lastLogin);
-
-		return $firstTimeLogin;
-	}
-
-	/**
-	 * Delete the user
-	 *
-	 * @return bool
-	 */
-	public function delete() {
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\User', 'preDelete', array($this));
-		}
-		// get the home now because it won't return it after user deletion
-		$homePath = $this->getHome();
-		$result = $this->backend->deleteUser($this->uid);
-		if ($result) {
-
-			// FIXME: Feels like an hack - suggestions?
-
-			$groupManager = \OC::$server->getGroupManager();
-			// We have to delete the user from all groups
-			foreach ($groupManager->getUserGroupIds($this) as $groupId) {
-				$group = $groupManager->get($groupId);
-				if ($group) {
-					\OC_Hook::emit("OC_Group", "pre_removeFromGroup", ["run" => true, "uid" => $this->uid, "gid" => $groupId]);
-					$group->removeUser($this);
-					\OC_Hook::emit("OC_User", "post_removeFromGroup", ["uid" => $this->uid, "gid" => $groupId]);
-				}
-			}
-			// Delete the user's keys in preferences
-			\OC::$server->getConfig()->deleteAllUserValues($this->uid);
-
-			// Delete user files in /data/
-			if ($homePath !== false) {
-				// FIXME: this operates directly on FS, should use View instead...
-				// also this is not testable/mockable...
-				\OC_Helper::rmdirr($homePath);
-			}
-
-			// Delete the users entry in the storage table
-			Storage::remove('home::' . $this->uid);
-
-			\OC::$server->getCommentsManager()->deleteReferencesOfActor('users', $this->uid);
-			\OC::$server->getCommentsManager()->deleteReadMarksFromUser($this);
-
-			$notification = \OC::$server->getNotificationManager()->createNotification();
-			$notification->setUser($this->uid);
-			\OC::$server->getNotificationManager()->markProcessed($notification);
-
-			/** @var AccountManager $accountManager */
-			$accountManager = \OC::$server->query(AccountManager::class);
-			$accountManager->deleteUser($this);
-
-			if ($this->emitter) {
-				$this->emitter->emit('\OC\User', 'postDelete', array($this));
-			}
-		}
-		return !($result === false);
-	}
-
-	/**
-	 * Set the password of the user
-	 *
-	 * @param string $password
-	 * @param string $recoveryPassword for the encryption app to reset encryption keys
-	 * @return bool
-	 */
-	public function setPassword($password, $recoveryPassword = null) {
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword));
-		}
-		if ($this->backend->implementsActions(Backend::SET_PASSWORD)) {
-			$result = $this->backend->setPassword($this->uid, $password);
-			if ($this->emitter) {
-				$this->emitter->emit('\OC\User', 'postSetPassword', array($this, $password, $recoveryPassword));
-			}
-			return !($result === false);
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * get the users home folder to mount
-	 *
-	 * @return string
-	 */
-	public function getHome() {
-		if (!$this->home) {
-			if ($this->backend->implementsActions(Backend::GET_HOME) and $home = $this->backend->getHome($this->uid)) {
-				$this->home = $home;
-			} elseif ($this->config) {
-				$this->home = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $this->uid;
-			} else {
-				$this->home = \OC::$SERVERROOT . '/data/' . $this->uid;
-			}
-		}
-		return $this->home;
-	}
-
-	/**
-	 * Get the name of the backend class the user is connected with
-	 *
-	 * @return string
-	 */
-	public function getBackendClassName() {
-		if($this->backend instanceof IUserBackend) {
-			return $this->backend->getBackendName();
-		}
-		return get_class($this->backend);
-	}
-
-	/**
-	 * check if the backend allows the user to change his avatar on Personal page
-	 *
-	 * @return bool
-	 */
-	public function canChangeAvatar() {
-		if ($this->backend->implementsActions(Backend::PROVIDE_AVATAR)) {
-			return $this->backend->canChangeAvatar($this->uid);
-		}
-		return true;
-	}
-
-	/**
-	 * check if the backend supports changing passwords
-	 *
-	 * @return bool
-	 */
-	public function canChangePassword() {
-		return $this->backend->implementsActions(Backend::SET_PASSWORD);
-	}
-
-	/**
-	 * check if the backend supports changing display names
-	 *
-	 * @return bool
-	 */
-	public function canChangeDisplayName() {
-		if ($this->config->getSystemValue('allow_user_to_change_display_name') === false) {
-			return false;
-		}
-		return $this->backend->implementsActions(Backend::SET_DISPLAYNAME);
-	}
-
-	/**
-	 * check if the user is enabled
-	 *
-	 * @return bool
-	 */
-	public function isEnabled() {
-		return $this->enabled;
-	}
-
-	/**
-	 * set the enabled status for the user
-	 *
-	 * @param bool $enabled
-	 */
-	public function setEnabled(bool $enabled = true) {
-		$oldStatus = $this->isEnabled();
-		$this->enabled = $enabled;
-		if ($oldStatus !== $this->enabled) {
-			$this->triggerChange('enabled', $enabled);
-			$this->config->setUserValue($this->uid, 'core', 'enabled', $enabled ? 'true' : 'false');
-		}
-	}
-
-	/**
-	 * get the users email address
-	 *
-	 * @return string|null
-	 * @since 9.0.0
-	 */
-	public function getEMailAddress() {
-		return $this->config->getUserValue($this->uid, 'settings', 'email', null);
-	}
-
-	/**
-	 * get the users' quota
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getQuota() {
-		$quota = $this->config->getUserValue($this->uid, 'files', 'quota', 'default');
-		if($quota === 'default') {
-			$quota = $this->config->getAppValue('files', 'default_quota', 'none');
-		}
-		return $quota;
-	}
-
-	/**
-	 * set the users' quota
-	 *
-	 * @param string $quota
-	 * @return void
-	 * @since 9.0.0
-	 */
-	public function setQuota($quota) {
-		$oldQuota = $this->config->getUserValue($this->uid, 'files', 'quota', '');
-		if($quota !== 'none' and $quota !== 'default') {
-			$quota = OC_Helper::computerFileSize($quota);
-			$quota = OC_Helper::humanFileSize($quota);
-		}
-		$this->config->setUserValue($this->uid, 'files', 'quota', $quota);
-		if($quota !== $oldQuota) {
-			$this->triggerChange('quota', $quota);
-		}
-	}
-
-	/**
-	 * get the avatar image if it exists
-	 *
-	 * @param int $size
-	 * @return IImage|null
-	 * @since 9.0.0
-	 */
-	public function getAvatarImage($size) {
-		// delay the initialization
-		if (is_null($this->avatarManager)) {
-			$this->avatarManager = \OC::$server->getAvatarManager();
-		}
-
-		$avatar = $this->avatarManager->getAvatar($this->uid);
-		$image = $avatar->get(-1);
-		if ($image) {
-			return $image;
-		}
-
-		return null;
-	}
-
-	/**
-	 * get the federation cloud id
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getCloudId() {
-		$uid = $this->getUID();
-		$server = $this->urlGenerator->getAbsoluteURL('/');
-		$server =  rtrim( $this->removeProtocolFromUrl($server), '/');
-		return \OC::$server->getCloudIdManager()->getCloudId($uid, $server)->getId();
-	}
-
-	/**
-	 * @param string $url
-	 * @return string
-	 */
-	private function removeProtocolFromUrl($url) {
-		if (strpos($url, 'https://') === 0) {
-			return substr($url, strlen('https://'));
-		} else if (strpos($url, 'http://') === 0) {
-			return substr($url, strlen('http://'));
-		}
-
-		return $url;
-	}
-
-	public function triggerChange($feature, $value = null, $oldValue = null) {
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\User', 'changeUser', array($this, $feature, $value, $oldValue));
-		}
-	}
+    /** @var string $uid */
+    private $uid;
+
+    /** @var string $displayName */
+    private $displayName;
+
+    /** @var UserInterface $backend */
+    private $backend;
+
+    /** @var bool $enabled */
+    private $enabled;
+
+    /** @var Emitter|Manager $emitter */
+    private $emitter;
+
+    /** @var string $home */
+    private $home;
+
+    /** @var int $lastLogin */
+    private $lastLogin;
+
+    /** @var \OCP\IConfig $config */
+    private $config;
+
+    /** @var IAvatarManager */
+    private $avatarManager;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /**
+     * @param string $uid
+     * @param UserInterface $backend
+     * @param \OC\Hooks\Emitter $emitter
+     * @param IConfig|null $config
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct($uid, $backend, $emitter = null, IConfig $config = null, $urlGenerator = null) {
+        $this->uid = $uid;
+        $this->backend = $backend;
+        $this->emitter = $emitter;
+        if(is_null($config)) {
+            $config = \OC::$server->getConfig();
+        }
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+        $enabled = $this->config->getUserValue($uid, 'core', 'enabled', 'true');
+        $this->enabled = ($enabled === 'true');
+        $this->lastLogin = $this->config->getUserValue($uid, 'login', 'lastLogin', 0);
+        if (is_null($this->urlGenerator)) {
+            $this->urlGenerator = \OC::$server->getURLGenerator();
+        }
+    }
+
+    /**
+     * get the user id
+     *
+     * @return string
+     */
+    public function getUID() {
+        return $this->uid;
+    }
+
+    /**
+     * get the display name for the user, if no specific display name is set it will fallback to the user id
+     *
+     * @return string
+     */
+    public function getDisplayName() {
+        if (!isset($this->displayName)) {
+            $displayName = '';
+            if ($this->backend and $this->backend->implementsActions(Backend::GET_DISPLAYNAME)) {
+                // get display name and strip whitespace from the beginning and end of it
+                $backendDisplayName = $this->backend->getDisplayName($this->uid);
+                if (is_string($backendDisplayName)) {
+                    $displayName = trim($backendDisplayName);
+                }
+            }
+
+            if (!empty($displayName)) {
+                $this->displayName = $displayName;
+            } else {
+                $this->displayName = $this->uid;
+            }
+        }
+        return $this->displayName;
+    }
+
+    /**
+     * set the displayname for the user
+     *
+     * @param string $displayName
+     * @return bool
+     */
+    public function setDisplayName($displayName) {
+        $displayName = trim($displayName);
+        if ($this->backend->implementsActions(Backend::SET_DISPLAYNAME) && !empty($displayName)) {
+            $result = $this->backend->setDisplayName($this->uid, $displayName);
+            if ($result) {
+                $this->displayName = $displayName;
+                $this->triggerChange('displayName', $displayName);
+            }
+            return $result !== false;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * set the email address of the user
+     *
+     * @param string|null $mailAddress
+     * @return void
+     * @since 9.0.0
+     */
+    public function setEMailAddress($mailAddress) {
+        $oldMailAddress = $this->getEMailAddress();
+        if($mailAddress === '') {
+            $this->config->deleteUserValue($this->uid, 'settings', 'email');
+        } else {
+            $this->config->setUserValue($this->uid, 'settings', 'email', $mailAddress);
+        }
+        if($oldMailAddress !== $mailAddress) {
+            $this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);
+        }
+    }
+
+    /**
+     * returns the timestamp of the user's last login or 0 if the user did never
+     * login
+     *
+     * @return int
+     */
+    public function getLastLogin() {
+        return $this->lastLogin;
+    }
+
+    /**
+     * updates the timestamp of the most recent login of this user
+     */
+    public function updateLastLoginTimestamp() {
+        $firstTimeLogin = ($this->lastLogin === 0);
+        $this->lastLogin = time();
+        $this->config->setUserValue(
+            $this->uid, 'login', 'lastLogin', $this->lastLogin);
+
+        return $firstTimeLogin;
+    }
+
+    /**
+     * Delete the user
+     *
+     * @return bool
+     */
+    public function delete() {
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\User', 'preDelete', array($this));
+        }
+        // get the home now because it won't return it after user deletion
+        $homePath = $this->getHome();
+        $result = $this->backend->deleteUser($this->uid);
+        if ($result) {
+
+            // FIXME: Feels like an hack - suggestions?
+
+            $groupManager = \OC::$server->getGroupManager();
+            // We have to delete the user from all groups
+            foreach ($groupManager->getUserGroupIds($this) as $groupId) {
+                $group = $groupManager->get($groupId);
+                if ($group) {
+                    \OC_Hook::emit("OC_Group", "pre_removeFromGroup", ["run" => true, "uid" => $this->uid, "gid" => $groupId]);
+                    $group->removeUser($this);
+                    \OC_Hook::emit("OC_User", "post_removeFromGroup", ["uid" => $this->uid, "gid" => $groupId]);
+                }
+            }
+            // Delete the user's keys in preferences
+            \OC::$server->getConfig()->deleteAllUserValues($this->uid);
+
+            // Delete user files in /data/
+            if ($homePath !== false) {
+                // FIXME: this operates directly on FS, should use View instead...
+                // also this is not testable/mockable...
+                \OC_Helper::rmdirr($homePath);
+            }
+
+            // Delete the users entry in the storage table
+            Storage::remove('home::' . $this->uid);
+
+            \OC::$server->getCommentsManager()->deleteReferencesOfActor('users', $this->uid);
+            \OC::$server->getCommentsManager()->deleteReadMarksFromUser($this);
+
+            $notification = \OC::$server->getNotificationManager()->createNotification();
+            $notification->setUser($this->uid);
+            \OC::$server->getNotificationManager()->markProcessed($notification);
+
+            /** @var AccountManager $accountManager */
+            $accountManager = \OC::$server->query(AccountManager::class);
+            $accountManager->deleteUser($this);
+
+            if ($this->emitter) {
+                $this->emitter->emit('\OC\User', 'postDelete', array($this));
+            }
+        }
+        return !($result === false);
+    }
+
+    /**
+     * Set the password of the user
+     *
+     * @param string $password
+     * @param string $recoveryPassword for the encryption app to reset encryption keys
+     * @return bool
+     */
+    public function setPassword($password, $recoveryPassword = null) {
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword));
+        }
+        if ($this->backend->implementsActions(Backend::SET_PASSWORD)) {
+            $result = $this->backend->setPassword($this->uid, $password);
+            if ($this->emitter) {
+                $this->emitter->emit('\OC\User', 'postSetPassword', array($this, $password, $recoveryPassword));
+            }
+            return !($result === false);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * get the users home folder to mount
+     *
+     * @return string
+     */
+    public function getHome() {
+        if (!$this->home) {
+            if ($this->backend->implementsActions(Backend::GET_HOME) and $home = $this->backend->getHome($this->uid)) {
+                $this->home = $home;
+            } elseif ($this->config) {
+                $this->home = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $this->uid;
+            } else {
+                $this->home = \OC::$SERVERROOT . '/data/' . $this->uid;
+            }
+        }
+        return $this->home;
+    }
+
+    /**
+     * Get the name of the backend class the user is connected with
+     *
+     * @return string
+     */
+    public function getBackendClassName() {
+        if($this->backend instanceof IUserBackend) {
+            return $this->backend->getBackendName();
+        }
+        return get_class($this->backend);
+    }
+
+    /**
+     * check if the backend allows the user to change his avatar on Personal page
+     *
+     * @return bool
+     */
+    public function canChangeAvatar() {
+        if ($this->backend->implementsActions(Backend::PROVIDE_AVATAR)) {
+            return $this->backend->canChangeAvatar($this->uid);
+        }
+        return true;
+    }
+
+    /**
+     * check if the backend supports changing passwords
+     *
+     * @return bool
+     */
+    public function canChangePassword() {
+        return $this->backend->implementsActions(Backend::SET_PASSWORD);
+    }
+
+    /**
+     * check if the backend supports changing display names
+     *
+     * @return bool
+     */
+    public function canChangeDisplayName() {
+        if ($this->config->getSystemValue('allow_user_to_change_display_name') === false) {
+            return false;
+        }
+        return $this->backend->implementsActions(Backend::SET_DISPLAYNAME);
+    }
+
+    /**
+     * check if the user is enabled
+     *
+     * @return bool
+     */
+    public function isEnabled() {
+        return $this->enabled;
+    }
+
+    /**
+     * set the enabled status for the user
+     *
+     * @param bool $enabled
+     */
+    public function setEnabled(bool $enabled = true) {
+        $oldStatus = $this->isEnabled();
+        $this->enabled = $enabled;
+        if ($oldStatus !== $this->enabled) {
+            $this->triggerChange('enabled', $enabled);
+            $this->config->setUserValue($this->uid, 'core', 'enabled', $enabled ? 'true' : 'false');
+        }
+    }
+
+    /**
+     * get the users email address
+     *
+     * @return string|null
+     * @since 9.0.0
+     */
+    public function getEMailAddress() {
+        return $this->config->getUserValue($this->uid, 'settings', 'email', null);
+    }
+
+    /**
+     * get the users' quota
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getQuota() {
+        $quota = $this->config->getUserValue($this->uid, 'files', 'quota', 'default');
+        if($quota === 'default') {
+            $quota = $this->config->getAppValue('files', 'default_quota', 'none');
+        }
+        return $quota;
+    }
+
+    /**
+     * set the users' quota
+     *
+     * @param string $quota
+     * @return void
+     * @since 9.0.0
+     */
+    public function setQuota($quota) {
+        $oldQuota = $this->config->getUserValue($this->uid, 'files', 'quota', '');
+        if($quota !== 'none' and $quota !== 'default') {
+            $quota = OC_Helper::computerFileSize($quota);
+            $quota = OC_Helper::humanFileSize($quota);
+        }
+        $this->config->setUserValue($this->uid, 'files', 'quota', $quota);
+        if($quota !== $oldQuota) {
+            $this->triggerChange('quota', $quota);
+        }
+    }
+
+    /**
+     * get the avatar image if it exists
+     *
+     * @param int $size
+     * @return IImage|null
+     * @since 9.0.0
+     */
+    public function getAvatarImage($size) {
+        // delay the initialization
+        if (is_null($this->avatarManager)) {
+            $this->avatarManager = \OC::$server->getAvatarManager();
+        }
+
+        $avatar = $this->avatarManager->getAvatar($this->uid);
+        $image = $avatar->get(-1);
+        if ($image) {
+            return $image;
+        }
+
+        return null;
+    }
+
+    /**
+     * get the federation cloud id
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getCloudId() {
+        $uid = $this->getUID();
+        $server = $this->urlGenerator->getAbsoluteURL('/');
+        $server =  rtrim( $this->removeProtocolFromUrl($server), '/');
+        return \OC::$server->getCloudIdManager()->getCloudId($uid, $server)->getId();
+    }
+
+    /**
+     * @param string $url
+     * @return string
+     */
+    private function removeProtocolFromUrl($url) {
+        if (strpos($url, 'https://') === 0) {
+            return substr($url, strlen('https://'));
+        } else if (strpos($url, 'http://') === 0) {
+            return substr($url, strlen('http://'));
+        }
+
+        return $url;
+    }
+
+    public function triggerChange($feature, $value = null, $oldValue = null) {
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\User', 'changeUser', array($this, $feature, $value, $oldValue));
+        }
+    }
 }

apps/files_external/lib/Settings/Personal.php

Indentation +57 added lines, -57 removed lines

@@ -32,72 +32,72 @@
 
 class Personal implements ISettings {
 
-	/** @var IManager */
-	private $encryptionManager;
+    /** @var IManager */
+    private $encryptionManager;
 
-	/** @var UserGlobalStoragesService */
-	private $userGlobalStoragesService;
+    /** @var UserGlobalStoragesService */
+    private $userGlobalStoragesService;
 
-	/** @var BackendService */
-	private $backendService;
+    /** @var BackendService */
+    private $backendService;
 
-	/** @var GlobalAuth	 */
-	private $globalAuth;
+    /** @var GlobalAuth	 */
+    private $globalAuth;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(
-		IManager $encryptionManager,
-		UserGlobalStoragesService $userGlobalStoragesService,
-		BackendService $backendService,
-		GlobalAuth $globalAuth,
-		IUserSession $userSession
-	) {
-		$this->encryptionManager = $encryptionManager;
-		$this->userGlobalStoragesService = $userGlobalStoragesService;
-		$this->backendService = $backendService;
-		$this->globalAuth = $globalAuth;
-		$this->userSession = $userSession;
-	}
+    public function __construct(
+        IManager $encryptionManager,
+        UserGlobalStoragesService $userGlobalStoragesService,
+        BackendService $backendService,
+        GlobalAuth $globalAuth,
+        IUserSession $userSession
+    ) {
+        $this->encryptionManager = $encryptionManager;
+        $this->userGlobalStoragesService = $userGlobalStoragesService;
+        $this->backendService = $backendService;
+        $this->globalAuth = $globalAuth;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$uid = $this->userSession->getUser()->getUID();
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $uid = $this->userSession->getUser()->getUID();
 
-		$parameters = [
-			'encryptionEnabled'    => $this->encryptionManager->isEnabled(),
-			'visibilityType'       => BackendService::VISIBILITY_PERSONAL,
-			'storages'             => $this->userGlobalStoragesService->getStorages(),
-			'backends'             => $this->backendService->getAvailableBackends(),
-			'authMechanisms'       => $this->backendService->getAuthMechanisms(),
-			'dependencies'         => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()),
-			'allowUserMounting'    => $this->backendService->isUserMountingAllowed(),
-			'globalCredentials'    => $this->globalAuth->getAuth($uid),
-			'globalCredentialsUid' => $uid,
-		];
+        $parameters = [
+            'encryptionEnabled'    => $this->encryptionManager->isEnabled(),
+            'visibilityType'       => BackendService::VISIBILITY_PERSONAL,
+            'storages'             => $this->userGlobalStoragesService->getStorages(),
+            'backends'             => $this->backendService->getAvailableBackends(),
+            'authMechanisms'       => $this->backendService->getAuthMechanisms(),
+            'dependencies'         => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()),
+            'allowUserMounting'    => $this->backendService->isUserMountingAllowed(),
+            'globalCredentials'    => $this->globalAuth->getAuth($uid),
+            'globalCredentialsUid' => $uid,
+        ];
 
-		return new TemplateResponse('files_external', 'settings', $parameters, '');
-	}
+        return new TemplateResponse('files_external', 'settings', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'externalstorages';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'externalstorages';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 40;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 40;
+    }
 
 }

apps/files_external/appinfo/app.php

Spacing +2 added lines, -2 removed lines

@@ -29,13 +29,13 @@
 
 OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php';
 
-require_once __DIR__ . '/../3rdparty/autoload.php';
+require_once __DIR__.'/../3rdparty/autoload.php';
 
 // register Application object singleton
 \OC_Mount_Config::$app = new \OCA\Files_External\AppInfo\Application();
 $appContainer = \OC_Mount_Config::$app->getContainer();
 
-\OCA\Files\App::getNavigationManager()->add(function () {
+\OCA\Files\App::getNavigationManager()->add(function() {
 	$l = \OC::$server->getL10N('files_external');
 	return [
 		'id' => 'extstoragemounts',

Indentation +8 added lines, -8 removed lines

@@ -37,14 +37,14 @@
 $appContainer = \OC_Mount_Config::$app->getContainer();
 
 \OCA\Files\App::getNavigationManager()->add(function () {
-	$l = \OC::$server->getL10N('files_external');
-	return [
-		'id' => 'extstoragemounts',
-		'appname' => 'files_external',
-		'script' => 'list.php',
-		'order' => 30,
-		'name' => $l->t('External storages'),
-	];
+    $l = \OC::$server->getL10N('files_external');
+    return [
+        'id' => 'extstoragemounts',
+        'appname' => 'files_external',
+        'script' => 'list.php',
+        'order' => 30,
+        'name' => $l->t('External storages'),
+    ];
 });
 
 $mountProvider = $appContainer->query(ConfigAdapter::class);

core/Command/Db/Migrations/ExecuteCommand.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 			$olderVersions = $ms->getMigratedVersions();
 			$olderVersions[] = '0';
 			$olderVersions[] = 'prev';
-			if (in_array($version,  $olderVersions, true)) {
+			if (in_array($version, $olderVersions, true)) {
 				$output->writeln('<error>Can not go back to previous migration without debug enabled</error>');
 				return 1;
 			}

Indentation +90 added lines, -90 removed lines

@@ -38,95 +38,95 @@
 
 class ExecuteCommand extends Command implements CompletionAwareInterface {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/**
-	 * ExecuteCommand constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(IDBConnection $connection, IAppManager $appManager, IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('migrations:execute')
-			->setDescription('Execute a single migration version manually.')
-			->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on')
-			->addArgument('version', InputArgument::REQUIRED, 'The version to execute.', null);
-
-		parent::configure();
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 */
-	public function execute(InputInterface $input, OutputInterface $output) {
-		$appName = $input->getArgument('app');
-		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
-		$version = $input->getArgument('version');
-
-		if ($this->config->getSystemValue('debug', false) === false) {
-			$olderVersions = $ms->getMigratedVersions();
-			$olderVersions[] = '0';
-			$olderVersions[] = 'prev';
-			if (in_array($version,  $olderVersions, true)) {
-				$output->writeln('<error>Can not go back to previous migration without debug enabled</error>');
-				return 1;
-			}
-		}
-
-
-		$ms->executeStep($version);
-		return 0;
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			$allApps = \OC_App::getAllApps();
-			return array_diff($allApps, \OC_App::getEnabledApps(true, true));
-		}
-
-		if ($argumentName === 'version') {
-			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-
-			$ms = new MigrationService($appName, $this->connection);
-			$migrations = $ms->getAvailableVersions();
-
-			array_unshift($migrations, 'next', 'latest');
-			return $migrations;
-		}
-
-		return [];
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    /**
+     * ExecuteCommand constructor.
+     *
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     * @param IAppManager $appManager
+     */
+    public function __construct(IDBConnection $connection, IAppManager $appManager, IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('migrations:execute')
+            ->setDescription('Execute a single migration version manually.')
+            ->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on')
+            ->addArgument('version', InputArgument::REQUIRED, 'The version to execute.', null);
+
+        parent::configure();
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    public function execute(InputInterface $input, OutputInterface $output) {
+        $appName = $input->getArgument('app');
+        $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
+        $version = $input->getArgument('version');
+
+        if ($this->config->getSystemValue('debug', false) === false) {
+            $olderVersions = $ms->getMigratedVersions();
+            $olderVersions[] = '0';
+            $olderVersions[] = 'prev';
+            if (in_array($version,  $olderVersions, true)) {
+                $output->writeln('<error>Can not go back to previous migration without debug enabled</error>');
+                return 1;
+            }
+        }
+
+
+        $ms->executeStep($version);
+        return 0;
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            $allApps = \OC_App::getAllApps();
+            return array_diff($allApps, \OC_App::getEnabledApps(true, true));
+        }
+
+        if ($argumentName === 'version') {
+            $appName = $context->getWordAtIndex($context->getWordIndex() - 1);
+
+            $ms = new MigrationService($appName, $this->connection);
+            $migrations = $ms->getAvailableVersions();
+
+            array_unshift($migrations, 'next', 'latest');
+            return $migrations;
+        }
+
+        return [];
+    }
 
 }

lib/private/DB/OracleConnection.php

Indentation +71 added lines, -71 removed lines

@@ -26,80 +26,80 @@
 namespace OC\DB;
 
 class OracleConnection extends Connection {
-	/**
-	 * Quote the keys of the array
-	 */
-	private function quoteKeys(array $data) {
-		$return = [];
-		$c = $this->getDatabasePlatform()->getIdentifierQuoteCharacter();
-		foreach($data as $key => $value) {
-			if ($key[0] !== $c) {
-				$return[$this->quoteIdentifier($key)] = $value;
-			} else {
-				$return[$key] = $value;
-			}
-		}
-		return $return;
-	}
+    /**
+     * Quote the keys of the array
+     */
+    private function quoteKeys(array $data) {
+        $return = [];
+        $c = $this->getDatabasePlatform()->getIdentifierQuoteCharacter();
+        foreach($data as $key => $value) {
+            if ($key[0] !== $c) {
+                $return[$this->quoteIdentifier($key)] = $value;
+            } else {
+                $return[$key] = $value;
+            }
+        }
+        return $return;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function insert($tableName, array $data, array $types = array()) {
-		if ($tableName[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
-			$tableName = $this->quoteIdentifier($tableName);
-		}
-		$data = $this->quoteKeys($data);
-		return parent::insert($tableName, $data, $types);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function insert($tableName, array $data, array $types = array()) {
+        if ($tableName[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
+            $tableName = $this->quoteIdentifier($tableName);
+        }
+        $data = $this->quoteKeys($data);
+        return parent::insert($tableName, $data, $types);
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function update($tableName, array $data, array $identifier, array $types = array()) {
-		if ($tableName[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
-			$tableName = $this->quoteIdentifier($tableName);
-		}
-		$data = $this->quoteKeys($data);
-		$identifier = $this->quoteKeys($identifier);
-		return parent::update($tableName, $data, $identifier, $types);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function update($tableName, array $data, array $identifier, array $types = array()) {
+        if ($tableName[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
+            $tableName = $this->quoteIdentifier($tableName);
+        }
+        $data = $this->quoteKeys($data);
+        $identifier = $this->quoteKeys($identifier);
+        return parent::update($tableName, $data, $identifier, $types);
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function delete($tableExpression, array $identifier, array $types = array()) {
-		if ($tableExpression[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
-			$tableExpression = $this->quoteIdentifier($tableExpression);
-		}
-		$identifier = $this->quoteKeys($identifier);
-		return parent::delete($tableExpression, $identifier);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function delete($tableExpression, array $identifier, array $types = array()) {
+        if ($tableExpression[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
+            $tableExpression = $this->quoteIdentifier($tableExpression);
+        }
+        $identifier = $this->quoteKeys($identifier);
+        return parent::delete($tableExpression, $identifier);
+    }
 
-	/**
-	 * Drop a table from the database if it exists
-	 *
-	 * @param string $table table name without the prefix
-	 */
-	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
-		$table = $this->quoteIdentifier($table);
-		$schema = $this->getSchemaManager();
-		if($schema->tablesExist(array($table))) {
-			$schema->dropTable($table);
-		}
-	}
+    /**
+     * Drop a table from the database if it exists
+     *
+     * @param string $table table name without the prefix
+     */
+    public function dropTable($table) {
+        $table = $this->tablePrefix . trim($table);
+        $table = $this->quoteIdentifier($table);
+        $schema = $this->getSchemaManager();
+        if($schema->tablesExist(array($table))) {
+            $schema->dropTable($table);
+        }
+    }
 
-	/**
-	 * Check if a table exists
-	 *
-	 * @param string $table table name without the prefix
-	 * @return bool
-	 */
-	public function tableExists($table){
-		$table = $this->tablePrefix . trim($table);
-		$table = $this->quoteIdentifier($table);
-		$schema = $this->getSchemaManager();
-		return $schema->tablesExist(array($table));
-	}
+    /**
+     * Check if a table exists
+     *
+     * @param string $table table name without the prefix
+     * @return bool
+     */
+    public function tableExists($table){
+        $table = $this->tablePrefix . trim($table);
+        $table = $this->quoteIdentifier($table);
+        $schema = $this->getSchemaManager();
+        return $schema->tablesExist(array($table));
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
 	private function quoteKeys(array $data) {
 		$return = [];
 		$c = $this->getDatabasePlatform()->getIdentifierQuoteCharacter();
-		foreach($data as $key => $value) {
+		foreach ($data as $key => $value) {
 			if ($key[0] !== $c) {
 				$return[$this->quoteIdentifier($key)] = $value;
 			} else {
@@ -82,10 +82,10 @@ 
 	 * @param string $table table name without the prefix
 	 */
 	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
+		$table = $this->tablePrefix.trim($table);
 		$table = $this->quoteIdentifier($table);
 		$schema = $this->getSchemaManager();
-		if($schema->tablesExist(array($table))) {
+		if ($schema->tablesExist(array($table))) {
 			$schema->dropTable($table);
 		}
 	}
@@ -96,8 +96,8 @@ 
 	 * @param string $table table name without the prefix
 	 * @return bool
 	 */
-	public function tableExists($table){
-		$table = $this->tablePrefix . trim($table);
+	public function tableExists($table) {
+		$table = $this->tablePrefix.trim($table);
 		$table = $this->quoteIdentifier($table);
 		$schema = $this->getSchemaManager();
 		return $schema->tablesExist(array($table));

lib/private/Migration/SimpleOutput.php

Indentation +39 added lines, -39 removed lines

@@ -36,49 +36,49 @@
  */
 class SimpleOutput implements IOutput {
 
-	/** @var ILogger */
-	private $logger;
-	private $appName;
+    /** @var ILogger */
+    private $logger;
+    private $appName;
 
-	public function __construct(ILogger $logger, $appName) {
-		$this->logger = $logger;
-		$this->appName = $appName;
-	}
+    public function __construct(ILogger $logger, $appName) {
+        $this->logger = $logger;
+        $this->appName = $appName;
+    }
 
-	/**
-	 * @param string $message
-	 * @since 9.1.0
-	 */
-	public function info($message) {
-		$this->logger->info($message, ['app' => $this->appName]);
-	}
+    /**
+     * @param string $message
+     * @since 9.1.0
+     */
+    public function info($message) {
+        $this->logger->info($message, ['app' => $this->appName]);
+    }
 
-	/**
-	 * @param string $message
-	 * @since 9.1.0
-	 */
-	public function warning($message) {
-		$this->logger->warning($message, ['app' => $this->appName]);
-	}
+    /**
+     * @param string $message
+     * @since 9.1.0
+     */
+    public function warning($message) {
+        $this->logger->warning($message, ['app' => $this->appName]);
+    }
 
-	/**
-	 * @param int $max
-	 * @since 9.1.0
-	 */
-	public function startProgress($max = 0) {
-	}
+    /**
+     * @param int $max
+     * @since 9.1.0
+     */
+    public function startProgress($max = 0) {
+    }
 
-	/**
-	 * @param int $step
-	 * @param string $description
-	 * @since 9.1.0
-	 */
-	public function advance($step = 1, $description = '') {
-	}
+    /**
+     * @param int $step
+     * @param string $description
+     * @since 9.1.0
+     */
+    public function advance($step = 1, $description = '') {
+    }
 
-	/**
-	 * @since 9.1.0
-	 */
-	public function finishProgress() {
-	}
+    /**
+     * @since 9.1.0
+     */
+    public function finishProgress() {
+    }
 }

lib/private/DB/SchemaWrapper.php

Spacing +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
 	 * @throws \Doctrine\DBAL\Schema\SchemaException
 	 */
 	public function getTable($tableName) {
-		return $this->schema->getTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->getTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 * @return boolean
 	 */
 	public function hasTable($tableName) {
-		return $this->schema->hasTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->hasTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 * @return \Doctrine\DBAL\Schema\Table
 	 */
 	public function createTable($tableName) {
-		return $this->schema->createTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->createTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 */
 	public function dropTable($tableName) {
 		$this->tablesToDelete[$tableName] = true;
-		return $this->schema->dropTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->dropTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**

Indentation +103 added lines, -103 removed lines

@@ -30,107 +30,107 @@
 
 class SchemaWrapper implements ISchemaWrapper {
 
-	/** @var IDBConnection|Connection */
-	protected $connection;
-
-	/** @var Schema */
-	protected $schema;
-
-	/** @var array */
-	protected $tablesToDelete = [];
-
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		$this->schema = $this->connection->createSchema();
-	}
-
-	public function getWrappedSchema() {
-		return $this->schema;
-	}
-
-	public function performDropTableCalls() {
-		foreach ($this->tablesToDelete as $tableName => $true) {
-			$this->connection->dropTable($tableName);
-			unset($this->tablesToDelete[$tableName]);
-		}
-	}
-
-	/**
-	 * Gets all table names
-	 *
-	 * @return array
-	 */
-	public function getTableNamesWithoutPrefix() {
-		$tableNames = $this->schema->getTableNames();
-		return array_map(function($tableName) {
-			if (strpos($tableName, $this->connection->getPrefix()) === 0) {
-				return substr($tableName, strlen($this->connection->getPrefix()));
-			}
-
-			return $tableName;
-		}, $tableNames);
-	}
-
-	// Overwritten methods
-
-	/**
-	 * @return array
-	 */
-	public function getTableNames() {
-		return $this->schema->getTableNames();
-	}
-
-	/**
-	 * @param string $tableName
-	 *
-	 * @return \Doctrine\DBAL\Schema\Table
-	 * @throws \Doctrine\DBAL\Schema\SchemaException
-	 */
-	public function getTable($tableName) {
-		return $this->schema->getTable($this->connection->getPrefix() . $tableName);
-	}
-
-	/**
-	 * Does this schema have a table with the given name?
-	 *
-	 * @param string $tableName
-	 *
-	 * @return boolean
-	 */
-	public function hasTable($tableName) {
-		return $this->schema->hasTable($this->connection->getPrefix() . $tableName);
-	}
-
-	/**
-	 * Creates a new table.
-	 *
-	 * @param string $tableName
-	 * @return \Doctrine\DBAL\Schema\Table
-	 */
-	public function createTable($tableName) {
-		return $this->schema->createTable($this->connection->getPrefix() . $tableName);
-	}
-
-	/**
-	 * Drops a table from the schema.
-	 *
-	 * @param string $tableName
-	 * @return \Doctrine\DBAL\Schema\Schema
-	 */
-	public function dropTable($tableName) {
-		$this->tablesToDelete[$tableName] = true;
-		return $this->schema->dropTable($this->connection->getPrefix() . $tableName);
-	}
-
-	/**
-	 * Gets all tables of this schema.
-	 *
-	 * @return \Doctrine\DBAL\Schema\Table[]
-	 */
-	public function getTables() {
-		return $this->schema->getTables();
-	}
+    /** @var IDBConnection|Connection */
+    protected $connection;
+
+    /** @var Schema */
+    protected $schema;
+
+    /** @var array */
+    protected $tablesToDelete = [];
+
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        $this->schema = $this->connection->createSchema();
+    }
+
+    public function getWrappedSchema() {
+        return $this->schema;
+    }
+
+    public function performDropTableCalls() {
+        foreach ($this->tablesToDelete as $tableName => $true) {
+            $this->connection->dropTable($tableName);
+            unset($this->tablesToDelete[$tableName]);
+        }
+    }
+
+    /**
+     * Gets all table names
+     *
+     * @return array
+     */
+    public function getTableNamesWithoutPrefix() {
+        $tableNames = $this->schema->getTableNames();
+        return array_map(function($tableName) {
+            if (strpos($tableName, $this->connection->getPrefix()) === 0) {
+                return substr($tableName, strlen($this->connection->getPrefix()));
+            }
+
+            return $tableName;
+        }, $tableNames);
+    }
+
+    // Overwritten methods
+
+    /**
+     * @return array
+     */
+    public function getTableNames() {
+        return $this->schema->getTableNames();
+    }
+
+    /**
+     * @param string $tableName
+     *
+     * @return \Doctrine\DBAL\Schema\Table
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function getTable($tableName) {
+        return $this->schema->getTable($this->connection->getPrefix() . $tableName);
+    }
+
+    /**
+     * Does this schema have a table with the given name?
+     *
+     * @param string $tableName
+     *
+     * @return boolean
+     */
+    public function hasTable($tableName) {
+        return $this->schema->hasTable($this->connection->getPrefix() . $tableName);
+    }
+
+    /**
+     * Creates a new table.
+     *
+     * @param string $tableName
+     * @return \Doctrine\DBAL\Schema\Table
+     */
+    public function createTable($tableName) {
+        return $this->schema->createTable($this->connection->getPrefix() . $tableName);
+    }
+
+    /**
+     * Drops a table from the schema.
+     *
+     * @param string $tableName
+     * @return \Doctrine\DBAL\Schema\Schema
+     */
+    public function dropTable($tableName) {
+        $this->tablesToDelete[$tableName] = true;
+        return $this->schema->dropTable($this->connection->getPrefix() . $tableName);
+    }
+
+    /**
+     * Gets all tables of this schema.
+     *
+     * @return \Doctrine\DBAL\Schema\Table[]
+     */
+    public function getTables() {
+        return $this->schema->getTables();
+    }
 }