read mail fix

diff --git a/wwwroot/inc/eventz/display.inc b/wwwroot/inc/eventz/display.inc
index 83fba394365300f113cd3822d231d8ecaa5ffe18..7a7cfc76e98eb6204e9a4b338b1436382996c86e 100644 (file)
--- a/wwwroot/inc/eventz/display.inc
+++ b/wwwroot/inc/eventz/display.inc
@@ -95,28 +95,16 @@ if (isset($_SESSION['user_id'])&&($user_id=$_SESSION['user_id'])) {
        $smarty->assign('k_wallet',$k_wallet);
        $user_id=$_SESSION['user_id'];
 
-       //mail node
-       if ($node['node_name']=='mail') {
+       //mail node //OMG remove constant
+       if ($node['node_id']==MAIL_NODE) {
 
                //clear new mail message
-               
-               if ($new_mail) $db->query("update users set user_mail=0 where user_id='$user_id'");
-
-               //set messages as delivered to recipient
-               $set=$db->query("select mail_id,mail_duplicate_id from mail where mail_user='$user_id' and mail_to='$user_id' and mail_read='no'");
-               while($set->next()) {
-                       $db->query("update mail set mail_read='yes' where mail_id='".$set->getString('mail_duplicate_id')."'");
-                       $db->query("update mail set mail_read='yes' where mail_id='".$set->getString('mail_id')."'");
-
-                       $new_messages[$set->getString('mail_id')]=true;
+               if ($new_mail) {
+                       //set messages as delivered 
+                       $db->query("update users set user_mail=0 where user_id='$user_id'");
+                       $db->query("update mail set mail_read='yes' where mail_to='$user_id' and mail_read='no'");
                }
-/*
-               if (count($new_messages)) {
-                       $db->query("update mail set mail_read='yes' where mail_user='$user_id' and mail_user=mail_to and mail_read='no'");
-                       $smarty->assign('new_messages',$new_messages);
 
-               }
-*/
        }
 }
 

diff --git a/wwwroot/inc/senate.inc b/wwwroot/inc/senate.inc
index c7f104d491fd252035594549c12ac364c4951fe6..de5c4dc86a8079b834d12b532ef65f00569a34a5 100644 (file)
--- a/wwwroot/inc/senate.inc
+++ b/wwwroot/inc/senate.inc
@@ -6,6 +6,7 @@ define('REGISTRATION_VOTES',2); //too small so far
 define('LOGOUT_IDLE_SEC', 3600);
 
 // An attempt to remove hard-code constants from code
+define('MAIL_NODE',24);
 define('REGISTRATION_TEXT_NODE',791946);
 define('REGISTRATION_REQUEST_NODE',2091448);
 define('UNVERIFIED_REGISTRATIONS_NODE',1836516);