Changeset 9985 for trunk/inc/classes/BxDolMailBox.php

Timestamp:

04/06/09 23:30:15 (3 years ago)

Author:

Andrey Prikaznov

Message:

 

File:

• trunk/inc/classes/BxDolMailBox.php (modified) (23 diffs)

trunk/inc/classes/BxDolMailBox.php

@@ -100 +100 @@
                $this -> aSortCriterias = array
                (
-                    'date'            => '`Messages`.`Date` ASC',
-                    'date_desc'       => '`Messages`.`Date` DESC',
-
-                    'subject'         => '`Messages`.`Subject` ASC',
-                    'subject_desc'    => '`Messages`.`Subject` DESC',
-
-                    'type'            => '`Messages`.`Type` ASC',
-                    'type_desc'       => '`Messages`.`Type` DESC',
+                    'date'            => '`sys_messages`.`Date` ASC',
+                    'date_desc'       => '`sys_messages`.`Date` DESC',
+
+                    'subject'         => '`sys_messages`.`Subject` ASC',
+                    'subject_desc'    => '`sys_messages`.`Subject` DESC',
+
+                    'type'            => '`sys_messages`.`Type` ASC',
+                    'type_desc'       => '`sys_messages`.`Type` DESC',
 
                     'author'          => '`Profiles`.`NickName` ASC',
@@ -121 +121 @@
                { 
                     // generate types from DB ;
-                    $sQuery  = "SHOW COLUMNS FROM  `Messages` LIKE 'Type'";
+                    $sQuery  = "SHOW COLUMNS FROM  `sys_messages` LIKE 'Type'";
                     $rResult = db_res($sQuery);
 
@@ -188 +188 @@
                if ( $this -> aMailBoxSettings['messageID'] )
                {
-                    $aMessageInfo = db_arr("SELECT `Recipient`, `New` FROM `Messages` WHERE `ID` = {$this -> aMailBoxSettings['messageID']}");
+                    $aMessageInfo = db_arr("SELECT `Recipient`, `New` FROM `sys_messages` WHERE `ID` = {$this -> aMailBoxSettings['messageID']}");
                     if ( $aMessageInfo['Recipient'] == $this -> aMailBoxSettings['member_id'] and $aMessageInfo['New'] == '1' )
                     {
-                         db_res("UPDATE `Messages` SET `New` = '0' WHERE `ID` = {$this -> aMailBoxSettings['messageID']}");
+                         db_res("UPDATE `sys_messages` SET `New` = '0' WHERE `ID` = {$this -> aMailBoxSettings['messageID']}");
                     }
                }
@@ -218 +218 @@
                                    IF (`Sender` = {$this -> aMailBoxSettings['member_id']},  `Recipient`, `Sender` ) AS `iSecondPerson`
                               FROM 
-                                   `Messages` 
+                                   `sys_messages` 
                               WHERE 
                                    `ID` = {$this -> aMailBoxSettings['messageID']}
@@ -251 +251 @@
                                         COUNT(*) 
                                    FROM 
-                                        `Messages`
+                                        `sys_messages`
                                    WHERE
                                         `Sender` = {$iSenderID}
@@ -267 +267 @@
                                    `Sender`, `Text`, `Subject`, `New`, `ID`
                               FROM
-                                   `Messages`
+                                   `sys_messages`
                               WHERE
                                    `Sender` = {$iSenderID}
@@ -404 +404 @@
                     COUNT( DISTINCT if(`Recipient` = {$this -> aMailBoxSettings['member_id']}, `Sender`, `Recipient`) ) AS `Contacts` 
                FROM 
-                    `Messages` 
+                    `sys_messages` 
                WHERE
                     `Sender` = {$this -> aMailBoxSettings['member_id']} 
@@ -418 +418 @@
                     SELECT
                          DISTINCT `Profiles`.*,
-                         DATE_FORMAT(`Messages`.`Date`, '%d.%c.%Y') AS `When`
+                         DATE_FORMAT(`sys_messages`.`Date`, '%d.%c.%Y') AS `When`
                     FROM     
-                         `Messages`
+                         `sys_messages`
                     INNER JOIN
                          `Profiles`
                     ON
-                         `Profiles`.`ID` = IF (`Messages`.`Recipient` = {$this -> aMailBoxSettings['member_id']}, `Messages`.`Sender`, `Messages`.`Recipient`)
+                         `Profiles`.`ID` = IF (`sys_messages`.`Recipient` = {$this -> aMailBoxSettings['member_id']}, `sys_messages`.`Sender`, `sys_messages`.`Recipient`)
                     WHERE
                          `Sender` = {$this -> aMailBoxSettings['member_id']}
@@ -432 +432 @@
                          `Profiles`.`NickName`
                     ORDER BY
-                         `Messages`.`Date` DESC
+                         `sys_messages`.`Date` DESC
                     {$sSqlLimit}
                ";
@@ -456 +456 @@
                          COUNT(*) 
                     FROM 
-                         `Messages` 
+                         `sys_messages` 
                     WHERE 
                     (
@@ -492 +492 @@
                                    AND
                               (
-                                   `Messages`.`Recipient` = {$this -> aMailBoxSettings['member_id']}
+                                   `sys_messages`.`Recipient` = {$this -> aMailBoxSettings['member_id']}
                                         AND
-                                   NOT FIND_IN_SET('Recipient', `Messages`.`Trash`)
+                                   NOT FIND_IN_SET('Recipient', `sys_messages`.`Trash`)
                                )
                          ";     
@@ -503 +503 @@
                                    AND
                               (
-                                   `Messages`.`Sender` = {$this -> aMailBoxSettings['member_id']}
+                                   `sys_messages`.`Sender` = {$this -> aMailBoxSettings['member_id']}
                                         AND
-                                   NOT FIND_IN_SET('Sender', `Messages`.`Trash`)
+                                   NOT FIND_IN_SET('Sender', `sys_messages`.`Trash`)
                               )
                          "; 
@@ -515 +515 @@
                               (
                                    (
-                                        `Messages`.`Sender` = {$this -> aMailBoxSettings['member_id']} 
+                                        `sys_messages`.`Sender` = {$this -> aMailBoxSettings['member_id']} 
                                              AND 
-                                        FIND_IN_SET('Sender', `Messages`.`Trash`)
+                                        FIND_IN_SET('Sender', `sys_messages`.`Trash`)
                                    ) 
                                    OR
                                    (
-                                        `Messages`.`Recipient` = {$this -> aMailBoxSettings['member_id']} 
+                                        `sys_messages`.`Recipient` = {$this -> aMailBoxSettings['member_id']} 
                                              AND 
-                                        FIND_IN_SET('Recipient', `Messages`.`Trash`)
+                                        FIND_IN_SET('Recipient', `sys_messages`.`Trash`)
                                    )
                               )
@@ -536 +536 @@
                     {
                          if ($sKey) 
-                              $sTypeMessages .= "`Messages`.`Type` = '{$sKey}' OR";
+                              $sTypeMessages .= "`sys_messages`.`Type` = '{$sKey}' OR";
                     }
                     $sTypeMessages = 'AND (' . preg_replace("/OR$/", '', $sTypeMessages). ')';
@@ -550 +550 @@
                     ("
                          SELECT 
-                              COUNT(`Messages`.`ID`) 
+                              COUNT(`sys_messages`.`ID`) 
                          FROM 
-                              `Messages` 
+                              `sys_messages` 
                          WHERE 
                               1
@@ -571 +571 @@
                          "
                               SELECT 
-                                   `Messages`.`ID`, DATE_FORMAT(`Messages`.`Date`, '%d.%m.%Y %H.%i') AS `Date`,
-                                   `Messages`.`Sender`, `Messages`.`Recipient`, `Messages`.`Text`, 
-                                   `Messages`.`Subject`, `Messages`.`New`, `Messages`.`Type`
+                                   `sys_messages`.`ID`, DATE_FORMAT(`sys_messages`.`Date`, '%d.%m.%Y %H.%i') AS `Date`,
+                                   `sys_messages`.`Sender`, `sys_messages`.`Recipient`, `sys_messages`.`Text`, 
+                                   `sys_messages`.`Subject`, `sys_messages`.`New`, `sys_messages`.`Type`
                               FROM 
-                                   `Messages`
+                                   `sys_messages`
                               INNER JOIN
                                    `Profiles`
                               ON
-                                   `Profiles`.`ID` = `Messages`.`Sender`
+                                   `Profiles`.`ID` = `sys_messages`.`Sender`
                               WHERE
                                    1
@@ -615 +615 @@
            "
                 UPDATE 
-                     `Messages` 
+                     `sys_messages` 
                 SET 
                      `New` = '{$iMarkMode}'
@@ -637 +637 @@
           {
                // try to define mailbox mode and trash mode;
-               $sQuery = "SELECT `Sender`, `Recipient`, `Trash` FROM `Messages` WHERE `ID` = {$iMessageID}";
+               $sQuery = "SELECT `Sender`, `Recipient`, `Trash` FROM `sys_messages` WHERE `ID` = {$iMessageID}";
                $rResult = db_res($sQuery);
 
@@ -660 +660 @@
                "
                          UPDATE
-                              `Messages`
+                              `sys_messages`
                          SET
                               `Trash` = '" . strtolower($sTrashValue) . "'
@@ -684 +684 @@
                $iMessageOwner = 0;
 
-               $sQuery = "SELECT `Sender`, `Recipient`, `Trash`     FROM `Messages` WHERE `ID` = {$iMessageID}";
+               $sQuery = "SELECT `Sender`, `Recipient`, `Trash`     FROM `sys_messages` WHERE `ID` = {$iMessageID}";
                $rResult = db_res($sQuery);
 
@@ -715 +715 @@
                     "
                          UPDATE 
-                              `Messages` 
+                              `sys_messages` 
                          SET     
                               `Trash` = '{$sTrashMode}' 
@@ -789 +789 @@
                               `ID` 
                          FROM 
-                              `Messages` 
+                              `sys_messages` 
                          WHERE 
                               `Sender` = {$this -> aMailBoxSettings['member_id']} 
@@ -824 +824 @@
                         "
                             INSERT INTO 
-                                `Messages` 
+                                `sys_messages` 
                             SET 
                                 `Sender`       = {$this -> aMailBoxSettings['member_id']},