cvs: phpweb / mirrors.php /include layout.inc
| From: | jim winstead | Date: | Sun, 03 Feb 2002 20:52:37 +0000 |
| Subject: | cvs: phpweb / mirrors.php /include layout.inc | ||
| Groups: | php.mirrors | ||
| Request: | Send a blank email to php-mirrors+get-8514@lists.php.net to get a copy of this message | ||
jimw Sun Feb 3 15:52:37 2002 EDT
Modified files:
/phpweb mirrors.php
/phpweb/include layout.inc
Log:
Squeeze out about 500 bytes of unnecessary data in the header and footer. This
amounts to 336,467,736 bytes less traffic that www.php.net would have had to
send on Friday. (More or less.) Or 74,302,558 bytes less data that would have
been sent for requests to the home page so far this month.
Index: phpweb/mirrors.php diff -u phpweb/mirrors.php:1.12 phpweb/mirrors.php:1.13 --- phpweb/mirrors.php:1.12 Thu Sep 20 19:15:45 2001 +++ phpweb/mirrors.php Sun Feb 3 15:52:36 2002 @@ -1,7 +1,7 @@ <?php require_once 'prepend.inc'; -if (isset($REDIRECT)) { +if (isset($FROM) && isset($country)) { header("Location: $country$FROM"); exit; } Index: phpweb/include/layout.inc diff -u phpweb/include/layout.inc:1.72 phpweb/include/layout.inc:1.73 --- phpweb/include/layout.inc:1.72 Wed Jan 30 13:59:15 2002 +++ phpweb/include/layout.inc Sun Feb 3 15:52:36 2002 @@ -1,5 +1,5 @@ <?php -/* $Id: layout.inc,v 1.72 2002/01/30 18:59:15 jimw Exp $ */ +/* $Id: layout.inc,v 1.73 2002/02/03 20:52:36 jimw Exp $ */ # spacer() # print a IMG tag for a sized spacer GIF @@ -186,28 +186,17 @@ <title>PHP<?php if ($title) echo ": $title";?></title> <link rel="stylesheet" href="/style.css"> </head> - <body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" - bgcolor="#ffffff" text="#000000" link="#000099" alink="#0000ff" - vlink="#000099"><a name="TOP"></a> + bgcolor="#ffffff" text="#000000" link="#000099" alink="#0000ff" + vlink="#000099"> <table border="0" cellspacing="0" cellpadding="0" height="48" width="100%"> - <tr bgcolor="#9999cc"> - <td align="middle" rowspan="2" width="120"> - <a href="/"><?php print_image('php_logo.gif', 'PHP'); ?></a><br> - </td> - <td align="right" valign="top"> - <font color="#ffffff"><b> - <url-minder-ignore> - <?php echo strftime("%A, %B %d, %Y"); ?> - </url-minder-ignore> - </b> <br> - </font> - </td> - </tr> - - <tr bgcolor="#9999cc"> - <td align="right" valign="bottom"> - <?php + <tr bgcolor="#9999cc"> + <td align="middle" rowspan="2" width="120"><a href="/"><?php print_image('php_logo.gif', 'PHP'); ?></a></td> + <td> </td> + </tr> + <tr bgcolor="#9999cc"> + <td align="right" valign="bottom"> +<?php print_link('/downloads.php','downloads',false,'class="small"'); echo delim(); print_link('/docs.php', 'documentation', false, 'class="small"'); @@ -219,16 +208,14 @@ print_link('http://bugs.php.net/','reporting bugs',false,'class="small"'); echo delim(); print_link('/links.php','links',false,'class="small"'); - ?> <br> - </td> - </tr> - - <tr bgcolor="#333366"><td colspan="2"><?php spacer(1,1);?><br></td></tr> - - <tr bgcolor="#666699"> - <form method="post" action="/search.php"> - <td align="right" valign="top" colspan="2"><font color="#ffffff"> - <small>search for</small> + ?> + </td> + </tr> + <tr bgcolor="#333366"><td colspan="2"><?php spacer(1,1);?></td></tr> + <tr bgcolor="#666699"> + <form method="post" action="/search.php"> + <td align="right" valign="top" colspan="2"><font color="#ffffff"> +<small>search for</small> <input class="small" type="text" name="pattern" value="<?php echo htmlspecialchars(get_magic_quotes_gpc()?stripslashes($prevsearch):$prevsearch) ?>" size="30"> <small>in the</small> <select name="show" class="small"> @@ -240,13 +227,12 @@ <option value="devlist">developer mailing list <option value="phpdoc">documentation mailing list </select> -<?php echo make_submit('small_submit_white.gif', 'search', 'bottom'); - ?> <br> - </font></td> - </form> - </tr> - - <tr bgcolor="#333366"><td colspan="2"><?php spacer(1,1);?><br></td></tr> +<?php echo make_submit('small_submit_white.gif', 'search', 'bottom'); ?> +</font> + </td> + </form> + </tr> + <tr bgcolor="#333366"><td colspan="2"><?php spacer(1,1);?></td></tr> </table> <?php @@ -257,19 +243,16 @@ <table cellpadding="0" cellspacing="0"> <tr valign="top"> <?php if (isset($SIDEBAR_DATA)):?> - <td width=200 bgcolor="#f0f0f0"> - <table width="100%" cellpadding="2" cellspacing="0" border=0> - <tr valign="top"> - <td class="sidebar"><?php echo $SIDEBAR_DATA?></td> - </tr> + <td width="200" bgcolor="#f0f0f0"> + <table width="100%" cellpadding="2" cellspacing="0" border="0"> + <tr valign="top"><td class="sidebar"><?php echo $SIDEBAR_DATA?></td></tr> </table> </td> - <td bgcolor="#cccccc" background="/gifs/checkerboard.gif"><?php spacer(1,1);?><br></td> + <td bgcolor="#cccccc" background="/gifs/checkerboard.gif"><?php spacer(1,1);?></td> <?php endif; ?> <td> <table cellpadding="10" cellspacing="0" width="620"> - <tr> - <td valign="top"> + <tr><td valign="top"> <?php endif; } @@ -283,43 +266,40 @@ global $SCRIPT_NAME,$MYSITE,$LAST_UPDATED,$PHP_SELF,$enclosed, $RSIDEBAR_DATA; if ($enclosed) { spacer(620); - echo "</td></tr></table></td>"; + echo "</td></tr></table></td>"; if(isset($RSIDEBAR_DATA)) {?> - <td bgcolor="#cccccc" background="/gifs/checkerboard.gif"><?php spacer(1,1);?><br></td> - <td width=175 bgcolor="#f0f0f0"> - <table width="100%" cellpadding="4" cellspacing="0"> - <tr valign="top"> - <td class="sidebar"><?php echo $RSIDEBAR_DATA?></td> - </tr> - </table> - </td> - <?} +<td bgcolor="#cccccc" background="/gifs/checkerboard.gif"><?php spacer(1,1);?></td> +<td width=175 bgcolor="#f0f0f0"> + <table width="100%" cellpadding="4" cellspacing="0"> + <tr valign="top"><td class="sidebar"><?php echo $RSIDEBAR_DATA?></td></tr> + </table> +</td> +<? } echo "</tr></table>\n"; } ?> <table border="0" cellspacing="0" cellpadding="0" width="100%"> - <tr bgcolor="#333366"><td><?php spacer(1,1);?><br></td></tr> - <tr bgcolor="#9999cc"> - <td align="right" valign="bottom"> - <form method="get" action="/mirrors.php" onsubmit="return gotomirror(this);" style="margin-bottom:0;"> - <script language="javascript"> - <!-- - function gotomirror(form) { - mirror = form.country.options[form.country.selectedIndex].value; - if (mirror != 'http://' + window.location.hostname + '/') { - window.location.href = mirror + - window.location.pathname.substring(1) + - window.location.hash + - window.location.search; - } - return false; - } - //--> - </script> - <input type="hidden" name="REDIRECT" value="1"> - <input type="hidden" name="FROM" value="<?php echo htmlspecialchars($PHP_SELF)?>"> - <?php + <tr bgcolor="#333366"><td><?php spacer(1,1);?></td></tr> + <tr bgcolor="#9999cc"> + <td align="right" valign="bottom"> + <form method="get" action="/mirrors.php" onsubmit="return gotomirror(this);" style="margin-bottom:0;"> + <script language="javascript"> + <!-- + function gotomirror(form) { + mirror = form.country.options[form.country.selectedIndex].value; + if (mirror != 'http://' + window.location.hostname + '/') { + window.location.href = mirror + + window.location.pathname.substring(1) + + window.location.hash + + window.location.search; + } + return false; + } + //--> + </script> + <input type="hidden" name="FROM" value="<?php echo htmlspecialchars($PHP_SELF)?>"> +<?php print_link('/source.php?url='.$SCRIPT_NAME, 'show source', false, 'class="small"'); echo delim(); print_link('/credits.php', 'credits', false, 'class="small"'); @@ -333,30 +313,24 @@ show_mirror_options($MYSITE); echo "</select> "; echo make_submit('small_submit.gif', 'go', 'bottom' ); - ?> <br> - </form> - </td> - </tr> - <tr bgcolor="#333366"><td><?php spacer(1,1); ?><br></td></tr> + ?> + </form> + </td> + </tr> + <tr bgcolor="#333366"><td><?php spacer(1,1); ?></td></tr> </table> <table border="0" cellspacing="0" cellpadding="6" width="100%"> - <tr valign="top" bgcolor="#cccccc"> - <td><small> - <?php echo make_link('/copyright.php', 'Copyright © 2001, 2002 The PHP Group'); ?><br> - All rights reserved.<br> - </small> - </td> - <td align="right"><small> - This mirror generously provided by: - <a href="<?php echo mirror_provider_url();?>"><?php echo mirror_provider();?></a><br> - Last updated: <url-minder-ignore><?php echo strftime("%c %Z", $LAST_UPDATED); ?></url-minder-ignore><br> - </small> - </td> - </tr> + <tr valign="top" bgcolor="#cccccc"> + <td><small><?php echo make_link('/copyright.php', 'Copyright © 2001, 2002 The PHP Group'); ?><br />All rights reserved.</small></td> + <td align="right"><small> + This mirror generously provided by: + <a href="<?php echo mirror_provider_url();?>"><?php echo mirror_provider();?></a><br /> + Last updated: <url-minder-ignore><?php echo strftime("%c %Z", $LAST_UPDATED); ?></url-minder-ignore> + </small> + </td> + </tr> </table> - - </body> </html> <?php
Index: phpweb/mirrors.php diff -u phpweb/mirrors.php:1.12 phpweb/mirrors.php:1.13 --- phpweb/mirrors.php:1.12 Thu Sep 20 19:15:45 2001 +++ phpweb/mirrors.php Sun Feb 3 15:52:36 2002 @@ -1,7 +1,7 @@ <?php require_once 'prepend.inc'; -if (isset($REDIRECT)) { +if (isset($FROM) && isset($country)) { header("Location: $country$FROM"); exit; } Index: phpweb/include/layout.inc diff -u phpweb/include/layout.inc:1.72 phpweb/include/layout.inc:1.73 --- phpweb/include/layout.inc:1.72 Wed Jan 30 13:59:15 2002 +++ phpweb/include/layout.inc Sun Feb 3 15:52:36 2002 @@ -1,5 +1,5 @@ <?php -/* $Id: layout.inc,v 1.72 2002/01/30 18:59:15 jimw Exp $ */ +/* $Id: layout.inc,v 1.73 2002/02/03 20:52:36 jimw Exp $ */ # spacer() # print a IMG tag for a sized spacer GIF @@ -186,28 +186,17 @@ <title>PHP<?php if ($title) echo ": $title";?></title> <link rel="stylesheet" href="/style.css"> </head> - <body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" - bgcolor="#ffffff" text="#000000" link="#000099" alink="#0000ff" - vlink="#000099"><a name="TOP"></a> + bgcolor="#ffffff" text="#000000" link="#000099" alink="#0000ff" + vlink="#000099"> <table border="0" cellspacing="0" cellpadding="0" height="48" width="100%"> - <tr bgcolor="#9999cc"> - <td align="middle" rowspan="2" width="120"> - <a href="/"><?php print_image('php_logo.gif', 'PHP'); ?></a><br> - </td> - <td align="right" valign="top"> - <font color="#ffffff"><b> - <url-minder-ignore> - <?php echo strftime("%A, %B %d, %Y"); ?> - </url-minder-ignore> - </b> <br> - </font> - </td> - </tr> - - <tr bgcolor="#9999cc"> - <td align="right" valign="bottom"> - <?php + <tr bgcolor="#9999cc"> + <td align="middle" rowspan="2" width="120"><a href="/"><?php print_image('php_logo.gif', 'PHP'); ?></a></td> + <td> </td> + </tr> + <tr bgcolor="#9999cc"> + <td align="right" valign="bottom"> +<?php print_link('/downloads.php','downloads',false,'class="small"'); echo delim(); print_link('/docs.php', 'documentation', false, 'class="small"'); @@ -219,16 +208,14 @@ print_link('http://bugs.php.net/','reporting bugs',false,'class="small"'); echo delim(); print_link('/links.php','links',false,'class="small"'); - ?> <br> - </td> - </tr> - - <tr bgcolor="#333366"><td colspan="2"><?php spacer(1,1);?><br></td></tr> - - <tr bgcolor="#666699"> - <form method="post" action="/search.php"> - <td align="right" valign="top" colspan="2"><font color="#ffffff"> - <small>search for</small> + ?> + </td> + </tr> + <tr bgcolor="#333366"><td colspan="2"><?php spacer(1,1);?></td></tr> + <tr bgcolor="#666699"> + <form method="post" action="/search.php"> + <td align="right" valign="top" colspan="2"><font color="#ffffff"> +<small>search for</small> <input class="small" type="text" name="pattern" value="<?php echo htmlspecialchars(get_magic_quotes_gpc()?stripslashes($prevsearch):$prevsearch) ?>" size="30"> <small>in the</small> <select name="show" class="small"> @@ -240,13 +227,12 @@ <option value="devlist">developer mailing list <option value="phpdoc">documentation mailing list </select> -<?php echo make_submit('small_submit_white.gif', 'search', 'bottom'); - ?> <br> - </font></td> - </form> - </tr> - - <tr bgcolor="#333366"><td colspan="2"><?php spacer(1,1);?><br></td></tr> +<?php echo make_submit('small_submit_white.gif', 'search', 'bottom'); ?> +</font> + </td> + </form> + </tr> + <tr bgcolor="#333366"><td colspan="2"><?php spacer(1,1);?></td></tr> </table> <?php @@ -257,19 +243,16 @@ <table cellpadding="0" cellspacing="0"> <tr valign="top"> <?php if (isset($SIDEBAR_DATA)):?> - <td width=200 bgcolor="#f0f0f0"> - <table width="100%" cellpadding="2" cellspacing="0" border=0> - <tr valign="top"> - <td class="sidebar"><?php echo $SIDEBAR_DATA?></td> - </tr> + <td width="200" bgcolor="#f0f0f0"> + <table width="100%" cellpadding="2" cellspacing="0" border="0"> + <tr valign="top"><td class="sidebar"><?php echo $SIDEBAR_DATA?></td></tr> </table> </td> - <td bgcolor="#cccccc" background="/gifs/checkerboard.gif"><?php spacer(1,1);?><br></td> + <td bgcolor="#cccccc" background="/gifs/checkerboard.gif"><?php spacer(1,1);?></td> <?php endif; ?> <td> <table cellpadding="10" cellspacing="0" width="620"> - <tr> - <td valign="top"> + <tr><td valign="top"> <?php endif; } @@ -283,43 +266,40 @@ global $SCRIPT_NAME,$MYSITE,$LAST_UPDATED,$PHP_SELF,$enclosed, $RSIDEBAR_DATA; if ($enclosed) { spacer(620); - echo "</td></tr></table></td>"; + echo "</td></tr></table></td>"; if(isset($RSIDEBAR_DATA)) {?> - <td bgcolor="#cccccc" background="/gifs/checkerboard.gif"><?php spacer(1,1);?><br></td> - <td width=175 bgcolor="#f0f0f0"> - <table width="100%" cellpadding="4" cellspacing="0"> - <tr valign="top"> - <td class="sidebar"><?php echo $RSIDEBAR_DATA?></td> - </tr> - </table> - </td> - <?} +<td bgcolor="#cccccc" background="/gifs/checkerboard.gif"><?php spacer(1,1);?></td> +<td width=175 bgcolor="#f0f0f0"> + <table width="100%" cellpadding="4" cellspacing="0"> + <tr valign="top"><td class="sidebar"><?php echo $RSIDEBAR_DATA?></td></tr> + </table> +</td> +<? } echo "</tr></table>\n"; } ?> <table border="0" cellspacing="0" cellpadding="0" width="100%"> - <tr bgcolor="#333366"><td><?php spacer(1,1);?><br></td></tr> - <tr bgcolor="#9999cc"> - <td align="right" valign="bottom"> - <form method="get" action="/mirrors.php" onsubmit="return gotomirror(this);" style="margin-bottom:0;"> - <script language="javascript"> - <!-- - function gotomirror(form) { - mirror = form.country.options[form.country.selectedIndex].value; - if (mirror != 'http://' + window.location.hostname + '/') { - window.location.href = mirror + - window.location.pathname.substring(1) + - window.location.hash + - window.location.search; - } - return false; - } - //--> - </script> - <input type="hidden" name="REDIRECT" value="1"> - <input type="hidden" name="FROM" value="<?php echo htmlspecialchars($PHP_SELF)?>"> - <?php + <tr bgcolor="#333366"><td><?php spacer(1,1);?></td></tr> + <tr bgcolor="#9999cc"> + <td align="right" valign="bottom"> + <form method="get" action="/mirrors.php" onsubmit="return gotomirror(this);" style="margin-bottom:0;"> + <script language="javascript"> + <!-- + function gotomirror(form) { + mirror = form.country.options[form.country.selectedIndex].value; + if (mirror != 'http://' + window.location.hostname + '/') { + window.location.href = mirror + + window.location.pathname.substring(1) + + window.location.hash + + window.location.search; + } + return false; + } + //--> + </script> + <input type="hidden" name="FROM" value="<?php echo htmlspecialchars($PHP_SELF)?>"> +<?php print_link('/source.php?url='.$SCRIPT_NAME, 'show source', false, 'class="small"'); echo delim(); print_link('/credits.php', 'credits', false, 'class="small"'); @@ -333,30 +313,24 @@ show_mirror_options($MYSITE); echo "</select> "; echo make_submit('small_submit.gif', 'go', 'bottom' ); - ?> <br> - </form> - </td> - </tr> - <tr bgcolor="#333366"><td><?php spacer(1,1); ?><br></td></tr> + ?> + </form> + </td> + </tr> + <tr bgcolor="#333366"><td><?php spacer(1,1); ?></td></tr> </table> <table border="0" cellspacing="0" cellpadding="6" width="100%"> - <tr valign="top" bgcolor="#cccccc"> - <td><small> - <?php echo make_link('/copyright.php', 'Copyright © 2001, 2002 The PHP Group'); ?><br> - All rights reserved.<br> - </small> - </td> - <td align="right"><small> - This mirror generously provided by: - <a href="<?php echo mirror_provider_url();?>"><?php echo mirror_provider();?></a><br> - Last updated: <url-minder-ignore><?php echo strftime("%c %Z", $LAST_UPDATED); ?></url-minder-ignore><br> - </small> - </td> - </tr> + <tr valign="top" bgcolor="#cccccc"> + <td><small><?php echo make_link('/copyright.php', 'Copyright © 2001, 2002 The PHP Group'); ?><br />All rights reserved.</small></td> + <td align="right"><small> + This mirror generously provided by: + <a href="<?php echo mirror_provider_url();?>"><?php echo mirror_provider();?></a><br /> + Last updated: <url-minder-ignore><?php echo strftime("%c %Z", $LAST_UPDATED); ?></url-minder-ignore> + </small> + </td> + </tr> </table> - - </body> </html> <?php