finalising upload_data_file

diff --git a/wwwroot/inc/eventz/display.inc b/wwwroot/inc/eventz/display.inc
index 8518cdf7f242db6c7e260a9f894849a7710c10c7..83fba394365300f113cd3822d231d8ecaa5ffe18 100644 (file)
--- a/wwwroot/inc/eventz/display.inc
+++ b/wwwroot/inc/eventz/display.inc
@@ -150,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;
@@ -203,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

diff --git a/wwwroot/nodes.php b/wwwroot/nodes.php
index 246a99e10d1e2fb3689fb042b184fe7ed31c8812..a8e01e007dca42845de6312e082a453e927370d0 100644 (file)
--- a/wwwroot/nodes.php
+++ b/wwwroot/nodes.php
@@ -35,7 +35,6 @@ $db = new CLASS_DATABASE();
 
 switch(true) {
        case preg_match('/id\/([0-9]+)(?:\/([a-zA-Z0-9]+)\/?)?/',$_SERVER['PATH_INFO'],$match):
-               //      print_r($match);
                $_GET['node_id']=$match[1];
                if (!empty($match[2])) {
                        $_GET['template_id']=$match[2];
@@ -52,7 +51,6 @@ switch(true) {
                break;
 
        case preg_match('/k\/([a-z0-9]{1,7})(?:\/([a-z0-9]+))?/',$_SERVER['PATH_INFO'],$match):
-               echo "picic";
                $_GET['node_id']=base_convert($match[1], 36, 10);
                if (!empty($match[2])) {
                        $_GET['template_id']=$match[2];