Changeset 35275

Timestamp:

Mar 8, 2013, 11:01:03 AM (13 years ago)

Author:

eugene

Message:

use full-url links as much as possible

Location:

branches/eam_branches/ipp-20130307/dvodist/www-util

Files:

• dvodist.page.mkd (modified) (2 diffs)
• ipp.php (modified) (2 diffs)
• ippdata.page.mkd (modified) (1 diff)

branches/eam_branches/ipp-20130307/dvodist/www-util/dvodist.page.mkd

@@ -12 +12 @@
 $fromProxy = $_SERVER['HTTP_X_FORWARDED_FOR'] && ($_SERVER['REMOTE_ADDR'] == $ifaProxy);
 if ($fromProxy) {
-  $rootdir = "";
+  $rootdir = "@ROOTWWW@";
  } else {
-  $rootdir = "@ROOTDIR@";
+  $rootdir = "@ROOTWWW@@ROOTDIR@";
  }
 
@@ -20 +20 @@
 
 $script = basename($_SERVER[SCRIPT_NAME]);
-do_markdown ($script);
+do_markdown ($script, $rootdir);
 
 menu_end();

branches/eam_branches/ipp-20130307/dvodist/www-util/ipp.php

@@ -245 +245 @@
 
 // lines which start with @ are processed by 'dirlist', all others are processed by Markdown
-function do_markdown ($source) {
+function do_markdown ($source, $root) {
+
   if (!file_exists($source)) return;
 
@@ -254 +255 @@
   $to_dirlist = "";
   while ($line = fgets ($file, 1024)) {
+    // replace @WWWHOST@ with $root
+    $line = str_replace ("@WWWHOST@", $root, $line);
+
     // echo "line: $line";
     if (!strncmp($line, "@", 1)) {

branches/eam_branches/ipp-20130307/dvodist/www-util/ippdata.page.mkd

@@ -20 +20 @@
 
 $script = basename($_SERVER[SCRIPT_NAME]);
-do_markdown ($script);
+do_markdown ($script, $rootdir);
 
 menu_end();