moved get_node_userlist into backend, removed some warnings

diff --git a/wwwroot/backend/mysql/backend.inc b/wwwroot/backend/mysql/backend.inc
index 7b1957770f0d1f170034ec2c1f30fb1a762dea4c..01717362fe91be455dbcc7fb1147b11d38cea2a9 100644 (file)
--- a/wwwroot/backend/mysql/backend.inc
+++ b/wwwroot/backend/mysql/backend.inc
@@ -482,8 +482,30 @@ public static function getSynapseWeight($user_id,$node_id){
        if (! ($synapse_weight) ) { $synapse_weight = 1;}       
 
        return $synapse_weight;
+}
+
+// getNodeUserlist
+
+// Get list of users currently viewing specified node.
+// Secure.
+// Returns list of (login, user_id)
+
+public static function getNodeUserlist($node_id) {
+
+       global $db;
+       if (!is_numeric($node_id))
+                { return -1; }
+               
+
+       $set=$db->query("select login,user_id from users where user_action_id='$node_id'");
+       while ($set->next()) {
+               $userlist[]=$set->getRecord();
+       }
 
+       return $userlist;
 }
+
+
 }
 
 ?>

diff --git a/wwwroot/inc/smarty/node_methodz/function.get_mail.php b/wwwroot/inc/smarty/node_methodz/function.get_mail.php
index dcf6db71f643fb92ed32500de986692a322bf55e..587d44d385ac5955b1b8dd3aca8ec9d2c2c303b7 100644 (file)
--- a/wwwroot/inc/smarty/node_methodz/function.get_mail.php
+++ b/wwwroot/inc/smarty/node_methodz/function.get_mail.php
@@ -43,7 +43,7 @@ userto.login as mail_to_name, userfrom.login as mail_from_name,
 mail.* from mail left join users as userfrom on
 mail_from=userfrom.user_id left join users as userto on mail_to=userto.user_id
 where mail_user='$user_id' ";
-       if ($sql_type) $query.=$sql_type;
+       if (isset($sql_type)) $query.=$sql_type;
        $query.=" order by mail_id desc limit $offset,$listing_amount";
 
        $set = $db->query($query);

diff --git a/wwwroot/inc/smarty/node_methodz/function.get_node_userlist.php b/wwwroot/inc/smarty/node_methodz/function.get_node_userlist.php
index b5bd2650372521d8b8c75ed67d5e4a63748007e6..43499a55f59fc86d2f5358023f90e1e09af76db0 100644 (file)
--- a/wwwroot/inc/smarty/node_methodz/function.get_node_userlist.php
+++ b/wwwroot/inc/smarty/node_methodz/function.get_node_userlist.php
@@ -1,17 +1,18 @@
 <?php
 
-       function smarty_function_get_node_userlist($params,&$smarty) {
+// Get list of users currently viewing specified node.
 
-               global $db,$node;
-               if (is_numeric($params['node_id'])) $node_id=$params['node_id'];
-               else $node_id=$node['node_id'];
+function smarty_function_get_node_userlist($params,&$smarty) {
 
-               $set=$db->query("select login,user_id from users where user_action_id='$node_id'");
-               while ($set->next()) {
-                       $userlist[]=$set->getRecord();
-               }
-
-               $smarty->assign('userlist',$userlist);
+       global $node;
 
+       if (isset($params['node_id']) && is_numeric($params['node_id'])) {
+               $node_id=$params['node_id'];
+       } else { 
+               $node_id=$node['node_id'];
        }
-?>
\ No newline at end of file
+
+       $userlist=nodes::getNodeUserlist($node_id);
+       $smarty->assign('userlist',$userlist);
+}
+?>

diff --git a/wwwroot/inc/smarty/node_methodz/function.get_nodes_by_parent.php b/wwwroot/inc/smarty/node_methodz/function.get_nodes_by_parent.php
index 3bb895eea5b73e387913d60dc6c2347216e415b7..9fb36599c53b0720cab628d2dc42ecebcb6e6d81 100644 (file)
--- a/wwwroot/inc/smarty/node_methodz/function.get_nodes_by_parent.php
+++ b/wwwroot/inc/smarty/node_methodz/function.get_nodes_by_parent.php
@@ -46,7 +46,7 @@ function smarty_function_get_nodes_by_parent($params,&$smarty) {
                        $q.=$sql_type;
         }
 
-       if ($orderby) $q.=" order by $orderby ";
+       if (isset($orderby)) $q.=" order by $orderby ";
        else $q.=" order by nodes.node_id desc ";
        $q.= " LIMIT $offset,$listing_amount ";
        $set=$db->query($q);