refactoring

LDAPAccountManager · Jul 12, 2024 · 74b760d · 74b760d
1 parent 12d2307
commit 74b760d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/lam/lib/modules/asteriskAccount.inc b/lam/lib/modules/asteriskAccount.inc
@@ -40,7 +40,7 @@ use LAM\TYPES\ConfiguredType;
  */
 class asteriskAccount extends baseModule implements passwordService {
 
-	const ASTERISK_DEFAULT_REALM = "asterisk";
+	private const ASTERISK_DEFAULT_REALM = "asterisk";
 
 	/**
 	 * These attributes will be ignored by default if a new account is copied from an existing one.
@@ -253,7 +253,7 @@ class asteriskAccount extends baseModule implements passwordService {
 		];
 		// self service options
 		$selfServiceContainer = new htmlResponsiveRow();
-		$selfServiceContainer->add(new htmlResponsiveInputField(_('Asterisk realm'), 'asteriskAccount_AsteriskRealm', null, ['AsteriskRealm', get_class($this)]), 12);
+		$selfServiceContainer->add(new htmlResponsiveInputField(_('Asterisk realm'), 'asteriskAccount_AsteriskRealm', null, ['AsteriskRealm', static::class]), 12);
 		$return['selfServiceSettings'] = $selfServiceContainer;
 		// profile options
 		$profileContainer = new htmlResponsiveRow();
@@ -1146,7 +1146,7 @@ class asteriskAccount extends baseModule implements passwordService {
 	 * @see passwordService::passwordChangeRequested
 	 */
 	public function passwordChangeRequested($password, $modules, $forcePasswordChange) {
-		if (!in_array(get_class($this), $modules)) {
+		if (!in_array(static::class, $modules)) {
 			return [];
 		}
 		$this->attributes['AstAccountRealmedPassword'][0] = asteriskAccount::buildPasswordString($this->attributes, $this->moduleSettings, $password);
@@ -1162,7 +1162,7 @@ class asteriskAccount extends baseModule implements passwordService {
 	 * @return String value for password attribute
 	 */
 	public static function buildPasswordString(&$attributes, &$moduleSettings, $password) {
-		$astRealm = asteriskAccount::ASTERISK_DEFAULT_REALM;
+		$astRealm = self::ASTERISK_DEFAULT_REALM;
 		if (!empty($moduleSettings['asteriskAccount_AsteriskRealm'][0])) {
 			$astRealm = $moduleSettings['asteriskAccount_AsteriskRealm'][0];
 		}

diff --git a/lam/lib/modules/asteriskExtension.inc b/lam/lib/modules/asteriskExtension.inc
@@ -259,7 +259,7 @@ class asteriskExtension extends baseModule {
 		}
 		$renderContainer->add($ownerList, 12);
 		$renderContainer->addVerticalSpacer('1rem');
-		$renderContainer->add(new htmlAccountPageButton(get_class($this), 'user', 'open', _('Change')), 12);
+		$renderContainer->add(new htmlAccountPageButton(static::class, 'user', 'open', _('Change')), 12);
 	}
 
 	/**
@@ -451,14 +451,14 @@ class asteriskExtension extends baseModule {
 				$users_dn[getAbstractDN($dn)] = $dn;
 			}
 		}
-		uasort($users_dn, 'compareDN');
+		uasort($users_dn, compareDN(...));
 		if (isset($this->extensionOwners)) {
 			$memberList = $this->extensionOwners;
 		}
 		else {
 			$memberList = [];
 		}
-		usort($memberList, 'compareDN');
+		usort($memberList, compareDN(...));
 		$members = [];
 		for ($i = 0; $i < sizeof($memberList); $i++) {
 			$members[getAbstractDN($memberList[$i])] = $memberList[$i];
@@ -473,7 +473,7 @@ class asteriskExtension extends baseModule {
 		$return->add(new htmlSubTitle(_("Extension owners")), 12);
 		$this->addDoubleSelectionArea($return, _("Selected users"), _("Available users"), $members, [], $users_dn, [], 'owners', true);
 		// back button
-		$backButton = new htmlAccountPageButton(get_class($this), 'attributes', 'back', _('Ok'));
+		$backButton = new htmlAccountPageButton(static::class, 'attributes', 'back', _('Ok'));
 		$backButton->colspan = 3;
 		$return->add($backButton, 12);
 		return $return;
@@ -692,7 +692,7 @@ class asteriskExtension extends baseModule {
 		//Fill the member filed
 		$extRow['member'] = $this->extensionOwners;
 		if ((!isset($extRow['member']) || count($extRow['member']) == 0)
-			&& !isset($_POST['form_subpage_' . get_class($this) . '_user_open'])) {
+			&& !isset($_POST['form_subpage_' . static::class . '_user_open'])) {
 			$errors[] = $this->messages['member'][0];
 		}
 		return $errors;

diff --git a/lam/lib/modules/asteriskVoicemail.inc b/lam/lib/modules/asteriskVoicemail.inc
@@ -501,7 +501,7 @@ class asteriskVoicemail extends baseModule implements passwordService {
 	 * @see passwordService::passwordChangeRequested
 	 */
 	public function passwordChangeRequested($password, $modules, $forcePasswordChange) {
-		if (!in_array(get_class($this), $modules)) {
+		if (!in_array(static::class, $modules)) {
 			return [];
 		}
 		$this->attributes['AstVoicemailPassword'][0] = $password;