cvs: php-master-web / forgot.php /entry cvs-account.php event.php user-note.php /fetch countries.php cvsforwarding.php cvspasswd.php cvsusers.php
events.php mirrordns.php mirrors.php stats.php user-notes.php /include alert_lib.inc functions.inc /manage event.php users.php /scripts
email-note-summaries mirror-summary mirror-test update-backend update-user-notes

wez Fri Aug 6 04:54:58 2004 EDT Modified files: /php-master-web forgot.php /php-master-web/entry cvs-account.php event.php user-note.php /php-master-web/fetch countries.php cvsforwarding.php cvspasswd.php cvsusers.php events.php mirrordns.php mirrors.php stats.php user-notes.php /php-master-web/include alert_lib.inc functions.inc /php-master-web/manage event.php users.php /php-master-web/scripts email-note-summaries mirror-summary mirror-test update-backend update-user-notes Log: Rename php3 -> phpmasterdb

http://cvs.php.net/diff.php/php-master-web/forgot.php?r1=1.4&r2=1.5&ty=u Index: php-master-web/forgot.php diff -u php-master-web/forgot.php:1.4 php-master-web/forgot.php:1.5 --- php-master-web/forgot.php:1.4 Sun Feb 15 13:13:11 2004 +++ php-master-web/forgot.php Fri Aug 6 04:54:58 2004 @@ -15,7 +15,7 @@ mysql_connect("localhost","nobody","") or die("unable to connect to database"); -mysql_select_db("php3") +mysql_select_db("phpmasterdb") or die("unable to select database"); if ($id && $key) { http://cvs.php.net/diff.php/php-master-web/entry/cvs-account.php?r1=1.11&r2=1.12&ty=u Index: php-master-web/entry/cvs-account.php diff -u php-master-web/entry/cvs-account.php:1.11 php-master-web/entry/cvs-account.php:1.12 --- php-master-web/entry/cvs-account.php:1.11 Sat Sep 6 01:09:06 2003 +++ php-master-web/entry/cvs-account.php Fri Aug 6 04:54:58 2004 @@ -21,7 +21,7 @@ @mysql_connect("localhost","nobody", "") or die("failed to connect to database"); -@mysql_select_db("php3") +@mysql_select_db("phpmasterdb") or die("failed to select database"); if (!is_emailable_address(stripslashes($email))) http://cvs.php.net/diff.php/php-master-web/entry/event.php?r1=1.8&r2=1.9&ty=u Index: php-master-web/entry/event.php diff -u php-master-web/entry/event.php:1.8 php-master-web/entry/event.php:1.9 --- php-master-web/entry/event.php:1.8 Sat Sep 6 01:09:06 2003 +++ php-master-web/entry/event.php Fri Aug 6 04:54:58 2004 @@ -23,7 +23,7 @@ @mysql_connect("localhost","nobody", "") or die("failed to connect to database"); -@mysql_select_db("php3") +@mysql_select_db("phpmasterdb") or die("failed to select database"); switch($type) { http://cvs.php.net/diff.php/php-master-web/entry/user-note.php?r1=1.24&r2=1.25&ty=u Index: php-master-web/entry/user-note.php diff -u php-master-web/entry/user-note.php:1.24 php-master-web/entry/user-note.php:1.25 --- php-master-web/entry/user-note.php:1.24 Mon Feb 9 08:13:34 2004 +++ php-master-web/entry/user-note.php Fri Aug 6 04:54:58 2004 @@ -10,7 +10,7 @@ @mysql_connect("localhost","nobody", "") or die("failed to connect to database"); -@mysql_select_db("php3") +@mysql_select_db("phpmasterdb") or die("failed to select database"); /* http://cvs.php.net/diff.php/php-master-web/fetch/countries.php?r1=1.5&r2=1.6&ty=u Index: php-master-web/fetch/countries.php diff -u php-master-web/fetch/countries.php:1.5 php-master-web/fetch/countries.php:1.6 --- php-master-web/fetch/countries.php:1.5 Sat Sep 6 01:09:07 2003 +++ php-master-web/fetch/countries.php Fri Aug 6 04:54:58 2004 @@ -6,7 +6,7 @@ // Connect and generate the list from the DB if (@mysql_connect("localhost","nobody","")) { - if (@mysql_select_db("php3")) { + if (@mysql_select_db("phpmasterdb")) { $res = @mysql_query("SELECT * FROM country ORDER BY name"); if ($res) { echo "<?php\n\$COUNTRIES = array(\n"; http://cvs.php.net/diff.php/php-master-web/fetch/cvsforwarding.php?r1=1.12&r2=1.13&ty=u Index: php-master-web/fetch/cvsforwarding.php diff -u php-master-web/fetch/cvsforwarding.php:1.12 php-master-web/fetch/cvsforwarding.php:1.13 --- php-master-web/fetch/cvsforwarding.php:1.12 Sat Sep 6 01:09:07 2003 +++ php-master-web/fetch/cvsforwarding.php Fri Aug 6 04:54:58 2004 @@ -6,7 +6,7 @@ // Connect and generate the list from the DB if (@mysql_connect("localhost","nobody","")) { - if (@mysql_select_db("php3")) { + if (@mysql_select_db("phpmasterdb")) { $res = @mysql_query("SELECT username,email,spamprotect FROM users WHERE email != '' AND cvsaccess"); if ($res) { while ($row = @mysql_fetch_array($res)) { http://cvs.php.net/diff.php/php-master-web/fetch/cvspasswd.php?r1=1.8&r2=1.9&ty=u Index: php-master-web/fetch/cvspasswd.php diff -u php-master-web/fetch/cvspasswd.php:1.8 php-master-web/fetch/cvspasswd.php:1.9 --- php-master-web/fetch/cvspasswd.php:1.8 Sat Jun 12 11:48:30 2004 +++ php-master-web/fetch/cvspasswd.php Fri Aug 6 04:54:58 2004 @@ -6,7 +6,7 @@ // Connect and generate the list from the DB if (@mysql_connect("localhost","nobody","")) { - if (@mysql_select_db("php3")) { + if (@mysql_select_db("phpmasterdb")) { $res = @mysql_query("SELECT username,passwd FROM users WHERE passwd != '' AND cvsaccess"); if ($res) { while ($row = @mysql_fetch_array($res)) { http://cvs.php.net/diff.php/php-master-web/fetch/cvsusers.php?r1=1.6&r2=1.7&ty=u Index: php-master-web/fetch/cvsusers.php diff -u php-master-web/fetch/cvsusers.php:1.6 php-master-web/fetch/cvsusers.php:1.7 --- php-master-web/fetch/cvsusers.php:1.6 Sat Sep 6 01:09:07 2003 +++ php-master-web/fetch/cvsusers.php Fri Aug 6 04:54:58 2004 @@ -6,7 +6,7 @@ // Connect and generate the list from the DB if (@mysql_connect("localhost","nobody","")) { - if (@mysql_select_db("php3")) { + if (@mysql_select_db("phpmasterdb")) { $res = @mysql_query("SELECT username,name,email FROM users WHERE cvsaccess"); if ($res) { while ($row = @mysql_fetch_array($res)) { http://cvs.php.net/diff.php/php-master-web/fetch/events.php?r1=1.10&r2=1.11&ty=u Index: php-master-web/fetch/events.php diff -u php-master-web/fetch/events.php:1.10 php-master-web/fetch/events.php:1.11 --- php-master-web/fetch/events.php:1.10 Sat Sep 6 01:09:07 2003 +++ php-master-web/fetch/events.php Fri Aug 6 04:54:58 2004 @@ -5,7 +5,7 @@ # die("token not correct."); @mysql_connect('localhost','nobody','') or exit; -@mysql_select_db('php3') or exit; +@mysql_select_db('phpmasterdb') or exit; // Set default values if (!isset($cm)) $cm = (int)strftime('%m'); http://cvs.php.net/diff.php/php-master-web/fetch/mirrordns.php?r1=1.7&r2=1.8&ty=u Index: php-master-web/fetch/mirrordns.php diff -u php-master-web/fetch/mirrordns.php:1.7 php-master-web/fetch/mirrordns.php:1.8 --- php-master-web/fetch/mirrordns.php:1.7 Sat Sep 6 01:09:07 2003 +++ php-master-web/fetch/mirrordns.php Fri Aug 6 04:54:58 2004 @@ -17,8 +17,8 @@ // Connect to local mysql database if (@mysql_connect("localhost","nobody","")) { - // Select php3 database - if (@mysql_select_db("php3")) { + // Select phpmasterdb database + if (@mysql_select_db("phpmasterdb")) { // Select mirrors list ordered by hostname $res = @mysql_query("SELECT * FROM mirrors ORDER BY hostname"); http://cvs.php.net/diff.php/php-master-web/fetch/mirrors.php?r1=1.22&r2=1.23&ty=u Index: php-master-web/fetch/mirrors.php diff -u php-master-web/fetch/mirrors.php:1.22 php-master-web/fetch/mirrors.php:1.23 --- php-master-web/fetch/mirrors.php:1.22 Sat Sep 6 01:09:07 2003 +++ php-master-web/fetch/mirrors.php Fri Aug 6 04:54:58 2004 @@ -42,8 +42,8 @@ // Connect to local mysql database if (@mysql_connect("localhost","nobody","")) { - // Select php3 database - if (@mysql_select_db("php3")) { + // Select phpmasterdb database + if (@mysql_select_db("phpmasterdb")) { // Select last mirror check time from table $lct = mysql_query("SELECT UNIX_TIMESTAMP(lastchecked) FROM mirrors ORDER BY lastchecked DESC LIMIT 1"); http://cvs.php.net/diff.php/php-master-web/fetch/stats.php?r1=1.4&r2=1.5&ty=u Index: php-master-web/fetch/stats.php diff -u php-master-web/fetch/stats.php:1.4 php-master-web/fetch/stats.php:1.5 --- php-master-web/fetch/stats.php:1.4 Thu Jun 10 05:21:10 2004 +++ php-master-web/fetch/stats.php Fri Aug 6 04:54:58 2004 @@ -1,13 +1,13 @@ <?php -// $Id: stats.php,v 1.4 2004/06/10 09:21:10 goba Exp $ +// $Id: stats.php,v 1.5 2004/08/06 08:54:58 wez Exp $ include_once 'functions.inc'; require_token(); if (db_connect(FALSE)) { - echo db_get_one("SELECT COUNT(*) FROM php3.note"), "\n"; + echo db_get_one("SELECT COUNT(*) FROM phpmasterdb.note"), "\n"; echo db_get_one("SELECT COUNT(*) FROM phphosts.hosts"), "\n"; - echo db_get_one("SELECT COUNT(*) FROM php3.bugdb"), "\n"; - echo db_get_one("SELECT COUNT(*) FROM php3.bugdb WHERE status IN ('Open', 'Assigned', 'Analyzed', 'Critical')"), "\n"; + echo db_get_one("SELECT COUNT(*) FROM phpmasterdb.bugdb"), "\n"; + echo db_get_one("SELECT COUNT(*) FROM phpmasterdb.bugdb WHERE status IN ('Open', 'Assigned', 'Analyzed', 'Critical')"), "\n"; } http://cvs.php.net/diff.php/php-master-web/fetch/user-notes.php?r1=1.8&r2=1.9&ty=u Index: php-master-web/fetch/user-notes.php diff -u php-master-web/fetch/user-notes.php:1.8 php-master-web/fetch/user-notes.php:1.9 --- php-master-web/fetch/user-notes.php:1.8 Sat Sep 6 01:09:07 2003 +++ php-master-web/fetch/user-notes.php Fri Aug 6 04:54:58 2004 @@ -6,7 +6,7 @@ @mysql_connect("localhost","nobody","") or exit; -@mysql_select_db("php3") +@mysql_select_db("phpmasterdb") or exit; $query = "SELECT DISTINCT id,note.sect,user,note,UNIX_TIMESTAMP(ts) AS ts,"; http://cvs.php.net/diff.php/php-master-web/include/alert_lib.inc?r1=1.3&r2=1.4&ty=u Index: php-master-web/include/alert_lib.inc diff -u php-master-web/include/alert_lib.inc:1.3 php-master-web/include/alert_lib.inc:1.4 --- php-master-web/include/alert_lib.inc:1.3 Sat Sep 6 01:09:08 2003 +++ php-master-web/include/alert_lib.inc Fri Aug 6 04:54:58 2004 @@ -1,7 +1,7 @@ <?php $alink = mysql_connect("localhost","nobody","") or die("failed to connect to database"); -@mysql_select_db("php3", $alink) or die("failed to select database"); +@mysql_select_db("phpmasterdb", $alink) or die("failed to select database"); /*{{{ show_alert_form */ function show_alert_form($user, $sect) { http://cvs.php.net/diff.php/php-master-web/include/functions.inc?r1=1.12&r2=1.13&ty=u Index: php-master-web/include/functions.inc diff -u php-master-web/include/functions.inc:1.12 php-master-web/include/functions.inc:1.13 --- php-master-web/include/functions.inc:1.12 Sun Jun 20 05:55:13 2004 +++ php-master-web/include/functions.inc Fri Aug 6 04:54:58 2004 @@ -1,5 +1,5 @@ <?php -// $Id: functions.inc,v 1.12 2004/06/20 09:55:13 goba Exp $ +// $Id: functions.inc,v 1.13 2004/08/06 08:54:58 wez Exp $ // ----------------------------------------------------------------------------------- @@ -60,7 +60,7 @@ } return FALSE; } - elseif (!@mysql_select_db("php3")) { + elseif (!@mysql_select_db("phpmasterdb")) { if ($dieonerror) { die(format_warn("Unable to select database!")); } http://cvs.php.net/diff.php/php-master-web/manage/event.php?r1=1.11&r2=1.12&ty=u Index: php-master-web/manage/event.php diff -u php-master-web/manage/event.php:1.11 php-master-web/manage/event.php:1.12 --- php-master-web/manage/event.php:1.11 Thu Jun 10 07:13:49 2004 +++ php-master-web/manage/event.php Fri Aug 6 04:54:58 2004 @@ -24,7 +24,7 @@ @mysql_connect("localhost","nobody","") or die("unable to connect to database"); -@mysql_select_db("php3"); +@mysql_select_db("phpmasterdb"); if (isset($id) && isset($action)) { $id = (int)$id; http://cvs.php.net/diff.php/php-master-web/manage/users.php?r1=1.35&r2=1.36&ty=u Index: php-master-web/manage/users.php diff -u php-master-web/manage/users.php:1.35 php-master-web/manage/users.php:1.36 --- php-master-web/manage/users.php:1.35 Tue Jul 20 16:33:59 2004 +++ php-master-web/manage/users.php Fri Aug 6 04:54:58 2004 @@ -16,7 +16,7 @@ @mysql_connect("localhost","nobody","") or die("unable to connect to database"); -@mysql_select_db("php3"); +@mysql_select_db("phpmasterdb"); # ?username=whatever will look up 'whatever' by email or cvs username if (isset($username) && !isset($id)) { http://cvs.php.net/diff.php/php-master-web/scripts/email-note-summaries?r1=1.2&r2=1.3&ty=u Index: php-master-web/scripts/email-note-summaries diff -u php-master-web/scripts/email-note-summaries:1.2 php-master-web/scripts/email-note-summaries:1.3 --- php-master-web/scripts/email-note-summaries:1.2 Sat May 17 16:50:33 2003 +++ php-master-web/scripts/email-note-summaries Fri Aug 6 04:54:58 2004 @@ -3,7 +3,7 @@ mysql_connect("localhost","nobody","") or die("unable to connect to server"); -mysql_select_db("php3") +mysql_select_db("phpmasterdb") or die("unable to select database"); $query = "SELECT COUNT(*) AS count,sect FROM note" http://cvs.php.net/diff.php/php-master-web/scripts/mirror-summary?r1=1.11&r2=1.12&ty=u Index: php-master-web/scripts/mirror-summary diff -u php-master-web/scripts/mirror-summary:1.11 php-master-web/scripts/mirror-summary:1.12 --- php-master-web/scripts/mirror-summary:1.11 Sun Aug 31 07:17:29 2003 +++ php-master-web/scripts/mirror-summary Fri Aug 6 04:54:58 2004 @@ -13,9 +13,9 @@ // Empty arrays by default $inactives = $outdated = array(); -// Try to connect to the database and select php3 database +// Try to connect to the database and select phpmasterdb database mysql_connect("localhost","nobody","") or die("unable to connect to database"); -mysql_select_db("php3"); +mysql_select_db("phpmasterdb"); // Select last mirror check time from table $lct = mysql_query("SELECT UNIX_TIMESTAMP(lastchecked) FROM mirrors ORDER BY lastchecked DESC LIMIT 1"); http://cvs.php.net/diff.php/php-master-web/scripts/mirror-test?r1=1.67&r2=1.68&ty=u Index: php-master-web/scripts/mirror-test diff -u php-master-web/scripts/mirror-test:1.67 php-master-web/scripts/mirror-test:1.68 --- php-master-web/scripts/mirror-test:1.67 Thu Jul 1 16:25:42 2004 +++ php-master-web/scripts/mirror-test Fri Aug 6 04:54:58 2004 @@ -20,7 +20,7 @@ // Connect to local MySQL database mysql_connect("localhost", "nobody", "") or die("unable to connect to database"); -mysql_select_db("php3"); +mysql_select_db("phpmasterdb"); // Get mirror information for all active mirrors (regardless of their type!) $query = "SELECT maintainer, hostname, id, has_search, has_stats, lang, http://cvs.php.net/diff.php/php-master-web/scripts/update-backend?r1=1.19&r2=1.20&ty=u Index: php-master-web/scripts/update-backend diff -u php-master-web/scripts/update-backend:1.19 php-master-web/scripts/update-backend:1.20 --- php-master-web/scripts/update-backend:1.19 Mon Dec 1 15:29:17 2003 +++ php-master-web/scripts/update-backend Fri Aug 6 04:54:58 2004 @@ -1,5 +1,5 @@ #!/usr/local/bin/php -q -<?php /* vim: set noet ts=2 sw=2 ft=php3: : */ +<?php /* vim: set noet ts=2 sw=2 ft=php: : */ // We protect the master server with this token, so // only who knows the token can fetch data from the server http://cvs.php.net/diff.php/php-master-web/scripts/update-user-notes?r1=1.13&r2=1.14&ty=u Index: php-master-web/scripts/update-user-notes diff -u php-master-web/scripts/update-user-notes:1.13 php-master-web/scripts/update-user-notes:1.14 --- php-master-web/scripts/update-user-notes:1.13 Mon Jun 14 07:58:20 2004 +++ php-master-web/scripts/update-user-notes Fri Aug 6 04:54:58 2004 @@ -1,5 +1,5 @@ #!/usr/local/bin/php -q -<?php /* vim: set noet ts=2 sw=2 ft=php3: : */ +<?php /* vim: set noet ts=2 sw=2 ft=php: : */ // Build complete file with all notes define("BUILD_COMPLETE_FILE", TRUE);