refactoring

LDAPAccountManager · Oct 12, 2023 · aaa1a97 · aaa1a97
1 parent 72f0ccf
commit aaa1a97
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/lam/lib/schema.inc b/lam/lib/schema.inc
@@ -427,7 +427,7 @@ class ObjectClass extends SchemaItem
      *
      * @return array An array of objectClass names (strings)
      */
-	function getSupClasses()
+	function getSupClasses(): array
 	{
 		return $this->sup_classes;
 	}

diff --git a/lam/templates/pdfedit/pdfmain.php b/lam/templates/pdfedit/pdfmain.php
@@ -30,7 +30,7 @@
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2006  Michael Duergner
-                2005 - 2022  Roland Gruber
+                2005 - 2023  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -517,11 +517,9 @@
 				foreach ($typesImport as $typeImport) {
 					if (($profile != $_SESSION['config']->getName()) || ($typeImport->getId() != $typeId)) {
 						$accountProfiles = $pdfStructurePersistenceManager->getPDFStructures($profile, $typeImport->getId());
-						if (!empty($accountProfiles)) {
-							foreach ($accountProfiles as $accountProfile) {
-								$importOptions[$profile][$typeImport->getAlias() . ': ' . $accountProfile] = $profile . '##' . $typeImport->getId() . '##' . $accountProfile;
-							}
-						}
+                        foreach ($accountProfiles as $accountProfile) {
+                            $importOptions[$profile][$typeImport->getAlias() . ': ' . $accountProfile] = $profile . '##' . $typeImport->getId() . '##' . $accountProfile;
+                        }
 					}
 				}
 			}

diff --git a/lam/templates/profedit/profilemain.php b/lam/templates/profedit/profilemain.php
@@ -27,7 +27,7 @@
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2022  Roland Gruber
+  Copyright (C) 2003 - 2023  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -346,10 +346,8 @@
 		foreach ($typesImport as $typeImport) {
 			if (($profile != $_SESSION['config']->getName()) || ($typeImport->getId() != $typeId)) {
 				$accountProfiles = $accountProfilePersistenceManager->getAccountProfileNames($typeImport->getId(), $profile);
-				if (!empty($accountProfiles)) {
-					foreach ($accountProfiles as $accountProfile) {
-						$importOptions[$profile][$typeImport->getAlias() . ': ' . $accountProfile] = $profile . '##' . $typeImport->getId() . '##' . $accountProfile;
-					}
+				foreach ($accountProfiles as $accountProfile) {
+					$importOptions[$profile][$typeImport->getAlias() . ': ' . $accountProfile] = $profile . '##' . $typeImport->getId() . '##' . $accountProfile;
 				}
 			}
 		}

diff --git a/lam/templates/schema/schema.php b/lam/templates/schema/schema.php
@@ -210,13 +210,11 @@ function displayObjectClassList(htmlResponsiveRow &$row): void {
 
 	// fill child object classes
 	foreach ($objectClasses as $name => $objectClass) {
-		if (!empty($objectClass->getSupClasses())) {
-			foreach ($objectClass->getSupClasses() as $subClass) {
-				if (!isset($objectClasses[strtolower($subClass)])) {
-					continue;
-				}
-				$objectClasses[strtolower($subClass)]->addChildObjectClass($name);
+		foreach ($objectClass->getSupClasses() as $subClass) {
+			if (!isset($objectClasses[strtolower($subClass)])) {
+				continue;
 			}
+			$objectClasses[strtolower($subClass)]->addChildObjectClass($name);
 		}
 	}