Changeset 9969 for trunk/inc/membership_levels.inc.php

Timestamp:

04/06/09 03:52:46 (3 years ago)

Author:

Andrey Prikaznov

Message:

 

File:

• trunk/inc/membership_levels.inc.php (modified) (17 diffs)

trunk/inc/membership_levels.inc.php

@@ -162 +162 @@
     $arrMemLevel =& $GLOBALS['MySQL']->fromMemory($sCacheName, 'getRow', "
         SELECT  ProfileMemLevels.IDLevel as ID,
-                MemLevels.Name as Name,
+                `sys_acl_levels`.Name as Name,
                 UNIX_TIMESTAMP(ProfileMemLevels.DateStarts) as DateStarts,
                 UNIX_TIMESTAMP(ProfileMemLevels.DateExpires) as DateExpires
@@ -173 +173 @@
                     AND (ProfileMemLevels.DateExpires IS NULL
                         OR ProfileMemLevels.DateExpires > FROM_UNIXTIME($time))
-                LEFT JOIN MemLevels
-                ON ProfileMemLevels.IDLevel = MemLevels.ID
+                LEFT JOIN `sys_acl_levels`
+                ON ProfileMemLevels.IDLevel = `sys_acl_levels`.ID
 
         WHERE   Profiles.ID = $memberID
@@ -187 +187 @@
     {
         //fetch info about Non-member membership
-        $arrMemLevel =& $GLOBALS['MySQL']->fromCache('MemLevels'.MEMBERSHIP_ID_NON_MEMBER, 'getRow', "SELECT ID, Name FROM MemLevels WHERE ID = ".MEMBERSHIP_ID_NON_MEMBER);
+        $arrMemLevel =& $GLOBALS['MySQL']->fromCache('sys_acl_levels'.MEMBERSHIP_ID_NON_MEMBER, 'getRow', "SELECT ID, Name FROM `sys_acl_levels` WHERE ID = ".MEMBERSHIP_ID_NON_MEMBER);
         if (!$arrMemLevel || !count($arrMemLevel))
         {
@@ -205 +205 @@
     if(is_null($arrMemLevel['ID']))
     {
-        $arrMemLevel =& $GLOBALS['MySQL']->fromCache('MemLevels'.MEMBERSHIP_ID_STANDARD, 'getRow', "SELECT ID, Name FROM MemLevels WHERE ID = ".MEMBERSHIP_ID_STANDARD);
+        $arrMemLevel =& $GLOBALS['MySQL']->fromCache('sys_acl_levels'.MEMBERSHIP_ID_STANDARD, 'getRow', "SELECT ID, Name FROM `sys_acl_levels` WHERE ID = ".MEMBERSHIP_ID_STANDARD);
         if (!$arrMemLevel || !count($arrMemLevel))
         {
@@ -436 +436 @@
                 UNIX_TIMESTAMP(AllowedPeriodEnd) as AllowedPeriodEnd,
                 AdditionalParamValue
-        FROM    MemActions
-                LEFT JOIN MemLevelActions
-                ON  MemLevelActions.IDAction = MemActions.ID
-                    AND MemLevelActions.IDLevel = {$arrMembership['ID']}
-        WHERE   MemActions.ID = $actionID");
+        FROM    `sys_acl_actions`
+                LEFT JOIN `sys_acl_matrix`
+                ON  `sys_acl_matrix`.IDAction = `sys_acl_actions`.ID
+                    AND `sys_acl_matrix`.IDLevel = {$arrMembership['ID']}
+        WHERE   `sys_acl_actions`.ID = $actionID");
 
     //no such action
@@ -515 +515 @@
         $actionTrack = db_res("SELECT ActionsLeft,
                                       UNIX_TIMESTAMP(ValidSince) as ValidSince
-                               FROM MemActionsTrack
+                               FROM `sys_acl_actions_track`
                                WHERE IDAction = $actionID AND IDMember = $memberID");
 
@@ -522 +522 @@
 
         //member is requesting/performing this action for the first time,
-        //and there is no corresponding record in MemActionsTrack table
+        //and there is no corresponding record in sys_acl_actions_track table
 
         if(mysql_num_rows($actionTrack) <= 0)
         {
-            //add action to MemActionsTrack table
+            //add action to sys_acl_actions_track table
 
             db_res("
-                INSERT INTO MemActionsTrack (IDAction, IDMember, ActionsLeft, ValidSince)
+                INSERT INTO `sys_acl_actions_track` (IDAction, IDMember, ActionsLeft, ValidSince)
                 VALUES ($actionID, $memberID, $actionsLeft, FROM_UNIXTIME($validSince))");
 
@@ -537 +537 @@
 
         //action has been requested/performed at least once at this point
-        //and there is a corresponding record in MemActionsTrack table
+        //and there is a corresponding record in sys_acl_actions_track table
 
         $actionTrack = mysql_fetch_assoc($actionTrack);
 
-        //action record in MemActionsTrack table is out of date
+        //action record in sys_acl_actions_track table is out of date
 
         $periodEnd = (int)$actionTrack['ValidSince'] + $periodLen * 3600; //ValidSince is in seconds, PeriodLen is in hours
@@ -548 +548 @@
         {
             db_res("
-                UPDATE  MemActionsTrack
+                UPDATE  `sys_acl_actions_track`
                 SET     ActionsLeft = $actionsLeft, ValidSince = FROM_UNIXTIME($validSince)
                 WHERE   IDAction = $actionID AND IDMember = $memberID");
@@ -581 +581 @@
 
             db_res("
-                UPDATE MemActionsTrack
+                UPDATE `sys_acl_actions_track`
                 SET ActionsLeft = $actionsLeft
                 WHERE IDAction = $actionID AND IDMember = $memberID");
@@ -626 +626 @@
     //check if membership is active and purchasable
 
-    $resMemLevels = db_res("SELECT Active, Purchasable FROM MemLevels WHERE ID = $membershipID");
+    $resMemLevels = db_res("SELECT Active, Purchasable FROM `sys_acl_levels` WHERE ID = $membershipID");
 
     if(mysql_num_rows($resMemLevels) <= 0) return false;    //membership not found
@@ -696 +696 @@
 
     //check if membership exists
-    $res = db_res("SELECT COUNT(ID) FROM MemLevels WHERE ID = $membershipID");
+    $res = db_res("SELECT COUNT(ID) FROM `sys_acl_levels` WHERE ID = $membershipID");
     $res = mysql_fetch_row($res);
     if($res[0]!=1) return false;
@@ -811 +811 @@
     if($purchasableOnly)
     {
-        $queryPurchasable = "INNER JOIN MemLevelPrices ON MemLevelPrices.IDLevel = MemLevels.ID WHERE Purchasable = 'yes' AND Active = 'yes'";
-    }
-
-    $resMemLevels = db_res("SELECT DISTINCT ID, Name FROM MemLevels $queryPurchasable");
+        $queryPurchasable = "INNER JOIN `sys_acl_level_prices` ON `sys_acl_level_prices`.IDLevel = `sys_acl_levels`.ID WHERE Purchasable = 'yes' AND Active = 'yes'";
+    }
+
+    $resMemLevels = db_res("SELECT DISTINCT ID, Name FROM `sys_acl_levels` $queryPurchasable");
 
     while(list($id, $name) = mysql_fetch_row($resMemLevels))
@@ -838 +838 @@
     $result = array();
 
-    $resMemLevelPrices = db_res("SELECT Days, Price FROM MemLevelPrices WHERE IDLevel = $membershipID ORDER BY Days ASC");
+    $resMemLevelPrices = db_res("SELECT Days, Price FROM `sys_acl_level_prices` WHERE IDLevel = $membershipID ORDER BY Days ASC");
 
     while(list($days, $price) = mysql_fetch_row($resMemLevelPrices))
@@ -865 +865 @@
     $result = array();
 
-    $resMemLevels = db_res("SELECT Name, Active, Purchasable, Removable FROM MemLevels WHERE ID = $membershipID");
+    $resMemLevels = db_res("SELECT Name, Active, Purchasable, Removable FROM `sys_acl_levels` WHERE ID = $membershipID");
 
     if(mysql_num_rows($resMemLevels) > 0)
@@ -880 +880 @@
  *  my action => BX_MY_ACTION
  *
- * @param $aActions array of actions from MemActions table, with default array keys (starting from 0) and text values
+ * @param $aActions array of actions from sys_acl_actions table, with default array keys (starting from 0) and text values
  */
 function defineMembershipActions ($aActions, $sPrefix = 'BX_')
@@ -887 +887 @@
         return;
     $sActions = implode("','", $aActions);        
-    $res = db_res("SELECT `ID`, `Name` FROM `MemActions` WHERE `Name` IN('$sActions')");
+    $res = db_res("SELECT `ID`, `Name` FROM `sys_acl_actions` WHERE `Name` IN('$sActions')");
     while ($r = mysql_fetch_array($res)) {
         define ($sPrefix . strtoupper(str_replace(' ', '_', $r['Name'])), $r['ID']);