Changeset 10410

Timestamp:

05/05/09 01:32:44 (3 years ago)

Author:

Leonid Sokushev

Message:

Changed notify procedure and fix error with EmailNotify

Location:

tags/6.1.5

Files:

• inc/match.inc.php (modified) (2 diffs)
• periodic/notifies.php (modified) (2 diffs)

tags/6.1.5/inc/match.inc.php

@@ -62 +62 @@
     }
 
-    $sAllProfSQL = "SELECT DISTINCT `Profiles`.* FROM `Profiles` WHERE `Status`='Active' AND (`Couple`='0' OR `Couple`>`ID`)";
+    $sAllProfSQL = "SELECT DISTINCT `ID`, `NickName`, `Email`, 'HTML' as `EmailFlag` FROM `Profiles` WHERE `Status`='Active' AND (`Couple`='0' OR `Couple`>`ID`) AND `EmailNotify`='1'";
     $vAllProf = db_res($sAllProfSQL);
     while ($aAnyProf = mysql_fetch_array($vAllProf)) {
@@ -94 +94 @@
     $message    = addslashes($message);
 
-    if ('Text' == $aAnyProf['EmailFlag']) {
-        $message = html2txt($message);
-    }
-    if ('HTML' == $aAnyProf['EmailFlag']) {
+    
+    if ('HTML' == $aAnyProf['EmailFlag'])
         $headers = "MIME-Version: 1.0\r\n" . "Content-type: text/html; charset=UTF-8\r\n" . $headers;
-    }
+    else
+        $message = html2txt($message);
 
     $sql = "INSERT INTO `NotifyQueue` SET `Email` = {$aAnyProf['ID']}, Msg = 0, `From` = 'ProfilesMsgText', Creation = NOW(), MsgText = '$message', MsgSubj = '$subject'";

tags/6.1.5/periodic/notifies.php

@@ -115 +115 @@
             WHERE
                 NotifyQueue.`From` = 'Profiles' AND
-                Profiles.EmailNotify  = 'NotifyMe'
+                Profiles.EmailNotify  = '1'
             ",0 );
         
@@ -150 +150 @@
             WHERE
                 NotifyQueue.`From` = 'ProfilesMsgText' AND
-                Profiles.EmailNotify  = 'NotifyMe'
+                Profiles.EmailNotify  = '1'
             ",0);