added $scope to get_alias
This commit is contained in:
parent
a91d5e85c3
commit
95fdb7b1a5
|
@ -138,7 +138,7 @@ function getAvailableModules($scope) {
|
||||||
$entry = substr($entry, 0, strpos($entry, '.'));
|
$entry = substr($entry, 0, strpos($entry, '.'));
|
||||||
$eval = '$module = '.$entry."::get_dependencies(".$scope.");";
|
$eval = '$module = '.$entry."::get_dependencies(".$scope.");";
|
||||||
eval ($eval);
|
eval ($eval);
|
||||||
if ($module != -1) $return[] = getModuleAlias($entry, $scope);
|
if ($module != -1) $return[] = $entry;
|
||||||
}
|
}
|
||||||
return $return;
|
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() ) {
|
if ($this->order[$i]==$this->order[$this->module['main']->current_page] || !$this->module[$this->order[$i]]->module_ready() ) {
|
||||||
// print disabled button
|
// print disabled button
|
||||||
echo "<input name=\"form_main_".$this->order[$i]."\" type=\"submit\" value=\"";
|
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>";
|
echo "\" disabled>\n<br>";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// print normal button
|
// print normal button
|
||||||
echo "<input name=\"form_main_".$this->order[$i]."\" type=\"submit\" value=\"";
|
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>";
|
echo "\">\n<br>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -273,7 +273,7 @@ class accountContainer {
|
||||||
echo "</fieldset></td></tr>\n";
|
echo "</fieldset></td></tr>\n";
|
||||||
echo "</table></td>\n<td>";
|
echo "</table></td>\n<td>";
|
||||||
echo "<td><fieldset class=\"".$this->type."edit-dark\"><legend class=\"".$this->type."edit-bright\"><b>";
|
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";
|
echo "</b></legend>\n";
|
||||||
// display html-code from mdule
|
// display html-code from mdule
|
||||||
$function = '$result = $this->module[$this->order[$this->module[\'main\']->current_page]]->display_html_'.$this->module['main']->subpage.'($post);';
|
$function = '$result = $this->module[$this->order[$this->module[\'main\']->current_page]]->display_html_'.$this->module['main']->subpage.'($post);';
|
||||||
|
|
|
@ -63,7 +63,7 @@ class account {
|
||||||
*/
|
*/
|
||||||
var $orig;
|
var $orig;
|
||||||
|
|
||||||
function get_alias() {
|
function get_alias($scope) {
|
||||||
return _('account');
|
return _('account');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -66,7 +66,7 @@ class inetOrgPerson {
|
||||||
*/
|
*/
|
||||||
var $orig;
|
var $orig;
|
||||||
|
|
||||||
function get_alias() {
|
function get_alias($scope) {
|
||||||
return _('inetOrgPerson');
|
return _('inetOrgPerson');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,7 @@ class main {
|
||||||
// name of accountContainer so we can read other classes in accuontArray
|
// name of accountContainer so we can read other classes in accuontArray
|
||||||
var $base;
|
var $base;
|
||||||
|
|
||||||
function get_alias() {
|
function get_alias($scope) {
|
||||||
return _('main');
|
return _('main');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -207,7 +207,7 @@ class main {
|
||||||
if (!$_SESSION[$this->base]->module[$module]->module_complete()) {
|
if (!$_SESSION[$this->base]->module[$module]->module_complete()) {
|
||||||
$disabled = true;
|
$disabled = true;
|
||||||
$table[] = array ( 0 => array ( 'kind' => 'message', 'type' => 'ERROR', 'headline' => _('Check module'),
|
$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)) ));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -119,7 +119,7 @@ class posixGroup {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_alias() {
|
function get_alias($scope) {
|
||||||
return _('posixGroup');
|
return _('posixGroup');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ class quota {
|
||||||
|
|
||||||
var $quota;
|
var $quota;
|
||||||
|
|
||||||
function get_alias() {
|
function get_alias($scope) {
|
||||||
return _('quota');
|
return _('quota');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,7 @@ class sambaAccount {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_alias() {
|
function get_alias($scope) {
|
||||||
return _('sambaAccount');
|
return _('sambaAccount');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ class sambaGroupMapping {
|
||||||
// Array of well known rids
|
// Array of well known rids
|
||||||
var $rids;
|
var $rids;
|
||||||
|
|
||||||
function get_alias() {
|
function get_alias($scope) {
|
||||||
return _('sambaGroupMapping');
|
return _('sambaGroupMapping');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,7 @@ class sambaSamAccount {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_alias() {
|
function get_alias($scope) {
|
||||||
return _('sambaSamAccount');
|
return _('sambaSamAccount');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -87,7 +87,7 @@ class shadowAccount {
|
||||||
*/
|
*/
|
||||||
var $orig;
|
var $orig;
|
||||||
|
|
||||||
function get_alias() {
|
function get_alias($scope) {
|
||||||
return _('shadowAccount');
|
return _('shadowAccount');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue