cvs: phpweb(NEW_LOOK_2008) / error.php /include layout.inc /security index.php vulndb.txt

bjori Fri Aug 22 18:36:25 2008 UTC Removed files: (Branch: NEW_LOOK_2008) /phpweb/security index.php vulndb.txt Modified files: /phpweb error.php /phpweb/include layout.inc Log: Remove unused stuff http://cvs.php.net/viewvc.cgi/phpweb/error.php?r1=1.84&r2=1.84.2.1&diff_format=u Index: phpweb/error.php diff -u phpweb/error.php:1.84 phpweb/error.php:1.84.2.1 --- phpweb/error.php:1.84 Sun Apr 20 03:36:11 2008 +++ phpweb/error.php Fri Aug 22 18:36:25 2008 @@ -1,6 +1,6 @@ <?php -// $Id: error.php,v 1.84 2008/04/20 03:36:11 philip Exp $ +// $Id: error.php,v 1.84.2.1 2008/08/22 18:36:25 bjori Exp $ /* @@ -43,15 +43,6 @@ } // ============================================================================ -// FC: handle advisories -if (preg_match("!^security/advisories/PHPSA-(\\d+)\\.php$!", $URI, $array)) { - status_header(200); - $_GET["id"] = $array[1]; - include_once $_SERVER['DOCUMENT_ROOT'] . '/security/index.php'; - exit; -} - -// ============================================================================ // Omit query string from URL and urldecode special chars $URI = urldecode(preg_replace("!(\\?.*$)!", "", $URI)); http://cvs.php.net/viewvc.cgi/phpweb/include/layout.inc?r1=1.287.2.5&r2=1.287.2.6&diff_format=u Index: phpweb/include/layout.inc diff -u phpweb/include/layout.inc:1.287.2.5 phpweb/include/layout.inc:1.287.2.6 --- phpweb/include/layout.inc:1.287.2.5 Wed Aug 20 18:03:05 2008 +++ phpweb/include/layout.inc Fri Aug 22 18:36:25 2008 @@ -1,5 +1,5 @@ <?php -/* $Id: layout.inc,v 1.287.2.5 2008/08/20 18:03:05 bjori Exp $ */ +/* $Id: layout.inc,v 1.287.2.6 2008/08/22 18:36:25 bjori Exp $ */ // Set the static content root differently on php.net $_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ? @@ -355,24 +355,6 @@ return $str; } -// Return HTML code for a submit button image -function make_submit($file, $alt = FALSE, $align = FALSE, $extras = FALSE, - $dir = '/images', $border = 0) -{ - // Get an image without size info and convert the - // border attribute to use CSS, as border="" is not - // supported on <input> elements in [X]HTML - $img = make_image($file, $alt, $align, $extras, $dir, 0, FALSE); - $img = str_replace( - "border=\"$border\"", - "style=\"border: {$border}px;\"", - $img - ); - - // Return with ready input image - return '<input type="image"' . substr($img, 4); -} - // Return a hiperlink to something within the site function make_link ($url, $linktext = FALSE, $target = FALSE, $extras = FALSE) { @@ -453,21 +435,6 @@ } } -function sect_to_file($string) { - $string = strtolower($string); - $string = str_replace(' ','-',$string); - $string = str_replace('_','-',$string); - $func = "function.$string.php"; - $chap = "ref.$string.php"; - $feat = "features.$string.php"; - $struct = "control-structures.$string.php"; - if(@is_file($func)) return $func; - else if(@is_file($chap)) return $chap; - else if(@is_file($feat)) return $feat; - else if(@is_file($struct)) return $struct; - else return "$string.php"; -} - function clean($var) { return htmlspecialchars(get_magic_quotes_gpc() ? stripslashes($var) : $var, ENT_QUOTES); }