From 57016564efa1fd2c04d8638a66660ddd60b6dac2 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 12 Dec 2008 13:05:19 +0000 Subject: [PATCH] Readded my changes - Testing now git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13283 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/html/main.php | 23 +++++------------ gosa-core/include/functions.inc | 10 ++++++++ .../plugins/admin/acl/class_aclManagement.inc | 13 +++++----- gosa-core/plugins/admin/acl/main.inc | 14 +++++++---- .../class_departmentManagement.inc | 6 ++--- gosa-core/plugins/admin/departments/main.inc | 13 +++++++--- .../admin/groups/class_groupManagement.inc | 12 ++++----- gosa-core/plugins/admin/groups/main.inc | 13 +++++++--- .../admin/ogroups/class_ogroupManagement.inc | 10 ++++---- gosa-core/plugins/admin/ogroups/main.inc | 10 +++++--- .../admin/users/class_userManagement.inc | 13 +++++----- gosa-core/plugins/admin/users/main.inc | 13 +++++++--- gosa-core/plugins/personal/generic/main.inc | 25 ++++++++++++++----- gosa-core/plugins/personal/password/main.inc | 5 ++++ gosa-core/plugins/personal/posix/main.inc | 16 ++++++++++-- gosa-core/setup/class_setupStep_Config2.inc | 21 ++-------------- gosa-core/setup/setup_config2.tpl | 2 +- 17 files changed, 128 insertions(+), 91 deletions(-) diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php index 6c2a5e7e4..a42fbe18e 100644 --- a/gosa-core/html/main.php +++ b/gosa-core/html/main.php @@ -196,13 +196,17 @@ if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])){ } /* Check if we need to delete a lock */ -if ($old_plugin_dir != $plugin_dir && $old_plugin_dir != ""){ +if ($old_plugin_dir != $plugin_dir && $old_plugin_dir != "" || isset($_POST['delete_lock'])){ if (is_file("$old_plugin_dir/main.inc")){ $remove_lock= true; + $cleanup= true; + $display = ""; require_once ("$old_plugin_dir/main.inc"); + $display = ""; } } $remove_lock= false; +$cleanup= false; /* Check for sizelimits */ eval_sizelimit(); @@ -240,19 +244,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){ header ("Location: logout.php"); exit; } - - if (isset($_POST['cancel_lock'])){ - session::un_set('dn'); - } } /* Load department list when plugin has changed. That is some kind of compromise between speed and beeing up to date */ if (isset($_GET['reset'])){ - if (session::is_set('objectinfo')){ - session::un_set('objectinfo'); - } + set_object_info(); } /* show web frontend */ @@ -298,13 +296,6 @@ $header= "".$smarty->fetch(get_template_path('headers.tpl')); /* React on clicks */ if ($_SERVER["REQUEST_METHOD"] == "POST"){ - - /* 'delete_lock' is set by the lock removal dialog. We should remove the - lock at this point globally. Plugins do not need to remove it. */ - if (isset($_POST['delete_lock']) && session::is_set('dn')){ - del_lock (session::get('dn')); - - } if (isset($_POST['delete_lock']) || isset($_POST['open_readonly'])){ /* Set old Post data */ @@ -314,9 +305,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){ $_POST[$name] = $value; } } - session::un_set ('dn'); } - } /* check if we are using account expiration */ diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc index 2f137ba65..b604e7c1b 100644 --- a/gosa-core/include/functions.inc +++ b/gosa-core/include/functions.inc @@ -2808,6 +2808,16 @@ function cred_decrypt($input,$password) { return mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $password, pack("H*", $input), MCRYPT_MODE_ECB, $iv); } +function get_object_info() +{ + return(session::get('objectinfo')); +} + +function set_object_info($str = "") +{ + session::set('objectinfo',$str); +} + // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?> diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc index 430382fbf..1044660a3 100644 --- a/gosa-core/plugins/admin/acl/class_aclManagement.inc +++ b/gosa-core/plugins/admin/acl/class_aclManagement.inc @@ -204,7 +204,7 @@ class aclManagement extends plugin } /* Set ACL and move DN to the headline */ - session::set('objectinfo',$this->dn); + set_object_info($this->dn); }else{ msg_dialog::display(_("Permission error"), msgPool::permModify(), ERROR_DIALOG); } @@ -216,14 +216,14 @@ class aclManagement extends plugin ********************/ if(isset($_POST['delete_lock'])){ $this->remove_lock(); - session::un_set('objectinfo'); + set_object_info(); } /* Reset all relevant data, if we get a _cancel request */ if (isset($_POST['edit_cancel'])){ $this->remove_lock(); $this->acltabs= NULL; - session::un_set('objectinfo'); + set_object_info(); } @@ -397,7 +397,7 @@ class aclManagement extends plugin unset ($this->acltabs); $this->acltabs= NULL; - session::un_set('objectinfo'); + set_object_info(); } } else { /* Ok. There seem to be errors regarding to the tab data, @@ -641,10 +641,11 @@ class aclManagement extends plugin /* Remove acl lock if a DN is marked as "currently edited" */ if (isset($this->acltabs->dn)){ del_lock ($this->acltabs->dn); - }else{ + }elseif(!empty($this->dn)){ del_lock ($this->dn); + }elseif(count($this->dns)){ + del_lock ($this->dns); } - del_lock ($this->dns); } diff --git a/gosa-core/plugins/admin/acl/main.inc b/gosa-core/plugins/admin/acl/main.inc index 7e4bce0e4..edfd23da3 100644 --- a/gosa-core/plugins/admin/acl/main.inc +++ b/gosa-core/plugins/admin/acl/main.inc @@ -20,12 +20,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* Remove classes and variables from session + */ +if ( $cleanup ){ + session::un_set('macl'); +} + + if ($remove_lock){ if(session::is_set('macl')){ $macl = session::get('macl'); $macl->remove_lock(); - del_lock ($ui->dn); - session::un_set ('macl'); } } else { $display= "No headpage yet for this module"; @@ -41,15 +46,14 @@ if (!session::is_set('macl') || (isset($_GET['reset']) && $_GET['reset'] == 1)){ $output= $macl->execute(); /* Page header*/ - if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('plugins/acl/images/plugin.png'), _("ACL management"), "\"\" ".LDAP::fix(session::get('objectinfo'))); + if (get_object_info() != ""){ + $display= print_header(get_template_path('plugins/acl/images/plugin.png'), _("ACL management"), "\"\" ".LDAP::fix(get_object_info())); } else { $display= print_header(get_template_path('plugins/acl/images/plugin.png'), _("ACL management")); } /* Reset requested? */ if (isset($_GET['reset']) && $_GET['reset'] == 1){ - del_lock ($ui->dn); session::un_set ('macl'); } diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc index 96d0ec353..bb0a20de8 100644 --- a/gosa-core/plugins/admin/departments/class_departmentManagement.inc +++ b/gosa-core/plugins/admin/departments/class_departmentManagement.inc @@ -176,7 +176,7 @@ class departmentManagement extends plugin $this->deptabs= new deptabs($this->config,$this->config->data['TABS'][$data['TAB']], $this->dn,"department"); $this->deptabs->set_acl_base($this->dn); - session::set('objectinfo',$this->dn); + set_object_info($this->dn); } } @@ -359,7 +359,7 @@ class departmentManagement extends plugin } unset ($this->deptabs); $this->deptabs= NULL; - session::un_set('objectinfo'); + set_object_info(); } @@ -373,7 +373,7 @@ class departmentManagement extends plugin if (isset($_POST['edit_cancel']) || isset($_POST['delete_cancel']) || isset($_POST['delete_department_confirm'])){ $this->remove_lock(); $this->deptabs= NULL; - session::un_set('objectinfo'); + set_object_info(); } /* Headpage or normal plugin screen? */ diff --git a/gosa-core/plugins/admin/departments/main.inc b/gosa-core/plugins/admin/departments/main.inc index 290c67df1..35f451354 100644 --- a/gosa-core/plugins/admin/departments/main.inc +++ b/gosa-core/plugins/admin/departments/main.inc @@ -20,11 +20,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* Remove classes and variables from session + */ +if ( $cleanup ){ + session::un_set('department'); +} + + if ($remove_lock){ if(session::is_set('department')){ $department = session::get('department'); $department->remove_lock(); - session::un_set ('department'); } } else { /* Create usermanagement object on demand */ @@ -38,15 +44,14 @@ if ($remove_lock){ $output= $department->execute(); /* Page header*/ - if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('plugins/departments/images/plugin.png'), _("Department management"), "\"\" ".LDAP::fix(session::get('objectinfo'))); + if (get_object_info() != ""){ + $display= print_header(get_template_path('plugins/departments/images/plugin.png'), _("Department management"), "\"\" ".LDAP::fix(get_object_info())); } else { $display= print_header(get_template_path('plugins/departments/images/plugin.png'), _("Department management")); } /* Reset requested? */ if (isset($_GET['reset']) && $_GET['reset'] == 1){ - del_lock ($ui->dn); session::un_set ('department'); } diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc index da14a33fe..81c8bb8f9 100644 --- a/gosa-core/plugins/admin/groups/class_groupManagement.inc +++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc @@ -268,7 +268,7 @@ class groupManagement extends plugin //$this->reload (); unset ($this->grouptab); $this->grouptab= NULL; - session::un_set('objectinfo'); + set_object_info(); }else{ /* Reinitialize tab */ @@ -303,7 +303,7 @@ class groupManagement extends plugin $tmp->lock_entries($this->ui->dn); if($tmp->multiple_available()){ $this->grouptab = $tmp; - session::set('objectinfo',$this->grouptab->get_object_info()); + set_object_info($this->grouptab->get_object_info()); } } @@ -328,7 +328,7 @@ class groupManagement extends plugin /* Register grouptab to trigger edit dialog */ $this->grouptab= new grouptabs($this->config,$this->config->data['TABS']['GROUPTABS'], $this->dn); $this->grouptab->set_acl_base($this->dn); - session::set('objectinfo',$this->dn); + set_object_info($this->dn); } @@ -495,7 +495,7 @@ class groupManagement extends plugin /* Remove lock file after successfull deletion */ $this->remove_lock(); - session::un_set('objectinfo'); + set_object_info(); } @@ -506,7 +506,7 @@ class groupManagement extends plugin /* Delete group canceled? */ if (isset($_POST['delete_cancel'])){ $this->remove_lock(); - session::un_set('objectinfo'); + set_object_info(); } @@ -520,7 +520,7 @@ class groupManagement extends plugin $this->remove_lock(); } $this->grouptab= NULL; - session::un_set('objectinfo'); + set_object_info(); } diff --git a/gosa-core/plugins/admin/groups/main.inc b/gosa-core/plugins/admin/groups/main.inc index 6f6630ea1..4f9aaf72f 100644 --- a/gosa-core/plugins/admin/groups/main.inc +++ b/gosa-core/plugins/admin/groups/main.inc @@ -20,11 +20,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* Remove classes and variables from session + */ +if ( $cleanup ){ + session::un_set('groupManagement'); +} + + if ($remove_lock){ if(session::is_set('groupManagement')){ $groupManagement = session::get('groupManagement'); $groupManagement->remove_lock(); - session::un_set ('groupManagement'); } } else { /* Create groupManagement object on demand */ @@ -36,11 +42,11 @@ if ($remove_lock){ $output= $groupManagement->execute(); /* Page header*/ - if (session::is_set('objectinfo')){ + if (get_object_info() != ""){ $display= print_header(get_template_path('plugins/groups/images/plugin.png'), _("Group administration"), "\"\" ". - LDAP::fix(session::get('objectinfo'))); + LDAP::fix(get_object_info())); } else { $display= print_header(get_template_path('plugins/groups/images/plugin.png'), _("Group administration")); } @@ -49,7 +55,6 @@ if ($remove_lock){ /* Reset requested? */ if (isset($_GET['reset']) && $_GET['reset'] == 1){ - del_lock ($ui->dn); session::un_set ('groupManagement'); } diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc index 634d863c9..048c12c45 100644 --- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc +++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc @@ -368,7 +368,7 @@ class ogroupManagement extends plugin /* Remove lock file after successfull deletion */ $this->remove_lock(); - session::un_set('objectinfo'); + set_object_info(); } @@ -379,7 +379,7 @@ class ogroupManagement extends plugin /* Delete group canceled? */ if (isset($_POST['delete_cancel'])){ $this->remove_lock(); - session::un_set('objectinfo'); + set_object_info(); } @@ -405,7 +405,7 @@ class ogroupManagement extends plugin /* Register grouptab to trigger edit dialog */ $this->ogroup= new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], $this->dn, "ogroups"); $this->ogroup->set_acl_base($this->dn); - session::set('objectinfo',$this->dn); + set_object_info($this->dn); } @@ -434,7 +434,7 @@ class ogroupManagement extends plugin unset ($this->ogroup); $this->ogroup= NULL; - session::un_set('objectinfo'); + set_object_info(); }else{ /* Reinitialize tab */ @@ -458,7 +458,7 @@ class ogroupManagement extends plugin if ((isset($_POST['edit_cancel'])) && (isset($this->ogroup->dn))){ $this->remove_lock(); $this->ogroup= NULL; - session::un_set('objectinfo'); + set_object_info(); } diff --git a/gosa-core/plugins/admin/ogroups/main.inc b/gosa-core/plugins/admin/ogroups/main.inc index 918c970aa..856adacff 100644 --- a/gosa-core/plugins/admin/ogroups/main.inc +++ b/gosa-core/plugins/admin/ogroups/main.inc @@ -20,13 +20,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* Remove classes and variables from session + */ +if ( $cleanup ){ + session::un_set('ogroup'); +} if ($remove_lock){ if(session::is_set('ogroup')){ $ogroup = session::get('ogroup'); $ogroup->remove_lock(); - session::un_set ('ogroup'); } } else { @@ -41,12 +45,12 @@ if ($remove_lock){ $output= $ogroup->execute (); /* Page header*/ - if (session::is_set('objectinfo')){ + if (get_object_info() != ""){ $display= print_header(get_template_path('plugins/ogroups/images/plugin.png'), _("Object groups"), "\"\" ".LDAP::fix(session::get('objectinfo'))); + "\"> ".LDAP::fix(get_object_info())); } else { $display= print_header(get_template_path('plugins/ogroups/images/plugin.png'), _("Object groups")); } diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc index 9bf6ea459..6b12c6dac 100644 --- a/gosa-core/plugins/admin/users/class_userManagement.inc +++ b/gosa-core/plugins/admin/users/class_userManagement.inc @@ -323,7 +323,7 @@ class userManagement extends plugin $this->sn= ""; $this->givenName= ""; $this->uid= ""; - session::un_set('objectinfo'); + set_object_info(); } @@ -372,7 +372,7 @@ class userManagement extends plugin /* User is allowed to change passwords, save 'dn' and 'acl' for next dialog. */ - session::set('objectinfo',$this->dn); + set_object_info($this->dn); return ($smarty->fetch(get_template_path('password.tpl', TRUE))); } else { /* User is not allowed. Show message and cancel. */ @@ -395,6 +395,7 @@ class userManagement extends plugin /* Check locking, save current plugin in 'back_plugin', so the dialog knows where to return. */ + if (($user= get_lock($this->dn)) != ""){ return(gen_locked_message ($user, $this->dn,TRUE)); } @@ -412,7 +413,7 @@ class userManagement extends plugin /* Set ACL and move DN to the headline */ $this->usertab->set_acl_base($this->dn); - session::set('objectinfo',$this->dn); + set_object_info($this->dn); } @@ -436,7 +437,7 @@ class userManagement extends plugin if($tmp->multiple_available()){ $this->usertab = $tmp; $this->usertab->set_active_tab($s_tab); - session::set('objectinfo',$this->usertab->get_object_info()); + set_object_info($this->usertab->get_object_info()); } } @@ -455,7 +456,7 @@ class userManagement extends plugin $this->sn= ""; $this->givenName= ""; $this->uid= ""; - session::un_set('objectinfo'); + set_object_info(); } @@ -735,7 +736,7 @@ class userManagement extends plugin unset ($this->usertab); $this->usertab= NULL; - session::un_set('objectinfo'); + set_object_info(); }else{ /* Reinitialize tab */ diff --git a/gosa-core/plugins/admin/users/main.inc b/gosa-core/plugins/admin/users/main.inc index 5e75fe18d..05d3eddf9 100644 --- a/gosa-core/plugins/admin/users/main.inc +++ b/gosa-core/plugins/admin/users/main.inc @@ -20,11 +20,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* Remove classes and variables from session + */ +if ( $cleanup ){ + session::un_set('userManagement'); +} + + if ($remove_lock){ if(session::is_set('userManagement')){ $userManagement = session::get('userManagement'); $userManagement->remove_lock(); - session::un_set ('userManagement'); } } else { /* Create usermanagement object on demand */ @@ -39,12 +45,12 @@ if ($remove_lock){ $output= $userManagement->execute(); /* Page header*/ - if (session::is_set('objectinfo')){ + if (get_object_info() != ""){ $display= print_header(get_template_path($userManagement->plIcon), _("User administration"), "\"\" ".LDAP::fix(session::get('objectinfo'))); + "\"> ".LDAP::fix(get_object_info())); } else { $display= print_header(get_template_path($userManagement->plIcon), _("User administration")); @@ -55,7 +61,6 @@ if ($remove_lock){ /* Reset requested? */ if (isset($_GET['reset']) && $_GET['reset'] == 1){ - del_lock ($ui->dn); session::un_set ('userManagement'); } diff --git a/gosa-core/plugins/personal/generic/main.inc b/gosa-core/plugins/personal/generic/main.inc index 63c770065..2f1376e61 100644 --- a/gosa-core/plugins/personal/generic/main.inc +++ b/gosa-core/plugins/personal/generic/main.inc @@ -23,7 +23,20 @@ /* Preset display */ $display = ""; $lock_msg = ""; -if (!$remove_lock){ + +/* Remove classes and variables from session + */ +if ( $cleanup ){ + session::un_set('user'); + session::un_set('edit'); +} + +if ( $remove_lock){ + if(session::is_set('user') && session::is_set('edit')){ + del_lock ($ui->dn); + } +}else{ + /* Reset requested? */ if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){ @@ -60,7 +73,7 @@ if (!$remove_lock){ session::set('back_plugin',$plug); session::set('LOCK_VARS_TO_USE',array("/^edit$/","/^plug$/")); $lock_msg = gen_locked_message ($username, $ui->dn); - + }else{ /* Lock the current entry */ @@ -133,7 +146,7 @@ if (!$remove_lock){ $display.= $smarty->fetch(get_template_path('password.tpl', TRUE)); return ($display); } else { - session::un_set ('user'); + session::un_set ('user'); } } else { @@ -167,7 +180,7 @@ if (!$remove_lock){ $display.= "\n"; $info= "\"\" ".$ui->dn." "; + "\"> ".$ui->dn." "; } else { /* 'viewid' may be set by i.e. the phonelist plugin. This means that we want to go back... */ @@ -178,7 +191,7 @@ if (!$remove_lock){ $str= msgPool::editButton(); $fn = "edit"; $info= "\"\" ".$ui->dn." "; + "\"> ".$ui->dn." "; } /* Only display edit button if there is at least one attribute editable */ @@ -197,7 +210,7 @@ if (!$remove_lock){ /* Page header*/ $display= print_header(get_template_path('plugins/generic/images/plugin.png'), - _("Generic user information"), $info).$display; + _("Generic user information"), $info).$display; } diff --git a/gosa-core/plugins/personal/password/main.inc b/gosa-core/plugins/personal/password/main.inc index 568aafa40..9b5c981ca 100644 --- a/gosa-core/plugins/personal/password/main.inc +++ b/gosa-core/plugins/personal/password/main.inc @@ -23,6 +23,11 @@ /* Clear display */ $display= ""; +if ( $cleanup ){ + session::un_set('password'); + session::un_set('edit'); +} + if (!$remove_lock){ /* Reset requested? */ diff --git a/gosa-core/plugins/personal/posix/main.inc b/gosa-core/plugins/personal/posix/main.inc index ffbd769fb..710d33a6c 100644 --- a/gosa-core/plugins/personal/posix/main.inc +++ b/gosa-core/plugins/personal/posix/main.inc @@ -23,7 +23,20 @@ /* Clear display */ $display = ""; $lock_msg = ""; -if (!$remove_lock){ + +/* Remove classes and variables from session + */ +if ( $cleanup ){ + session::un_set('posixAccount'); + session::un_set('edit'); +} + +if ( $remove_lock){ + if(session::is_set('posixAccount') && session::is_set('edit')){ + del_lock ($ui->dn); + } + +}else{ /* Reset requested? */ if (isset($_POST['edit_cancel']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){ @@ -65,7 +78,6 @@ if (!$remove_lock){ /* Lock the current entry */ add_lock ($ui->dn, $ui->dn); - session::set('dn',$ui->dn); session::set('edit',TRUE); } } diff --git a/gosa-core/setup/class_setupStep_Config2.inc b/gosa-core/setup/class_setupStep_Config2.inc index 9f8397119..7a9a1cb8e 100644 --- a/gosa-core/setup/class_setupStep_Config2.inc +++ b/gosa-core/setup/class_setupStep_Config2.inc @@ -272,11 +272,6 @@ class Step_Config2 extends setup_step $this->samba_settings['samba_sid_active'] = TRUE; $this->samba_settings['samba_rid_active'] = TRUE; } - - /* Reload mail naming attribute */ - if($old_mail != $this->mail && isset($this->mail_methods[$this->mail]['uattrib'])){ - $this->mail_attrib = $this->mail_methods[$this->mail]['uattrib']; - } } $tmp = $this->check(); @@ -315,24 +310,12 @@ class Step_Config2 extends setup_step if(!class_available("mailMethod")){ return(array()); } - - $default_uattrib = ""; - $m_class_vars = get_class_vars("mailMethod"); - if(isset($m_class_vars['uattrib'])){ - $default_uattrib = $m_class_vars['uattrib']; - } - + $methods = array(); foreach($class_mapping as $name => $file){ - if(preg_match("/^mailMethod[a-z]*$/i",$name)){ + if(preg_match("/^mailMethod.*$/i",$name)){ $name = preg_replace("/^mailMethod/","",$name); if(!empty($name)){ $methods[$name]['name'] = $name; - $m_class_vars = get_class_vars("mailMethod".$methods[$name]['name']); - if(isset($m_class_vars['uattrib'])){ - $methods[$name]['uattrib'] = $m_class_vars['uattrib']; - }else{ - $methods[$name]['uattrib'] = $default_uattrib; - } } } } diff --git a/gosa-core/setup/setup_config2.tpl b/gosa-core/setup/setup_config2.tpl index 3ed7daec9..b6d806b31 100644 --- a/gosa-core/setup/setup_config2.tpl +++ b/gosa-core/setup/setup_config2.tpl @@ -200,7 +200,7 @@ -- 2.30.2