cvs: php-master-web /fetch stats.php /manage event.php mirrors.php pinfo.php user-notes.php

bjori Fri Apr 24 06:58:26 2009 UTC Modified files: /php-master-web/fetch stats.php /php-master-web/manage event.php mirrors.php pinfo.php user-notes.php Log: - Nuke few include_ones() and magic include_paths - Use db_connect() rather then connect+select database 'manually' - Add header titles http://cvs.php.net/viewvc.cgi/php-master-web/fetch/stats.php?r1=1.5&r2=1.6&diff_format=u Index: php-master-web/fetch/stats.php diff -u php-master-web/fetch/stats.php:1.5 php-master-web/fetch/stats.php:1.6 --- php-master-web/fetch/stats.php:1.5 Fri Aug 6 08:54:58 2004 +++ php-master-web/fetch/stats.php Fri Apr 24 06:58:26 2009 @@ -1,7 +1,7 @@ <?php -// $Id: stats.php,v 1.5 2004/08/06 08:54:58 wez Exp $ +// $Id: stats.php,v 1.6 2009/04/24 06:58:26 bjori Exp $ -include_once 'functions.inc'; +include_once '../include/functions.inc'; require_token(); http://cvs.php.net/viewvc.cgi/php-master-web/manage/event.php?r1=1.19&r2=1.20&diff_format=u Index: php-master-web/manage/event.php diff -u php-master-web/manage/event.php:1.19 php-master-web/manage/event.php:1.20 --- php-master-web/manage/event.php:1.19 Thu Sep 6 13:30:49 2007 +++ php-master-web/manage/event.php Fri Apr 24 06:58:26 2009 @@ -1,7 +1,6 @@ <?php -require_once 'login.inc'; -require_once 'functions.inc'; -require_once 'email-validation.inc'; +require '../include/login.inc'; +require '../include/email-validation.inc'; $mailto = "php-webmaster@lists.php.net"; #$mailto = "jimw@apache.org"; @@ -20,10 +19,7 @@ $type = array(1=>'single',2=>'multi',3=>'recur'); head("event administration"); - -@mysql_connect("localhost","nobody","") - or die("unable to connect to database"); -@mysql_select_db("phpmasterdb"); +db_connect(); if (isset($id)) $id = (int)$id; http://cvs.php.net/viewvc.cgi/php-master-web/manage/mirrors.php?r1=1.108&r2=1.109&diff_format=u Index: php-master-web/manage/mirrors.php diff -u php-master-web/manage/mirrors.php:1.108 php-master-web/manage/mirrors.php:1.109 --- php-master-web/manage/mirrors.php:1.108 Sat Apr 11 16:19:40 2009 +++ php-master-web/manage/mirrors.php Fri Apr 24 06:58:26 2009 @@ -1,7 +1,6 @@ <?php // vim: et // Force login and include common functions -include_once 'login.inc'; -include_once 'functions.inc'; +include '../include/login.inc'; // This page is for mirror administration head("mirror administration"); http://cvs.php.net/viewvc.cgi/php-master-web/manage/pinfo.php?r1=1.2&r2=1.3&diff_format=u Index: php-master-web/manage/pinfo.php diff -u php-master-web/manage/pinfo.php:1.2 php-master-web/manage/pinfo.php:1.3 --- php-master-web/manage/pinfo.php:1.2 Tue May 15 01:57:47 2007 +++ php-master-web/manage/pinfo.php Fri Apr 24 06:58:26 2009 @@ -1,6 +1,5 @@ <?php -require_once 'login.inc'; -require_once 'functions.inc'; +require '../include/login.inc'; if (!is_mirror_site_admin($user)) { warn("Sorry, you are not allowed to view this web page"); @@ -23,4 +22,4 @@ } else { return FALSE; } -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-master-web/manage/user-notes.php?r1=1.71&r2=1.72&diff_format=u Index: php-master-web/manage/user-notes.php diff -u php-master-web/manage/user-notes.php:1.71 php-master-web/manage/user-notes.php:1.72 --- php-master-web/manage/user-notes.php:1.71 Mon Feb 16 15:57:16 2009 +++ php-master-web/manage/user-notes.php Fri Apr 24 06:58:26 2009 @@ -1,11 +1,10 @@ <?php -// $Id: user-notes.php,v 1.71 2009/02/16 15:57:16 bjori Exp $ +// $Id: user-notes.php,v 1.72 2009/04/24 06:58:26 bjori Exp $ // Force login before action can be taken -include_once 'login.inc'; -include_once 'functions.inc'; -include_once 'email-validation.inc'; -include_once 'note-reasons.inc'; +include '../include/login.inc'; +include '../include/email-validation.inc'; +include '../include/note-reasons.inc'; //require_once 'alert_lib.inc'; // remove comment if alerts are needed define("NOTES_MAIL", "php-notes@lists.php.net"); @@ -43,7 +42,7 @@ if (!$action) { // search ! - head(); + head("user notes"); // someting done before ? if ($id) { @@ -151,7 +150,7 @@ switch($action) { case 'mass': if (!allow_mass_change($user)) { die("You are not allowed to take this action!"); } - head(); + head("user notes"); $step = (isset($_REQUEST["step"]) ? $_REQUEST["step"] : 0); $where = array(); if (!empty($_REQUEST["old_sect"])) { @@ -289,7 +288,7 @@ if ($id) { $note = (isset($_POST['note']) ? escape($_POST['note']) : null); if (!isset($note) || $action == 'preview') { - head(); + head("user notes"); } $row = note_get_by_id($id); @@ -352,7 +351,7 @@ } /* falls through */ default: - head(); + head('user notes'); echo "<p>'$action' is not a recognized action, or no id was specified.</p>"; foot(); }