From b17a1e9bc746b7eb0549dfd8dff61e132c9de828 Mon Sep 17 00:00:00 2001 From: niekt0 Date: Sat, 2 Apr 2011 01:13:45 +0200 Subject: [PATCH] k_neurons fix & small warnings removed --- wwwroot/backend/mysql/backend.inc | 5 ++++ wwwroot/backend/mysql/functions.sql | 17 ++++++----- wwwroot/inc/eventz.inc | 5 ++-- wwwroot/inc/eventz/display.inc | 44 ++++++++++++++++------------- 4 files changed, 42 insertions(+), 29 deletions(-) diff --git a/wwwroot/backend/mysql/backend.inc b/wwwroot/backend/mysql/backend.inc index bdc8515..87e1d2d 100644 --- a/wwwroot/backend/mysql/backend.inc +++ b/wwwroot/backend/mysql/backend.inc @@ -363,6 +363,11 @@ function setSynapse($params){ $dst=$params['dst']; $weight=$params['weight']; + // weight could be only positive + if ( $weight < 0) { + return false; + } + // if already exists $q="select count(src) from neurons where dst ='$dst' and src = '$src'"; $set=$db->query($q); diff --git a/wwwroot/backend/mysql/functions.sql b/wwwroot/backend/mysql/functions.sql index b5c81a1..c50f19d 100644 --- a/wwwroot/backend/mysql/functions.sql +++ b/wwwroot/backend/mysql/functions.sql @@ -20,17 +20,19 @@ BEGIN /* weigths from user to: - all nodes from node to root node - all node owners from node to root node - - all nodes between themselves (safe?) + - all nodes between themselves (safe?) XXX removed */ - select node_weight,node_creator into n_weight,n_owner from nodes where node_id=node2; + select /*node_weight,*/node_creator into /*n_weight,*/n_owner from nodes where node_id=node2; select synapse_weight into s_weight from neurons where src=user and dst=node2; + if found_rows() = 0 then set s_weight=1; end if; select synapse_weight into o_weight from neurons where src=user and dst=n_owner; + if found_rows() = 0 then set o_weight=1; end if; + +/* if o_weight = NULL or o_weight=0 then set o_weight=1; end if; + if s_weight = NULL or s_weight=0 then set s_weight=1; end if;*/ + /*if n_weight = NULL or n_weight=0 then set n_weight=1; end if;*/ - if o_weight = NULL or o_weight=0 then set o_weight=1; end if; - if s_weight = NULL or s_weight=0 then set s_weight=1; end if; - if n_weight = NULL or n_weight=0 then set n_weight=1; end if; - - set final = final * s_weight * o_weight * n_weight; + set final = final * s_weight * o_weight;/* * n_weight;*/ END WHILE; RETURN final; END// @@ -43,6 +45,7 @@ BEGIN nodes.node_name, nodes.node_creator, nodes.node_content, + nodes.k, nodes.node_parent,(k_get_node_weigth(nodes.node_id,user_id)*nodes.k) as weight_k, users.login as creator_name, parent.node_name as parent_name diff --git a/wwwroot/inc/eventz.inc b/wwwroot/inc/eventz.inc index 418ab07..a47a4c6 100644 --- a/wwwroot/inc/eventz.inc +++ b/wwwroot/inc/eventz.inc @@ -1,12 +1,13 @@ assign('_POST',$_POST); $smarty->assign('bookmarks',$_SESSION['bookmarks']); - $smarty->assign('ignore',$_SESSION['ignore']); + if (isset($_SESSION['ignore'])) { $smarty->assign('ignore',$_SESSION['ignore']); }; $smarty->assign('bookstyl',$_SESSION['bookstyl']); - $smarty->assign('fook',$_SESSION['fook']); + if (isset($_SESSION['fook'])) {$smarty->assign('fook',$_SESSION['fook']); }; $smarty->assign('user_id',$_SESSION['user_id']); $smarty->assign('user_name',$_SESSION['user_name']); if (!empty($_SESSION['cube_vector'])) $smarty->assign('cube_vector',$_SESSION['cube_vector']); $smarty->assign('friends',$_SESSION['friends']); //req by freezy, done by darkaural - $smarty->assign('user_quota',$_SESSION['user_quota']); + if (isset($_SESSION['user_quota'])) {$smarty->assign('user_quota',$_SESSION['user_quota']);}; // XXX into function $newmail_q = sprintf('select u.user_mail_id @@ -244,23 +245,25 @@ if (!empty($_POST['template_event'])) { //movement forward and backward // if ($listing_order=='asc' && !$offset) $offset=$descendant_count-$listing_amount; - if ($_POST['get_children_move']=='<') { - $offset=$offset-$listing_amount; - if ($offset<0) $offset=0; - } - elseif ($_POST['get_children_move']=='>') { - $offset=$offset+$listing_amount; - } - elseif ($_POST['get_children_move']=='>>') { - $offset=$descendant_count-$listing_amount; - } - - elseif ($_POST['get_children_move']=='<<') { - $offset=0; - } - if ($offset<0) $offset=0; - $_POST['offset']=$offset; - $smarty->assign('offset',$offset); + if (isset($_POST['get_children_move'])) { + if ($_POST['get_children_move']=='<') { + $offset=$offset-$listing_amount; + if ($offset<0) $offset=0; + } + elseif ($_POST['get_children_move']=='>') { + $offset=$offset+$listing_amount; + } + elseif ($_POST['get_children_move']=='>>') { + $offset=$descendant_count-$listing_amount; + } + + elseif ($_POST['get_children_move']=='<<') { + $offset=0; + } + } + if ($offset<0) $offset=0; + $_POST['offset']=$offset; // XXX sqli? + $smarty->assign('offset',$offset); if ($node['external_link']=='header://svg' && !is_numeric($template_id)) { @@ -292,6 +295,7 @@ else { $content.=$smarty->fetch($node['template_id'].".tpl"); } +// XXX remove constant if ($template_id=='2019721'){ $content=$smarty->fetch($template_id.".tpl"); echo $content; -- 2.30.2