removed some warnings

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

diff --git a/wwwroot/inc/eventz/display.inc b/wwwroot/inc/eventz/display.inc
index 1793463cab663bccc57d135c9497abd420807268..83fba394365300f113cd3822d231d8ecaa5ffe18 100644 (file)
--- a/wwwroot/inc/eventz/display.inc
+++ b/wwwroot/inc/eventz/display.inc
@@ -3,9 +3,10 @@ function display() {
        global $node,$db,$error,$referer_id,$smarty,$permissions,$template_id;
        global $timer_start;
        if (!$referer_id) $referer_id=1;
+       $content='';
 
        $node_id=$node['node_id'];
-       $user_id=$_SESSION['user_id'];
+       $user_id=(empty($_SESSION['user_id'])) ? "" : $_SESSION['user_id'];
 
 if ($permissions['r']) {
 
@@ -149,28 +150,28 @@ else {
 
 
 // XXX into function
-if (($node['template_id']!='2019721') && (isset($_SESSION['user_id']))){
+if (isset($_SESSION['user_id'])){
 //setting user location
-$q="update users set last_action=NOW(),user_location_vector='".$node['node_vector']."',user_action='".addslashes($node['node_name'])."',user_action_id='".$node['node_id']."' where user_id='".$_SESSION['user_id']."'";
-$db->query($q);
+       $q="update users set last_action=NOW(),user_location_vector='".$node['node_vector']."',user_action='".addslashes($node['node_name'])."',user_action_id='".$node['node_id']."' where user_id='".$_SESSION['user_id']."'";
+       $db->query($q);
 }
 
 $whole_time=SubStr((Time()+SubStr(MicroTime(),0,8)-$timer_start),0,7);
 $smarty->assign('whole_time',$whole_time);
 
 
-if ($template_id=='download' OR $template_id=='download.jpg') {
+if ($template_id=='data') {
        if ($permissions['r']) {
-       $linkname = SYSTEM_ROOT."/files/".$node['node_id'];
-       $filename= readlink($linkname);
-       $suffix=preg_replace("/(.*?)\.(.*?)/i","$2",$filename);
-
-       $ext = substr( $filename,-3 );
-       if( $filename == "" ) {
-          echo "ERROR: Empty file to download. ";
-          exit;
-       } elseif ( ! file_exists( $filename ) ) {
-               exit;
+               $linkname = FILE_DIR."/".$node['node_id'];
+               $filename= readlink($linkname);
+               $suffix=preg_replace("/(.*?)\.(.*?)/i","$2",$filename);
+
+               $ext = substr( $filename,-3 );
+               if( $filename == "" ) {
+                  echo "ERROR: Empty file to download. ";
+                  exit;
+               } elseif ( ! file_exists( $filename ) ) {
+                       exit;
        };
        switch( strtolower($ext) ){
           case "pdf": $ctype="application/pdf";              break;
@@ -202,16 +203,12 @@ if ($template_id=='download' OR $template_id=='download.jpg') {
        readfile("$filename");
        exit();
        }
-       else { echo "you don't have permissions for downloading this data"; die(); }
+       else { 
+               echo "you don't have permissions for downloading this data"; 
+               die(); 
+       }
 }
 
-if ($node['template_id']=='2019721'){
-Header("Cache-control: max-age=3600");
-}else{
-Header("Cache-control: no-cache");
-Header("Expires:".gmdate("D, d M Y H:i:s")." GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-}
 
 
 //for cases like search & preview
@@ -265,7 +262,6 @@ if (!empty($_POST['template_event'])) {
        $_POST['offset']=$offset; // XXX sqli?
        $smarty->assign('offset',$offset);
 
-
 if ($node['external_link']=='header://svg' && !is_numeric($template_id)) {
        header("Content-Type: image/svg+xml");
 }