X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_pathNavigator.inc;h=6140e0e0146290e591bf152726ecba82c2dccc21;hb=dfd337167feecfc96bf7ecceda0bc548b2f30cd1;hp=601b8908294b97cfd890a12ee1b035f9d9c02ffd;hpb=6df0c95ddfd05868555ed9cf88ecc1304e388f7c;p=gosa.git diff --git a/gosa-core/include/class_pathNavigator.inc b/gosa-core/include/class_pathNavigator.inc index 601b89082..6140e0e01 100644 --- a/gosa-core/include/class_pathNavigator.inc +++ b/gosa-core/include/class_pathNavigator.inc @@ -3,10 +3,9 @@ class pathNavigator { - static function registerPlugin($class) + static function registerPlugin($class, $title= "") { - - $str = $title = ""; + $str = ""; // Display headline of management plugins if($class instanceOf management && isset($class->plHeadline)){ @@ -15,9 +14,7 @@ class pathNavigator // Shown title of sub dialogs (They have no plHeadline set.) if($class instanceOf plugin && !isset($class->plHeadline)){ - if(empty($class->pathTitle)){ - $str = "Missing: ".get_class($class); - }else{ + if(!empty($class->pathTitle)){ $str = _($class->pathTitle); } } @@ -30,15 +27,22 @@ class pathNavigator if(!session::is_set("pathNavigator::registerPlugin:{$class->dn}")){ global $config; $ldap = $config->get_ldap_link(); - $ldap->cat($class->dn, array('cn')); - if($ldap->count()){ - $attrs = $ldap->fetch(); - $str = $attrs['cn'][0]; + + if(!empty($class->dn)){ + $namingAttr = preg_replace("/^([^=]*)=.*$/","\\1",$class->dn); + + $ldap->cat($class->dn, array($namingAttr)); + if($ldap->count()){ + $attrs = $ldap->fetch(); + $str = $attrs[$namingAttr][0]; + } + session::set("pathNavigator::registerPlugin:{$class->dn}", $str); } - session::set("pathNavigator::registerPlugin:{$class->dn}", $str); } $str = session::get("pathNavigator::registerPlugin:{$class->dn}"); - $title = $class->dn; + if(empty($title)){ + $title = $class->dn; + } } } @@ -49,26 +53,47 @@ class pathNavigator if(!empty($str)){ $cur = session::get('pathNavigator::position'); - - if(!empty($title)) $title = " title='{$title}' "; - - $cur.= "\n