diff options
6 files changed, 22 insertions, 16 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 88ec38e..b538b07 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -37,7 +37,7 @@ class ResourceController extends Zend_Controller_Action $rightroles = new Application_Model_RightRoles(); - @list($this->membership) = $membershipMapper->findBy(array('apikey' => $apikey)); + list($this->membership) = $membershipMapper->findBy(array('apikey' => $apikey)); if($this->membership == null){ header('HTTP/1.0 401 Member not found'); die(); @@ -87,7 +87,7 @@ class ResourceController extends Zend_Controller_Action public function addbootosAction() { - @list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '55', 'roleID' => $this->membership->getRoleID())); + list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '55', 'roleID' => $this->membership->getRoleID())); if($rightroles == null){ header('HTTP/1.0 403 No Right to Create Bootos'); die(); @@ -115,7 +115,7 @@ class ResourceController extends Zend_Controller_Action $bootosMapper = new Application_Model_BootOsMapper(); $groupID = $this->membership->getGroupID(); - @list($bootos) = $bootosMapper->findBy(array('groupid' => $groupID, 'title' => $params['title'], 'distro' => $params['distro'], 'distroversion' => $params['distroversion'], 'source' => $source, 'share' => $params['share'])); + list($bootos) = $bootosMapper->findBy(array('groupid' => $groupID, 'title' => $params['title'], 'distro' => $params['distro'], 'distroversion' => $params['distroversion'], 'source' => $source, 'share' => $params['share'])); if($bootos != null){ header('HTTP/1.0 400 Bootos already exists'); die(); @@ -157,7 +157,7 @@ class ResourceController extends Zend_Controller_Action public function editbootosAction() { - @list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '58', 'roleID' => $this->membership->getRoleID())); + list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '58', 'roleID' => $this->membership->getRoleID())); if($rightroles == null){ header('HTTP/1.0 403 No Right to Edit Bootos'); die(); @@ -181,7 +181,7 @@ class ResourceController extends Zend_Controller_Action $bootosMapper = new Application_Model_BootOsMapper(); $groupID = $this->membership->getGroupID(); - @list($bootos) = $bootosMapper->findBy(array('groupid' => $groupID, 'title' => $params['title'], 'distro' => $params['distro'], 'distroversion' => $params['distroversion'], 'source' => $source, 'share' => $params['share'])); + list($bootos) = $bootosMapper->findBy(array('groupid' => $groupID, 'title' => $params['title'], 'distro' => $params['distro'], 'distroversion' => $params['distroversion'], 'source' => $source, 'share' => $params['share'])); if($bootos == null){ header('HTTP/1.0 400 Bootos not found'); @@ -226,7 +226,7 @@ class ResourceController extends Zend_Controller_Action public function addprebootAction() { - @list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '40', 'roleID' => $this->membership->getRoleID())); + list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '40', 'roleID' => $this->membership->getRoleID())); if($rightroles == null){ header('HTTP/1.0 403 No Right to Create Preboots'); die(); @@ -255,7 +255,7 @@ class ResourceController extends Zend_Controller_Action $prebootMapper = new Application_Model_PreBootMapper(); $groupID = $this->membership->getGroupID(); - @list($preboot) = $prebootMapper->findBy(array('groupid' => $groupID, 'title' => $params['title'])); + list($preboot) = $prebootMapper->findBy(array('groupid' => $groupID, 'title' => $params['title'])); if($preboot != null){ header('HTTP/1.0 400 Preboot already exists'); die(); @@ -286,7 +286,7 @@ class ResourceController extends Zend_Controller_Action public function editprebootAction() { - @list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '41', 'roleID' => $this->membership->getRoleID())); + list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '41', 'roleID' => $this->membership->getRoleID())); if($rightroles == null){ header('HTTP/1.0 403 No Right to Edit Preboot'); die(); @@ -315,7 +315,7 @@ class ResourceController extends Zend_Controller_Action $groupID = $this->membership->getGroupID(); $preboot = new Application_Model_PreBoot(); - @list($preboot) = $prebootMapper->findBy(array('groupid' => $groupID, 'title' => $params['title'])); + list($preboot) = $prebootMapper->findBy(array('groupid' => $groupID, 'title' => $params['title'])); if($preboot == null){ header('HTTP/1.0 400 Preboot not found'); 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; } } 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/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml index d6fb6cb..9e31dd3 100644 --- a/application/modules/user/views/scripts/role/show.phtml +++ b/application/modules/user/views/scripts/role/show.phtml @@ -58,7 +58,9 @@ if(count($this->rightsList)==0) { <?php if(isset($this->rightcategorieslist)) { foreach($this->rightcategorieslist as $k => $v): - @$rights = $this->rightsList[$k]; + if(isset($this->rightsList[$k])){ + $rights = $this->rightsList[$k]; + } if(count($rights) > 0) { ?> <h3><?php echo $v; ?>:</h3> |