openrat-cms

commit ad621ea0d280abc0c7a5d6fe1cdf2a0b81a27319
parent 4fccc7ecba33495f7e17768e7f540f6c8e8fd3df
Author: Jan Dankert <develop@jandankert.de>
Date:   Sat, 31 Oct 2020 03:52:03 +0100

Fix: Better detection if password change is possbile.

Diffstat:
M
modules/cms/action/LoginAction.class.php
 | 
1
-
M
modules/cms/action/ProfileAction.class.php
 | 
2
+-
M
modules/cms/model/User.class.php
 | 
1
-

3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/modules/cms/action/LoginAction.class.php b/modules/cms/action/LoginAction.class.php
@@ -622,7 +622,6 @@ class LoginAction extends BaseAction
 			{
 				// Benutzer über den Benutzernamen laden.
 				$user = User::loadWithName($loginName,User::AUTH_TYPE_INTERNAL,null);
-				$user->loginModuleName = $lastModule;
                 $user->setCurrent();
                 $user->updateLoginTimestamp();
 
diff --git a/modules/cms/action/ProfileAction.class.php b/modules/cms/action/ProfileAction.class.php
@@ -103,7 +103,7 @@ class ProfileAction extends BaseAction
 		// Hier wird festgestellt, ob der Benutzer sich über die interne Datenbank angemeldet hat.
 		// Nur dann kann man auch sein Kennwort ändern.
 		$user             = $this->getUserFromSession();
-		$pwchangePossible = in_array( strtolower($user->loginModuleName), array('cookieauth','internal'));
+		$pwchangePossible = $user->type == User::AUTH_TYPE_INTERNAL;
 		$this->setTemplateVar('pwchange_enabled', $pwchangePossible);
 	}
 	
diff --git a/modules/cms/model/User.class.php b/modules/cms/model/User.class.php
@@ -69,7 +69,6 @@ class User extends ModelBase
 	
 	var $mustChangePassword = false;
 	var $groups = null;
-	var $loginModuleName = null;
 
 	public $issuer = null;
 	public $type = User::AUTH_TYPE_INTERNAL;