index 80c9a33d981e530f0c4343e887fb11e4f91c4673..ee593b34ba9b2a60c558783e523a4539d22cbe5d 100644 (file)
if (!isset($plug['CLASS'])){
msg_dialog::display(
_("Configuration error"),
if (!isset($plug['CLASS'])){
msg_dialog::display(
_("Configuration error"),
- _("The configuration format has changed. Please re-run setup!"),
+ _("The configuration format has changed: please run the setup again!"),
FATAL_ERROR_DIALOG);
exit();
}
FATAL_ERROR_DIALOG);
exit();
}
*/
if(preg_match("/:self$/",$acl_to_check)){
$acl_to_check = preg_replace("/:self$/","",$acl_to_check);
*/
if(preg_match("/:self$/",$acl_to_check)){
$acl_to_check = preg_replace("/:self$/","",$acl_to_check);
- if($this->ui->get_permissions($this->ui->dn,$acl_to_check,"") != ""){
- $this->silly_cache[$aclname]= TRUE;
- return(TRUE);
+ if(strpos($acl_to_check,"/")){
+ if($this->ui->get_permissions($this->ui->dn,$acl_to_check,"") != ""){
+ $this->silly_cache[$aclname]= TRUE;
+ return(TRUE);
+ }
+ }else{
+ if($this->ui->get_category_permissions($this->ui->dn,$acl_to_check,"") != ""){
+ $this->silly_cache[$aclname]= TRUE;
+ return(TRUE);
+ }
}
}
- $this->silly_cache[$aclname]= FALSE;
- return(FALSE);
}else{
// No self acls. Check if we have any acls for the given ACL type
}else{
// No self acls. Check if we have any acls for the given ACL type
$this->menu .=
"\n <script language='javascript' type='text/javascript'>".
"\n function openPlugin(id){".
$this->menu .=
"\n <script language='javascript' type='text/javascript'>".
"\n function openPlugin(id){".
- "\n return question(\""._("You are currently editing a database entry. Do you want to dismiss the changes?")."\",".
+ "\n return question(\""._("You are currently editing a database entry. Do you want to discard the changes?")."\",".
"\n \"main.php?plug=\" + id + \"&reset=1\");".
"\n }".
"\n </script>\n";
"\n \"main.php?plug=\" + id + \"&reset=1\");".
"\n }".
"\n </script>\n";
$this->pathMenu =
"\n <div class='plugin-path'>".
"\n <ul class='path-navigation'>".
$this->pathMenu =
"\n <div class='plugin-path'>".
"\n <ul class='path-navigation'>".
- "\n <li class='left right-border' onClick=\"openPlugin('');\">".
- "\n <div class='nav-home'></div>".
+ "\n <li class='left' onClick=\"openPlugin('');\" title='"._("Back to main menu")."'>".
+ "\n ".image(get_template_path("images/home.png")).
"\n </li>".
"\n </li>".
- "\n <li class='left'>Welcome to GOsa</li>";
+ "\n %navigator%";
// Check if we've at least one entry defined ih the pathmenu
if(isset($this->config->data['PATHMENU'])){
// Check if we've at least one entry defined ih the pathmenu
if(isset($this->config->data['PATHMENU'])){
}
$this->pathMenu.= "\n </ul>";
$this->pathMenu.= "\n </div>";
}
$this->pathMenu.= "\n </ul>";
$this->pathMenu.= "\n </div>";
- }
- return($this->pathMenu);
+ }
+
+ $menu = pathNavigator::getCurrentPath();
+ return(preg_replace("/%navigator%/", $menu, $this->pathMenu));
}
}