diff --git a/plugins/addons/dashboard/tabs_dashBoard.inc b/plugins/addons/dashboard/tabs_dashBoard.inc index 55d3ca84d7c58a262509f33285408a2222514c16..646a0c81705bc6101c05de466b7de3cdf6db947b 100644 --- a/plugins/addons/dashboard/tabs_dashBoard.inc +++ b/plugins/addons/dashboard/tabs_dashBoard.inc @@ -19,19 +19,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ -class tabs_dashboard extends tabs +class tabs_dashboard extends simpleTabs_noSpecial { - - function __construct($config, $data, $dn = NULL, $category = 'dashboard', $copied_object = NULL) + function __construct($type, $dn, $copied_object = NULL) { - foreach ($data as $key => $infos) { - if (($infos['CLASS'] == 'dashboardNetwork') && - !(class_available('dhcpService') || class_available('serviceDNS'))) { - unset($data[$key]); - } + parent::__construct($type, $dn, $copied_object); + if (!class_available('dhcpService') && !class_available('serviceDNS')) { + unset($this->by_object['dashboardNetwork']); + unset($this->by_name['dashboardNetwork']); } - $data = array_values($data); - parent::__construct($config, $data, $dn, $category); } function save() diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc index 669799ae11f42b774181d3d02b6aa4d54c097cea..f6736cf62ba84980558d170ed839a115fe7438b4 100644 --- a/plugins/config/class_configInLdap.inc +++ b/plugins/config/class_configInLdap.inc @@ -456,6 +456,11 @@ class configInLdap extends simplePlugin ); } + function compute_dn() + { + return $this->dn; + } + static function get_themes() { $themesdir = '../ihtml/themes/'; diff --git a/plugins/config/tabs_configInLdap.inc b/plugins/config/tabs_configInLdap.inc index 36445f12038e6021c0ce116dfec6b050648419cd..aeb29df384634ab38cdbc5ede93e38a8db9e0b9c 100644 --- a/plugins/config/tabs_configInLdap.inc +++ b/plugins/config/tabs_configInLdap.inc @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ -class tabs_configInLdap extends tabs +class tabs_configInLdap extends simpleTabs_noSpecial { function save () {