cvs: php-gcov-web(SOC06) /www index.php site.api.php viewer.php

nlopess Sat Sep 2 22:35:57 2006 UTC Modified files: (Branch: SOC06) /php-gcov-web/www index.php site.api.php viewer.php Log: remove more old (unused) code. remove some E_NOTICES warnings (but there are still a few more) http://cvs.php.net/viewvc.cgi/php-gcov-web/www/index.php?r1=1.1.2.5&r2=1.1.2.6&diff_format=u Index: php-gcov-web/www/index.php diff -u php-gcov-web/www/index.php:1.1.2.5 php-gcov-web/www/index.php:1.1.2.6 --- php-gcov-web/www/index.php:1.1.2.5 Sat Sep 2 18:38:45 2006 +++ php-gcov-web/www/index.php Sat Sep 2 22:35:57 2006 @@ -9,26 +9,16 @@ $appvars['page']['title'] = 'PHP: Test and Code Coverage Analysis'; $appvars['page']['head'] = 'PHP: Test and Code Coverage Analysis'; -$x = 0; -$phptags = array(); - -$sql = 'SELECT version_id, version_name, version_last_build_time, version_last_attempted_build_date, version_last_successful_build_date FROM versions WHERE'; +$sql = 'SELECT version_name, version_last_build_time, version_last_attempted_build_date, version_last_successful_build_date FROM versions WHERE'; foreach($appvars['site']['tags'] as $tag) { - $sql .= ' version_name = ?'; - - if($x < count($appvars['site']['tags'])-1) - { - $sql .= ' OR'; - } - - $phptags[] = $tag; - ++$x; + $sql .= " version_name = '$tag' OR"; } +$sql = substr($sql, 0, -3); $stmt = $mysqlconn->prepare($sql); -$stmt->execute($phptags); +$stmt->execute(); // Outputs the site header to the screen api_showheader($appvars); @@ -52,9 +42,9 @@ <?php // Output PHP versions into a table -while($row = $stmt->fetch(PDO::FETCH_ORI_NEXT)) +while($row = $stmt->fetch(PDO::FETCH_NUM)) { - list($version_id, $version_name, $version_last_build_time, $version_last_attempted_build_date, $version_last_successful_build_date) = $row; + list($version_name, $version_last_build_time, $version_last_attempted_build_date, $version_last_successful_build_date) = $row; echo "<tr>"; echo "<th align='left'><a href='viewer.php?version=$version_name'>$version_name</a></th>"; http://cvs.php.net/viewvc.cgi/php-gcov-web/www/site.api.php?r1=1.1.2.5&r2=1.1.2.6&diff_format=u Index: php-gcov-web/www/site.api.php diff -u php-gcov-web/www/site.api.php:1.1.2.5 php-gcov-web/www/site.api.php:1.1.2.6 --- php-gcov-web/www/site.api.php:1.1.2.5 Sat Sep 2 18:38:45 2006 +++ php-gcov-web/www/site.api.php Sat Sep 2 22:35:57 2006 @@ -52,29 +52,8 @@ function api_showheader($appvars=array()) { -// start content from main.inc -//$tags = array('PHP_4_4', 'PHP_5_1', 'PHP_5_2', 'PHP_HEAD'); $mytag = NULL; -if (isset($maindir)) -{ - $sub = substr(dirname($_SERVER['SCRIPT_FILENAME']), strlen($maindir) + 1); - $pos = strpos($sub, '/'); - if ($pos) - { - $mytag = substr($sub, 0, $pos); - } -} -// end content from main.inc - -/* -echo '<?xml version="1.0" encoding="UTF-8"?>'."\n" -.'<!DOCTYPE html'."\n\t" -.'PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'."\n\t" -.'"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'; -*/ - -echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">'."\n"; - -?><html> +?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> <head> <title><?php // Output the header for the web browser title http://cvs.php.net/viewvc.cgi/php-gcov-web/www/viewer.php?r1=1.1.2.4&r2=1.1.2.5&diff_format=u Index: php-gcov-web/www/viewer.php diff -u php-gcov-web/www/viewer.php:1.1.2.4 php-gcov-web/www/viewer.php:1.1.2.5 --- php-gcov-web/www/viewer.php:1.1.2.4 Mon Aug 21 04:06:41 2006 +++ php-gcov-web/www/viewer.php Sat Sep 2 22:35:57 2006 @@ -26,8 +26,8 @@ $incfile = ''; // used for php includes of files // Pull in defined variables -$file = $_REQUEST['file']; -$version = $_REQUEST['version']; +$file = isset($_REQUEST['file']) ? $_REQUEST['file'] : ''; +$version = isset($_REQUEST['version']) ? $_REQUEST['version'] : ''; // todo: in testing phase if(isset($_REQUEST['username']))