Ticket #1907

inc/classes/BxDolMenuQuery.php

@@ -71,6 +71,42 @@ class BxDolMenuQuery extends BxDolDb
         $sQuery = $this->prepare("SELECT * FROM `sys_menu_items` WHERE `set_name` = ? ORDER BY `order` ASC", $sSetName);
         return $this->getAllWithKey($sQuery, 'name');
     }
+
+    public function getMenuItemsBy($aParams = array())
+    {
+        $aMethod = array('name' => 'getAll', 'params' => array(0 => 'query'));
+        $aBindings = array();
+
+    	$sSelectClause = '*';
+    	$sWhereClause = $sGroupClause = '';
+    	$sLimitClause = isset($aParams['start']) && !empty($aParams['per_page']) ? "LIMIT " . $aParams['start'] . ", " . $aParams['per_page'] : "";
+
+    	if(!empty($aParams['type']))
+            switch($aParams['type']) {
+                case 'set_name':
+                    $aBindings['set_name'] = $aParams['set_name'];
+
+                    $sWhereClause = 'AND `set_name` = :set_name';
+                    break;
+                    
+                case 'set_name_duplicates':
+                    $aMethod['name'] = 'getColumn';
+                    $aBindings['set_name'] = $aParams['set_name'];
+
+                    $sSelectClause = '`name`';
+                    $sWhereClause = 'AND `set_name` = :set_name';
+                    $sGroupClause = '`name` HAVING COUNT(`id`) > 1';
+                    break;
+            }
+
+        if(!empty($sGroupClause))
+            $sGroupClause = " GROUP BY " . $sGroupClause;
+
+        $aMethod['params'][0] = "SELECT " . $sSelectClause . " FROM `sys_menu_items` WHERE 1 " . $sWhereClause . " " . $sGroupClause . " " . $sLimitClause;
+        $aMethod['params'][] = $aBindings;
+
+        return call_user_func_array(array($this, $aMethod['name']), $aMethod['params']);
+    }
 }
 
 /** @} */

template/scripts/BxBaseMenuAccountNotifications.php

@@ -18,10 +18,35 @@ class BxBaseMenuAccountNotifications extends BxTemplMenu
         parent::__construct ($aObject, $oTemplate);
 
         $this->addMarkers(array(
-        	'studio_url' => BX_DOL_URL_STUDIO
+            'studio_url' => BX_DOL_URL_STUDIO
         ));        
     }
 
+    protected function getMenuItemsRaw ()
+    {
+        $aItems = $this->_oQuery->getMenuItemsBy(array(
+            'type' => 'set_name', 
+            'set_name' => $this->_aObject['set_name']
+        ));
+
+        $aDuplicates = $this->_oQuery->getMenuItemsBy(array(
+            'type' => 'set_name_duplicates', 
+            'set_name' => $this->_aObject['set_name']
+        ));
+
+        $sModule = BxDolProfile::getInstance()->getModule();
+
+        $aResult = array();
+        foreach($aItems as $aItem) {
+            if(in_array($aItem['name'], $aDuplicates) && $aItem['module'] != $sModule)
+                continue;
+            
+            $aResult[$aItem['name']] = $aItem;
+        }
+
+        return $aResult;
+    }
+
     /**
      * Check if menu items is visible with extended checking for friends notifications
      * @param $a menu item array
@@ -32,33 +57,24 @@ class BxBaseMenuAccountNotifications extends BxTemplMenu
         // default visible settings
         if (!BxDolAcl::getInstance()->isMemberLevelInSet($a['visible_for_levels']))
             return false;
-        
+
         switch ($a['name']) {
             case 'studio':
                 if (!isAdmin())
                     return false;
                 break;
-        	case 'cart':
-        		$oPayments = BxDolPayments::getInstance();
-        		if(!$oPayments->isActive())
-        			return false;
-        		break;
 
-        	case 'orders':
-        		$oPayments = BxDolPayments::getInstance();
-        		if(!$oPayments->isActive())
-        			return false;
-        		break;
+            case 'cart':
+                $oPayments = BxDolPayments::getInstance();
+                if(!$oPayments->isActive())
+                    return false;
+                break;
 
-			// show only friends for currently active profile for friend request notification
-        	case 'notifications-friend-requests':
-        	case 'profile-stats-friend-requests':
-        	case 'profile-stats-subscriptions':
-            case 'profile-stats-subscribed-me':
-	            $aInfo = BxDolProfile::getInstance()->getInfo();
-	            if($a['module'] != $aInfo['type'])
-	                return false;
-				break;
+            case 'orders':
+                $oPayments = BxDolPayments::getInstance();
+                if(!$oPayments->isActive())
+                    return false;
+                break;
         }
 
         return true;