Changeset 8652 for trunk/inc/classes/BxDolCommunicator.php

Timestamp:

01/20/09 05:17:52 (3 years ago)

Author:

Alexander Ermashev

Message:

List of changes

• Correct the per_page_step condition into "inc/classes/BxDolPaginate.php";
• Set up the per page step into "templates/scripts/classes/BxBaseBrowse.php";
• Change the greet.php (add the code that send message also into member's site personal mailbox );
• Fix member's actions window size into mailbox ;
• add new sql query into "periodic/cmd.php" that will delete all trashed messages ;

File:

• trunk/inc/classes/BxDolCommunicator.php (modified) (8 diffs)

trunk/inc/classes/BxDolCommunicator.php

@@ -65 +65 @@
          *
          * @param   : $sTableName (string) - DB's table name;
-         * @param   : $sAdditionalParam (string) - additional SQL query ;
          * @param   : $aRequestTypes (array) - contain language keys for differences person's mode ;
-                      [ from ]  - needed if person mode = 'from' ;
-                      [ to ]    - needed if person mode = 'to'   ;
+                        [ from ]  - needed if person mode = 'from' ;
+                        [ to ]    - needed if person mode = 'to'   ;
+         * @param   : $sAdditionalParam (string) - additional SQL query ;                      
+         * @param   : $sAdditionalField (string) - additional table's field ;                      
          * @return  : (array) array with all requests ;
-         */
-        function getRequests( $sTableName, $sAdditionalParam, &$aRequestTypes)
+                        [ member_id ] -  member's ID ;
+                        [ date ]      -  request's date ;
+                        [ type ]      -  type of request ;
+         */
+        function getRequests( $sTableName, &$aRequestTypes, $sAdditionalParam = null, $sAdditionalField = null )
         {
             // ** init some needed variables ;
@@ -135 +139 @@
                 $sSqlLimit = "LIMIT {$sLimitFrom}, {$this -> aCommunicatorSettings['per_page']}";
 
+                // define the additional table's field ;
+                $sExtFieldName = ( $sAdditionalField ) ? ", `{$sTableName}`.`{$sAdditionalField}`" : null ;
+
                 $sQuery =
                 "
@@ -145 +152 @@
 
                         DATE_FORMAT(`{$sTableName}`.`When`, '%d.%m.%Y %H.%i') AS `sDate`
+                        {$sExtFieldName}
                     FROM
                         `{$sTableName}`
-                    INNER JOIN 
+                    LEFT JOIN 
                         `Profiles`
                     ON
@@ -162 +170 @@
                 $rResult = db_res($sQuery);
                 while( $aRow = mysql_fetch_assoc($rResult) )
-                {
+                {   
+                    $sExtType = ( !empty($aRequestTypes['specific_key']) and $sAdditionalField )
+                        ? ' ' . _t( $aRequestTypes['specific_key'], $aRow[$sAdditionalField] )
+                        : null ;
+
                     $aRequests[] = array
                     (
                         'member_id' => $aRow['iMemberID'],
                         'date'      => $aRow['sDate'],
-                        'type'      => $aRow['sType']
+                        'type'      => $aRow['sType'] . $sExtType,
                     );
                 }
@@ -230 +242 @@
          * @param   : $iMemberID (integer)  - member's ID ;
          */
-        function DeleteFromHotList( $iMemberID )
+        function DeleteHotList( $iMemberID )
         {
             $sQuery = 
@@ -250 +262 @@
          * @param   : $iMemberID (integer)  - member's ID ;
          */
-        function AddToHotList($iMemberID)
+        function AddHotList($iMemberID)
         {
            $sQuery = 
@@ -281 +293 @@
 
         /**
+         * Function will delete from greetings  ;
+         *
+         * @param   : $bFromOwner (integer) - swith mode to from owner or from recipent ;
+         * @param   : $iMemberID (integer)  - member's ID ;
+         */
+        function DeleteGreeting( $iMemberID, $iFromOwner = 0 )
+        {
+            // define the table's field ;
+            if ( !$iFromOwner )
+            {
+                $iID        = $iMemberID;
+                $iProfile   = $this -> aCommunicatorSettings['member_id'];
+            }
+            else
+            {
+                $iID        = $this -> aCommunicatorSettings['member_id'];
+                $iProfile   = $iMemberID;
+            }
+
+            $sQuery = "DELETE FROM `Greetings` WHERE `ID` = {$iID} AND `Profile` = {$iProfile}";
+            db_res($sQuery);
+        }
+
+        /**
          * Function will execute the received method name ;
          *
@@ -292 +328 @@
             if ( is_callable($aCallback) and is_array($aRowsList) and !empty($aRowsList) )
             {
-                foreach( $aRowsList AS $iKey )
+                foreach( $aRowsList AS $iMemberID )
                 {
-                    $iMemberID = (int) $iKey;
-                    if ($iMemberID)
+                    if ( is_numeric($iMemberID) )
                     {
-                        $aExtendedParameters = array_merge( array($iMemberID), $aParameters );
+                        $aExtendedParameters = array_merge( array( $iMemberID), $aParameters );
                         call_user_func_array($aCallback, $aExtendedParameters );
-                    }    
+                    }
                 }
             }