Changeset 15967 for trunk/inc

Timestamp:

02/09/12 00:41:43 (4 months ago)

Author:

Anton Lesnikov

Message:

1. Minor fixes and improvements.
2. Visible For Levels feature unification.

Location:

trunk/inc/classes

Files:

• BxDolAcl.php (modified) (1 diff)
• BxDolAclQuery.php (modified) (3 diffs)

trunk/inc/classes/BxDolAcl.php

@@ -316 +316 @@
      * @return array( membershipID_1 => membershipName_1,  membershipID_2 => membershipName_2, ...) if no such memberships, then just array()
      */
-    function getMemberships($bPurchasableOnly = false) {
+    function getMemberships($bPurchasableOnly = false, $bActiveOnly = false) {
+        $sType = 'all_pair';
+        if($bPurchasableOnly)
+            $sType = 'all_active_purchasble_pair';
+        else if($bActiveOnly)
+            $sType = 'all_active_pair';
+
         $aLevels = array();
-        $this->oDb->getLevels(array('type' => ($bPurchasableOnly ? 'all_active_purchasble_pair' : 'all_pair')), $aLevels, false);
+        $this->oDb->getLevels(array('type' => $sType), $aLevels, false);
         return $aLevels;
     }

trunk/inc/classes/BxDolAclQuery.php

@@ -57 +57 @@
                 $sWhereClause .= "AND `tal`.`Active`='yes' AND `tal`.`Purchasable`='yes'";
                 break;
+            case 'all_active_pair':
+                $aMethod['name'] = "getPairs";
+                $aMethod['params'][1] = 'id';
+                $aMethod['params'][2] = 'name';
+                $sWhereClause .= "AND `tal`.`Active`='yes'";
+                break;    
             case 'all_pair':
                 $aMethod['name'] = "getPairs";
@@ -69 +75 @@
         }
 
-        $aMethod['params'][0] = "SELECT 
+        $aMethod['params'][0] = "SELECT SQL_CALC_FOUND_ROWS
                 `tal`.`ID` AS `id`,
                 `tal`.`Name` AS `name`,
@@ -88 +94 @@
             return count($aItems) > 0;
 
-        $sQuery = "SELECT 
-                COUNT(`tal`.`ID`)
-            FROM `sys_acl_levels` AS `tal`" . $sJoinClause . "
-            WHERE 1 " . $sWhereClause . " 
-            LIMIT 1";
-        return $this->getOne($sQuery);
+        return (int)$this->getOne("SELECT FOUND_ROWS()");
     }