Changeset 40764

Timestamp:

May 30, 2019, 8:47:11 AM (7 years ago)

Author:

eugene

Message:

merge changes from trunk (updates to support modern PHP)

Location:

tags/ipp-ps2-20190404/dvodist/www-util

Files:

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

tags/ipp-ps2-20190404/dvodist/www-util/dvodist.page.mkd

@@ -20 +20 @@
 menu("$utils/dvodist.menu.dat", 'DVO Distribution Server', $rootdir, "$rootdir/ipp.css", '', '');
 
-$script = basename($_SERVER[SCRIPT_NAME]);
+$script = basename($_SERVER['SCRIPT_NAME']);
 do_markdown ($script, $rootdir);
 

tags/ipp-ps2-20190404/dvodist/www-util/ipp.page.mkd

@@ -19 +19 @@
 menu("$utils/ipp.menu.dat", 'DVO Distribution Server', $rootdir, "$rootdir/ipp.css", '', '');
 
-$script = basename($_SERVER[SCRIPT_NAME]);
+$script = basename($_SERVER['SCRIPT_NAME']);
 do_markdown ($script);
 

tags/ipp-ps2-20190404/dvodist/www-util/ipp.php

@@ -56 +56 @@
   // loop over the lines in the file and generate lines in the menu
   while ($line = fgetcsv ($file, 1024, "|")) {
-    if (ereg ('^[:blank:]*#', $line[0])) continue;
+    if (preg_match ('/^\s*#/', $line[0])) continue;
     if (count($line) < 2) continue;
 
@@ -81 +81 @@
 
     // append additional elements if needed
+    $link = "$base";
     if ($append) {
       $link = "$base" . "?" . $append;
-    } else {
-      $link = "$base";
     }
         
     // prepend the rootdir if needed (reference to /)
-    if ($link[0] == '/') {
+    if (substr($link, 0, 1) == "/") {
       $link = $root . $link;
     } 
 
     // hi-lite the current page (use select-style, not style)
-    $thisname = $_SERVER[SCRIPT_NAME]; 
+    $thisname = $_SERVER['SCRIPT_NAME']; 
     $page = $root . $base;
     if ($page == $thisname) {
@@ -147 +146 @@
   // loop over the lines in the file and generate lines in the menu
   while ($line = fgetcsv ($file, 1024, ":")) {
-    if (ereg ('^[:blank:]*#', $line[0])) continue;
+    if (preg_match ('/^\s*#/', $line[0])) continue;
     if (count($line) < 2) continue;
 
@@ -205 +204 @@
     $inline = trim ($inlist[$i], "@ \t");
     $line = explode (":", $inline);
-    if (ereg ('^[:blank:]*#', $line[0])) continue;
+    if (preg_match ('/^\s*#/', $line[0])) continue;
     if (count($line) < 2) continue;
 

tags/ipp-ps2-20190404/dvodist/www-util/ippdata.page.mkd

@@ -18 +18 @@
 menu("$utils/ippdata.menu.dat", 'Pan-STARRS 1 Data Distribution Server', $rootdir, "$rootdir/ipp.css", '', '');
 
-$script = basename($_SERVER[SCRIPT_NAME]);
+$script = basename($_SERVER['SCRIPT_NAME']);
 do_markdown ($script, $rootdir);