From 13826e4f1ca35cbce3d20be1131a1b7dbf68ac7b Mon Sep 17 00:00:00 2001 From: niekt0 Date: Wed, 28 Sep 2011 00:59:14 +0200 Subject: [PATCH] removing warning messages and not working rss --- {cron => trash}/delete_rss.php | 4 ---- cron/rssparse.php => trash/rssparse_cron.php | 0 wwwroot/backend/mysql/permissions.inc | 4 ++-- wwwroot/inc/eventz.inc | 4 ++-- wwwroot/inc/eventz/display.inc | 2 +- wwwroot/inc/smarty/resource.kyberia.php | 2 +- wwwroot/nodes.php | 4 ++-- 7 files changed, 8 insertions(+), 12 deletions(-) rename {cron => trash}/delete_rss.php (99%) rename cron/rssparse.php => trash/rssparse_cron.php (100%) diff --git a/cron/delete_rss.php b/trash/delete_rss.php similarity index 99% rename from cron/delete_rss.php rename to trash/delete_rss.php index 3c7cc0d..2777f00 100755 --- a/cron/delete_rss.php +++ b/trash/delete_rss.php @@ -19,8 +19,4 @@ while ($set->next()) { } } - - - - ?> diff --git a/cron/rssparse.php b/trash/rssparse_cron.php similarity index 100% rename from cron/rssparse.php rename to trash/rssparse_cron.php diff --git a/wwwroot/backend/mysql/permissions.inc b/wwwroot/backend/mysql/permissions.inc index a66af2d..ce17117 100644 --- a/wwwroot/backend/mysql/permissions.inc +++ b/wwwroot/backend/mysql/permissions.inc @@ -22,8 +22,8 @@ public static function checkPerms($node) { $set->next(); $node_vector=$set->getString('node_vector'); } - - $user_id = $_SESSION['user_id']; + + $user_id=(empty($_SESSION['user_id'])) ? "" : $_SESSION['user_id']; $perms['r'] = 0; $perms['w'] = 0; diff --git a/wwwroot/inc/eventz.inc b/wwwroot/inc/eventz.inc index a47a4c6..d79ea22 100644 --- a/wwwroot/inc/eventz.inc +++ b/wwwroot/inc/eventz.inc @@ -14,7 +14,7 @@ if($event=='delete' || (!empty($_POST['event']) && $_POST['event']=='delete')) { } //do not make a permission check if an event was executed before -if ($_SESSION['eventz'][$event]) { +if (!empty($_SESSION['eventz'][$event]) && ($_SESSION['eventz'][$event])) { include_once(INCLUDE_DIR."eventz/$event.inc"); $status=$event(); } @@ -24,7 +24,7 @@ elseif (is_file(INCLUDE_DIR."eventz/$event.inc")) { $event_node=nodes::getNodeById($event_id,$_SESSION['user_id']); if ( ($event_node['node_system_access']=='public') - || ($event_node['node_creator']==$_SESSION['user_id']) + || (!empty($_SESSION['user_id']) && ($event_node['node_creator']==$_SESSION['user_id'])) || ($event_node['node_permission']=='op') || ($event_node['node_permission']=='execute') || ($event_node['node_permission']=='master') diff --git a/wwwroot/inc/eventz/display.inc b/wwwroot/inc/eventz/display.inc index 934e191..8518cdf 100644 --- a/wwwroot/inc/eventz/display.inc +++ b/wwwroot/inc/eventz/display.inc @@ -6,7 +6,7 @@ function display() { $content=''; $node_id=$node['node_id']; - $user_id=$_SESSION['user_id']; + $user_id=(empty($_SESSION['user_id'])) ? "" : $_SESSION['user_id']; if ($permissions['r']) { diff --git a/wwwroot/inc/smarty/resource.kyberia.php b/wwwroot/inc/smarty/resource.kyberia.php index 895bb94..bf28a33 100644 --- a/wwwroot/inc/smarty/resource.kyberia.php +++ b/wwwroot/inc/smarty/resource.kyberia.php @@ -24,7 +24,7 @@ function db_get_template ($tpl_name, &$tpl_source, &$smarty_obj) { */ // populating $tpl_source with actual template contents //$tpl_source = stripslashes($set->getString('node_content')); - $tpl_source = nodes::getNodeById($add_template_id,$_SESSION['user_id']); + $tpl_source = nodes::getNodeById($add_template_id,empty($_SESSION['user_id']) ? "" : $_SESSION['user_id']); $tpl_source = $tpl_source['node_content']; // return true on success, false to generate failure notification return true; diff --git a/wwwroot/nodes.php b/wwwroot/nodes.php index 9bafe51..063f4e6 100644 --- a/wwwroot/nodes.php +++ b/wwwroot/nodes.php @@ -146,12 +146,12 @@ if (isset($_SESSION['cube_vector']) && ($_SESSION['cube_vector'])) { } } -@include_once(INCLUDE_DIR.'mail_rss.inc'); //haluz... +#@include_once(INCLUDE_DIR.'mail_rss.inc'); //haluz... //checking permissions include_once(BACKEND_DIR.'/'.DB_TYPE.'/permissions.inc'); $permissions=permissions::checkPerms($node); -if ($_SESSION['debugging']) { +if (!empty($_SESSION['debugging']) && $_SESSION['debugging']) { print_r($permissions); } -- 2.30.2