Use a controller instead of two files for changepassword.php

settings/ajax/changepassword.php

@@ -1,37 +1,65 @@
 <?php
 
+namespace OC\Settings\ChangePassword;
+
+class Controller {
+	public static function changePersonalPassword($args) {
 		// Check if we are an user
-OC_JSON::callCheck();
+		\OC_JSON::callCheck();
-OC_JSON::checkLoggedIn();
+		\OC_JSON::checkLoggedIn();
 
 		// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
-OC_App::loadApps();
+		\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')) ));
+			\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())) {
+		if (\OC_User::isAdminUser(\OC_User::getUser())) {
 			$userstatus = 'admin';
-} elseif (OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
+		} 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')) ));
+			\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');
+			$recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
 
 			$validRecoveryPassword = false;
 			$recoveryPasswordSupported = false;
@@ -41,28 +69,30 @@ if (\OC_App::isEnabled('files_encryption')) {
 			}
 
 			if ($recoveryEnabledForUser && $recoveryPassword === '') {
-		OC_JSON::error(array('data' => array('message' => 'Please provide a admin recovery password, otherwise all user data will be lost')));
+				\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.')));
+				\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);
+				$result = \OC_User::setPassword($username, $password, $recoveryPassword);
 				if (!$result && $recoveryPasswordSupported) {
-			OC_JSON::error(array(
+					\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" )));
+					\OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
 				} else {
-			OC_JSON::success(array("data" => array( "username" => $username )));
+					\OC_JSON::success(array("data" => array( "username" => $username )));
 				}
 
 			}
 		} else { // if encryption is disabled, proceed
-	if (!is_null($password) && OC_User::setPassword($username, $password)) {
+			if (!is_null($password) && \OC_User::setPassword($username, $password)) {
-		OC_JSON::success(array('data' => array('username' => $username)));
+				\OC_JSON::success(array('data' => array('username' => $username)));
 			} else {
-		OC_JSON::error(array('data' => array('message' => 'Unable to change password')));
+				\OC_JSON::error(array('data' => array('message' => 'Unable to change password')));
+			}
+		}
 	}
 }

settings/ajax/changepersonalpassword.php

@@ -1,23 +0,0 @@
-<?php
-
-// 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();
-}

settings/routes.php

@@ -6,6 +6,9 @@
  * See the COPYING-README file.
  */
 
+// Necessary to include changepassword controller
+OC::$CLASSPATH['OC\Settings\ChangePassword\Controller'] = 'settings/ajax/changepassword.php';
+
 // Settings pages
 $this->create('settings_help', '/settings/help')
 	->actionInclude('settings/help.php');
@@ -37,13 +40,15 @@ $this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.p
 	->actionInclude('settings/ajax/togglesubadmins.php');
 $this->create('settings_ajax_removegroup', '/settings/ajax/removegroup.php')
 	->actionInclude('settings/ajax/removegroup.php');
-$this->create('settings_ajax_changepassword', '/settings/ajax/changepassword.php')
+$this->create('settings_ajax_changepassword', '/settings/users/changepassword')
-	->actionInclude('settings/ajax/changepassword.php');
+	->post()
-$this->create('settings_ajax_changepersonalpassword', '/settings/ajax/changepersonalpassword.php')
+	->action('OC\Settings\ChangePassword\Controller', 'changeUserPassword');
-        ->actionInclude('settings/ajax/changepersonalpassword.php');
 $this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')
 	->actionInclude('settings/ajax/changedisplayname.php');
-// personel
+// personal
+$this->create('settings_ajax_changepersonalpassword', '/settings/personal/changepassword')
+	->post()
+	->action('OC\Settings\ChangePassword\Controller', 'changePersonalPassword');
 $this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')
 	->actionInclude('settings/ajax/lostpassword.php');
 $this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php')