chnaged return array of getProfileOptions. Use Module names as array-index.
Removed error-message when creating a new account.
This commit is contained in:
parent
bc94fb6563
commit
1b7c0d261f
|
@ -84,7 +84,7 @@ function getAvailableModules($scope) {
|
||||||
return $return;
|
return $return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getProfileOptions($scope, $post) {
|
function getProfileOptions($scope, $post=false) {
|
||||||
// type = user, group, host, ...
|
// type = user, group, host, ...
|
||||||
if (!isset($_SESSION['profile_account'])) {
|
if (!isset($_SESSION['profile_account'])) {
|
||||||
// create new object
|
// create new object
|
||||||
|
@ -623,7 +623,9 @@ class accountContainer {
|
||||||
$function = 'display_html_' . $item;
|
$function = 'display_html_' . $item;
|
||||||
$page = $this->module[$singlemodule]->$function($post,true);
|
$page = $this->module[$singlemodule]->$function($post,true);
|
||||||
//eval($function);
|
//eval($function);
|
||||||
$return = array_merge($return, $page);
|
foreach ( $page as $item )
|
||||||
|
$return[$singlemodule][] = $item;
|
||||||
|
//$return = array_merge($return, $page);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $return;
|
return $return;
|
||||||
|
@ -654,6 +656,7 @@ class accountContainer {
|
||||||
foreach ($modules as $module) $this->module[$module] = new $module($this->base);
|
foreach ($modules as $module) $this->module[$module] = new $module($this->base);
|
||||||
|
|
||||||
$module = array_keys ($this->module);
|
$module = array_keys ($this->module);
|
||||||
|
$modulelist = array();
|
||||||
// loop until all modules are in order.
|
// loop until all modules are in order.
|
||||||
// We don't want to loop forever
|
// We don't want to loop forever
|
||||||
$remain = count($module) * count($module);
|
$remain = count($module) * count($module);
|
||||||
|
|
Loading…
Reference in New Issue