diff --git a/lam/lib/account.inc b/lam/lib/account.inc index e410c394..02e70a66 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -529,6 +529,9 @@ class accountContainer { echo ">\n"; echo "" . _('Help') . "\n"; break; + case 'message': + StatusMessage($input[$i][$j]['type'], $input[$i][$j]['headline'], $input[$i][$j]['text']); + break; default: echo "Unrecognized type: " . $input[$i][$j]['kind'] . "\n"; break; @@ -797,8 +800,6 @@ class accountContainer { else { // Add module if it exists if (class_exists($objectClass)) { - print $objectClass; - print "
X"; $this->module[$objectClass] = new $objectClass($this->base); } else trigger_error (_("objectClass $objectClass required but no module found."), E_USER_WARNING); @@ -882,10 +883,7 @@ class accountContainer { $this->order = $order; // *** fixme load*Profile must return array in the same way ldap_get_attributes does. $function = '$newattributes = load'.ucfirst($this->type).'Profile(\'default\');'; - eval($function); - // pass newattributes to each module - //foreach ($module as $module2) - // $this->module[$module2]->load_attributes($newattributes); + //eval($function); return 0; } diff --git a/lam/lib/modules/main.inc b/lam/lib/modules/main.inc index f311a6fe..2c0e0b30 100644 --- a/lam/lib/modules/main.inc +++ b/lam/lib/modules/main.inc @@ -194,7 +194,7 @@ class main { // Show reason why module is disabled for ($i=0; $i array ( 'kind' => 'message', 'type' => 'ERROR', 'headline' => _('Check module'), - 'text' => sprintf(_('Please set up all required attributes on %s page'), $_SESSION[$this->base]->module[$modules[$i]]->alias) )); + 'text' => sprintf(_('Please set up all required attributes on %s page.'), $_SESSION[$this->base]->module[$modules[$i]]->get_alias()) )); } else $disabled = true; diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc index c3e9997e..74f66131 100644 --- a/lam/lib/modules/posixAccount.inc +++ b/lam/lib/modules/posixAccount.inc @@ -72,7 +72,6 @@ class posixAccount { $this->orig = $_SESSION[$this->base]->get_module_attributes('posixAccount'); $this->attributes = $_SESSION[$this->base]->get_module_attributes('posixAccount'); - $this->alias = _('posixAccount'); $groups = $_SESSION[$_SESSION[$this->base]->cache]->findgroups(); // list of all groupnames if (count($groups)==0) trigger_error(_('No groups found in ldap.'), E_USER_WARNING);