X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=wwwroot%2Finc%2Feventz.inc;h=a47a4c65fda14b88f658d0a83f6a9283429e8797;hb=d068d94b5e62de2f80164fd8062adce6e0ad93ae;hp=6464345536b65bdd71380acbcbfe2c9970c0be55;hpb=65c78defcdbdfef53deb8d4de76fe616f0d3fb1c;p=mirrors%2FKyberia-bloodline.git

diff --git a/wwwroot/inc/eventz.inc b/wwwroot/inc/eventz.inc
index 6464345..a47a4c6 100644
--- a/wwwroot/inc/eventz.inc
+++ b/wwwroot/inc/eventz.inc
@@ -1,12 +1,13 @@
 <?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
@@ -29,13 +30,11 @@ elseif (is_file(INCLUDE_DIR."eventz/$event.inc")) {
 		|| ($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']."/");
-}
+} 
 
 
 ?>