Index: trunk/dvodist/www-util/ipp.php =================================================================== --- trunk/dvodist/www-util/ipp.php (revision 35238) +++ trunk/dvodist/www-util/ipp.php (revision 35415) @@ -1,5 +1,3 @@ \n"; + echo "\n"; + echo "\n"; + echo "\n"; + if (! $project) { $project = "none"; } - // echo "

host: $WWWHOST, db: $DBHOST

\n"; + // echo "

host: $root

\n"; echo "
\n"; echo "\n"; @@ -76,9 +92,7 @@ } - 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,5 +106,5 @@ break; case 'picture': - // prepend the rootdir if needed (reference to /) + // prepend the root if needed (reference to /) if ($name[0] == '/') { $name = $root . $name; @@ -99,5 +113,5 @@ break; case 'piclink': - // prepend the rootdir if needed (reference to /) + // prepend the root if needed (reference to /) if ($name[0] == '/') { $name = $root . $name; @@ -249,5 +263,6 @@ // 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; @@ -258,4 +273,7 @@ $to_dirlist = ""; while ($line = fgets ($file, 1024)) { + // replace @WWWHOST@ with $root + $line = str_replace ("@WWWHOST@", $root, $line); + // echo "line: $line"; if (!strncmp($line, "@", 1)) {