Changeset 15283

Timestamp:

04/08/13 20:14:24 (12 years ago)

Author:

tbretz

Message:

Show the log according to the link in /users/fact/operation if no path is given.

File:

• trunk/FACT++/www/showlog.php (modified) (2 diffs)

trunk/FACT++/www/showlog.php

@@ -311 +311 @@
 unset($_GET['refresh']);
 
-$name = empty($_GET['log']) ? "dimserver.log" : $_GET['log'].".log";
-$dir  = empty($_GET['dir']) ? "FACT++"        : $_GET['dir'];
-
-if (!strpos($name, "/")===false || !strpos($dir, "/")===false)
+$prg = empty($_GET['log']) ? "dimserver" : $_GET['log'];
+$dir = $_GET['dir'];
+
+if (!strpos($prg, "/")===false || !strpos($dir, "/")===false)
     return header('HTTP/1.0 403 Access forbidden.');
 
-$filename = "/users/fact/".$dir."/".$name;
+if (empty($dir))
+{
+    if ($prg=="schedule")
+        $prg = "scripts/schedule.js";
+
+    $filename = "/users/fact/operation/".$prg;
+    if (is_link($filename))
+        $filename = "/users/fact/operation/".dirname(readlink($filename))."/".$prg.".log";
+}
+
+if (empty($filename))
+    $filename = "/users/fact/".$dir."/".$prg.".log";
 
 $size = filesize($filename);
@@ -337 +348 @@
     array_splice($file, $pos+1, $n-$max);
 }
+
+$dir  = basename(dirname($filename));
+$name = basename($filename);
 
 ?>