From 95fdb7b1a5e0e567490b57c5efea9ac6608f38e7 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Mon, 23 Feb 2004 15:59:56 +0000
Subject: [PATCH] added $scope to get_alias

---
 lam/lib/modules.inc                   | 8 ++++----
 lam/lib/modules/account.inc           | 2 +-
 lam/lib/modules/inetOrgPerson.inc     | 2 +-
 lam/lib/modules/main.inc              | 4 ++--
 lam/lib/modules/posixGroup.inc        | 2 +-
 lam/lib/modules/quota.inc             | 2 +-
 lam/lib/modules/sambaAccount.inc      | 2 +-
 lam/lib/modules/sambaGroupMapping.inc | 2 +-
 lam/lib/modules/sambaSamAccount.inc   | 2 +-
 lam/lib/modules/shadowAccount.inc     | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index cfa3ea46..0061b8a9 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -138,7 +138,7 @@ function getAvailableModules($scope) {
 			$entry = substr($entry, 0, strpos($entry, '.'));
 			$eval = '$module = '.$entry."::get_dependencies(".$scope.");";
 			eval ($eval);
-			if ($module != -1) $return[] = getModuleAlias($entry, $scope);
+			if ($module != -1) $return[] = $entry;
 			}
 	return $return;
 	}
@@ -259,13 +259,13 @@ class accountContainer {
 			if ($this->order[$i]==$this->order[$this->module['main']->current_page] || !$this->module[$this->order[$i]]->module_ready() ) {
 				// print disabled button
 				echo "<input name=\"form_main_".$this->order[$i]."\" type=\"submit\" value=\"";
-				echo $this->module[$this->order[$i]]->get_alias();
+				echo $this->module[$this->order[$i]]->get_alias($type);
 				echo "\" disabled>\n<br>";
 				}
 			else {
 				// print normal button
 				echo "<input name=\"form_main_".$this->order[$i]."\" type=\"submit\" value=\"";
-				echo $this->module[$this->order[$i]]->get_alias();
+				echo $this->module[$this->order[$i]]->get_alias($type);
 				echo "\">\n<br>";
 				}
 			}
@@ -273,7 +273,7 @@ class accountContainer {
 		echo "</fieldset></td></tr>\n";
 		echo "</table></td>\n<td>";
 		echo "<td><fieldset class=\"".$this->type."edit-dark\"><legend class=\"".$this->type."edit-bright\"><b>";
-			echo $this->module[$this->order[$this->module['main']->current_page]]->get_alias();
+			echo $this->module[$this->order[$this->module['main']->current_page]]->get_alias($type);
 			echo "</b></legend>\n";
 		// display html-code from mdule
 		$function = '$result = $this->module[$this->order[$this->module[\'main\']->current_page]]->display_html_'.$this->module['main']->subpage.'($post);';
diff --git a/lam/lib/modules/account.inc b/lam/lib/modules/account.inc
index fa52b9c8..50ca8fc0 100644
--- a/lam/lib/modules/account.inc
+++ b/lam/lib/modules/account.inc
@@ -63,7 +63,7 @@ class account {
 	*/
 	var $orig;
 
-	function get_alias() {
+	function get_alias($scope) {
 		return _('account');
 	}
 
diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc
index fac3b4f4..5f585394 100644
--- a/lam/lib/modules/inetOrgPerson.inc
+++ b/lam/lib/modules/inetOrgPerson.inc
@@ -66,7 +66,7 @@ class inetOrgPerson {
 	*/
 	var $orig;
 
-	function get_alias() {
+	function get_alias($scope) {
 		return _('inetOrgPerson');
 	}
 
diff --git a/lam/lib/modules/main.inc b/lam/lib/modules/main.inc
index b3adce40..8ab20ab2 100644
--- a/lam/lib/modules/main.inc
+++ b/lam/lib/modules/main.inc
@@ -63,7 +63,7 @@ class main {
 	// name of accountContainer so we can read other classes in accuontArray
 	var $base;
 
-	function get_alias() {
+	function get_alias($scope) {
 		return _('main');
 		}
 
@@ -207,7 +207,7 @@ class main {
 				if (!$_SESSION[$this->base]->module[$module]->module_complete()) {
 					$disabled = true;
 					$table[] = array ( 0 => array ( 'kind' => 'message', 'type' => 'ERROR', 'headline' =>  _('Check module'),
-						'text' => sprintf(_('Please set up all required attributes on %s page.'), $_SESSION[$this->base]->module[$module]->get_alias()) ));
+						'text' => sprintf(_('Please set up all required attributes on %s page.'), $_SESSION[$this->base]->module[$module]->get_alias($this->base->type)) ));
 					}		
 				}
 			}
diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc
index bff7928f..8ee8c87f 100644
--- a/lam/lib/modules/posixGroup.inc
+++ b/lam/lib/modules/posixGroup.inc
@@ -119,7 +119,7 @@ class posixGroup {
 			}
 		}
 
-	function get_alias() {
+	function get_alias($scope) {
 		return _('posixGroup');
 		}
 
diff --git a/lam/lib/modules/quota.inc b/lam/lib/modules/quota.inc
index ba5e9be3..6f08df7b 100644
--- a/lam/lib/modules/quota.inc
+++ b/lam/lib/modules/quota.inc
@@ -67,7 +67,7 @@ class quota {
 
 	var $quota;
 
-	function get_alias() {
+	function get_alias($scope) {
 		return _('quota');
 		}
 
diff --git a/lam/lib/modules/sambaAccount.inc b/lam/lib/modules/sambaAccount.inc
index 675d7833..9d81f243 100644
--- a/lam/lib/modules/sambaAccount.inc
+++ b/lam/lib/modules/sambaAccount.inc
@@ -122,7 +122,7 @@ class sambaAccount {
 			}
 		}
 
-	function get_alias() {
+	function get_alias($scope) {
 		return _('sambaAccount');
 		}
 
diff --git a/lam/lib/modules/sambaGroupMapping.inc b/lam/lib/modules/sambaGroupMapping.inc
index 67c8f70f..005b8868 100644
--- a/lam/lib/modules/sambaGroupMapping.inc
+++ b/lam/lib/modules/sambaGroupMapping.inc
@@ -93,7 +93,7 @@ class sambaGroupMapping {
 	// Array of well known rids
 	var $rids;
 
-	function get_alias() {
+	function get_alias($scope) {
 		return _('sambaGroupMapping');
 		}
 
diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc
index 314bc233..6cb17b91 100644
--- a/lam/lib/modules/sambaSamAccount.inc
+++ b/lam/lib/modules/sambaSamAccount.inc
@@ -122,7 +122,7 @@ class sambaSamAccount {
 			}
 		}
 
-	function get_alias() {
+	function get_alias($scope) {
 		return _('sambaSamAccount');
 		}
 
diff --git a/lam/lib/modules/shadowAccount.inc b/lam/lib/modules/shadowAccount.inc
index 0b791294..87355024 100644
--- a/lam/lib/modules/shadowAccount.inc
+++ b/lam/lib/modules/shadowAccount.inc
@@ -87,7 +87,7 @@ class shadowAccount {
 	*/
 	var $orig;
 
-	function get_alias() {
+	function get_alias($scope) {
 		return _('shadowAccount');
 		}