Menu
▾
▴
[phpBT-dev] CVS: phpbt bug.php,1.70,1.71 include.php,1.86,1.87 query.php,1.51,1.52
|
From: Benjamin C. <bc...@us...> - 2002-01-05 19:49:38
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv32569
Modified Files:
bug.php include.php query.php
Log Message:
Working towards removing the dependency on register_globals = on
Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- bug.php 2001/12/19 13:52:03 1.70
+++ bug.php 2002/01/05 19:49:35 1.71
@@ -414,10 +414,15 @@
}
function show_form($bugid = 0, $error = '') {
- global $q, $me, $t, $project, $TITLE;
+ global $q, $me, $t, $_gv, $TITLE;
- if ($GLOBALS['HTTP_POST_VARS'])
- while (list($k,$v) = each($GLOBALS['HTTP_POST_VARS'])) $$k = $v;
+ if (isset($_gv['project'])) {
+ $project = $_gv['project'];
+ }
+
+ if (isset($_pv)) {
+ foreach ($_pv as $k => $v) $$k = $v;
+ }
$t->set_file('content','bugform.html');
$projectname = $q->grab_field("select project_name from ".TBL_PROJECT." where project_id = $project");
@@ -540,9 +545,9 @@
///
/// Grab the links for the previous and next bugs in the list
function prev_next_links($bugid, $pos) {
- global $q, $queryinfo, $STRING;
+ global $q, $_sv, $STRING;
- if (!isset($queryinfo['query']) || !$queryinfo['query']) {
+ if (!isset($_sv['queryinfo']['query']) || !$_sv['queryinfo']['query']) {
return array('', '');
}
@@ -565,8 +570,8 @@
where b.severity_id = severity.severity_id and b.status_id = status.status_id
and b.os_id = os.os_id and b.version_id = version.version_id
and b.component_id = component.component_id and b.project_id = project.project_id '.
- "and {$queryinfo['query']} and bug_id <> $bugid
- order by {$queryinfo['order']} {$queryinfo['sort']}, bug_id asc", $limit, $offset);
+ "and {$_sv['queryinfo']['query']} and bug_id <> $bugid
+ order by {$_sv['queryinfo']['order']} {$_sv['queryinfo']['sort']}, bug_id asc", $limit, $offset);
$firstid = $q->grab_field();
$secondid = $q->grab_field();
@@ -783,18 +788,18 @@
$t->set_file('wrap','wrap.html');
-if ($op) {
- switch($op) {
+if (isset($_gv['op'])) {
+ switch($_gv['op']) {
case 'history' : show_history($bugid); break;
case 'add' :
$perm->check('Editbug');
if (isset($_gv['project'])) show_form();
else show_projects();
break;
- case 'show' : show_bug($bugid); break;
- case 'update' : update_bug($bugid); break;
- case 'do' : do_form($bugid); break;
- case 'print' : show_bug_printable($bugid); break;
+ case 'show' : show_bug($_gv['bugid']); break;
+ case 'update' : update_bug($_gv['bugid']); break;
+ case 'do' : do_form($_gv['bugid']); break;
+ case 'print' : show_bug_printable($_gv['bugid']); break;
}
} else header("Location: query.php");
Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- include.php 2001/12/24 20:52:50 1.86
+++ include.php 2002/01/05 19:49:35 1.87
@@ -162,12 +162,6 @@
$default_db_fields = array('bug_id', 'title', 'reporter', 'owner',
'severity_name', 'priority', 'status_name', 'resolution_name');
-class usess extends Session {
- var $classname = 'usess';
- var $lifetime = 0;
- var $allowcache = '';
-}
-
class templateclass extends Template {
function pparse($target, $handle, $append = false) {
global $auth, $perm, $q;
@@ -506,13 +500,16 @@
// Begin every page with a page_open
if (!defined('NO_AUTH')) {
- page_open(array('sess' => 'usess', 'auth' => 'uauth', 'perm' => 'uperm'));
+ session_start();
+ $_sv =& $HTTP_SESSION_VARS;
+ $auth = new uauth;
+ $perm = new uperm;
$u = isset($auth->auth['uid']) ? $auth->auth['uid'] : 0;
}
// Check to see if the user is trying to login
-if (isset($HTTP_POST_VARS['dologin'])) {
- if (isset($HTTP_POST_VARS['sendpass'])) {
+if (isset($_pv['dologin'])) {
+ if (isset($_pv['sendpass'])) {
list($email, $password) = $q->grab("select email, password from ".TBL_AUTH_USER." where login = '$username' and active > 0");
if (!$q->num_rows()) {
$t->set_var(array(
@@ -533,15 +530,11 @@
));
}
} else {
- $auth->auth['uid'] = $auth->auth_validatelogin();
- if (!$auth->auth['uid']) {
+ if (!$u = $auth->auth_validatelogin()) {
$t->set_var(array(
'loginerrorcolor' => '#ff0000',
'loginerror' => 'Invalid login<br>'
));
- } else {
- // Now that login is complete update the userid variable
- $u = $auth->auth['uid'];
}
}
}
Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- query.php 2002/01/05 12:57:34 1.51
+++ query.php 2002/01/05 19:49:35 1.52
@@ -195,9 +195,9 @@
}
function list_items($assignedto = 0, $reportedby = 0, $open = 0) {
- global $queryinfo, $me, $q, $t, $selrange, $order, $sort, $query,
+ global $me, $q, $t, $selrange, $order, $sort, $query,
$page, $op, $select, $TITLE, $STRING, $savedqueryname, $u, $auth,
- $default_db_fields, $all_db_fields, $sess;
+ $default_db_fields, $all_db_fields, $_sv;
$t->set_file('content','buglist.html');
$t->set_block('content','row','rows');
@@ -211,31 +211,32 @@
values (".$q->nextid(TBL_SAVED_QUERY).", $u, '$savedqueryname', '$savedquerystring')");
}
if (!$order) {
- if (isset($queryinfo['order'])) {
- $order = $queryinfo['order'];
- $sort = $queryinfo['sort'];
+ if (isset($_sv['queryinfo']['order'])) {
+ $order = $_sv['queryinfo']['order'];
+ $sort = $_sv['queryinfo']['sort'];
} else {
$order = 'bug_id';
$sort = 'asc';
}
}
- $queryinfo['order'] = $order;
- $queryinfo['sort'] = $sort;
+ $_sv['queryinfo']['order'] = $order;
+ $_sv['queryinfo']['sort'] = $sort;
- if (empty($queryinfo['query']) or $op) {
- $queryinfo['query'] = build_query($assignedto, $reportedby, $open);
+ if (empty($_sv['queryinfo']['query']) or $op) {
+ $_sv['queryinfo']['query'] = build_query($assignedto, $reportedby, $open);
}
- if (!$sess->is_registered('queryinfo')) {
- $sess->register('queryinfo');
+ if (!session_is_registered('queryinfo')) {
+ session_register('queryinfo');
+ $_sv['queryinfo'] = array();
}
$nr = $q->grab_field('select count(*) from '.TBL_BUG.' b
left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id
left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '.
- ($queryinfo['query'] != '' ? "where {$queryinfo['query']}": ''));
+ ($_sv['queryinfo']['query'] != '' ? "where {$_sv['queryinfo']['query']}": ''));
- $queryinfo['numrows'] = $nr;
+ $_sv['queryinfo']['numrows'] = $nr;
list($selrange, $llimit, $npages, $pages) = multipages($nr,$page,
"order=$order&sort=$sort");
@@ -259,7 +260,7 @@
where b.severity_id = severity.severity_id and b.status_id = status.status_id
and b.os_id = os.os_id and b.version_id = version.version_id
and b.component_id = component.component_id and b.project_id = project.project_id '.
- ($queryinfo['query'] != '' ? "and {$queryinfo['query']} " : '').
+ ($_sv['queryinfo']['query'] != '' ? "and {$_sv['queryinfo']['query']} " : '').
"order by $order $sort, bug_id asc", $selrange, $llimit);
$headers = array(
@@ -366,7 +367,7 @@
if (isset($_gv['op'])) switch($_gv['op']) {
case 'query' : show_query(); break;
- case 'doquery' : $queryinfo['query'] = ''; list_items(); break;
+ case 'doquery' : $_sv['queryinfo'] = array(); list_items(); break;
case 'delquery' : delete_saved_query($queryid); break;
case 'mybugs' : list_items($assignedto, $reportedby, $open); break;
default : show_query(); break;
|
