Changeset 9969 for trunk/periodic/notifies.php

Timestamp:

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

Author:

Andrey Prikaznov

Message:

 

File:

• trunk/periodic/notifies.php (modified) (7 diffs)

trunk/periodic/notifies.php

@@ -48 +48 @@
 $msgs_per_start = getParam( 'msgs_per_start' );
 
-$iFullCount = (int)db_value( 'SELECT COUNT(*) FROM NotifyQueue', 0 );
+$iFullCount = (int)db_value( 'SELECT COUNT(*) FROM `sys_mail_queue`', 0 );
 if ( !$iFullCount ) exit;
 
@@ -65 +65 @@
         $nfs_res = db_res("
             SELECT
-                NotifyQueue.Email as ID1,
-                NotifyQueue.Msg as ID2,
-                NotifyEmails.Name as Name,
-                NotifyEmails.Email,
-                NotifyMsgs.Subj,
-                NotifyMsgs.HTML as Body
-            FROM NotifyQueue
-            INNER JOIN NotifyMsgs ON
-                (NotifyMsgs.ID =  NotifyQueue.Msg)
-            INNER JOIN NotifyEmails ON
-                (NotifyEmails.ID = NotifyQueue.Email)
+                `sys_mail_queue`.Email as ID1,
+                `sys_mail_queue`.Msg as ID2,
+                `sys_subscriptions`.Name as Name,
+                `sys_subscriptions`.Email,
+                `sys_mass_messages`.Subj,
+                `sys_mass_messages`.HTML as Body
+            FROM `sys_mail_queue`
+            INNER JOIN `sys_mass_messages` ON
+                (`sys_mass_messages`.ID =  `sys_mail_queue`.Msg)
+            INNER JOIN `sys_subscriptions` ON
+                (`sys_subscriptions`.ID = `sys_mail_queue`.Email)
             WHERE
-                NotifyQueue.`From` = 'NotifyEmails' AND
-                NotifyEmails.EmailFlag = 'NotifyMe'
+                `sys_mail_queue`.`From` = 'NotifyEmails' AND
+                `sys_subscriptions`.EmailFlag = 'NotifyMe'
             LIMIT $total_per_query
         ",0 );
@@ -89 +89 @@
                 ++$err;
             if ( $row[ID1] && $row[ID2] )
-                db_res("DELETE FROM NotifyQueue WHERE `Email` = $row[ID1] AND `Msg` = $row[ID2] AND `From` = 'NotifyEmails'", 0 );
+                db_res("DELETE FROM `sys_mail_queue` WHERE `Email` = $row[ID1] AND `Msg` = $row[ID2] AND `From` = 'NotifyEmails'", 0 );
             else
-                echo "ERROR: while deleting from 'NotifyQueue' ( Email ID: $row[ID1], Msg ID: $row[ID2] )\n";
+                echo "ERROR: while deleting from 'sys_mail_queue' ( Email ID: $row[ID1], Msg ID: $row[ID2] )\n";
             ++$count_ok;
             if ( $count_ok >= $total_count ) break;
@@ -102 +102 @@
         $nfs_res = db_res("
             SELECT
-                NotifyQueue.Email as ID1,
-                NotifyQueue.Msg as ID2,
+                `sys_mail_queue`.Email as ID1,
+                `sys_mail_queue`.Msg as ID2,
                 Profiles.NickName as Name,
                 Profiles.Email,
-                NotifyMsgs.Subj,
-                NotifyMsgs.HTML as Body
-            FROM NotifyQueue            
-            INNER JOIN NotifyMsgs ON
-                (NotifyMsgs.ID =  NotifyQueue.Msg)
+                `sys_mass_messages`.Subj,
+                `sys_mass_messages`.HTML as Body
+            FROM `sys_mail_queue`           
+            INNER JOIN `sys_mass_messages` ON
+                (`sys_mass_messages`.ID =  `sys_mail_queue`.Msg)
             INNER JOIN Profiles ON
-                (Profiles.ID = NotifyQueue.Email)
+                (Profiles.ID = `sys_mail_queue`.Email)
             WHERE
-                NotifyQueue.`From` = 'Profiles' AND
+                `sys_mail_queue`.`From` = 'Profiles' AND
                 Profiles.EmailNotify = 1
             ",0 );
@@ -125 +125 @@
                 ++$err;
             if ( $row[ID1] && $row[ID2] )
-                db_res("DELETE FROM NotifyQueue WHERE Email = $row[ID1] AND Msg = $row[ID2] AND NotifyQueue.`From` = 'Profiles'", 0 );
+                db_res("DELETE FROM `sys_mail_queue` WHERE Email = $row[ID1] AND Msg = $row[ID2] AND `sys_mail_queue`.`From` = 'Profiles'", 0 );
             else
-                echo "ERROR: while deleting from 'NotifyQueue' ( Email ID: $row[ID1], Msg ID: $row[ID2] )\n";
+                echo "ERROR: while deleting from 'sys_mail_queue' ( Email ID: $row[ID1], Msg ID: $row[ID2] )\n";
             ++$count_ok;
             if ( $count_ok >= $total_count ) break;
@@ -139 +139 @@
         $nfs_res = db_res("
             SELECT
-                NotifyQueue.Email as ID1,
-                NotifyQueue.Msg as ID2,
-                NotifyQueue.MsgText as Body,
-                NotifyQueue.MsgSubj as Subj,
+                `sys_mail_queue`.Email as ID1,
+                `sys_mail_queue`.Msg as ID2,
+                `sys_mail_queue`.MsgText as Body,
+                `sys_mail_queue`.MsgSubj as Subj,
                 Profiles.NickName as Name,
                 Profiles.Email
-            FROM NotifyQueue
+            FROM `sys_mail_queue`
             INNER JOIN Profiles ON
-                (Profiles.ID = NotifyQueue.Email)
+                (Profiles.ID = `sys_mail_queue`.Email)
             WHERE
-                NotifyQueue.`From` = 'ProfilesMsgText' AND
+                `sys_mail_queue`.`From` = 'ProfilesMsgText' AND
                 Profiles.EmailNotify = 1
             ",0);
@@ -162 +162 @@
             if ( !mail( $row['Email'], $row['Subj'], $body, $headers, "-f{$site['email_notify']}") )
                 ++$err;
-            if ( !db_res("DELETE FROM NotifyQueue WHERE Email = $row[ID1] AND NotifyQueue.`From` = 'ProfilesMsgText'", 0 ) )
-                echo "ERROR: while deleting from 'NotifyQueue' ( Email ID: $row[ID1], Msg ID: $row[ID2] )\n";
+            if ( !db_res("DELETE FROM `sys_mail_queue` WHERE Email = $row[ID1] AND `sys_mail_queue`.`From` = 'ProfilesMsgText'", 0 ) )
+                echo "ERROR: while deleting from 'sys_mail_queue' ( Email ID: $row[ID1], Msg ID: $row[ID2] )\n";
             ++$count_ok;
             if ( $count_ok >= $total_count ) break;