cvs: phpweb /include bugform.inc bugtypes.inc email-validation.inc layout.inc prepend.inc shared-manual.inc site.inc table_wrapper.inc

goba Sun Jul 8 09:06:41 2001 EDT Modified files: /phpweb/include bugform.inc bugtypes.inc email-validation.inc layout.inc prepend.inc shared-manual.inc site.inc table_wrapper.inc Log: Cosmetics done in the include dir too :))

Index: phpweb/include/bugform.inc diff -u phpweb/include/bugform.inc:1.4 phpweb/include/bugform.inc:1.5 --- phpweb/include/bugform.inc:1.4 Sat Jul 7 02:54:16 2001 +++ phpweb/include/bugform.inc Sun Jul 8 09:06:37 2001 @@ -1,10 +1,10 @@ -<form method="POST" action="<?php echo $PHP_SELF;?>"> -<input type="hidden" name="cmd" value="send" /> -<table> +<form method="post" action="<?php echo $PHP_SELF;?>"> +<input type="hidden" name="cmd" value="send"> +<table border="0"> <tr> <th align="right">Your email address:</th> <td colspan="2"> - <input type="text" size="20" maxlength="40" name="email" value="<?php echo htmlspecialchars(stripslashes($email));?>" /> + <input type="text" size="20" maxlength="40" name="email" value="<?php echo htmlspecialchars(stripslashes($email));?>"> </td> </tr><tr> <th align="right">PHP version:</th> @@ -19,20 +19,20 @@ </tr><tr> <th align="right">Operating system:</th> <td colspan="2"> - <input type="text" size="20" maxlength="32" name="php_os" value="<?php echo htmlspecialchars(stripslashes($operating_system));?>" /> + <input type="text" size="20" maxlength="32" name="php_os" value="<?php echo htmlspecialchars(stripslashes($operating_system));?>"> </td> </tr><tr> <th align="right">Bug description:</th> <td colspan="2"> - <input type="text" size="40" maxlength="79" name="sdesc" value="<?php echo htmlspecialchars(stripslashes($sdesc));?>" /> + <input type="text" size="40" maxlength="79" name="sdesc" value="<?php echo htmlspecialchars(stripslashes($sdesc));?>"> </td></tr> </tr><tr> <th align="right">Password:</th> <td> - <input type="text" size="20" maxlength="20" name="passwd" value="<?php echo htmlspecialchars(stripslashes($passwd));?>" /> + <input type="text" size="20" maxlength="20" name="passwd" value="<?php echo htmlspecialchars(stripslashes($passwd));?>"> </td> <td><font size="-2"> - You may enter any password here. This password allows you to come back and + You may enter any password here. This password allows you to come back and modify your submitted bug report at a later date. [<a href="/bug-pwd-finder.php">Lost your password?</a>] </font></td> Index: phpweb/include/bugtypes.inc diff -u phpweb/include/bugtypes.inc:1.3 phpweb/include/bugtypes.inc:1.4 --- phpweb/include/bugtypes.inc:1.3 Sun Jul 8 04:33:14 2001 +++ phpweb/include/bugtypes.inc Sun Jul 8 09:06:38 2001 @@ -151,3 +151,4 @@ "Unknown/Other Function" => "Unknown/Other Function", "Website problem" => "Website problem" ); +?> Index: phpweb/include/email-validation.inc diff -u phpweb/include/email-validation.inc:1.5 phpweb/include/email-validation.inc:1.6 --- phpweb/include/email-validation.inc:1.5 Wed Mar 7 19:18:09 2001 +++ phpweb/include/email-validation.inc Sun Jul 8 09:06:38 2001 @@ -2,17 +2,15 @@ /* * email_validation.inc - * $Id: email-validation.inc,v 1.5 2001/03/08 00:18:09 jimw Exp $ + * $Id: email-validation.inc,v 1.6 2001/07/08 13:06:38 goba Exp $ */ - // checks that is an *outside* host, and tries to remove anti-SPAM bits function clean_AntiSPAM ($email) { $remove_spam = "[-_]?(NO|I[-_]?HATE|DELETE|REMOVE)[-_]?(THIS)?(ME|SPAM)?[-_]?"; return eregi_replace($remove_spam,"",trim($email)); } - function is_emailable_address( $email) { $hosts_regex="lists\.php\.net|chek.*\.com"; $excluded_hosts = ereg($hosts_regex,$email); @@ -23,4 +21,5 @@ return false; } } + ?> Index: phpweb/include/layout.inc diff -u phpweb/include/layout.inc:1.42 phpweb/include/layout.inc:1.43 --- phpweb/include/layout.inc:1.42 Fri Jul 6 23:41:10 2001 +++ phpweb/include/layout.inc Sun Jul 8 09:06:38 2001 @@ -1,7 +1,6 @@ <?php -/* $Id: layout.inc,v 1.42 2001/07/07 03:41:10 jimw Exp $ */ +/* $Id: layout.inc,v 1.43 2001/07/08 13:06:38 goba Exp $ */ - # spacer() # print a IMG tag for a sized spacer GIF # @@ -15,8 +14,6 @@ ); } - - # resize_image() # tag the output of make_image() and resize it manually # @@ -28,8 +25,6 @@ return $str; } - - # make_image() # return an IMG tag for a given file (relative to the images dir) # @@ -62,8 +57,6 @@ return $image; } - - # print_image() # print an IMG tag for a given file # @@ -72,8 +65,6 @@ print make_image($file, $alt, $align, $extras, $dir); } - - # make_submit() # - make a submit button image # @@ -90,8 +81,6 @@ return $return; } - - # delim() # print a pipe delimiter # @@ -103,8 +92,6 @@ return sprintf('<font color="%s">&nbsp;|&nbsp;</font>', $color ); } - - # hdelim() # print a horizontal delimiter (just a wide line); # @@ -116,8 +103,6 @@ return sprintf('<hr noshade size="1" color="%s">', $color ); } - - # make_link() # return a hyperlink to something, within the site # @@ -131,8 +116,6 @@ ); } - - # print_link() # echo a hyperlink to something, within the site # @@ -141,7 +124,6 @@ echo make_link($url, $linktext, $target, $extras); } - # download_link() # print a link for a downloadable file (including filesize) # @@ -164,10 +146,8 @@ if ($size) { echo " [" . number_format($size, 0, ".", ",") . "Kb]"; } } - $enclosed = 0; - # commonheader() # # @@ -183,15 +163,9 @@ <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> +<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" + bgcolor="#ffffff" text="#000000" link="#000099" alink="#0000ff" + vlink="#000099"><a name="TOP"></a> <table border="0" cellspacing="0" cellpadding="0" height="48" width="100%"> <tr bgcolor="#9999cc"> <td align="middle" rowspan="2" width="120"> @@ -228,21 +202,21 @@ <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"> + <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($prevsearch) ?>" SIZE="30"> +<input class="small" type="text" name="pattern" value="<?php echo htmlspecialchars($prevsearch) ?>" size="30"> <small>in the</small> -<SELECT NAME="show" CLASS="small"> -<OPTION VALUE="quickref" SELECTED>function list -<OPTION VALUE="nosource">whole site -<OPTION VALUE="manual">online documentation -<OPTION VALUE="bugdb">bug database -<OPTION VALUE="maillist">general mailing list -<OPTION VALUE="devlist">developer mailing list -<OPTION VALUE="phpdoc">documentation mailing list -<OPTION VALUE="source">website source code -</SELECT> +<select name="show" class="small"> +<option value="quickref" selected>function list +<option value="nosource">whole site +<option value="manual">online documentation +<option value="bugdb">bug database +<option value="maillist">general mailing list +<option value="devlist">developer mailing list +<option value="phpdoc">documentation mailing list +<option value="source">website source code +</select> <?php echo make_submit('small_submit_white.gif', 'search', 'bottom'); ?>&nbsp;<br> </font></td> @@ -278,8 +252,6 @@ } - - # commonfooter() # # @@ -294,7 +266,7 @@ <table border="0" cellspacing="0" cellpadding="0" width="100%"> <tr bgcolor="#333366"><td><?php spacer(1,1);?><br></td></tr> <tr bgcolor="#9999cc"> - <form method="GET" action="/mirrors.php" onsubmit="return gotomirror(this);"> + <form method="get" action="/mirrors.php" onsubmit="return gotomirror(this);"> <td align="right" valign="bottom"> <script language="javascript"> <!-- @@ -308,8 +280,8 @@ } //--> </script> - <input type="hidden" name="REDIRECT" value="1" /> - <input type="hidden" name="FROM" value="<?php echo htmlspecialchars($PHP_SELF)?>" /> + <input type="hidden" name="REDIRECT" value="1"> + <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(); @@ -334,14 +306,14 @@ <table border="0" cellspacing="0" cellpadding="6" width="100%"> <tr valign="top" bgcolor="#cccccc"> <td><small> - <?php echo make_link('/copyright.php', 'Copyright &copy; 2001 The PHP Group'); ?><BR> - All rights reserved.<BR> + <?php echo make_link('/copyright.php', 'Copyright &copy; 2001 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> + <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> @@ -378,4 +350,5 @@ $text = "<tt>".nl2br($text)."</tt>"; return $text; } + ?> Index: phpweb/include/prepend.inc diff -u phpweb/include/prepend.inc:1.3 phpweb/include/prepend.inc:1.4 --- phpweb/include/prepend.inc:1.3 Fri Jun 29 13:51:20 2001 +++ phpweb/include/prepend.inc Sun Jul 8 09:06:38 2001 @@ -1,10 +1,10 @@ <?php // -*- C++ -*- -/* $Id: prepend.inc,v 1.3 2001/06/29 17:51:20 goba Exp $ */ require_once 'site.inc'; require_once 'layout.inc'; -# this file is generated on rsync.php.net and propogated from there -# it just defines $LAST_UPDATED. + +# this file is generated on rsync.php.net and propogated +# from there it just defines $LAST_UPDATED. require_once 'last_updated.inc'; ?> Index: phpweb/include/shared-manual.inc diff -u phpweb/include/shared-manual.inc:1.106 phpweb/include/shared-manual.inc:1.107 --- phpweb/include/shared-manual.inc:1.106 Sun Jul 1 05:55:13 2001 +++ phpweb/include/shared-manual.inc Sun Jul 8 09:06:38 2001 @@ -6,7 +6,6 @@ $SIDEBAR_DATA = ''; - function setupNavigation($data) { global $NEXT, $PREV, $UP, $HOME, $TOC, $tstamp; $HOME = @$data["home"]; @@ -18,14 +17,12 @@ $tstamp = gmdate("D, d M Y",getlastmod()); } - - function makeBorderTOC($this) { global $NEXT, $PREV, $UP, $HOME, $TOC, $PHP_SELF, $DOCUMENT_ROOT; global $SIDEBAR_DATA, $LANG; - $SIDEBAR_DATA = '<form method="GET" action="/manual-lookup.php">' . - $SIDEBAR_DATA.= '<table border="0" CELLPADDING="4" CELLSPACING="0">'; + $SIDEBAR_DATA = '<form method="get" action="/manual-lookup.php">' . + $SIDEBAR_DATA.= '<table border="0" cellpadding="4" cellspacing="0">'; $SIDEBAR_DATA.= '<tr valign="top"><td><small>' . '<input type="hidden" name="lang" value="' . $LANG . '">' . @@ -181,7 +178,7 @@ </td></tr> </table> </td> -</tr> +</tr> <?php }; @@ -191,8 +188,8 @@ // otherwise look in "/manual/usernotes/$title.txt" (if present) global $MYSITE; $notes = array(); - if(strstr($MYSITE,"www.php.net")) { -# if(strstr($MYSITE,"www.php.net") || strstr($MYSITE,"localhost")) { + if (is_primary_site()) { +# if(is_primary_site() || strstr($MYSITE,"localhost")) { $host = 'localhost'; # $host = '127.0.0.1'; $user = 'nobody'; @@ -235,7 +232,7 @@ (($SERVER_PORT==80) ? '' : ':'.$SERVER_PORT ) . $PHP_SELF; - echo "<tr bgcolor=\"#d0d0d0\" VALIGN=\"top\">\n"; + echo "<tr bgcolor=\"#d0d0d0\" valign=\"top\">\n"; echo "<td><small>User Contributed Notes<br></small><b>$title</b><br></td>\n"; echo "<td align=\"right\">"; print_link('/manual/add-note.php?sect='.$id.'&redirect='.$back_url, @@ -288,7 +285,7 @@ function manualLastModified($title, $id) { global $MYSITE, $SCRIPT_FILENAME; - if(strstr($MYSITE,"www.php.net")) { + if (is_primary_site()) { $host = 'localhost'; $user = 'nobody'; $pass = ''; Index: phpweb/include/site.inc diff -u phpweb/include/site.inc:1.210 phpweb/include/site.inc:1.211 --- phpweb/include/site.inc:1.210 Fri Jul 6 23:23:33 2001 +++ phpweb/include/site.inc Sun Jul 8 09:06:38 2001 @@ -46,11 +46,11 @@ foreach ($MIRRORS as $url=>$mirror) { if ($mirror[4] == 1) { /* only list full mirrors here */ if ($url==$current) { - echo '<option value="' . $url . '" SELECTED>' . $COUNTRIES[$mirror[0]] . - ' (' . $mirror[1] . ") *\n"; + echo '<option value="' . $url . '" selected>' . $COUNTRIES[$mirror[0]] . + ' (' . $mirror[1] . ") *</option>\n"; } else { echo '<option value="' . $url . '">' . $COUNTRIES[$mirror[0]] . - ' (' . $mirror[1] . ")\n"; + ' (' . $mirror[1] . ")</option>\n"; } } } Index: phpweb/include/table_wrapper.inc diff -u phpweb/include/table_wrapper.inc:1.3 phpweb/include/table_wrapper.inc:1.4 --- phpweb/include/table_wrapper.inc:1.3 Sun Jul 1 05:59:41 2001 +++ phpweb/include/table_wrapper.inc Sun Jul 8 09:06:38 2001 @@ -114,7 +114,7 @@ } echo ":<br>\n"; - echo "<center><table border=\"0\" cellspacing=\"2\" width=\"95%\"><tr>\n"; + echo "<table align=\"center\" border=\"0\" cellspacing=\"2\" width=\"95%\"><tr>\n"; # print table header global $conversion_table,$dont_display,$centering,$default_alignment,$coloring,$header_coloring,$dont_link; @@ -216,11 +216,11 @@ } } } - echo "</table></center>\n"; + echo "</table>\n"; if ($num_rows!=$total_num_rows) { if ($limit_length && $limit_start!=-1) { - echo "<hr width=\"70%\"><center><table><tr>\n"; + echo "<hr width=\"70%\"><table border=\"0\" align=\"center\"><tr>\n"; if ($limit_start>0) { $new_limit_start = $limit_start-$limit_length; if ($limit_start<0) { @@ -243,7 +243,7 @@ } echo "</a></td>\n"; } - echo "</tr></table></center>\n"; + echo "</tr></table>\n"; } mysql_free_result($result); }