X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=wwwroot%2Finc%2Feventz.inc;h=1801b2960b51e6b2e8e8ebe9380dfaa6f83e49f9;hb=57dd552c75ca1484ab8f1a8ce349a66e632427cd;hp=1a240d37501257d543d79f77be614a075e849ef6;hpb=54edb62777fe751e512eceb28ac348cab0931ae0;p=mirrors%2FKyberia-bloodline.git

diff --git a/wwwroot/inc/eventz.inc b/wwwroot/inc/eventz.inc
index 1a240d3..1801b29 100644
--- a/wwwroot/inc/eventz.inc
+++ b/wwwroot/inc/eventz.inc
@@ -1,38 +1,40 @@
 <?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();
 }
 
 elseif (is_file(INCLUDE_DIR."eventz/$event.inc")) {
 	$event_id=nodes::getNodeIdByName($event,"event://$event");
-	$event_node=nodes::getNodeById($event_id,$_SESSION['user_id']);
-	if (($event_node['node_system_access']=='public')
-	|| ($event_node['node_creator']==$_SESSION['user_id'])
-	|| ($event_node['node_permission']=='op')
-	|| ($event_node['node_permission']=='execute')
-	|| ($event_node['node_permission']=='master') ) {
-		include_once(INCLUDE_DIR."eventz/$event.inc");
+	$event_node=nodes::getNodeById($event_id,isset($_SESSION['user_id']) ? $_SESSION['user_id'] : "");
+	if (
+		($event_node['node_system_access']=='public')
+		|| (!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')
+	) {
+		require_once(INCLUDE_DIR."eventz/$event.inc");
 		$status=$event();
 		$_SESSION['eventz'][$event]=true;
 
-	}
-
-	else {
+	} else {
 		$error=$error_messages['EVENT_NOT_PERMITTED'];
 	}
 
@@ -43,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']."/");
-}
+} 
 
 
 ?>