Move ajax/changepassword to changepassword/controller to use autoloading

1 files changed, 0 insertions, 98 deletions

diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
deleted file mode 100644
index 53bd69a2cd0..00000000000
--- a/settings/ajax/changepassword.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace OC\Settings\ChangePassword;
-
-class Controller {
-	public static function changePersonalPassword($args) {
-		// Check if we are an user
-		\OC_JSON::callCheck();
-		\OC_JSON::checkLoggedIn();
-
-		// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
-		\OC_App::loadApps();
-
-		$username = \OC_User::getUser();
-		$password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
-		$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
-
-		if (!\OC_User::checkPassword($username, $oldPassword)) {
-			$l = new \OC_L10n('settings');
-			\OC_JSON::error(array("data" => array("message" => $l->t("Wrong password")) ));
-			exit();
-		}
-		if (!is_null($password) && \OC_User::setPassword($username, $password)) {
-			\OC_JSON::success();
-		} else {
-			\OC_JSON::error();
-		}
-	}
-
-	public static function changeUserPassword($args) {
-		// Check if we are an user
-		\OC_JSON::callCheck();
-		\OC_JSON::checkLoggedIn();
-
-		// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
-		\OC_App::loadApps();
-
-		if (isset($_POST['username'])) {
-			$username = $_POST['username'];
-		} else {
-			$l = new \OC_L10n('settings');
-			\OC_JSON::error(array('data' => array('message' => $l->t('No user supplied')) ));
-			exit();
-		}
-
-		$password = isset($_POST['password']) ? $_POST['password'] : null;
-		$recoveryPassword = isset($_POST['recoveryPassword']) ? $_POST['recoveryPassword'] : null;
-
-		if (\OC_User::isAdminUser(\OC_User::getUser())) {
-			$userstatus = 'admin';
-		} elseif (\OC_SubAdmin::isUserAccessible(\OC_User::getUser(), $username)) {
-			$userstatus = 'subadmin';
-		} else {
-			$l = new \OC_L10n('settings');
-			\OC_JSON::error(array('data' => array('message' => $l->t('Authentication error')) ));
-			exit();
-		}
-
-		if (\OC_App::isEnabled('files_encryption')) {
-			//handle the recovery case
-			$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
-			$recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
-
-			$validRecoveryPassword = false;
-			$recoveryPasswordSupported = false;
-			if ($recoveryAdminEnabled) {
-				$validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
-				$recoveryEnabledForUser = $util->recoveryEnabledForUser();
-			}
-
-			if ($recoveryEnabledForUser && $recoveryPassword === '') {
-				\OC_JSON::error(array('data' => array('message' => 'Please provide a admin recovery password, otherwise all user data will be lost')));
-			} elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
-				\OC_JSON::error(array('data' => array('message' => '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
-				$result = \OC_User::setPassword($username, $password, $recoveryPassword);
-				if (!$result && $recoveryPasswordSupported) {
-					\OC_JSON::error(array(
-						"data" => array(
-							"message" => "Back-end doesn't support password change, but the users encryption key was successfully updated." 
-						)
-					));
-				} elseif (!$result && !$recoveryPasswordSupported) {
-					\OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
-				} else {
-					\OC_JSON::success(array("data" => array( "username" => $username )));
-				}
-
-			}
-		} else { // if encryption is disabled, proceed
-			if (!is_null($password) && \OC_User::setPassword($username, $password)) {
-				\OC_JSON::success(array('data' => array('username' => $username)));
-			} else {
-				\OC_JSON::error(array('data' => array('message' => 'Unable to change password')));
-			}
-		}
-	}
-}