Changeset 35272

Timestamp:

Mar 8, 2013, 10:29:38 AM (13 years ago)

Author:

eugene

Message:

wget does a better job if menu links include the host http server

Location:

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

Files:

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

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

@@ -1 +1 @@
 <?php
-
-global $rootdir;
 
 function head ($title) {
@@ -24 +22 @@
   if (! $project) { $project = "none"; }
 
-  // echo "<p style=\"font-size:50%\">host: $WWWHOST, db: $DBHOST</p>\n";
+  // echo "<p style=\"font-size:50%\">host: $root</p>\n";
   echo "<table class=page cellspacing=10px><tr><td valign=top>\n";
   echo "<table class=menu cellspacing=0px>\n";
@@ -76 +74 @@
     } 
 
-    global $rootdir;
-
     // hi-lite the current page (use select-style, not style)
     $thisname = $_SERVER[SCRIPT_NAME]; 
-    $page = $rootdir . $base;
+    $page = $root . $base;
     if ($page == $thisname) {
       $style = trim($line[1]);
@@ -92 +88 @@
       break;
     case 'picture':
-      // prepend the rootdir if needed (reference to /)
+      // prepend the root if needed (reference to /)
       if ($name[0] == '/') {
         $name = $root . $name;
@@ -99 +95 @@
       break;
     case 'piclink':
-      // prepend the rootdir if needed (reference to /)
+      // prepend the root if needed (reference to /)
       if ($name[0] == '/') {
         $name = $root . $name;

branches/eam_branches/ipp-20130307/dvodist/www-util/ippdata.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@";
  }