From ef1eec558ad4409161858f5dc01f84c32b36c3fd Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Thu, 30 Mar 2017 18:56:23 +0200
Subject: [PATCH] new type API

---
 lam/lib/modules.inc                    | 14 ++++++++------
 lam/templates/profedit/profilepage.php |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index ae7a394b..42eb959f 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -1,11 +1,11 @@
 <?php
 use LAM\TYPES\ConfiguredType;
-
+use \LAM\TYPES\TypeManager;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2016  Roland Gruber
+  Copyright (C) 2003 - 2017  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
@@ -306,14 +306,16 @@ function getAvailableModules($scope, $mustSupportAdminInterface = false) {
 /**
 * Returns the elements for the profile page.
 *
-* @param string $scope account type (user, group, host)
+* @param string $typeId account type (user, group, host)
 * @return array profile elements
 */
-function getProfileOptions($scope) {
-	$mods = $_SESSION['config']->get_AccountModules($scope);
+function getProfileOptions($typeId) {
+	$typeManager = new TypeManager();
+	$type = $typeManager->getConfiguredType($typeId);
+	$mods = $type->getModules();
 	$return = array();
 	for ($i = 0; $i < sizeof($mods); $i++) {
-		$module = moduleCache::getModule($mods[$i], $scope);
+		$module = moduleCache::getModule($mods[$i], $type->getScope());
 		$return[$mods[$i]] = $module->get_profileOptions();
 	}
 	return $return;
diff --git a/lam/templates/profedit/profilepage.php b/lam/templates/profedit/profilepage.php
index 57757a22..7f142513 100644
--- a/lam/templates/profedit/profilepage.php
+++ b/lam/templates/profedit/profilepage.php
@@ -239,7 +239,7 @@ $modules = array_keys($options);
 for ($m = 0; $m < sizeof($modules); $m++) {
 	// ignore modules without options
 	if (sizeof($options[$modules[$m]]) < 1) continue;
-	$module = new $modules[$m]($type->getId());
+	$module = new $modules[$m]($type->getScope());
 	$icon = $module->getIcon();
 	if (($icon != null) && !(strpos($icon, 'http') === 0) && !(strpos($icon, '/') === 0)) {
 		$icon = '../../graphics/' . $icon;