nextcloud / server

apps/user_ldap/ajax/setConfiguration.php

Indentation +4 added lines, -4 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 \OC_JSON::checkAppEnabled('user_ldap');
 \OC_JSON::callCheck();
 
-$prefix = (string)$_POST['ldap_serverconfig_chooser'];
+$prefix = (string) $_POST['ldap_serverconfig_chooser'];
 
 // Checkboxes are not submitted, when they are unchecked. Set them manually.
 // only legacy checkboxes (Advanced and Expert tab) need to be handled here,

apps/user_ldap/ajax/wizard.php

Spacing +2 added lines, -2 removed lines

@@ -39,13 +39,13 @@
 if (!isset($_POST['action'])) {
 	\OC_JSON::error(['message' => $l->t('No action specified')]);
 }
-$action = (string)$_POST['action'];
+$action = (string) $_POST['action'];
 
 
 if (!isset($_POST['ldap_serverconfig_chooser'])) {
 	\OC_JSON::error(['message' => $l->t('No configuration specified')]);
 }
-$prefix = (string)$_POST['ldap_serverconfig_chooser'];
+$prefix = (string) $_POST['ldap_serverconfig_chooser'];
 
 $ldapWrapper = new \OCA\User_LDAP\LDAP();
 $configuration = new \OCA\User_LDAP\Configuration($prefix);

Indentation +75 added lines, -75 removed lines

@@ -34,12 +34,12 @@ 
 $l = \OC::$server->getL10N('user_ldap');
 
 if (!isset($_POST['action'])) {
-	\OC_JSON::error(['message' => $l->t('No action specified')]);
+    \OC_JSON::error(['message' => $l->t('No action specified')]);
 }
 $action = (string)$_POST['action'];
 
 if (!isset($_POST['ldap_serverconfig_chooser'])) {
-	\OC_JSON::error(['message' => $l->t('No configuration specified')]);
+    \OC_JSON::error(['message' => $l->t('No configuration specified')]);
 }
 $prefix = (string)$_POST['ldap_serverconfig_chooser'];
 
@@ -57,79 +57,79 @@ 
 $wizard = new \OCA\User_LDAP\Wizard($configuration, $ldapWrapper, $access);
 
 switch ($action) {
-	case 'guessPortAndTLS':
-	case 'guessBaseDN':
-	case 'detectEmailAttribute':
-	case 'detectUserDisplayNameAttribute':
-	case 'determineGroupMemberAssoc':
-	case 'determineUserObjectClasses':
-	case 'determineGroupObjectClasses':
-	case 'determineGroupsForUsers':
-	case 'determineGroupsForGroups':
-	case 'determineAttributes':
-	case 'getUserListFilter':
-	case 'getUserLoginFilter':
-	case 'getGroupFilter':
-	case 'countUsers':
-	case 'countGroups':
-	case 'countInBaseDN':
-		try {
-			$result = $wizard->$action();
-			if ($result !== false) {
-				\OC_JSON::success($result->getResultArray());
-				exit;
-			}
-		} catch (\Exception $e) {
-			\OC_JSON::error(['message' => $e->getMessage(), 'code' => $e->getCode()]);
-			exit;
-		}
-		\OC_JSON::error();
-		exit;
-		break;
+    case 'guessPortAndTLS':
+    case 'guessBaseDN':
+    case 'detectEmailAttribute':
+    case 'detectUserDisplayNameAttribute':
+    case 'determineGroupMemberAssoc':
+    case 'determineUserObjectClasses':
+    case 'determineGroupObjectClasses':
+    case 'determineGroupsForUsers':
+    case 'determineGroupsForGroups':
+    case 'determineAttributes':
+    case 'getUserListFilter':
+    case 'getUserLoginFilter':
+    case 'getGroupFilter':
+    case 'countUsers':
+    case 'countGroups':
+    case 'countInBaseDN':
+        try {
+            $result = $wizard->$action();
+            if ($result !== false) {
+                \OC_JSON::success($result->getResultArray());
+                exit;
+            }
+        } catch (\Exception $e) {
+            \OC_JSON::error(['message' => $e->getMessage(), 'code' => $e->getCode()]);
+            exit;
+        }
+        \OC_JSON::error();
+        exit;
+        break;
 
-	case 'testLoginName': {
-		try {
-			$loginName = $_POST['ldap_test_loginname'];
-			$result = $wizard->$action($loginName);
-			if ($result !== false) {
-				\OC_JSON::success($result->getResultArray());
-				exit;
-			}
-		} catch (\Exception $e) {
-			\OC_JSON::error(['message' => $e->getMessage()]);
-			exit;
-		}
-		\OC_JSON::error();
-		exit;
-		break;
-	}
+    case 'testLoginName': {
+        try {
+            $loginName = $_POST['ldap_test_loginname'];
+            $result = $wizard->$action($loginName);
+            if ($result !== false) {
+                \OC_JSON::success($result->getResultArray());
+                exit;
+            }
+        } catch (\Exception $e) {
+            \OC_JSON::error(['message' => $e->getMessage()]);
+            exit;
+        }
+        \OC_JSON::error();
+        exit;
+        break;
+    }
 
-	case 'save':
-		$key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false;
-		$val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null;
-		if ($key === false || is_null($val)) {
-			\OC_JSON::error(['message' => $l->t('No data specified')]);
-			exit;
-		}
-		if (is_array($key)) {
-			\OC_JSON::error(['message' => $l->t('Invalid data specified')]);
-			exit;
-		}
-		$cfg = [$key => $val];
-		$setParameters = [];
-		$configuration->setConfiguration($cfg, $setParameters);
-		if (!in_array($key, $setParameters)) {
-			\OC_JSON::error(['message' => $l->t($key.
-				' Could not set configuration %s', $setParameters[0])]);
-			exit;
-		}
-		$configuration->saveConfiguration();
-		//clear the cache on save
-		$connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
-		$connection->clearCache();
-		\OC_JSON::success();
-		break;
-	default:
-		\OC_JSON::error(['message' => $l->t('Action does not exist')]);
-		break;
+    case 'save':
+        $key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false;
+        $val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null;
+        if ($key === false || is_null($val)) {
+            \OC_JSON::error(['message' => $l->t('No data specified')]);
+            exit;
+        }
+        if (is_array($key)) {
+            \OC_JSON::error(['message' => $l->t('Invalid data specified')]);
+            exit;
+        }
+        $cfg = [$key => $val];
+        $setParameters = [];
+        $configuration->setConfiguration($cfg, $setParameters);
+        if (!in_array($key, $setParameters)) {
+            \OC_JSON::error(['message' => $l->t($key.
+                ' Could not set configuration %s', $setParameters[0])]);
+            exit;
+        }
+        $configuration->saveConfiguration();
+        //clear the cache on save
+        $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
+        $connection->clearCache();
+        \OC_JSON::success();
+        break;
+    default:
+        \OC_JSON::error(['message' => $l->t('Action does not exist')]);
+        break;
 }

apps/encryption/lib/Recovery.php

Spacing +7 added lines, -7 removed lines

@@ -126,7 +126,7 @@ 
 		$encryptedRecoveryKey = $this->crypt->encryptPrivateKey($decryptedRecoveryKey, $newPassword);
 		$header = $this->crypt->generateHeader();
 		if ($encryptedRecoveryKey) {
-			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header . $encryptedRecoveryKey);
+			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header.$encryptedRecoveryKey);
 			return true;
 		}
 		return false;
@@ -187,9 +187,9 @@ 
 				$value);
 
 			if ($value === '1') {
-				$this->addRecoveryKeys('/' . $this->user->getUID() . '/files/');
+				$this->addRecoveryKeys('/'.$this->user->getUID().'/files/');
 			} else {
-				$this->removeRecoveryKeys('/' . $this->user->getUID() . '/files/');
+				$this->removeRecoveryKeys('/'.$this->user->getUID().'/files/');
 			}
 
 			return true;
@@ -207,7 +207,7 @@ 
 		foreach ($dirContent as $item) {
 			$filePath = $item->getPath();
 			if ($item['type'] === 'dir') {
-				$this->addRecoveryKeys($filePath . '/');
+				$this->addRecoveryKeys($filePath.'/');
 			} else {
 				$fileKey = $this->keyManager->getFileKey($filePath, $this->user->getUID());
 				if (!empty($fileKey)) {
@@ -235,7 +235,7 @@ 
 		foreach ($dirContent as $item) {
 			$filePath = $item->getPath();
 			if ($item['type'] === 'dir') {
-				$this->removeRecoveryKeys($filePath . '/');
+				$this->removeRecoveryKeys($filePath.'/');
 			} else {
 				$this->keyManager->deleteShareKey($filePath, $this->keyManager->getRecoveryKeyId());
 			}
@@ -253,7 +253,7 @@ 
 
 		$privateKey = $this->crypt->decryptPrivateKey($encryptedKey, $recoveryPassword);
 		if ($privateKey !== false) {
-			$this->recoverAllFiles('/' . $user . '/files/', $privateKey, $user);
+			$this->recoverAllFiles('/'.$user.'/files/', $privateKey, $user);
 		}
 	}
 
@@ -271,7 +271,7 @@ 
 			// Get relative path from encryption/keyfiles
 			$filePath = $item->getPath();
 			if ($this->view->is_dir($filePath)) {
-				$this->recoverAllFiles($filePath . '/', $privateKey, $uid);
+				$this->recoverAllFiles($filePath.'/', $privateKey, $uid);
 			} else {
 				$this->recoverFile($filePath, $privateKey, $uid);
 			}

Indentation +270 added lines, -270 removed lines

@@ -37,274 +37,274 @@
 class Recovery {
 
 
-	/**
-	 * @var null|IUser
-	 */
-	protected $user;
-	/**
-	 * @var Crypt
-	 */
-	protected $crypt;
-	/**
-	 * @var KeyManager
-	 */
-	private $keyManager;
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-	/**
-	 * @var View
-	 */
-	private $view;
-	/**
-	 * @var IFile
-	 */
-	private $file;
-
-	/**
-	 * @param IUserSession $userSession
-	 * @param Crypt $crypt
-	 * @param KeyManager $keyManager
-	 * @param IConfig $config
-	 * @param IFile $file
-	 * @param View $view
-	 */
-	public function __construct(IUserSession $userSession,
-								Crypt $crypt,
-								KeyManager $keyManager,
-								IConfig $config,
-								IFile $file,
-								View $view) {
-		$this->user = ($userSession->isLoggedIn()) ? $userSession->getUser() : null;
-		$this->crypt = $crypt;
-		$this->keyManager = $keyManager;
-		$this->config = $config;
-		$this->view = $view;
-		$this->file = $file;
-	}
-
-	/**
-	 * @param string $password
-	 * @return bool
-	 */
-	public function enableAdminRecovery($password) {
-		$appConfig = $this->config;
-		$keyManager = $this->keyManager;
-
-		if (!$keyManager->recoveryKeyExists()) {
-			$keyPair = $this->crypt->createKeyPair();
-			if (!is_array($keyPair)) {
-				return false;
-			}
-
-			$this->keyManager->setRecoveryKey($password, $keyPair);
-		}
-
-		if ($keyManager->checkRecoveryPassword($password)) {
-			$appConfig->setAppValue('encryption', 'recoveryAdminEnabled', 1);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * change recovery key id
-	 *
-	 * @param string $newPassword
-	 * @param string $oldPassword
-	 * @return bool
-	 */
-	public function changeRecoveryKeyPassword($newPassword, $oldPassword) {
-		$recoveryKey = $this->keyManager->getSystemPrivateKey($this->keyManager->getRecoveryKeyId());
-		$decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $oldPassword);
-		if ($decryptedRecoveryKey === false) {
-			return false;
-		}
-		$encryptedRecoveryKey = $this->crypt->encryptPrivateKey($decryptedRecoveryKey, $newPassword);
-		$header = $this->crypt->generateHeader();
-		if ($encryptedRecoveryKey) {
-			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header . $encryptedRecoveryKey);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $recoveryPassword
-	 * @return bool
-	 */
-	public function disableAdminRecovery($recoveryPassword) {
-		$keyManager = $this->keyManager;
-
-		if ($keyManager->checkRecoveryPassword($recoveryPassword)) {
-			// Set recoveryAdmin as disabled
-			$this->config->setAppValue('encryption', 'recoveryAdminEnabled', 0);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * check if recovery is enabled for user
-	 *
-	 * @param string $user if no user is given we check the current logged-in user
-	 *
-	 * @return bool
-	 */
-	public function isRecoveryEnabledForUser($user = '') {
-		$uid = $user === '' ? $this->user->getUID() : $user;
-		$recoveryMode = $this->config->getUserValue($uid,
-			'encryption',
-			'recoveryEnabled',
-			0);
-
-		return ($recoveryMode === '1');
-	}
-
-	/**
-	 * check if recovery is key is enabled by the administrator
-	 *
-	 * @return bool
-	 */
-	public function isRecoveryKeyEnabled() {
-		$enabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled', 0);
-
-		return ($enabled === '1');
-	}
-
-	/**
-	 * @param string $value
-	 * @return bool
-	 */
-	public function setRecoveryForUser($value) {
-		try {
-			$this->config->setUserValue($this->user->getUID(),
-				'encryption',
-				'recoveryEnabled',
-				$value);
-
-			if ($value === '1') {
-				$this->addRecoveryKeys('/' . $this->user->getUID() . '/files/');
-			} else {
-				$this->removeRecoveryKeys('/' . $this->user->getUID() . '/files/');
-			}
-
-			return true;
-		} catch (PreConditionNotMetException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * add recovery key to all encrypted files
-	 * @param string $path
-	 */
-	private function addRecoveryKeys($path) {
-		$dirContent = $this->view->getDirectoryContent($path);
-		foreach ($dirContent as $item) {
-			$filePath = $item->getPath();
-			if ($item['type'] === 'dir') {
-				$this->addRecoveryKeys($filePath . '/');
-			} else {
-				$fileKey = $this->keyManager->getFileKey($filePath, $this->user->getUID());
-				if (!empty($fileKey)) {
-					$accessList = $this->file->getAccessList($filePath);
-					$publicKeys = [];
-					foreach ($accessList['users'] as $uid) {
-						$publicKeys[$uid] = $this->keyManager->getPublicKey($uid);
-					}
-
-					$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $this->user->getUID());
-
-					$encryptedKeyfiles = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
-					$this->keyManager->setAllFileKeys($filePath, $encryptedKeyfiles);
-				}
-			}
-		}
-	}
-
-	/**
-	 * remove recovery key to all encrypted files
-	 * @param string $path
-	 */
-	private function removeRecoveryKeys($path) {
-		$dirContent = $this->view->getDirectoryContent($path);
-		foreach ($dirContent as $item) {
-			$filePath = $item->getPath();
-			if ($item['type'] === 'dir') {
-				$this->removeRecoveryKeys($filePath . '/');
-			} else {
-				$this->keyManager->deleteShareKey($filePath, $this->keyManager->getRecoveryKeyId());
-			}
-		}
-	}
-
-	/**
-	 * recover users files with the recovery key
-	 *
-	 * @param string $recoveryPassword
-	 * @param string $user
-	 */
-	public function recoverUsersFiles($recoveryPassword, $user) {
-		$encryptedKey = $this->keyManager->getSystemPrivateKey($this->keyManager->getRecoveryKeyId());
-
-		$privateKey = $this->crypt->decryptPrivateKey($encryptedKey, $recoveryPassword);
-		if ($privateKey !== false) {
-			$this->recoverAllFiles('/' . $user . '/files/', $privateKey, $user);
-		}
-	}
-
-	/**
-	 * recover users files
-	 *
-	 * @param string $path
-	 * @param string $privateKey
-	 * @param string $uid
-	 */
-	private function recoverAllFiles($path, $privateKey, $uid) {
-		$dirContent = $this->view->getDirectoryContent($path);
-
-		foreach ($dirContent as $item) {
-			// Get relative path from encryption/keyfiles
-			$filePath = $item->getPath();
-			if ($this->view->is_dir($filePath)) {
-				$this->recoverAllFiles($filePath . '/', $privateKey, $uid);
-			} else {
-				$this->recoverFile($filePath, $privateKey, $uid);
-			}
-		}
-	}
-
-	/**
-	 * recover file
-	 *
-	 * @param string $path
-	 * @param string $privateKey
-	 * @param string $uid
-	 */
-	private function recoverFile($path, $privateKey, $uid) {
-		$encryptedFileKey = $this->keyManager->getEncryptedFileKey($path);
-		$shareKey = $this->keyManager->getShareKey($path, $this->keyManager->getRecoveryKeyId());
-
-		if ($encryptedFileKey && $shareKey && $privateKey) {
-			$fileKey = $this->crypt->multiKeyDecrypt($encryptedFileKey,
-				$shareKey,
-				$privateKey);
-		}
-
-		if (!empty($fileKey)) {
-			$accessList = $this->file->getAccessList($path);
-			$publicKeys = [];
-			foreach ($accessList['users'] as $user) {
-				$publicKeys[$user] = $this->keyManager->getPublicKey($user);
-			}
-
-			$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $uid);
-
-			$encryptedKeyfiles = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
-			$this->keyManager->setAllFileKeys($path, $encryptedKeyfiles);
-		}
-	}
+    /**
+     * @var null|IUser
+     */
+    protected $user;
+    /**
+     * @var Crypt
+     */
+    protected $crypt;
+    /**
+     * @var KeyManager
+     */
+    private $keyManager;
+    /**
+     * @var IConfig
+     */
+    private $config;
+    /**
+     * @var View
+     */
+    private $view;
+    /**
+     * @var IFile
+     */
+    private $file;
+
+    /**
+     * @param IUserSession $userSession
+     * @param Crypt $crypt
+     * @param KeyManager $keyManager
+     * @param IConfig $config
+     * @param IFile $file
+     * @param View $view
+     */
+    public function __construct(IUserSession $userSession,
+                                Crypt $crypt,
+                                KeyManager $keyManager,
+                                IConfig $config,
+                                IFile $file,
+                                View $view) {
+        $this->user = ($userSession->isLoggedIn()) ? $userSession->getUser() : null;
+        $this->crypt = $crypt;
+        $this->keyManager = $keyManager;
+        $this->config = $config;
+        $this->view = $view;
+        $this->file = $file;
+    }
+
+    /**
+     * @param string $password
+     * @return bool
+     */
+    public function enableAdminRecovery($password) {
+        $appConfig = $this->config;
+        $keyManager = $this->keyManager;
+
+        if (!$keyManager->recoveryKeyExists()) {
+            $keyPair = $this->crypt->createKeyPair();
+            if (!is_array($keyPair)) {
+                return false;
+            }
+
+            $this->keyManager->setRecoveryKey($password, $keyPair);
+        }
+
+        if ($keyManager->checkRecoveryPassword($password)) {
+            $appConfig->setAppValue('encryption', 'recoveryAdminEnabled', 1);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * change recovery key id
+     *
+     * @param string $newPassword
+     * @param string $oldPassword
+     * @return bool
+     */
+    public function changeRecoveryKeyPassword($newPassword, $oldPassword) {
+        $recoveryKey = $this->keyManager->getSystemPrivateKey($this->keyManager->getRecoveryKeyId());
+        $decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $oldPassword);
+        if ($decryptedRecoveryKey === false) {
+            return false;
+        }
+        $encryptedRecoveryKey = $this->crypt->encryptPrivateKey($decryptedRecoveryKey, $newPassword);
+        $header = $this->crypt->generateHeader();
+        if ($encryptedRecoveryKey) {
+            $this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header . $encryptedRecoveryKey);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param string $recoveryPassword
+     * @return bool
+     */
+    public function disableAdminRecovery($recoveryPassword) {
+        $keyManager = $this->keyManager;
+
+        if ($keyManager->checkRecoveryPassword($recoveryPassword)) {
+            // Set recoveryAdmin as disabled
+            $this->config->setAppValue('encryption', 'recoveryAdminEnabled', 0);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * check if recovery is enabled for user
+     *
+     * @param string $user if no user is given we check the current logged-in user
+     *
+     * @return bool
+     */
+    public function isRecoveryEnabledForUser($user = '') {
+        $uid = $user === '' ? $this->user->getUID() : $user;
+        $recoveryMode = $this->config->getUserValue($uid,
+            'encryption',
+            'recoveryEnabled',
+            0);
+
+        return ($recoveryMode === '1');
+    }
+
+    /**
+     * check if recovery is key is enabled by the administrator
+     *
+     * @return bool
+     */
+    public function isRecoveryKeyEnabled() {
+        $enabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled', 0);
+
+        return ($enabled === '1');
+    }
+
+    /**
+     * @param string $value
+     * @return bool
+     */
+    public function setRecoveryForUser($value) {
+        try {
+            $this->config->setUserValue($this->user->getUID(),
+                'encryption',
+                'recoveryEnabled',
+                $value);
+
+            if ($value === '1') {
+                $this->addRecoveryKeys('/' . $this->user->getUID() . '/files/');
+            } else {
+                $this->removeRecoveryKeys('/' . $this->user->getUID() . '/files/');
+            }
+
+            return true;
+        } catch (PreConditionNotMetException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * add recovery key to all encrypted files
+     * @param string $path
+     */
+    private function addRecoveryKeys($path) {
+        $dirContent = $this->view->getDirectoryContent($path);
+        foreach ($dirContent as $item) {
+            $filePath = $item->getPath();
+            if ($item['type'] === 'dir') {
+                $this->addRecoveryKeys($filePath . '/');
+            } else {
+                $fileKey = $this->keyManager->getFileKey($filePath, $this->user->getUID());
+                if (!empty($fileKey)) {
+                    $accessList = $this->file->getAccessList($filePath);
+                    $publicKeys = [];
+                    foreach ($accessList['users'] as $uid) {
+                        $publicKeys[$uid] = $this->keyManager->getPublicKey($uid);
+                    }
+
+                    $publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $this->user->getUID());
+
+                    $encryptedKeyfiles = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
+                    $this->keyManager->setAllFileKeys($filePath, $encryptedKeyfiles);
+                }
+            }
+        }
+    }
+
+    /**
+     * remove recovery key to all encrypted files
+     * @param string $path
+     */
+    private function removeRecoveryKeys($path) {
+        $dirContent = $this->view->getDirectoryContent($path);
+        foreach ($dirContent as $item) {
+            $filePath = $item->getPath();
+            if ($item['type'] === 'dir') {
+                $this->removeRecoveryKeys($filePath . '/');
+            } else {
+                $this->keyManager->deleteShareKey($filePath, $this->keyManager->getRecoveryKeyId());
+            }
+        }
+    }
+
+    /**
+     * recover users files with the recovery key
+     *
+     * @param string $recoveryPassword
+     * @param string $user
+     */
+    public function recoverUsersFiles($recoveryPassword, $user) {
+        $encryptedKey = $this->keyManager->getSystemPrivateKey($this->keyManager->getRecoveryKeyId());
+
+        $privateKey = $this->crypt->decryptPrivateKey($encryptedKey, $recoveryPassword);
+        if ($privateKey !== false) {
+            $this->recoverAllFiles('/' . $user . '/files/', $privateKey, $user);
+        }
+    }
+
+    /**
+     * recover users files
+     *
+     * @param string $path
+     * @param string $privateKey
+     * @param string $uid
+     */
+    private function recoverAllFiles($path, $privateKey, $uid) {
+        $dirContent = $this->view->getDirectoryContent($path);
+
+        foreach ($dirContent as $item) {
+            // Get relative path from encryption/keyfiles
+            $filePath = $item->getPath();
+            if ($this->view->is_dir($filePath)) {
+                $this->recoverAllFiles($filePath . '/', $privateKey, $uid);
+            } else {
+                $this->recoverFile($filePath, $privateKey, $uid);
+            }
+        }
+    }
+
+    /**
+     * recover file
+     *
+     * @param string $path
+     * @param string $privateKey
+     * @param string $uid
+     */
+    private function recoverFile($path, $privateKey, $uid) {
+        $encryptedFileKey = $this->keyManager->getEncryptedFileKey($path);
+        $shareKey = $this->keyManager->getShareKey($path, $this->keyManager->getRecoveryKeyId());
+
+        if ($encryptedFileKey && $shareKey && $privateKey) {
+            $fileKey = $this->crypt->multiKeyDecrypt($encryptedFileKey,
+                $shareKey,
+                $privateKey);
+        }
+
+        if (!empty($fileKey)) {
+            $accessList = $this->file->getAccessList($path);
+            $publicKeys = [];
+            foreach ($accessList['users'] as $user) {
+                $publicKeys[$user] = $this->keyManager->getPublicKey($user);
+            }
+
+            $publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $uid);
+
+            $encryptedKeyfiles = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
+            $this->keyManager->setAllFileKeys($path, $encryptedKeyfiles);
+        }
+    }
 }

apps/settings/lib/Controller/AdminSettingsController.php

Spacing +2 added lines, -2 removed lines

@@ -87,9 +87,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 +71 added lines, -71 removed lines

@@ -38,83 +38,83 @@
 use OCP\Template;
 
 class AdminSettingsController extends Controller {
-	use CommonSettingsTrait;
+    use CommonSettingsTrait;
 
-	public function __construct(
-		$appName,
-		IRequest $request,
-		INavigationManager $navigationManager,
-		ISettingsManager $settingsManager,
-		IUserSession $userSession,
-		IGroupManager $groupManager,
-		ISubAdmin $subAdmin
-	) {
-		parent::__construct($appName, $request);
-		$this->navigationManager = $navigationManager;
-		$this->settingsManager = $settingsManager;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->subAdmin = $subAdmin;
-	}
+    public function __construct(
+        $appName,
+        IRequest $request,
+        INavigationManager $navigationManager,
+        ISettingsManager $settingsManager,
+        IUserSession $userSession,
+        IGroupManager $groupManager,
+        ISubAdmin $subAdmin
+    ) {
+        parent::__construct($appName, $request);
+        $this->navigationManager = $navigationManager;
+        $this->settingsManager = $settingsManager;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->subAdmin = $subAdmin;
+    }
 
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * We are checking the permissions in the getSettings method. If there is no allowed
-	 * settings for the given section. The user will be gretted by an error message.
-	 */
-	public function index(string $section): TemplateResponse {
-		return $this->getIndexResponse('admin', $section);
-	}
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * We are checking the permissions in the getSettings method. If there is no allowed
+     * settings for the given section. The user will be gretted by an error message.
+     */
+    public function index(string $section): TemplateResponse {
+        return $this->getIndexResponse('admin', $section);
+    }
 
-	/**
-	 * @param string $section
-	 * @return array
-	 */
-	protected function getSettings($section) {
-		/** @var IUser $user */
-		$user = $this->userSession->getUser();
-		$isSubAdmin = !$this->groupManager->isAdmin($user->getUID()) && $this->subAdmin->isSubAdmin($user);
-		$settings = $this->settingsManager->getAllowedAdminSettings($section, $user);
-		if (empty($settings)) {
-			throw new NotAdminException("Logged in user doesn't have permission to access these settings.");
-		}
-		$formatted = $this->formatSettings($settings);
-		// Do not show legacy forms for sub admins
-		if ($section === 'additional' && !$isSubAdmin) {
-			$formatted['content'] .= $this->getLegacyForms();
-		}
-		return $formatted;
-	}
+    /**
+     * @param string $section
+     * @return array
+     */
+    protected function getSettings($section) {
+        /** @var IUser $user */
+        $user = $this->userSession->getUser();
+        $isSubAdmin = !$this->groupManager->isAdmin($user->getUID()) && $this->subAdmin->isSubAdmin($user);
+        $settings = $this->settingsManager->getAllowedAdminSettings($section, $user);
+        if (empty($settings)) {
+            throw new NotAdminException("Logged in user doesn't have permission to access these settings.");
+        }
+        $formatted = $this->formatSettings($settings);
+        // Do not show legacy forms for sub admins
+        if ($section === 'additional' && !$isSubAdmin) {
+            $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 [
-					'anchor' => $anchor,
-					'section-name' => $sectionName,
-					'form' => $form
-				];
-			}
-			return [
-				'form' => $form
-			];
-		}, $forms);
+                return [
+                    'anchor' => $anchor,
+                    'section-name' => $sectionName,
+                    'form' => $form
+                ];
+            }
+            return [
+                '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();
+    }
 }

apps/settings/lib/Controller/PersonalSettingsController.php

Spacing +2 added lines, -2 removed lines

@@ -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 +62 added lines, -62 removed lines

@@ -36,74 +36,74 @@
 use OCP\Template;
 
 class PersonalSettingsController extends Controller {
-	use CommonSettingsTrait;
+    use CommonSettingsTrait;
 
-	public function __construct(
-		$appName,
-		IRequest $request,
-		INavigationManager $navigationManager,
-		ISettingsManager $settingsManager,
-		IUserSession $userSession,
-		IGroupManager $groupManager,
-		ISubAdmin $subAdmin
-	) {
-		parent::__construct($appName, $request);
-		$this->navigationManager = $navigationManager;
-		$this->settingsManager = $settingsManager;
-		$this->userSession = $userSession;
-		$this->subAdmin = $subAdmin;
-		$this->groupManager = $groupManager;
-	}
+    public function __construct(
+        $appName,
+        IRequest $request,
+        INavigationManager $navigationManager,
+        ISettingsManager $settingsManager,
+        IUserSession $userSession,
+        IGroupManager $groupManager,
+        ISubAdmin $subAdmin
+    ) {
+        parent::__construct($appName, $request);
+        $this->navigationManager = $navigationManager;
+        $this->settingsManager = $settingsManager;
+        $this->userSession = $userSession;
+        $this->subAdmin = $subAdmin;
+        $this->groupManager = $groupManager;
+    }
 
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 */
-	public function index(string $section): TemplateResponse {
-		return $this->getIndexResponse('personal', $section);
-	}
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     */
+    public function index(string $section): TemplateResponse {
+        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 [
-					'anchor' => $anchor,
-					'section-name' => $sectionName,
-					'form' => $form
-				];
-			}
-			return [
-				'form' => $form
-			];
-		}, $forms);
+                return [
+                    'anchor' => $anchor,
+                    'section-name' => $sectionName,
+                    'form' => $form
+                ];
+            }
+            return [
+                '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();
+    }
 }

apps/settings/lib/Controller/LogSettingsController.php

Indentation +22 added lines, -22 removed lines

@@ -35,28 +35,28 @@
 
 class LogSettingsController extends Controller {
 
-	/** @var Log */
-	private $log;
+    /** @var Log */
+    private $log;
 
-	public function __construct(string $appName, IRequest $request, Log $logger) {
-		parent::__construct($appName, $request);
-		$this->log = $logger;
-	}
+    public function __construct(string $appName, IRequest $request, Log $logger) {
+        parent::__construct($appName, $request);
+        $this->log = $logger;
+    }
 
-	/**
-	 * download logfile
-	 *
-	 * @NoCSRFRequired
-	 *
-	 * @return StreamResponse
-	 */
-	public function download() {
-		if (!$this->log instanceof Log) {
-			throw new \UnexpectedValueException('Log file not available');
-		}
-		$resp = new StreamResponse($this->log->getLogPath());
-		$resp->addHeader('Content-Type', 'application/octet-stream');
-		$resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
-		return $resp;
-	}
+    /**
+     * download logfile
+     *
+     * @NoCSRFRequired
+     *
+     * @return StreamResponse
+     */
+    public function download() {
+        if (!$this->log instanceof Log) {
+            throw new \UnexpectedValueException('Log file not available');
+        }
+        $resp = new StreamResponse($this->log->getLogPath());
+        $resp->addHeader('Content-Type', 'application/octet-stream');
+        $resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
+        return $resp;
+    }
 }

apps/settings/lib/Controller/ChangePasswordController.php

Spacing +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
 						'message' => $this->l->t('Please provide an admin recovery password; otherwise, all user data will be lost.'),
 					]
 				]);
-			} elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
+			} elseif ($recoveryEnabledForUser && !$validRecoveryPassword) {
 				return new JSONResponse([
 					'status' => 'error',
 					'data' => [

Indentation +217 added lines, -217 removed lines

@@ -49,235 +49,235 @@
 use OCP\IUserSession;
 
 class ChangePasswordController extends Controller {
-	private ?string $userId;
-	private IUserManager $userManager;
-	private IL10N $l;
-	private GroupManager $groupManager;
-	private Session $userSession;
-	private IAppManager $appManager;
+    private ?string $userId;
+    private IUserManager $userManager;
+    private IL10N $l;
+    private GroupManager $groupManager;
+    private Session $userSession;
+    private IAppManager $appManager;
 
-	public function __construct(string $appName,
-								IRequest $request,
-								?string $userId,
-								IUserManager $userManager,
-								IUserSession $userSession,
-								IGroupManager $groupManager,
-								IAppManager $appManager,
-								IL10N $l) {
-		parent::__construct($appName, $request);
+    public function __construct(string $appName,
+                                IRequest $request,
+                                ?string $userId,
+                                IUserManager $userManager,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager,
+                                IAppManager $appManager,
+                                IL10N $l) {
+        parent::__construct($appName, $request);
 
-		$this->userId = $userId;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->appManager = $appManager;
-		$this->l = $l;
-	}
+        $this->userId = $userId;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->appManager = $appManager;
+        $this->l = $l;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * @BruteForceProtection(action=changePersonalPassword)
-	 */
-	public function changePersonalPassword(string $oldpassword = '', string $newpassword = null): JSONResponse {
-		$loginName = $this->userSession->getLoginName();
-		/** @var IUser $user */
-		$user = $this->userManager->checkPassword($loginName, $oldpassword);
-		if ($user === false) {
-			$response = new JSONResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $this->l->t('Wrong password'),
-				],
-			]);
-			$response->throttle();
-			return $response;
-		}
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * @BruteForceProtection(action=changePersonalPassword)
+     */
+    public function changePersonalPassword(string $oldpassword = '', string $newpassword = null): JSONResponse {
+        $loginName = $this->userSession->getLoginName();
+        /** @var IUser $user */
+        $user = $this->userManager->checkPassword($loginName, $oldpassword);
+        if ($user === false) {
+            $response = new JSONResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $this->l->t('Wrong password'),
+                ],
+            ]);
+            $response->throttle();
+            return $response;
+        }
 
-		try {
-			if ($newpassword === null || strlen($newpassword) > IUserManager::MAX_PASSWORD_LENGTH || $user->setPassword($newpassword) === false) {
-				return new JSONResponse([
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l->t('Unable to change personal password'),
-					],
-				]);
-			}
-			// password policy app throws exception
-		} catch (HintException $e) {
-			return new JSONResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $e->getHint(),
-				],
-			]);
-		}
+        try {
+            if ($newpassword === null || strlen($newpassword) > IUserManager::MAX_PASSWORD_LENGTH || $user->setPassword($newpassword) === false) {
+                return new JSONResponse([
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l->t('Unable to change personal password'),
+                    ],
+                ]);
+            }
+            // password policy app throws exception
+        } catch (HintException $e) {
+            return new JSONResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $e->getHint(),
+                ],
+            ]);
+        }
 
-		$this->userSession->updateSessionTokenPassword($newpassword);
+        $this->userSession->updateSessionTokenPassword($newpassword);
 
-		return new JSONResponse([
-			'status' => 'success',
-			'data' => [
-				'message' => $this->l->t('Saved'),
-			],
-		]);
-	}
+        return new JSONResponse([
+            'status' => 'success',
+            'data' => [
+                'message' => $this->l->t('Saved'),
+            ],
+        ]);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 */
-	public function changeUserPassword(string $username = null, string $password = null, string $recoveryPassword = null): JSONResponse {
-		if ($username === null) {
-			return new JSONResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $this->l->t('No user supplied'),
-				],
-			]);
-		}
+    /**
+     * @NoAdminRequired
+     * @PasswordConfirmationRequired
+     */
+    public function changeUserPassword(string $username = null, string $password = null, string $recoveryPassword = null): JSONResponse {
+        if ($username === null) {
+            return new JSONResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $this->l->t('No user supplied'),
+                ],
+            ]);
+        }
 
-		if ($password === null) {
-			return new JSONResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $this->l->t('Unable to change password'),
-				],
-			]);
-		}
+        if ($password === null) {
+            return new JSONResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $this->l->t('Unable to change password'),
+                ],
+            ]);
+        }
 
-		if (strlen($password) > IUserManager::MAX_PASSWORD_LENGTH) {
-			return new JSONResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $this->l->t('Unable to change password. Password too long.'),
-				],
-			]);
-		}
+        if (strlen($password) > IUserManager::MAX_PASSWORD_LENGTH) {
+            return new JSONResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $this->l->t('Unable to change password. Password too long.'),
+                ],
+            ]);
+        }
 
-		$currentUser = $this->userSession->getUser();
-		$targetUser = $this->userManager->get($username);
-		if ($currentUser === null || $targetUser === null ||
-			!($this->groupManager->isAdmin($this->userId) ||
-			 $this->groupManager->getSubAdmin()->isUserAccessible($currentUser, $targetUser))
-		) {
-			return new JSONResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $this->l->t('Authentication error'),
-				],
-			]);
-		}
+        $currentUser = $this->userSession->getUser();
+        $targetUser = $this->userManager->get($username);
+        if ($currentUser === null || $targetUser === null ||
+            !($this->groupManager->isAdmin($this->userId) ||
+             $this->groupManager->getSubAdmin()->isUserAccessible($currentUser, $targetUser))
+        ) {
+            return new JSONResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $this->l->t('Authentication error'),
+                ],
+            ]);
+        }
 
-		if ($this->appManager->isEnabledForUser('encryption')) {
-			//handle the recovery case
-			$crypt = new \OCA\Encryption\Crypto\Crypt(
-				\OC::$server->getLogger(),
-				\OC::$server->getUserSession(),
-				\OC::$server->getConfig(),
-				\OC::$server->getL10N('encryption'));
-			$keyStorage = \OC::$server->getEncryptionKeyStorage();
-			$util = new \OCA\Encryption\Util(
-				new \OC\Files\View(),
-				$crypt,
-				\OC::$server->getLogger(),
-				\OC::$server->getUserSession(),
-				\OC::$server->getConfig(),
-				\OC::$server->getUserManager());
-			$keyManager = new \OCA\Encryption\KeyManager(
-				$keyStorage,
-				$crypt,
-				\OC::$server->getConfig(),
-				\OC::$server->getUserSession(),
-				new \OCA\Encryption\Session(\OC::$server->getSession()),
-				\OC::$server->getLogger(),
-				$util,
-				\OC::$server->getLockingProvider()
-			);
-			$recovery = new \OCA\Encryption\Recovery(
-				\OC::$server->getUserSession(),
-				$crypt,
-				$keyManager,
-				\OC::$server->getConfig(),
-				\OC::$server->getEncryptionFilesHelper(),
-				new \OC\Files\View());
-			$recoveryAdminEnabled = $recovery->isRecoveryKeyEnabled();
+        if ($this->appManager->isEnabledForUser('encryption')) {
+            //handle the recovery case
+            $crypt = new \OCA\Encryption\Crypto\Crypt(
+                \OC::$server->getLogger(),
+                \OC::$server->getUserSession(),
+                \OC::$server->getConfig(),
+                \OC::$server->getL10N('encryption'));
+            $keyStorage = \OC::$server->getEncryptionKeyStorage();
+            $util = new \OCA\Encryption\Util(
+                new \OC\Files\View(),
+                $crypt,
+                \OC::$server->getLogger(),
+                \OC::$server->getUserSession(),
+                \OC::$server->getConfig(),
+                \OC::$server->getUserManager());
+            $keyManager = new \OCA\Encryption\KeyManager(
+                $keyStorage,
+                $crypt,
+                \OC::$server->getConfig(),
+                \OC::$server->getUserSession(),
+                new \OCA\Encryption\Session(\OC::$server->getSession()),
+                \OC::$server->getLogger(),
+                $util,
+                \OC::$server->getLockingProvider()
+            );
+            $recovery = new \OCA\Encryption\Recovery(
+                \OC::$server->getUserSession(),
+                $crypt,
+                $keyManager,
+                \OC::$server->getConfig(),
+                \OC::$server->getEncryptionFilesHelper(),
+                new \OC\Files\View());
+            $recoveryAdminEnabled = $recovery->isRecoveryKeyEnabled();
 
-			$validRecoveryPassword = false;
-			$recoveryEnabledForUser = false;
-			if ($recoveryAdminEnabled) {
-				$validRecoveryPassword = $keyManager->checkRecoveryPassword($recoveryPassword);
-				$recoveryEnabledForUser = $recovery->isRecoveryEnabledForUser($username);
-			}
+            $validRecoveryPassword = false;
+            $recoveryEnabledForUser = false;
+            if ($recoveryAdminEnabled) {
+                $validRecoveryPassword = $keyManager->checkRecoveryPassword($recoveryPassword);
+                $recoveryEnabledForUser = $recovery->isRecoveryEnabledForUser($username);
+            }
 
-			if ($recoveryEnabledForUser && $recoveryPassword === '') {
-				return new JSONResponse([
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l->t('Please provide an admin recovery password; otherwise, all user data will be lost.'),
-					]
-				]);
-			} elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
-				return new JSONResponse([
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l->t('Wrong admin recovery password. Please check the password and try again.'),
-					]
-				]);
-			} else { // now we know that everything is fine regarding the recovery password, let's try to change the password
-				try {
-					$result = $targetUser->setPassword($password, $recoveryPassword);
-					// password policy app throws exception
-				} catch (HintException $e) {
-					return new JSONResponse([
-						'status' => 'error',
-						'data' => [
-							'message' => $e->getHint(),
-						],
-					]);
-				}
-				if (!$result && $recoveryEnabledForUser) {
-					return new JSONResponse([
-						'status' => 'error',
-						'data' => [
-							'message' => $this->l->t('Backend does not support password change, but the user\'s encryption key was updated.'),
-						]
-					]);
-				} elseif (!$result && !$recoveryEnabledForUser) {
-					return new JSONResponse([
-						'status' => 'error',
-						'data' => [
-							'message' => $this->l->t('Unable to change password'),
-						]
-					]);
-				}
-			}
-		} else {
-			try {
-				if ($targetUser->setPassword($password) === false) {
-					return new JSONResponse([
-						'status' => 'error',
-						'data' => [
-							'message' => $this->l->t('Unable to change password'),
-						],
-					]);
-				}
-				// password policy app throws exception
-			} catch (HintException $e) {
-				return new JSONResponse([
-					'status' => 'error',
-					'data' => [
-						'message' => $e->getHint(),
-					],
-				]);
-			}
-		}
+            if ($recoveryEnabledForUser && $recoveryPassword === '') {
+                return new JSONResponse([
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l->t('Please provide an admin recovery password; otherwise, all user data will be lost.'),
+                    ]
+                ]);
+            } elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
+                return new JSONResponse([
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l->t('Wrong admin recovery password. Please check the password and try again.'),
+                    ]
+                ]);
+            } else { // now we know that everything is fine regarding the recovery password, let's try to change the password
+                try {
+                    $result = $targetUser->setPassword($password, $recoveryPassword);
+                    // password policy app throws exception
+                } catch (HintException $e) {
+                    return new JSONResponse([
+                        'status' => 'error',
+                        'data' => [
+                            'message' => $e->getHint(),
+                        ],
+                    ]);
+                }
+                if (!$result && $recoveryEnabledForUser) {
+                    return new JSONResponse([
+                        'status' => 'error',
+                        'data' => [
+                            'message' => $this->l->t('Backend does not support password change, but the user\'s encryption key was updated.'),
+                        ]
+                    ]);
+                } elseif (!$result && !$recoveryEnabledForUser) {
+                    return new JSONResponse([
+                        'status' => 'error',
+                        'data' => [
+                            'message' => $this->l->t('Unable to change password'),
+                        ]
+                    ]);
+                }
+            }
+        } else {
+            try {
+                if ($targetUser->setPassword($password) === false) {
+                    return new JSONResponse([
+                        'status' => 'error',
+                        'data' => [
+                            'message' => $this->l->t('Unable to change password'),
+                        ],
+                    ]);
+                }
+                // password policy app throws exception
+            } catch (HintException $e) {
+                return new JSONResponse([
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $e->getHint(),
+                    ],
+                ]);
+            }
+        }
 
-		return new JSONResponse([
-			'status' => 'success',
-			'data' => [
-				'username' => $username,
-			],
-		]);
-	}
+        return new JSONResponse([
+            'status' => 'success',
+            'data' => [
+                'username' => $username,
+            ],
+        ]);
+    }
 }

apps/settings/templates/settings/admin/overview.php

Indentation +2 added lines, -2 removed lines

@@ -46,9 +46,9 @@
 	</div>
 
 	<div id="postsetupchecks" data-check-wellknown="<?php if ($_['checkForWorkingWellKnownSetup']) {
-	p('true');
+    p('true');
 } else {
-	p('false');
+    p('false');
 } ?>">
 		<ul class="errors hidden"></ul>
 		<ul class="warnings hidden"></ul>

Spacing +9 added lines, -9 removed lines

@@ -28,21 +28,21 @@ 
 ?>
 
 <div id="security-warning" class="section">
-	<h2 class="inlineblock"><?php p($l->t('Security & setup warnings'));?></h2>
-	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-warnings')); ?>"></a>
-	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the linked documentation for more information.'));?></p>
+	<h2 class="inlineblock"><?php p($l->t('Security & setup warnings')); ?></h2>
+	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation')); ?>" href="<?php p(link_to_docs('admin-warnings')); ?>"></a>
+	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the linked documentation for more information.')); ?></p>
 
 	<div id="security-warning-state-ok" class="hidden">
-		<span class="icon icon-checkmark-white"></span><span class="message"><?php p($l->t('All checks passed.'));?></span>
+		<span class="icon icon-checkmark-white"></span><span class="message"><?php p($l->t('All checks passed.')); ?></span>
 	</div>
 	<div id="security-warning-state-failure" class="hidden">
-		<span class="icon icon-close-white"></span><span class="message"><?php p($l->t('There are some errors regarding your setup.'));?></span>
+		<span class="icon icon-close-white"></span><span class="message"><?php p($l->t('There are some errors regarding your setup.')); ?></span>
 	</div>
 	<div id="security-warning-state-warning" class="hidden">
-		<span class="icon icon-error-white"></span><span class="message"><?php p($l->t('There are some warnings regarding your setup.'));?></span>
+		<span class="icon icon-error-white"></span><span class="message"><?php p($l->t('There are some warnings regarding your setup.')); ?></span>
 	</div>
 	<div id="security-warning-state-loading">
-		<span class="icon loading"></span><span class="message"><?php p($l->t('Checking for system and security issues.'));?></span>
+		<span class="icon loading"></span><span class="message"><?php p($l->t('Checking for system and security issues.')); ?></span>
 	</div>
 
 	<div id="postsetupchecks" data-check-wellknown="<?php if ($_['checkForWorkingWellKnownSetup']) {
@@ -59,14 +59,14 @@ 
 	</p>
 
 	<p class="extra-top-margin">
-		<?php print_unescaped($l->t('Check the security of your Nextcloud over <a target="_blank" rel="noreferrer noopener" href="%s">our security scan ↗</a>.', ['https://scan.nextcloud.com']));?>
+		<?php print_unescaped($l->t('Check the security of your Nextcloud over <a target="_blank" rel="noreferrer noopener" href="%s">our security scan ↗</a>.', ['https://scan.nextcloud.com'])); ?>
 	</p>
 
 </div>
 
 <div id="version" class="section">
 	<!-- should be the last part, so Updater can follow if enabled (it has no heading therefore). -->
-	<h2><?php p($l->t('Version'));?></h2>
+	<h2><?php p($l->t('Version')); ?></h2>
 	<?php if ($theme->getTitle() === 'Nextcloud'): ?>
 	<p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer noopener" target="_blank">Nextcloud Hub 3</a> (<?php p(OC_Util::getHumanVersion()) ?>)</strong></p>
 	<?php else: ?>

Braces +5 added lines, -2 removed lines

@@ -69,7 +69,10 @@
 	<h2><?php p($l->t('Version'));?></h2>
 	<?php if ($theme->getTitle() === 'Nextcloud'): ?>
 	<p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer noopener" target="_blank">Nextcloud Hub 3</a> (<?php p(OC_Util::getHumanVersion()) ?>)</strong></p>
-	<?php else: ?>
-	<p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer noopener" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></strong></p>
+	<?php else {
+    : ?>
+	<p><strong><a href="<?php print_unescaped($theme->getBaseUrl());
+}
+?>" rel="noreferrer noopener" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></strong></p>
 	<?php endif; ?>
 </div>

apps/settings/templates/settings/additional.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 ?>
 
 <?php foreach ($_['forms'] as $form) {
-	if (isset($form['form'])) {?>
+    if (isset($form['form'])) {?>
 		<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
 	<?php }
 } ?>

Spacing +1 added lines, -1 removed lines

@@ -28,6 +28,6 @@
 
 <?php foreach ($_['forms'] as $form) {
 	if (isset($form['form'])) {?>
-		<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
+		<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p(''); ?>"><?php print_unescaped($form['form']); ?></div>
 	<?php }
 } ?>