From 842d345c3222363e12d2d97849c950b4e4862a44 Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Tue, 26 Apr 2011 18:14:39 +0200
Subject: config fix

---
 .../modules/user/controllers/ConfigController.php    | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'application/modules/user/controllers/ConfigController.php')

diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index bf79151..10aad3a 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -111,12 +111,14 @@ class user_ConfigController extends Zend_Controller_Action
 							$this->view->bootoslist[] = $b;
 							if(Pbs_Acl::checkRight('cc')){
 								$ownerconfs = $this->configMapper->findBy(array('groupID' => $b->getGroupID(), 'membershipID' => null, 'bootosID' => $b->getID()));
-								$groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID()));
-								$this->view->configlist[$b->getID()] = array_unique(array_merge($ownerconfs,$groupconfs));
+								if($groupID != $b->getID())
+									$groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID()));
+								$this->view->configlist[$b->getID()] = array_merge($ownerconfs,$groupconfs);
 							}else{
 								$ownerconfs = $this->configMapper->findBy(array('groupID' => $b->getGroupID(), 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1'));
-								$groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1'));
-								$this->view->configlist[$b->getID()] = array_unique(array_merge($ownerconfs,$groupconfs));
+								if($groupID != $b->getID())
+									$groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1'));
+								$this->view->configlist[$b->getID()] = array_merge($ownerconfs,$groupconfs);
 								
 							}
 							foreach ($this->view->configlist[$b->getID()] as $config){
@@ -127,12 +129,14 @@ class user_ConfigController extends Zend_Controller_Action
 							$this->view->bootoslist[] = $b;
 							if(Pbs_Acl::checkRight('cc')){
 								$ownerconfs = $this->configMapper->findBy(array('groupID' => $b->getGroupID(), 'membershipID' => null, 'bootosID' => $b->getID()));
-								$groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID()));
-								$this->view->configlist[$b->getID()] = array_unique(array_merge($ownerconfs,$groupconfs));
+								if($groupID != $b->getID())
+									$groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID()));
+								$this->view->configlist[$b->getID()] = array_merge($ownerconfs,$groupconfs);
 							}else{ 
 								$ownerconfs = $this->configMapper->findBy(array('groupID' => $b->getGroupID(), 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1'));
-								$groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1'));
-								$this->view->configlist[$b->getID()] = array_unique(array_merge($ownerconfs,$groupconfs));
+								if($groupID != $b->getID())
+									$groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1'));
+								$this->view->configlist[$b->getID()] = array_merge($ownerconfs,$groupconfs);
 							}
 							foreach ($this->view->configlist[$b->getID()] as $config){
 								$config->setCreated(date(Zend_Registry::get('dateformat'),$config->getCreated()));
-- 
cgit v1.2.3-55-g7522