From 0bf870276318f94f3adf163bb989f86a40f9c54d Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Mon, 26 Dec 2016 18:41:22 +0100
Subject: [PATCH] new type API

---
 lam/lib/tools/ouEditor.inc      | 51 +++++++++++++++++----------------
 lam/lib/tools/pdfEdit.inc       | 51 +++++++++++++++++----------------
 lam/lib/tools/profileEditor.inc | 51 +++++++++++++++++----------------
 lam/templates/ou_edit.php       | 22 ++++++++++----
 4 files changed, 94 insertions(+), 81 deletions(-)

diff --git a/lam/lib/tools/ouEditor.inc b/lam/lib/tools/ouEditor.inc
index 81769e63..5f49143f 100644
--- a/lam/lib/tools/ouEditor.inc
+++ b/lam/lib/tools/ouEditor.inc
@@ -1,20 +1,21 @@
 <?php
+namespace LAM\TOOLS\OU_EDIT;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2009 - 2011  Roland Gruber
+  Copyright (C) 2009 - 2016  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
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
-  
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -30,56 +31,56 @@ $Id$
 
 /**
  * OU editor
- * 
+ *
  * @package tools
- */ 
-class toolOUEditor implements LAMTool {
-	
+ */
+class toolOUEditor implements \LAMTool {
+
 	/**
 	 * Returns the name of the tool.
-	 * 
+	 *
 	 * @return string name
 	 */
 	 function getName() {
 	 	return _("OU editor");
 	 }
-	
+
 	/**
 	 * returns a description text for the tool.
-	 * 
+	 *
 	 * @return string description
 	 */
 	function getDescription() {
 		return _("Manages OU objects in your LDAP tree.");
 	}
-	
+
 	/**
 	 * Returns a link to the tool page (relative to templates/).
-	 * 
+	 *
 	 * @return string link
 	 */
 	function getLink() {
 		return "ou_edit.php";
 	}
-	
-	/** 
+
+	/**
 	 * Returns if the tool requires write access to LDAP.
-	 * 
+	 *
 	 * @return boolean true if write access is needed
 	 */
 	function getRequiresWriteAccess() {
 		return true;
 	}
-	
+
 	/**
 	 * Returns if the tool requires password change rights.
-	 * 
+	 *
 	 * @return boolean true if password change rights are needed
 	 */
 	function getRequiresPasswordChangeRights() {
 		return true;
 	}
-	
+
 	/**
 	 * Returns the link to the tool image (relative to graphics/)
 	 *
@@ -88,7 +89,7 @@ class toolOUEditor implements LAMTool {
 	function getImageLink() {
 		return 'ou.png';
 	}
-	
+
 	/**
 	 * Returns the prefered position of this tool on the tools page.
 	 * The position may be between 0 and 1000. 0 is the top position.
@@ -98,16 +99,16 @@ class toolOUEditor implements LAMTool {
 	function getPosition() {
 		return 500;
 	}
-	
+
 	/**
 	 * Returns a list of sub tools or an empty array.
-	 * 
+	 *
 	 * @return array list of subtools (LAMTool)
 	 */
 	function getSubTools() {
 		return array();
 	}
-	
+
 	/**
 	 * Returns if the tool is visible in the menu.
 	 *
@@ -116,16 +117,16 @@ class toolOUEditor implements LAMTool {
 	function isVisible() {
 		return (sizeof($_SESSION['config']->get_ActiveTypes()) > 0);
 	}
-	
+
 	/**
 	 * Returns if a tool may be hidden by configuration in the LAM server profile.
-	 * 
+	 *
 	 * @return boolean hideable
 	 */
 	function isHideable() {
 		return true;
 	}
-	
+
 }
 
 ?>
\ No newline at end of file
diff --git a/lam/lib/tools/pdfEdit.inc b/lam/lib/tools/pdfEdit.inc
index f3c36650..ed321650 100644
--- a/lam/lib/tools/pdfEdit.inc
+++ b/lam/lib/tools/pdfEdit.inc
@@ -1,20 +1,21 @@
 <?php
+namespace LAM\TOOLS\PDF_EDITOR;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2009 - 2011  Roland Gruber
+  Copyright (C) 2009 - 2016  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
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
-  
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -30,56 +31,56 @@ $Id$
 
 /**
  * PDF editor
- * 
+ *
  * @package tools
- */ 
-class toolPDFEditor implements LAMTool {
-	
+ */
+class toolPDFEditor implements \LAMTool {
+
 	/**
 	 * Returns the name of the tool.
-	 * 
+	 *
 	 * @return string name
 	 */
 	 function getName() {
 	 	return _("PDF editor");
 	 }
-	
+
 	/**
 	 * returns a description text for the tool.
-	 * 
+	 *
 	 * @return string description
 	 */
 	function getDescription() {
 		return _("This tool allows you to customize the PDF pages.");
 	}
-	
+
 	/**
 	 * Returns a link to the tool page (relative to templates/).
-	 * 
+	 *
 	 * @return string link
 	 */
 	function getLink() {
 		return "pdfedit/pdfmain.php";
 	}
-	
-	/** 
+
+	/**
 	 * Returns if the tool requires write access to LDAP.
-	 * 
+	 *
 	 * @return boolean true if write access is needed
 	 */
 	function getRequiresWriteAccess() {
 		return true;
 	}
-	
+
 	/**
 	 * Returns if the tool requires password change rights.
-	 * 
+	 *
 	 * @return boolean true if password change rights are needed
 	 */
 	function getRequiresPasswordChangeRights() {
 		return true;
 	}
-	
+
 	/**
 	 * Returns the link to the tool image (relative to graphics/)
 	 *
@@ -88,7 +89,7 @@ class toolPDFEditor implements LAMTool {
 	function getImageLink() {
 		return 'pdf.png';
 	}
-	
+
 	/**
 	 * Returns the prefered position of this tool on the tools page.
 	 * The position may be between 0 and 1000. 0 is the top position.
@@ -98,16 +99,16 @@ class toolPDFEditor implements LAMTool {
 	function getPosition() {
 		return 200;
 	}
-	
+
 	/**
 	 * Returns a list of sub tools or an empty array.
-	 * 
+	 *
 	 * @return array list of subtools (LAMTool)
 	 */
 	function getSubTools() {
 		return array();
 	}
-	
+
 	/**
 	 * Returns if the tool is visible in the menu.
 	 *
@@ -116,16 +117,16 @@ class toolPDFEditor implements LAMTool {
 	function isVisible() {
 		return (sizeof($_SESSION['config']->get_ActiveTypes()) > 0);
 	}
-	
+
 	/**
 	 * Returns if a tool may be hidden by configuration in the LAM server profile.
-	 * 
+	 *
 	 * @return boolean hideable
 	 */
 	function isHideable() {
 		return true;
 	}
-	
+
 }
 
 ?>
\ No newline at end of file
diff --git a/lam/lib/tools/profileEditor.inc b/lam/lib/tools/profileEditor.inc
index 1771c4e4..36f88eed 100644
--- a/lam/lib/tools/profileEditor.inc
+++ b/lam/lib/tools/profileEditor.inc
@@ -1,20 +1,21 @@
 <?php
+namespace LAM\TOOLS\PROFILE_EDITOR;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2009 - 2011  Roland Gruber
+  Copyright (C) 2009 - 2016  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
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
-  
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -30,56 +31,56 @@ $Id$
 
 /**
  * Profile editor
- * 
+ *
  * @package tools
- */ 
-class toolProfileEditor implements LAMTool {
-	
+ */
+class toolProfileEditor implements \LAMTool {
+
 	/**
 	 * Returns the name of the tool.
-	 * 
+	 *
 	 * @return string name
 	 */
 	 function getName() {
 	 	return _("Profile editor");
 	 }
-	
+
 	/**
 	 * returns a description text for the tool.
-	 * 
+	 *
 	 * @return string description
 	 */
 	function getDescription() {
 		return _("Here you can manage your account profiles.");
 	}
-	
+
 	/**
 	 * Returns a link to the tool page (relative to templates/).
-	 * 
+	 *
 	 * @return string link
 	 */
 	function getLink() {
 		return "profedit/profilemain.php";
 	}
-	
-	/** 
+
+	/**
 	 * Returns if the tool requires write access to LDAP.
-	 * 
+	 *
 	 * @return boolean true if write access is needed
 	 */
 	function getRequiresWriteAccess() {
 		return true;
 	}
-	
+
 	/**
 	 * Returns if the tool requires password change rights.
-	 * 
+	 *
 	 * @return boolean true if password change rights are needed
 	 */
 	function getRequiresPasswordChangeRights() {
 		return true;
 	}
-	
+
 	/**
 	 * Returns the link to the tool image (relative to graphics/)
 	 *
@@ -88,7 +89,7 @@ class toolProfileEditor implements LAMTool {
 	function getImageLink() {
 		return 'edit.png';
 	}
-	
+
 	/**
 	 * Returns the prefered position of this tool on the tools page.
 	 * The position may be between 0 and 1000. 0 is the top position.
@@ -98,16 +99,16 @@ class toolProfileEditor implements LAMTool {
 	function getPosition() {
 		return 100;
 	}
-	
+
 	/**
 	 * Returns a list of sub tools or an empty array.
-	 * 
+	 *
 	 * @return array list of subtools (LAMTool)
 	 */
 	function getSubTools() {
 		return array();
 	}
-	
+
 	/**
 	 * Returns if the tool is visible in the menu.
 	 *
@@ -116,16 +117,16 @@ class toolProfileEditor implements LAMTool {
 	function isVisible() {
 		return (sizeof($_SESSION['config']->get_ActiveTypes()) > 0);
 	}
-	
+
 	/**
 	 * Returns if a tool may be hidden by configuration in the LAM server profile.
-	 * 
+	 *
 	 * @return boolean hideable
 	 */
 	function isHideable() {
 		return true;
 	}
-	
+
 }
 
 ?>
\ No newline at end of file
diff --git a/lam/templates/ou_edit.php b/lam/templates/ou_edit.php
index 76207a73..aa9a2f72 100644
--- a/lam/templates/ou_edit.php
+++ b/lam/templates/ou_edit.php
@@ -1,4 +1,15 @@
 <?php
+namespace LAM\TOOLS\OU_EDIT;
+use \htmlTable;
+use \htmlSpacer;
+use \htmlOutputText;
+use \htmlButton;
+use \htmlHiddenInput;
+use \htmlSubTitle;
+use \htmlStatusMessage;
+use \htmlSelect;
+use \htmlHelpLink;
+use \htmlInputField;
 /*
 $Id$
 
@@ -51,8 +62,6 @@ if (!empty($_POST)) {
 	validateSecurityToken();
 }
 
-$types = $_SESSION['config']->get_ActiveTypes();
-
 // check if deletion was canceled
 if (isset($_POST['abort'])) {
 	display_main(null, null);
@@ -166,13 +175,14 @@ function display_main($message, $error) {
 		$container->addElement($msg, true);
 	}
 
+	$typeManager = new \LAM\TYPES\TypeManager();
+	$typeList = $typeManager->getConfiguredTypes();
 	$types = array();
-	$typeList = $_SESSION['config']->get_ActiveTypes();
-	for ($i = 0; $i < sizeof($typeList); $i++) {
-		if (isAccountTypeHidden($typeList[$i]) || !checkIfWriteAccessIsAllowed($typeList[$i])) {
+	foreach ($typeList as $type) {
+		if ($type->isHidden() || !checkIfWriteAccessIsAllowed($type->getId())) {
 			continue;
 		}
-		$types[$typeList[$i]] = LAM\TYPES\getTypeAlias($typeList[$i]);
+		$types[$type->getId()] = $type->getAlias();
 	}
 	natcasesort($types);
 	$options = array();