cvs: phpweb /include shared-manual.inc

goba Sat Aug 9 04:30:02 2003 EDT Modified files: /phpweb/include shared-manual.inc Log: Proper base setting for printed pages with notes Index: phpweb/include/shared-manual.inc diff -u phpweb/include/shared-manual.inc:1.205 phpweb/include/shared-manual.inc:1.206 --- phpweb/include/shared-manual.inc:1.205 Fri Aug 1 08:29:24 2003 +++ phpweb/include/shared-manual.inc Sat Aug 9 04:30:01 2003 @@ -1,6 +1,6 @@ <?php // -*- C++ -*- -// $Id: shared-manual.inc,v 1.205 2003/08/01 12:29:24 goba Exp $ +// $Id: shared-manual.inc,v 1.206 2003/08/09 08:30:01 goba Exp $ /* @@ -40,7 +40,7 @@ // already set up function manual_header() { - global $PGI, $LAST_UPDATED, $MYSITE, $PRINT_PAGE; + global $PGI, $LAST_UPDATED, $MYSITE, $PRINT_PAGE, $PRINT_NOTES; // Get values out of the config array list($filename, $title) = $PGI['this']; @@ -52,18 +52,22 @@ header("Content-type: text/html;charset=$encoding"); header("Content-language: $lang"); - // Set initial base for this manual page - // [will be extended in manualHeader()!] + // Set base page and href for this manual page $_SERVER['BASE_PAGE'] = 'manual/' . language_convert($lang); + if ($PRINT_PAGE) { + if ($PRINT_NOTES) { + $_SERVER['BASE_PAGE'] .= "/printwn/$filename"; + } else { + $_SERVER['BASE_PAGE'] .= "/print/$filename"; + } + } else { + $_SERVER['BASE_PAGE'] .= "/$filename"; + } $_SERVER['BASE_HREF'] = $MYSITE . $_SERVER['BASE_PAGE']; if ($PRINT_PAGE) { - $_SERVER['BASE_PAGE'] .= "/print/$filename"; - $_SERVER['BASE_HREF'] .= "/print/$filename"; manual_header_print(); } else { - $_SERVER['BASE_PAGE'] .= "/$filename"; - $_SERVER['BASE_HREF'] .= "/$filename"; manual_sidebar(); commonHeader("$title - Manual"); manual_navbar();