Minor display cleanup

[mirrors/Kyberia-bloodline.git] / wwwroot / inc / eventz / display.inc

diff --git a/wwwroot/inc/eventz/display.inc b/wwwroot/inc/eventz/display.inc
index 83fba394365300f113cd3822d231d8ecaa5ffe18..aff889de0186de9956419f3bef24fdc564bdeba8 100644 (file)
--- a/wwwroot/inc/eventz/display.inc
+++ b/wwwroot/inc/eventz/display.inc
@@ -10,19 +10,13 @@ function display() {
 
 if ($permissions['r']) {
 
-// these 4 lines are not the source of kyberia lagging problems.
-// leave them. started on the 10.4. 
 // data gained will be used for scientific purposes
 
-// if (isset($_SESSION['user_id']) {
-//     log_levenshtein($_SESSION['user_id'],$node['node_id']);
-// }
-
 if ((isset($_SESSION['user_id'])) && ($_SESSION['user_id'])) {
-       $q="insert delayed into levenshtein set user_id='".$_SESSION['user_id']."',node_id='".$node['node_id']."'";
-       $db->update($q);
+       levenshteinLog($_SESSION['user_id'],$node['node_id']);
 }
 
+// WTF
 //if node is css
 //XXX into function
 if ($node['template_id']!='2019721'){
@@ -30,7 +24,6 @@ if ($node['template_id']!='2019721'){
        logger::log('enter',$node['node_id'],'ok',$node['node_user_subchild_count']);
        if (!empty($_SESSION['user_id']) && is_numeric($node['node_id'])) {
                $q="update node_access set visits=visits+1,node_user_subchild_count='0',last_visit=NOW() where node_id='".$node['node_id']."' and user_id='".$_SESSION['user_id']."'";
-//             echo $q;
                $result=$db->update($q);
 
                if (!$result) {
@@ -42,16 +35,6 @@ if ($node['template_id']!='2019721'){
 
 }
 
-//XXX into function
-// if (isset($_SESSION['user_id']) {
-//     if (isset($referer_id)) {
-//             update_nodes($_SESSION['user_id'],$node['node_id'],$referer_id);
-//     } else {
-//             update_nodes($_SESSION['user_id'],$node['node_id'],0);  
-//     }
-// }
-
-
 //assigning user data to smarty if user logged in
 if (isset($_SESSION['user_id'])&&($user_id=$_SESSION['user_id'])) {
        $smarty->assign('_POST',$_POST);
@@ -95,28 +78,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);
 
-               }
-*/
        }
 }
 
@@ -150,9 +121,11 @@ else {
 
 
 // XXX into function
-if (isset($_SESSION['user_id'])){
-//setting user location
-       $q="update users set last_action=NOW(),user_location_vector='".$node['node_vector']."',user_action='".addslashes($node['node_name'])."',user_action_id='".$node['node_id']."' where user_id='".$_SESSION['user_id']."'";
+if (isset($_SESSION['user_id']) && ($_SESSION['user_id']!='')){
+       //setting user location
+       $q="update users set last_action=NOW(),user_location_vector='".
+       $node['node_vector']."',user_action='".addslashes($node['node_name']).
+       "',user_action_id='".$node['node_id']."' where user_id='".$_SESSION['user_id']."'";
        $db->query($q);
 }