openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 9505cedf79a8a6b0b8300bf0ba0cafe4eb1176ab
parent b7ce695bef2518b1d1cb243746eb7508ffff1fc4
Author: dankert <devnull@localhost>
Date:   Sat, 25 Dec 2010 23:09:45 +0100

Nur 1 MenĂ¼liste pro Action.

Diffstat:
actionClasses/Action.class.php | 23++++++++++++++++++-----
actionClasses/ElementAction.ini.php | 5+++--
actionClasses/FileAction.ini.php | 5+++--
actionClasses/GroupAction.ini.php | 5+++--
actionClasses/IndexAction.ini.php | 9+++++++--
actionClasses/LinkAction.ini.php | 5+++--
actionClasses/ModelAction.ini.php | 5++---
actionClasses/PageAction.ini.php | 1+
actionClasses/ProfileAction.ini.php | 4++--
actionClasses/ProjectAction.ini.php | 3+--
actionClasses/SearchAction.ini.php | 2+-
actionClasses/TemplateAction.ini.php | 7++-----
actionClasses/UserAction.ini.php | 7+------
13 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/actionClasses/Action.class.php b/actionClasses/Action.class.php @@ -67,6 +67,20 @@ class Action */ var $currentUser; + + + function setCharset( $charset ) + { + Session::set('charset',$charset); + } + + + + function setStyle( $style ) + { + Session::set('style',$style); + } + /** * Wird durch das Controller-Skript (do.php) nach der Kontruierung des Objektes aufgerufen. @@ -516,8 +530,7 @@ class Action $user = Session::getUser(); return is_object($user) && $user->isAdmin; } - - + /** * Ermitteln des Benutzerobjektes aus der Session @@ -624,8 +637,9 @@ class Action return; $windowMenu = array(); $name = $this->actionConfig[$this->subActionName]['menu']; - $menuList = explode(',',$this->actionConfig['menu'][$name]); - + $menuList = explode(',',$this->actionConfig['menu']['menu']); + //$menuList = explode(',',$this->actionConfig['menu'][$name]); + if ( isset($this->actionConfig[$this->subActionName]['menuaction'])) $actionName = $this->actionConfig[$this->subActionName]['menuaction']; else @@ -641,7 +655,6 @@ class Action $menuKey = 'accesskey_window_'.$menuName; -// Logger::trace("testing menu $menuName"); $menuEntry = array('subaction'=>$menuName, 'text' =>$menuText, 'title' =>$menuText.'_DESC', diff --git a/actionClasses/ElementAction.ini.php b/actionClasses/ElementAction.ini.php @@ -31,4 +31,5 @@ target=delete goto=name [menu] -edit=name,type,properties,remove- \ No newline at end of file +;edit=name,type,properties,remove +menu=name,type,properties,remove+ \ No newline at end of file diff --git a/actionClasses/FileAction.ini.php b/actionClasses/FileAction.ini.php @@ -85,4 +85,5 @@ actions=show,edit,editvalue,compress,uncompress,extract,pub,prop,size,rights,acl edit=show,edit,editvalue,compress,uncompress,extract,pub,prop,size,rights,aclform prop=show,edit,editvalue,compress,uncompress,extract,pub,prop,size,rights,aclform rights=show,edit,editvalue,compress,uncompress,extract,pub,prop,size,rights,aclform -pub=show,edit,editvalue,compress,uncompress,extract,pub,prop,size,rights,aclform- \ No newline at end of file +pub=show,edit,editvalue,compress,uncompress,extract,pub,prop,size,rights,aclform +menu=show,edit,editvalue,compress,uncompress,extract,pub,prop,size,rights+ \ No newline at end of file diff --git a/actionClasses/GroupAction.ini.php b/actionClasses/GroupAction.ini.php @@ -39,4 +39,5 @@ listing=listing,add users=users,adduser edit=edit,remove memberships=users -rights=rights- \ No newline at end of file +rights=rights +menu=listing,add,users,adduser,edit,remove,users,rights+ \ No newline at end of file diff --git a/actionClasses/IndexAction.ini.php b/actionClasses/IndexAction.ini.php @@ -8,6 +8,8 @@ goto=show [logout] guest=true goto=login +write=get +clear=tree [switchuser] goto=show @@ -76,6 +78,9 @@ goto=show menu=login write=true guest=true +;goto=projectmenu + +[projectmenu] [openid] guest=true @@ -96,5 +101,5 @@ goto=projectmenu guest=true [menu] -login=login,register,password,applications,projectmenu,administration,logout -menu =login,register,password,applications,projectmenu,administration,logout +login=login,register,password +menu =login,register,password diff --git a/actionClasses/LinkAction.ini.php b/actionClasses/LinkAction.ini.php @@ -39,4 +39,5 @@ goto=rights [menu] edit=edit prop=prop -rights=rights,aclform- \ No newline at end of file +rights=rights,aclform +menu=edit,prop,rights+ \ No newline at end of file diff --git a/actionClasses/ModelAction.ini.php b/actionClasses/ModelAction.ini.php @@ -30,5 +30,4 @@ menu=listing target=addmodel [menu] -listing=listing,add -edit=edit,remove- \ No newline at end of file +menu=listing,add,edit,remove+ \ No newline at end of file diff --git a/actionClasses/PageAction.ini.php b/actionClasses/PageAction.ini.php @@ -72,6 +72,7 @@ goto=rights [menu] +menu=show,pub,el,prop,src,rights pub=show,pub,el,form,rights,prop,changetemplate,src elements=show,pub,el,form,rights,prop,changetemplate,src rights=show,pub,el,form,rights,prop,changetemplate,src diff --git a/actionClasses/ProfileAction.ini.php b/actionClasses/ProfileAction.ini.php @@ -39,4 +39,4 @@ menu=edit write=true [menu] -edit=edit,settings,pwchange,mail,groups- \ No newline at end of file +menu=edit,settings,pwchange,mail,groups+ \ No newline at end of file diff --git a/actionClasses/ProjectAction.ini.php b/actionClasses/ProjectAction.ini.php @@ -36,5 +36,4 @@ write=true menu=edit [menu] -list=listing,add -edit=edit,remove,info,export,maintenance +menu=listing,add,edit,remove,info,export,maintenance diff --git a/actionClasses/SearchAction.ini.php b/actionClasses/SearchAction.ini.php @@ -24,4 +24,4 @@ goto=result goto=result [menu] -search=prop,content +menu=prop,content diff --git a/actionClasses/TemplateAction.ini.php b/actionClasses/TemplateAction.ini.php @@ -67,7 +67,4 @@ goto=listing menu=prop [menu] -listing=listing,add -prop=name,extension,pages,remove -el=el,addel -edit=src,srcelement- \ No newline at end of file +menu=listing,name,extension,pages,remove,el,src+ \ No newline at end of file diff --git a/actionClasses/UserAction.ini.php b/actionClasses/UserAction.ini.php @@ -37,9 +37,5 @@ write=true menu=rights [menu] -listing=listing,add -edit=edit,remove -memberships=groups -pw=pw +menu=listing,add,edit,remove,groups,pw,rights ;info=show,mail -rights=rights- \ No newline at end of file