summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers
diff options
context:
space:
mode:
authorSimon2011-04-20 19:07:23 +0200
committerSimon2011-04-20 19:07:23 +0200
commit39d216f1091b2a0b3eb95a52580d04d342a8d912 (patch)
tree9f7805e191fc72e04e58cabe6f9edf7e608d1c5e /application/modules/user/controllers
parentmerges (diff)
downloadpbs2-39d216f1091b2a0b3eb95a52580d04d342a8d912.tar.gz
pbs2-39d216f1091b2a0b3eb95a52580d04d342a8d912.tar.xz
pbs2-39d216f1091b2a0b3eb95a52580d04d342a8d912.zip
Error und Warning Unterdrückung entfernt
Diffstat (limited to 'application/modules/user/controllers')
-rw-r--r--application/modules/user/controllers/BootisoController.php5
-rw-r--r--application/modules/user/controllers/BootmenuController.php5
-rw-r--r--application/modules/user/controllers/PersonController.php4
3 files changed, 9 insertions, 5 deletions
diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php
index 18472a9..e83a2c5 100644
--- a/application/modules/user/controllers/BootisoController.php
+++ b/application/modules/user/controllers/BootisoController.php
@@ -97,7 +97,10 @@ class user_BootisoController extends Zend_Controller_Action
$bootiso->setPrebootID("[".$bootiso->getPrebootID()."] ".$prebootMapper->find($bootiso->getPrebootID())->getTitle());
$bootiso->setGroupID("[".$bootiso->getGroupID()."] ".$groupMapper->find($bootiso->getGroupID())->getTitle());
$bootiso->setCreated(date(Zend_Registry::get('dateformat'),$bootiso->getCreated()));
- @$bootiso->setExpires(date(Zend_Registry::get('dateformat'),$bootiso->getExpires()));
+ if($bootiso->getExpires() == ""){
+ $bootiso->setExpires(0);
+ }
+ $bootiso->setExpires(date(Zend_Registry::get('dateformat'),$bootiso->getExpires()));
}
// Search
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index f901568..f82171f 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -79,6 +79,7 @@ class user_BootmenuController extends Zend_Controller_Action
$bootosMapper = new Application_Model_BootOsMapper();
$configMapper = new Application_Model_ConfigMapper();
+ $bootmenuentries = array();
if($this->type =='group' && Pbs_Acl::checkRight('booai')){
$this->view->type = 'group';
$bootmenu = $this->bootmenuMapper->findBy(array('groupID' => $this->membership->getGroupID()));
@@ -143,7 +144,7 @@ class user_BootmenuController extends Zend_Controller_Action
$this->view->page = $pagination->getRequestPage();
$this->view->bootmenulist = $bootmenu;
- @$this->view->bootmenuentrylist = $bootmenuentries;
+ $this->view->bootmenuentrylist = $bootmenuentries;
}
@@ -283,7 +284,7 @@ class user_BootmenuController extends Zend_Controller_Action
if($bootmenu->getDefaultbootmenu() == false){
- @list($defaultbootmenu) = $this->bootmenuMapper->findBy(array('defaultbootmenu' => '1'));
+ list($defaultbootmenu) = $this->bootmenuMapper->findBy(array('defaultbootmenu' => '1'));
if($defaultbootmenu != null){
$defaultbootmenu->setDefaultbootmenu(false);
$this->bootmenuMapper->save($defaultbootmenu);
diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
index 07a69ee..cc8a1e2 100644
--- a/application/modules/user/controllers/PersonController.php
+++ b/application/modules/user/controllers/PersonController.php
@@ -49,7 +49,7 @@ class user_PersonController extends Zend_Controller_Action
if(isset($this->memberships)) {
foreach($this->memberships as $membership) {
$group = $this->groupMapper->find($membership['groupID']);
- @list($rightroles) = $rightrolesMapper->findBy(array('rightID' => '55', 'roleID' => $membership['roleID']));
+ list($rightroles) = $rightrolesMapper->findBy(array('rightID' => '55', 'roleID' => $membership['roleID']));
$role = $roleMapper->find($membership['roleID']);
if($rightroles != null)
$this->view->apikeys[$group->getID()] = $membership['apikey'];
@@ -228,7 +228,7 @@ class user_PersonController extends Zend_Controller_Action
if($membership['groupID'] == $group->getID()) {
$groupsFound[$count] = true;
} else {
- if(@$groupsFound[$count] != true) {
+ if(isset($groupsFound[$count]) && $groupsFound[$count] != true) {
$groupsFound[$count] = false;
}
}