diff options
| author | michael pereira | 2011-04-21 14:03:59 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-21 14:03:59 +0200 |
| commit | daf6e795d126ec49e25e8b40931470e3c63666a9 (patch) | |
| tree | 3368e0e2c463bfa9d77478dce2dc142ae7428836 /application/modules/user/forms | |
| parent | updates raus (diff) | |
| parent | Userpasswort verschlüsselung (diff) | |
| download | pbs2-daf6e795d126ec49e25e8b40931470e3c63666a9.tar.gz pbs2-daf6e795d126ec49e25e8b40931470e3c63666a9.tar.xz pbs2-daf6e795d126ec49e25e8b40931470e3c63666a9.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/forms')
| -rw-r--r-- | application/modules/user/forms/BootmenuEntries.php | 2 | ||||
| -rw-r--r-- | application/modules/user/forms/Filter.php | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/application/modules/user/forms/BootmenuEntries.php b/application/modules/user/forms/BootmenuEntries.php index ded5cc5..1177d1c 100644 --- a/application/modules/user/forms/BootmenuEntries.php +++ b/application/modules/user/forms/BootmenuEntries.php @@ -54,7 +54,7 @@ class user_Form_BootmenuEntries extends Zend_Form { if(!isset($_POST['bootosID'])){ - @list($key) = array_keys($this->bootoslist); + list($key) = array_keys($this->bootoslist); $firstbootos = $this->bootoslist[$key]; $_POST['bootosID'] = $firstbootos->getID(); diff --git a/application/modules/user/forms/Filter.php b/application/modules/user/forms/Filter.php index 81d9e15..5eabd60 100644 --- a/application/modules/user/forms/Filter.php +++ b/application/modules/user/forms/Filter.php @@ -18,13 +18,18 @@ class user_Form_Filter extends Zend_Form public function init() { $this->setName("Add Filter"); - $this->setMethod('post'); + $this->setMethod('post'); - if(Pbs_Acl::checkRight('fefp') || Pbs_Acl::checkRight('fa')){ - $edit = 'true'; + if(stristr($_SERVER['REQUEST_URI'],'addfilter')){ + $edit = null; } else{ - $edit = null; + if(!Pbs_Acl::checkRight('fe') && Pbs_Acl::checkRight('fefp') ){ + $edit = 'true'; + } + else{ + $edit = null; + } } $this->addElement('text', 'title', array( |