removing warning messages and not working rss

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

diff --git a/wwwroot/inc/eventz.inc b/wwwroot/inc/eventz.inc
index 6464345536b65bdd71380acbcbfe2c9970c0be55..d79ea2249515d97a186dfa0185846dc272a3596f 100644 (file)
--- a/wwwroot/inc/eventz.inc
+++ b/wwwroot/inc/eventz.inc
@@ -1,19 +1,20 @@
 <?php
-if(preg_match('/36$/', $event) || preg_match('/36$/', $_POST['event'])) {
+if(preg_match('/36$/', $event) ||  (!empty($_POST['event']) && preg_match('/36$/', $_POST['event']))) {
   $event = preg_replace('/36$/', '', $event);
   $_POST['event'] = preg_replace('/36$/', '', $_POST['event']);
   $_POST['nodeshell_id'] = base_convert($_POST['nodeshell_id'], 36, 10); //put36
   $_POST['new_parent'] = base_convert($_POST['new_parent'], 36, 10); //set_parent36
 }
 
-if($event=='delete' || $_POST['event']=='delete') { //XXX TODO FIXME UglyFuckingHack - should go to delete.inc (but something is broken)
+if($event=='delete' || (!empty($_POST['event']) && $_POST['event']=='delete')) { 
+//XXX TODO FIXME UglyFuckingHack - should go to delete.inc (but something is broken)
   $event='set_parent';
   $_POST['event']=$event;
   $_POST['new_parent']=123456; //XXX TODO FIXME Hardcoded
 }
 
 //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();
 }
@@ -23,19 +24,17 @@ 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')
                || ($event=='display')
        ) {
-               include_once(INCLUDE_DIR."eventz/$event.inc");
+               require_once(INCLUDE_DIR."eventz/$event.inc");
                $status=$event();
                $_SESSION['eventz'][$event]=true;
 
-       }
-
-       else {
+       } else {
                $error=$error_messages['EVENT_NOT_PERMITTED'];
        }
 
@@ -46,14 +45,18 @@ else {
        $status=false;
 }
 
+if (!$status) {
+       require_once(INCLUDE_DIR."eventz/display.inc");
+       display();      
+}
 
-if ($status>1) {
+elseif ($status>1) {
        Header("Location: /id/".$status."/");
 }
 
-elseif ($status) {
+elseif ($status && $event!='display') {
        Header("Location: /id/".$node['node_id']."/");
-}
+} 
 
 
 ?>