cvs: phpweb /include shared-manual.inc

goba Wed Sep 13 20:32:40 2006 UTC Modified files: /phpweb/include shared-manual.inc Log: remove compatibility functions, as all manuals are now generated with the new interface plus apply https linking to the master server and remove an old notice http://cvs.php.net/viewvc.cgi/phpweb/include/shared-manual.inc?r1=1.228&r2=1.229&diff_format=u Index: phpweb/include/shared-manual.inc diff -u phpweb/include/shared-manual.inc:1.228 phpweb/include/shared-manual.inc:1.229 --- phpweb/include/shared-manual.inc:1.228 Wed Sep 13 20:23:32 2006 +++ phpweb/include/shared-manual.inc Wed Sep 13 20:32:40 2006 @@ -1,6 +1,6 @@ <?php // -*- C++ -*- -// $Id: shared-manual.inc,v 1.228 2006/09/13 20:23:32 goba Exp $ +// $Id: shared-manual.inc,v 1.229 2006/09/13 20:32:40 goba Exp $ /* @@ -227,7 +227,6 @@ // If we have no notes, then inform the user if (sizeof($notes) == 0) { - //echo "\n <div class=\"note\">User notes are temporarily unavailable. Please read the related news item on <a href=\"/\">our frontpage</a>.</div>"; echo "\n <div class=\"note\">There are no user contributed notes for this page.</div>"; } @@ -290,21 +289,21 @@ $admin = "\n <span class=\"action\">\n " . make_popup_link( - 'http://master.php.net/manage/user-notes.php?action=edit+' . $id, + 'https://master.php.net/manage/user-notes.php?action=edit+' . $id, make_image('notes-edit.gif', 'edit note'), 'admin', 'scrollbars=yes,width=650,height=400' ) . "\n " . make_popup_link( - 'http://master.php.net/manage/user-notes.php?action=reject+' . $id, + 'https://master.php.net/manage/user-notes.php?action=reject+' . $id, make_image('notes-reject.gif', 'reject note'), 'admin', 'scrollbars=no,width=300,height=200' ) . "\n " . make_popup_link( - 'http://master.php.net/manage/user-notes.php?action=delete+' . $id, + 'https://master.php.net/manage/user-notes.php?action=delete+' . $id, make_image('notes-delete.gif', 'delete note'), 'admin', 'scrollbars=no,width=300,height=200' @@ -322,30 +321,3 @@ USER_NOTE_TEXT; } - -// ============================================================================= -// Compatibility functions with old function interface -// ============================================================================= - -function sendManualHeaders($charset, $lang) -{ - $GLOBALS['PGI']['head'] = array($charset, $lang); -} - -function manualHeader() -{ - // XSL [and new DSSSL] sheets provide params in the - // 'this' PGI array element, while old DSSSL sheets - // provide info via two parameters [title, id] - if (func_num_args() > 0) { - list($title, $id) = func_get_args(); - $GLOBALS['PGI']['this'] = array($id, $title); - } - - // This does the work of sendManualHeaders() - // and manualHeader() too - manual_header(); -} - -function manualFooter() { manual_footer(); } -function setupNavigation($data) { manual_setup($data); }