Menu
▾
▴
[phpBT-dev] CVS: phpbt/admin group.php,1.5,1.6 os.php,1.22,1.23 project.php,1.34,1.35 resolution.php,1.23,1.24 severity.php,1.19,1.20 status.php,1.23,1.24 user.php,1.41,1.42
|
From: Benjamin C. <bc...@us...> - 2002-03-29 18:25:41
|
Update of /cvsroot/phpbt/phpbt/admin
In directory usw-pr-cvs1:/tmp/cvs-serv20053/admin
Modified Files:
group.php os.php project.php resolution.php severity.php
status.php user.php
Log Message:
Database independence... ooo-eee!
Index: group.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/group.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- group.php 17 Mar 2002 01:38:31 -0000 1.5
+++ group.php 29 Mar 2002 18:25:37 -0000 1.6
@@ -81,7 +81,7 @@
function list_items($groupid = 0, $error = '') {
- global $me, $db, $t, $_gv, $STRING, $TITLE;
+ global $me, $db, $t, $_gv, $STRING, $TITLE, $QUERY;
$t->set_file('content','grouplist.html');
$t->set_block('content','row','rows');
@@ -109,9 +109,7 @@
'last' => $llimit+$selrange > $nr ? $nr : $llimit+$selrange,
'records' => $nr));
- $rs = $db->limitQuery("select ag.group_id, group_name, locked, count(ug.group_id) as count from ".
- TBL_AUTH_GROUP." ag left join ".TBL_USER_GROUP." ug using (group_id) left join ".
- TBL_AUTH_USER." using (user_id) group by ag.group_id, group_name, locked order by $order $sort",
+ $rs = $db->limitQuery(sprintf($QUERY['admin-list-groups'], $order, $sort),
$llimit, $selrange);
if (!$rs->numRows()) {
Index: os.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/os.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- os.php 17 Mar 2002 01:38:31 -0000 1.22
+++ os.php 29 Mar 2002 18:25:38 -0000 1.23
@@ -85,7 +85,7 @@
function list_items($osid = 0, $error = '') {
- global $db, $me, $t, $_gv, $STRING, $TITLE;
+ global $db, $me, $t, $_gv, $STRING, $TITLE, $QUERY;
$t->set_file('content','oslist.html');
$t->set_block('content','row','rows');
@@ -113,11 +113,8 @@
'last' => $llimit+$selrange > $nr ? $nr : $llimit+$selrange,
'records' => $nr));
- $rs = $db->limitQuery('select s.os_id, os_name, regex, sort_order,'.
- ' count(bug_id) as bug_count from '.TBL_OS.
- ' s left join '.TBL_BUG.' using (os_id) group by s.os_id,'.
- ' os_name, regex, sort_order'.
- " order by $order $sort", $llimit, $selrange);
+ $rs = $db->limitQuery(sprintf($QUERY['admin-list-oses'], $order, $sort),
+ $llimit, $selrange);
if (!$rs->numRows()) {
$t->set_var('rows',"<tr><td>{$STRING['nooses']}</td></tr>");
Index: project.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/project.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- project.php 28 Mar 2002 22:26:06 -0000 1.34
+++ project.php 29 Mar 2002 18:25:38 -0000 1.35
@@ -49,14 +49,12 @@
}
function show_version($versionid = 0, $error = '') {
- global $db, $t, $_pv, $STRING;
+ global $db, $t, $_pv, $STRING, $QUERY;
foreach ($_pv as $k => $v) $$k = $v;
if ($versionid && !$error) {
- $row = $db->getRow("select v.*, p.project_name as project_name"
- ." from ".TBL_VERSION." v left join ".TBL_PROJECT." p using(project_id)"
- ." where version_id = '$versionid'");
+ $row = $db->getRow(sprintf($QUERY['admin-show-version'], $versionid));
$t->set_var(array(
'vf_error' => '',
'versionid' => $row['version_id'],
@@ -126,14 +124,12 @@
}
function show_component($componentid = 0, $error = '') {
- global $db, $t, $_pv, $STRING;
+ global $db, $t, $_pv, $STRING, $QUERY;
foreach ($_pv as $k => $v) $$k = $v;
if ($componentid && !$error) {
- $row = $db->getRow('select c.*, p.project_name as project_name
- from '.TBL_COMPONENT.' c left join '.TBL_PROJECT." p using (project_id)
- where component_id = '$componentid'");
+ $row = $db->getRow(sprintf($QUERY['admin-show-component'], $componentid));
$t->set_var(array(
'cf_error' => '',
'componentid' => $row['component_id'],
Index: resolution.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/resolution.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- resolution.php 17 Mar 2002 01:38:31 -0000 1.23
+++ resolution.php 29 Mar 2002 18:25:38 -0000 1.24
@@ -92,7 +92,7 @@
function list_items($resolutionid = 0, $error = '') {
- global $me, $db, $t, $STRING, $TITLE, $_gv;
+ global $me, $db, $t, $STRING, $TITLE, $_gv, $QUERY;
$t->set_file('content','resolutionlist.html');
$t->set_block('content','row','rows');
@@ -119,11 +119,8 @@
'last' => $llimit+$selrange > $nr ? $nr : $llimit+$selrange,
'records' => $nr));
- $rs = $db->limitQuery('select s.resolution_id, resolution_name, resolution_desc,'.
- ' sort_order, count(bug_id) as bug_count from '.TBL_RESOLUTION.
- ' s left join '.TBL_BUG.' using (resolution_id) group by s.resolution_id,'.
- ' resolution_name, resolution_desc, sort_order'.
- " order by $order $sort", $llimit, $selrange);
+ $rs = $db->limitQuery(sprintf($QUERY['admin-list-resolutions'], $order, $sort),
+ $llimit, $selrange);
if (!$rs->numRows()) {
$t->set_var('rows',"<tr><td>{$STRING['noresolutions']}</td></tr>");
Index: severity.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/severity.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- severity.php 17 Mar 2002 01:38:31 -0000 1.19
+++ severity.php 29 Mar 2002 18:25:38 -0000 1.20
@@ -95,7 +95,7 @@
function list_items($severityid = 0, $error = '') {
- global $me, $db, $t, $_gv, $STRING, $TITLE;
+ global $me, $db, $t, $_gv, $STRING, $TITLE, $QUERY;
$t->set_file('content','severitylist.html');
$t->set_block('content','row','rows');
@@ -122,11 +122,8 @@
'last' => $llimit+$selrange > $nr ? $nr : $llimit+$selrange,
'records' => $nr));
- $rs = $db->limitQuery('select s.severity_id, severity_name, severity_desc,'.
- ' severity_color, sort_order, count(bug_id) as bug_count from '.TBL_SEVERITY.
- ' s left join '.TBL_BUG.' using (severity_id) group by s.severity_id,'.
- ' severity_name, severity_desc, severity_color, sort_order'.
- " order by $order $sort", $llimit, $selrange);
+ $rs = $db->limitQuery(sprintf($QUERY['admin-list-severities'], $order, $sort),
+ $llimit, $selrange);
if (!$rs->numRows()) {
Index: status.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/status.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- status.php 17 Mar 2002 01:38:31 -0000 1.23
+++ status.php 29 Mar 2002 18:25:38 -0000 1.24
@@ -92,7 +92,7 @@
function list_items($statusid = 0, $error = '') {
- global $me, $db, $t, $_gv, $STRING, $TITLE;
+ global $me, $db, $t, $_gv, $STRING, $TITLE, $QUERY;
$t->set_file('content','statuslist.html');
$t->set_block('content','row','rows');
@@ -119,10 +119,8 @@
'last' => $llimit+$selrange > $nr ? $nr : $llimit+$selrange,
'records' => $nr));
- $rs = $db->limitQuery('select s.status_id, status_name, status_desc,'.
- ' sort_order, count(bug_id) as bug_count from '.TBL_STATUS.' s left join '.
- TBL_BUG.' using (status_id) group by s.status_id, status_name, status_desc,'.
- " sort_order order by $order $sort", $llimit, $selrange);
+ $rs = $db->limitQuery(sprintf($QUERY['admin-list-statuses'], $order, $sort),
+ $llimit, $selrange);
if (!$rs->numRows()) {
$t->set_var('rows',"<tr><td>{$STRING['nostatuses']}</td></tr>");
Index: user.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/user.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- user.php 17 Mar 2002 01:38:31 -0000 1.41
+++ user.php 29 Mar 2002 18:25:38 -0000 1.42
@@ -26,7 +26,7 @@
include '../include.php';
function do_form($userid = 0) {
- global $db, $me, $_pv, $STRING, $now, $u;
+ global $db, $me, $_pv, $STRING, $now, $u, $QUERY;
$error = '';
// Validation
@@ -92,9 +92,7 @@
// Update group memberships
// Get user's groups (without dropping the user group)
- $user_groups = $db->getCol('select ug.group_id from '.
- TBL_USER_GROUP.' ug left join '.TBL_AUTH_GROUP.' g using (group_id) '
- ." where user_id = $userid and group_name <> 'User'");
+ $user_groups = $db->getCol(sprintf($QUERY['admin-user-groups'], $userid));
// Compute differences between old and new
if (!isset($user_groups) or !is_array($user_groups)) {
|
