cvs: docweb /include .cvsignore lib_cache.inc.php lib_general.inc.php lib_proj_lang.inc.php lib_revcheck.inc.php lib_rfc.inc.php

sean Sun Sep 12 02:26:47 2004 EDT Removed files: /docweb/include .cvsignore Modified files: /docweb/include lib_cache.inc.php lib_general.inc.php lib_proj_lang.inc.php lib_revcheck.inc.php lib_rfc.inc.php Log: cs/ws cleanup

http://cvs.php.net/diff.php/docweb/include/lib_cache.inc.php?r1=1.3&r2=1.4&ty=u Index: docweb/include/lib_cache.inc.php diff -u docweb/include/lib_cache.inc.php:1.3 docweb/include/lib_cache.inc.php:1.4 --- docweb/include/lib_cache.inc.php:1.3 Sun Sep 5 02:36:08 2004 +++ docweb/include/lib_cache.inc.php Sun Sep 12 02:26:47 2004 @@ -1,5 +1,5 @@ <?php -/* +/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: +----------------------------------------------------------------------+ | PHP Documentation Tools Site Source Code | +----------------------------------------------------------------------+ @@ -15,7 +15,7 @@ +----------------------------------------------------------------------+ | Authors: Mehdi Achour <didou@php.net> | +----------------------------------------------------------------------+ -$Id: lib_cache.inc.php,v 1.3 2004/09/05 06:36:08 sean Exp $ +$Id: lib_cache.inc.php,v 1.4 2004/09/12 06:26:47 sean Exp $ */ define('CACHE_DIR', PATH_ROOT . '/cache/'); @@ -25,3 +25,5 @@ { return file_exists(CACHE_DIR . $file . CACHE_EXT); } + +?> http://cvs.php.net/diff.php/docweb/include/lib_general.inc.php?r1=1.22&r2=1.23&ty=u Index: docweb/include/lib_general.inc.php diff -u docweb/include/lib_general.inc.php:1.22 docweb/include/lib_general.inc.php:1.23 --- docweb/include/lib_general.inc.php:1.22 Sat Sep 11 19:27:17 2004 +++ docweb/include/lib_general.inc.php Sun Sep 12 02:26:47 2004 @@ -1,5 +1,5 @@ <?php -/* +/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: +----------------------------------------------------------------------+ | PHP Documentation Tools Site Source Code | +----------------------------------------------------------------------+ @@ -18,12 +18,12 @@ | Gabor Hojtsy <goba@php.net> | | Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: lib_general.inc.php,v 1.22 2004/09/11 23:27:17 sean Exp $ +$Id: lib_general.inc.php,v 1.23 2004/09/12 06:26:47 sean Exp $ */ error_reporting(E_ALL); -define('PATH_ROOT', realpath(dirname(__FILE__) . '/../')); +define('PATH_ROOT', realpath(dirname(__FILE__) . '/../')); define('SQLITE_DIR', PATH_ROOT . '/sqlite/'); define('CVS_DIR', PATH_ROOT . '/cvs/'); @@ -41,8 +41,7 @@ define('LANGD', $LANGUAGES[LANGC]); // set up BASE_URL -if (substr($_SERVER['REQUEST_URI'], -1, 1) == '/') -{ +if (substr($_SERVER['REQUEST_URI'], -1, 1) == '/') { // is a directory, use verbatim $baseURL = $_SERVER['REQUEST_URI']; } else { @@ -64,9 +63,8 @@ function get_cvs_dir($project) { -/** make this return something until the function is found **/ -// return documentation_exists($project) ? $GLOBALS['PROJECTS'][$project] . '/' : FALSE; - return $GLOBALS['PROJECTS'][$project][1]; + // @@@ make this return something until the function is found + return $GLOBALS['PROJECTS'][$project][1]; } function site_header($title = '', $style = array()) @@ -232,14 +230,14 @@ function extract_links($text) { $text = eregi_replace( - "([[:alnum:]]+)://([^[:space:]]*)([[:alnum:]#?/&=])", - "<a href=\"\\1://\\2\\3\">\\1://\\2\\3</A>", - $text + "([[:alnum:]]+)://([^[:space:]]*)([[:alnum:]#?/&=])", + "<a href=\"\\1://\\2\\3\">\\1://\\2\\3</A>", + $text ); $text = eregi_replace( - "([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+)", - "<a href=\"mailto:\\1\">\\1</a>", - $text + "([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+)", + "<a href=\"mailto:\\1\">\\1</a>", + $text ); return $text; } @@ -254,10 +252,10 @@ $ret = '/'; if ($project != $GLOBALS['defaultProject']) { - $ret .= "$project/"; + $ret .= "$project/"; } if ($lang != $GLOBALS['defaultLanguage']) { - $ret .= "$lang/"; + $ret .= "$lang/"; } return $ret . ltrim($path, '/'); } @@ -285,7 +283,7 @@ if (count($links) == 0) { $links[] = 'N/A'; } - return join("<br />", $links); + return implode("<br />", $links); } // This function provides the relevant offsite navigation options for the @@ -294,12 +292,12 @@ { $links = array(); switch (SITE) { - case 'php': + case 'php': switch (LANGC) { - case 'hu': + case 'hu': $links[] = '<a href="http://wfsz.njszt.hu/projektek_phpdoc.php">Translation information</a>'; break; - case 'it': + case 'it': $links[] = '<a href="http://cortesi.com/php/">Translation information</a>'; break; } @@ -309,5 +307,6 @@ if (count($links) == 0) { $links[] = 'N/A'; } - return join("<br />", $links); + return implode("<br />", $links); } +?> http://cvs.php.net/diff.php/docweb/include/lib_proj_lang.inc.php?r1=1.1&r2=1.2&ty=u Index: docweb/include/lib_proj_lang.inc.php diff -u docweb/include/lib_proj_lang.inc.php:1.1 docweb/include/lib_proj_lang.inc.php:1.2 --- docweb/include/lib_proj_lang.inc.php:1.1 Sat Sep 11 19:17:14 2004 +++ docweb/include/lib_proj_lang.inc.php Sun Sep 12 02:26:47 2004 @@ -1,5 +1,6 @@ <?php /* +vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: +----------------------------------------------------------------------+ | PHP Documentation Tools Site Source Code | +----------------------------------------------------------------------+ @@ -18,7 +19,7 @@ | Gabor Hojtsy <goba@php.net> | | Sean Coates <sean@php.net> | +----------------------------------------------------------------------+ -$Id: lib_proj_lang.inc.php,v 1.1 2004/09/11 23:17:14 sean Exp $ +$Id: lib_proj_lang.inc.php,v 1.2 2004/09/12 06:26:47 sean Exp $ */ // split from lib_general.inc.php http://cvs.php.net/diff.php/docweb/include/lib_revcheck.inc.php?r1=1.4&r2=1.5&ty=u Index: docweb/include/lib_revcheck.inc.php diff -u docweb/include/lib_revcheck.inc.php:1.4 docweb/include/lib_revcheck.inc.php:1.5 --- docweb/include/lib_revcheck.inc.php:1.4 Sun Sep 5 02:36:08 2004 +++ docweb/include/lib_revcheck.inc.php Sun Sep 12 02:26:47 2004 @@ -1,5 +1,5 @@ <?php -/* +/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: +----------------------------------------------------------------------+ | PHP Documentation Tools Site Source Code | +----------------------------------------------------------------------+ @@ -148,19 +148,19 @@ { $tmp = array(); - if( !$idx ) { + if (!$idx) { return FALSE; } $sql = 'SELECT distinct lang FROM description'; $result = @sqlite_query($sql, $idx); - if( !$result ) { + if (!$result) { return FALSE; } if ($result) { - while($r = sqlite_fetch_array($result, SQLITE_ASSOC)) { + while ($r = sqlite_fetch_array($result, SQLITE_ASSOC)) { $tmp[] = $r['lang']; } } @@ -169,15 +169,15 @@ // Return en integer -function get_nb_EN_files($idx) { +function get_nb_EN_files($idx) +{ $sql = "select COUNT(*) as total FROM files WHERE lang = 'en'"; $res = sqlite_query($idx, $sql); $row = sqlite_fetch_array($res, SQLITE_ASSOC); $files_EN = $row['total']; - return $files_EN; + return $files_EN; } - function get_missfiles($idx, $lang) { $sql = 'SELECT @@ -225,8 +225,8 @@ } // Return an integer -function get_nb_LANG_files($idx) { - +function get_nb_LANG_files($idx) +{ $sql = ' SELECT lang, @@ -245,12 +245,12 @@ while ($row = sqlite_fetch_array($res, SQLITE_ASSOC)) { $files[$row['lang']] = $row['total']; } - return $files; -} // fin de la fonction - + return $files; +} // Return a string -function translator_get_wip($idx, $lang){ +function translator_get_wip($idx, $lang) +{ $sql = 'SELECT COUNT(name) AS total, person as nick @@ -264,14 +264,14 @@ nick'; $result = sqlite_query($idx, $sql); $tmp = array(); - while($r = sqlite_fetch_array($result, SQLITE_ASSOC)) { - $tmp[$r['nick']] = $r['total'];//array('partial' => $r['total'], 'ready' => 0, 'wip' => 0); + while ($r = sqlite_fetch_array($result, SQLITE_ASSOC)) { + $tmp[$r['nick']] = $r['total']; } return $tmp; } - -function translator_get_old($idx, $lang){ +function translator_get_old($idx, $lang) +{ $sql = 'SELECT COUNT(a.name) AS total, a.maintainer as maintainer @@ -299,17 +299,18 @@ a.size is not NULL GROUP BY a.maintainer'; - // echo $sql; + $result = sqlite_query($idx, $sql); $tmp = array(); - while($r = sqlite_fetch_array($result, SQLITE_ASSOC)) { + while ($r = sqlite_fetch_array($result, SQLITE_ASSOC)) { $tmp[$r['maintainer']] = $r['total']; } return $tmp; } -function translator_get_critical($idx, $lang){ +function translator_get_critical($idx, $lang) +{ $sql = 'SELECT COUNT(a.name) AS total, a.maintainer as maintainer @@ -328,7 +329,6 @@ AND ( b.revision - a.revision >= ' . ALERT_REV . ' - OR ( b.revision != a.revision @@ -348,14 +348,14 @@ a.maintainer'; $result = sqlite_query($idx, $sql); $tmp = array(); - while($r = sqlite_fetch_array($result, SQLITE_ASSOC)) { + while ($r = sqlite_fetch_array($result, SQLITE_ASSOC)) { $tmp[$r['maintainer']] = $r['total']; } return $tmp; } - -function translator_get_uptodate($idx, $lang){ +function translator_get_uptodate($idx, $lang) +{ $sql = 'SELECT COUNT(a.name) AS total, a.maintainer as maintainer @@ -379,7 +379,7 @@ a.maintainer'; $result = sqlite_query($idx, $sql); $tmp = array(); - while($r = sqlite_fetch_array($result, SQLITE_ASSOC)) { + while ($r = sqlite_fetch_array($result, SQLITE_ASSOC)) { $tmp[$r['maintainer']] = $r['total']; } return $tmp; @@ -404,7 +404,8 @@ return $persons; } -function get_nb_LANG_files_Translated($idx, $lang) { +function get_nb_LANG_files_Translated($idx, $lang) +{ $sql = ' SELECT b.lang as language, @@ -430,14 +431,12 @@ $res = sqlite_query($idx, $sql); $result = sqlite_fetch_array($res, SQLITE_ASSOC); - return $result; + return $result; } - // Return an array function get_stats_uptodate($idx, $lang) { - $sql = 'SELECT COUNT(a.name) as total, SUM(c.size) as size @@ -463,13 +462,13 @@ } // Return an array -function mtime($dir, $file, $lang) { +function mtime($dir, $file, $lang) +{ return intval((time() - @filemtime(ROOT_PATH . "/cvs/phpdoc-all/$lang$dir/$file")) / 86400); } function get_stats_critical($idx, $lang) { - $sql = 'SELECT COUNT(a.name) as total, sum(b.size) as size @@ -489,7 +488,6 @@ AND ( b.revision - a.revision >= ' . ALERT_REV . ' - OR ( b.revision != a.revision @@ -517,7 +515,6 @@ // Return an array function get_stats_old($idx, $lang) { - $sql = 'SELECT COUNT(a.name) as total, sum(b.size) as size @@ -554,7 +551,7 @@ $r = sqlite_fetch_array($result, SQLITE_ASSOC); $result = array($r['total'], $r['size']); return $result; -} // fin de la fonction +} function get_stats_notrans($idx, $lang) @@ -601,14 +598,6 @@ WHERE lang = "' . $lang . '"'; - /* $sql = 'SELECT - COUNT(*) as total, - SUM(en_size(name, 0)) as size - FROM - wip - WHERE - lang = "' . $lang . '"'; - sqlite_create_function($idx, 'en_size', 'en_filesize', 2); */ $result = sqlite_query($idx, $sql); $r = sqlite_fetch_array($result, SQLITE_ASSOC); return array($r['total'], $r['size']); @@ -647,6 +636,5 @@ $result = array($r['total'], $r['size']); return $result; } - ?> http://cvs.php.net/diff.php/docweb/include/lib_rfc.inc.php?r1=1.1&r2=1.2&ty=u Index: docweb/include/lib_rfc.inc.php diff -u docweb/include/lib_rfc.inc.php:1.1 docweb/include/lib_rfc.inc.php:1.2 --- docweb/include/lib_rfc.inc.php:1.1 Wed Aug 4 13:14:55 2004 +++ docweb/include/lib_rfc.inc.php Sun Sep 12 02:26:47 2004 @@ -1,5 +1,5 @@ <?php -/* +/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: +----------------------------------------------------------------------+ | PHP Version 4 | +----------------------------------------------------------------------+ @@ -17,60 +17,61 @@ | Yannick Torres <yannick@php.net> | | Mehdi Achour <didou@php.net> | +----------------------------------------------------------------------+ -$Id: lib_rfc.inc.php,v 1.1 2004/08/04 17:14:55 goba Exp $ +$Id: lib_rfc.inc.php,v 1.2 2004/09/12 06:26:47 sean Exp $ */ -if( SITE == 'www' ) { - - define('RFC_SITE', 'php'); - +if (SITE == 'www' ) { + define('RFC_SITE', 'php'); } else { - - define('RFC_SITE', SITE); - + define('RFC_SITE', SITE); } define('CVS_RFC_DIR', CVS_DIR . $TYPES[RFC_SITE] . '/RFC'); -function scan_RFC_dir() { +function scan_RFC_dir() +{ + if (!is_dir(CVS_RFC_DIR)) { + return FALSE; + } + + $dh = opendir(CVS_RFC_DIR); + + $rfc_file = array(); + + while (($file = readdir($dh)) !== false) { + if ( + $file != '.' && + $file != '..' && + $file != 'CVS' && + $file != '.cvsignore' && + substr($file, -4) != '.xml' && + substr($file, -3) != '.in' && + substr($file, -5) != '.html' + ) { + $rfc_file['file_name'][] = $file; + } + } + closedir($dh); - if(!is_dir(CVS_RFC_DIR) ) { - return FALSE; - } - -$dh = opendir(CVS_RFC_DIR); + $rfc_file['nb_file'] = sizeof($rfc_file['file_name']); -$rfc_file = array(); - -while (($file = readdir($dh)) !== false) { - - if($file != '.' && $file != '..' && $file != 'CVS' && $file != '.cvsignore' && substr($file, -4) != '.xml' && substr($file, -3) != '.in' && substr($file, -5) != '.html') { - $rfc_file['file_name'][] = $file; - } + return $rfc_file; } -closedir($dh); - -$rfc_file['nb_file'] = sizeof($rfc_file['file_name']); - -return $rfc_file; -} // end function - - -function clean_file_name($name) { +function clean_file_name($name) +{ + if (substr($name, -4) == '.txt') { + $name = substr($name, 0, (strlen($name)-4)); + } - if( substr($name, -4) == '.txt' ) { - $name = substr($name, 0, (strlen($name)-4)); - } - - $name = str_replace('_', ' ', $name); + $name = str_replace('_', ' ', $name); -return $name; + return $name; } -function out_put_comment($rows) { - - $buff = " +function out_put_comment($rows) +{ + $buff = " <!-- #id_database : " . $rows['id'] . "--> <h2>" . htmlentities(format_email($rows['user'])) . "</h2> @@ -78,9 +79,10 @@ <p class=\"comment\"> " . nl2br(htmlentities($rows['note'])) . " </p> - "; + "; - -return $buff; -} + return $buff; +} + ?> +