Menu
▾
▴
[phpBT-dev] CVS: phpbt/admin component.php,1.10,1.11 os.php,1.10,1.11 project.php,1.13,1.14 resolution.php,1.11,1.12 severity.php,1.4,1.5 status.php,1.11,1.12 user.php,1.17,1.18 version.php,1.11,1.12
|
From: Patrick M. <mo...@us...> - 2001-09-01 15:44:23
|
Update of /cvsroot/phpbt/phpbt/admin
In directory usw-pr-cvs1:/tmp/cvs-serv32304/admin
Modified Files:
component.php os.php project.php resolution.php severity.php
status.php user.php version.php
Log Message:
configurable tablenames
----------------------------------------------------------------------
Committing in .
Modified Files:
attachment.php bug.php config.php images.php include.php
index.php newaccount.php query.php report.php user.php
admin/component.php admin/os.php admin/project.php
admin/resolution.php admin/severity.php admin/status.php
admin/user.php admin/version.php
Added Files:
table_rename.sql
----------------------------------------------------------------------
Index: component.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/component.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- component.php 2001/08/23 01:39:03 1.10
+++ component.php 2001/09/01 15:44:20 1.11
@@ -41,7 +41,7 @@
if (!$componentid) {
$q->query("insert into component (component_id, project_id, component_name, component_desc, owner, active, created_by, created_date, last_modified_by, last_modified_date) values (".$q->nextid('component ').", $projectid, '$name', '$description', $owner, $active, $u, $time, $u, $time)");
} else {
- $q->query("update component set component_name = '$name', component_desc = '$description', owner = $owner, active = $active, last_modified_by = $u, last_modified_date = $time where component_id = '$componentid'");
+ $q->query("update ".TBL_COMPONENT." set component_name = '$name', component_desc = '$description', owner = $owner, active = $active, last_modified_by = $u, last_modified_date = $time where component_id = '$componentid'");
}
header("Location: project.php?op=edit&id=$projectid");
}
@@ -52,7 +52,10 @@
$t->set_file('content','componentform.html');
if ($componentid && !$error) {
- $row = $q->grab("select c.*, p.project_name as project_name from component c left join project p using (project_id) where component_id = '$componentid'");
+ $row = $q->grab("select c.*, p.project_name as project_name"
+ ." from ".TBL_COMPONENT." c"
+ ." left join ".TBL_PROJECT." p using (project_id)"
+ ." where component_id = '$componentid'");
$t->set_var(array(
'componentid' => $row['component_id'],
'projectid' => $row['project_id'],
@@ -72,7 +75,7 @@
'error' => $error,
'componentid' => $componentid,
'projectid' => $projectid,
- 'project' => $q->grab_field("select project_name from project where project_id = $projectid"),
+ 'project' => $q->grab_field("select project_name from ".TBL_PROJECT." where project_id = $projectid"),
'name' => $name,
'description' => $description,
'owner' => build_select('owner',$owner),
Index: os.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/os.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- os.php 2001/08/23 01:39:03 1.10
+++ os.php 2001/09/01 15:44:20 1.11
@@ -34,9 +34,9 @@
if ($error) { list_items($osid, $error); return; }
if (!$osid) {
- $q->query("insert into os (os_id, os_name, regex, sort_order) values (".$q->nextid('os').", '$fname', '$fregex', '$fsortorder')");
+ $q->query("insert into ".TBL_OS." (os_id, os_name, regex, sort_order) values (".$q->nextid('os').", '$fname', '$fregex', '$fsortorder')");
} else {
- $q->query("update os set os_name = '$fname', regex = '$fregex', sort_order = '$fsortorder' where os_id = '$osid'");
+ $q->query("update ".TBL_OS." set os_name = '$fname', regex = '$fregex', sort_order = '$fsortorder' where os_id = '$osid'");
}
header("Location: $me?");
}
@@ -46,7 +46,7 @@
#$t->set_file('content','osform.html');
if ($osid && !$error) {
- $row = $q->grab("select * from os where os_id = '$osid'");
+ $row = $q->grab("select * from ".TBL_OS." where os_id = '$osid'");
$t->set_var(array(
'action' => $STRING['edit'],
'fosid' => $row['os_id'],
@@ -72,7 +72,7 @@
$t->set_block('content','row','rows');
if (!$order) { $order = 'sort_order'; $sort = 'asc'; }
- $nr = $q->query("select count(*) from os where os_id = '$osid' order by $order $sort");
+ $nr = $q->query("select count(*) from ".TBL_OS." where os_id = '$osid' order by $order $sort");
list($selrange, $llimit, $npages, $pages) = multipages($nr,$page,
"order=$order&sort=$sort");
@@ -83,7 +83,7 @@
'last' => $llimit+$selrange > $nr ? $nr : $llimit+$selrange,
'records' => $nr));
- $q->query("select * from os order by $order $sort limit $llimit, $selrange");
+ $q->query("select * from ".TBL_OS." order by $order $sort limit $llimit, $selrange");
if (!$q->num_rows()) {
$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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.php 2001/08/23 01:40:36 1.13
+++ project.php 2001/09/01 15:44:20 1.14
@@ -40,11 +40,13 @@
if (!$active) $active = 0;
if (!$projectid) {
$projectid = $q->nextid('project');
- $q->query("insert into project (project_id, project_name, project_desc, active, created_by, created_date) values ($projectid , '$name', '$description', $active, $u, $now)");
- $q->query("insert into version (version_id, project_id, version_name, active, created_by, created_date) values (".$q->nextid('version').", $projectid, '$version', $active, $u, $now)");
+ $q->query("insert into ".TBL_PROJECT." (project_id, project_name, project_desc, active, created_by, created_date)"
+ ." values ($projectid , '$name', '$description', $active, $u, $now)");
+ $q->query("insert into ".TBL_VERSION." (version_id, project_id, version_name, active, created_by, created_date)"
+ ." values (".$q->nextid('version').", $projectid, '$version', $active, $u, $now)");
$location = "component.php?op=add&projectid=$projectid";
} else {
- $q->query("update project set project_name = '$name', project_desc = '$description', active = $active where project_id = $projectid");
+ $q->query("update ".TBL_PROJECT." set project_name = '$name', project_desc = '$description', active = $active where project_id = $projectid");
$location = "$me?";
}
header("Location: $location");
@@ -57,7 +59,7 @@
$t->set_block('content','box','details');
$t->set_block('content','vfield','verfield');
if ($projectid && !$error) {
- $row = $q->grab("select * from project where project_id = $projectid");
+ $row = $q->grab("select * from ".TBL_PROJECT." where project_id = $projectid");
$t->set_var(array(
'projectid' => $row['project_id'],
'name' => $row['project_name'],
@@ -97,7 +99,7 @@
global $q, $t, $STRING;
$t->set_block('box','verrow','verrows');
- $q->query("select * from version where project_id = $projectid");
+ $q->query("select * from ".TBL_VERSION." where project_id = $projectid");
if (!$q->num_rows()) {
$t->set_var('verrows',"<tr><td colspan='2' align='center'>{$STRING['noversions']}</td></tr>");
return;
@@ -120,7 +122,7 @@
global $q, $t, $STRING;
$t->set_block('box','row','rows');
- $q->query("select * from component where project_id = $projectid");
+ $q->query("select * from ".TBL_COMPONENT." where project_id = $projectid");
if (!$q->num_rows()) {
$t->set_var('rows',"<tr><td colspan='2' align='center'>{$STRING['nocomponents']}</td></tr>");
return;
@@ -150,7 +152,7 @@
$t->set_block('content','row','rows');
if (!$order) { $order = '1'; $sort = 'asc'; }
- $nr = $q->query("select count(*) from project");
+ $nr = $q->query("select count(*) from ".TBL_PROJECT);
list($selrange, $llimit, $npages, $pages) = multipages($nr,$page,
"order=$order&sort=$sort");
@@ -163,7 +165,7 @@
'TITLE' => $TITLE['project']
));
- $q->query("select * from project order by $order $sort limit $llimit, $selrange");
+ $q->query("select * from ".TBL_PROJECT." order by $order $sort limit $llimit, $selrange");
if (!$q->num_rows()) {
$t->set_var('rows',"<tr><td>{$STRING['noprojects']}</td></tr>");
Index: resolution.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/resolution.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- resolution.php 2001/08/23 01:39:03 1.11
+++ resolution.php 2001/09/01 15:44:20 1.12
@@ -36,9 +36,10 @@
if ($error) { list_items($resolutionid, $error); return; }
if (!$resolutionid) {
- $q->query("insert into resolution (resolution_id, resolution_name, resolution_desc, sort_order) values (".$q->nextid('resolution').", '$fname', '$fdescription', '$fsortorder')");
+ $q->query("insert into ".TBL_RESOLUTION." (resolution_id, resolution_name, resolution_desc, sort_order)"
+ ." values (".$q->nextid('resolution').", '$fname', '$fdescription', '$fsortorder')");
} else {
- $q->query("update resolution set resolution_name = '$fname', resolution_desc = '$fdescription', sort_order = '$fsortorder' where resolution_id = '$resolutionid'");
+ $q->query("update ".TBL_RESOLUTION." set resolution_name = '$fname', resolution_desc = '$fdescription', sort_order = '$fsortorder' where resolution_id = '$resolutionid'");
}
header("Location: $me?");
}
@@ -47,7 +48,7 @@
global $q, $me, $t, $fname, $fdescription, $fsortorder, $STRING;
if ($resolutionid && !$error) {
- $row = $q->grab("select * from resolution where resolution_id = '$resolutionid'");
+ $row = $q->grab("select * from ".TBL_RESOLUTION." where resolution_id = '$resolutionid'");
$t->set_var(array(
'action' => $STRING['edit'],
'fresolutionid' => $row['resolution_id'],
@@ -73,7 +74,7 @@
$t->set_block('content','row','rows');
if (!$order) { $order = 'sort_order'; $sort = 'asc'; }
- $nr = $q->query("select count(*) from resolution where resolution_id = '$resolutionid' order by $order $sort");
+ $nr = $q->query("select count(*) from ".TBL_RESOLUTION." where resolution_id = '$resolutionid' order by $order $sort");
list($selrange, $llimit, $npages, $pages) = multipages($nr,$page,
"order=$order&sort=$sort");
@@ -84,7 +85,7 @@
'last' => $llimit+$selrange > $nr ? $nr : $llimit+$selrange,
'records' => $nr));
- $q->query("select * from resolution order by $order $sort limit $llimit, $selrange");
+ $q->query("select * from ".TBL_RESOLUTION." order by $order $sort limit $llimit, $selrange");
if (!$q->num_rows()) {
$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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- severity.php 2001/08/23 01:39:03 1.4
+++ severity.php 2001/09/01 15:44:20 1.5
@@ -36,9 +36,9 @@
if ($error) { list_items($severityid, $error); return; }
if (!$severityid) {
- $q->query("insert into severity (severity_id, severity_name, severity_desc, sort_order, severity_color) values (".$q->nextid('severity').", '$fname', '$fdescription', '$fsortorder', '$fcolor')");
+ $q->query("insert into ".TBL_SEVERITY." (severity_id, severity_name, severity_desc, sort_order, severity_color) values (".$q->nextid('severity').", '$fname', '$fdescription', '$fsortorder', '$fcolor')");
} else {
- $q->query("update severity set severity_name = '$fname', severity_desc = '$fdescription', sort_order = '$fsortorder', severity_color = '$fcolor' where severity_id = '$severityid'");
+ $q->query("update ".TBL_SEVERITY." set severity_name = '$fname', severity_desc = '$fdescription', sort_order = '$fsortorder', severity_color = '$fcolor' where severity_id = '$severityid'");
}
header("Location: $me?");
}
@@ -47,7 +47,7 @@
global $q, $me, $t, $fname, $fdescription, $fsortorder, $STRING;
if ($severityid && !$error) {
- $row = $q->grab("select * from severity where severity_id = '$severityid'");
+ $row = $q->grab("select * from ".TBL_SEVERITY." where severity_id = '$severityid'");
$t->set_var(array(
'action' => $STRING['edit'],
'fseverityid' => $row['severity_id'],
@@ -75,7 +75,7 @@
$t->set_block('content','row','rows');
if (!$order) { $order = 'sort_order'; $sort = 'asc'; }
- $nr = $q->query("select count(*) from severity where severity_id = '$severityid' order by $order $sort");
+ $nr = $q->query("select count(*) from ".TBL_SEVERITY." where severity_id = '$severityid' order by $order $sort");
list($selrange, $llimit, $npages, $pages) = multipages($nr,$page,
"order=$order&sort=$sort");
@@ -86,7 +86,7 @@
'last' => $llimit+$selrange > $nr ? $nr : $llimit+$selrange,
'records' => $nr));
- $q->query("select * from severity order by $order $sort limit $llimit, $selrange");
+ $q->query("select * from ".TBL_SEVERITY." order by $order $sort limit $llimit, $selrange");
if (!$q->num_rows()) {
$t->set_var('rows',"<tr><td>{$STRING['noseverities']}</td></tr>");
Index: status.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/status.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- status.php 2001/08/23 01:39:03 1.11
+++ status.php 2001/09/01 15:44:20 1.12
@@ -36,9 +36,9 @@
if ($error) { list_items($statusid, $error); return; }
if (!$statusid) {
- $q->query("insert into status (status_id, status_name, status_desc, sort_order) values (".$q->nextid('status').", '$fname', '$fdescription', '$fsortorder')");
+ $q->query("insert into ".TBL_STATUS." (status_id, status_name, status_desc, sort_order) values (".$q->nextid('status').", '$fname', '$fdescription', '$fsortorder')");
} else {
- $q->query("update status set status_name = '$fname', status_desc = '$fdescription', sort_order = '$fsortorder' where status_id = '$statusid'");
+ $q->query("update ".TBL_STATUS." set status_name = '$fname', status_desc = '$fdescription', sort_order = '$fsortorder' where status_id = '$statusid'");
}
header("Location: $me?");
}
@@ -47,7 +47,7 @@
global $q, $me, $t, $fname, $fdescription, $fsortorder, $STRING;
if ($statusid && !$error) {
- $row = $q->grab("select * from status where status_id = '$statusid'");
+ $row = $q->grab("select * from ".TBL_STATUS." where status_id = '$statusid'");
$t->set_var(array(
'action' => $STRING['edit'],
'fstatusid' => $row['status_id'],
@@ -73,7 +73,7 @@
$t->set_block('content','row','rows');
if (!$order) { $order = 'sort_order'; $sort = 'asc'; }
- $nr = $q->query("select count(*) from status where status_id = '$statusid' order by $order $sort");
+ $nr = $q->query("select count(*) from ".TBL_STATUS." where status_id = '$statusid' order by $order $sort");
list($selrange, $llimit, $npages, $pages) = multipages($nr,$page,
"order=$order&sort=$sort");
@@ -84,7 +84,7 @@
'last' => $llimit+$selrange > $nr ? $nr : $llimit+$selrange,
'records' => $nr));
- $q->query("select * from status order by $order $sort limit $llimit, $selrange");
+ $q->query("select * from ".TBL_STATUS." order by $order $sort limit $llimit, $selrange");
if (!$q->num_rows()) {
$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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- user.php 2001/08/25 18:39:11 1.17
+++ user.php 2001/09/01 15:44:20 1.18
@@ -38,10 +38,10 @@
if (!$userid) {
if (ENCRYPTPASS) $mpassword = md5($fpassword);
else $mpassword = $fpassword;
- $q->query("insert into auth_user (user_id, first_name, last_name, email, password, user_level, created_date) values (".$q->nextid('user').", '$ffirstname', '$flastname', '$femail', '$mpassword', $usertype, $now)");
+ $q->query("insert into ".TBL_AUTH_USER." (user_id, first_name, last_name, email, password, user_level, created_date) values (".$q->nextid('user').", '$ffirstname', '$flastname', '$femail', '$mpassword', $usertype, $now)");
} else {
if (ENCRYPTPASS) {
- $oldpass = $q->grab_field("select password from auth_user where user_id = $userid");
+ $oldpass = $q->grab_field("select password from ".TBL_AUTH_USER." where user_id = $userid");
if ($oldpass != $fpassword) {
$pquery = "password = '".md5($fpassword)."',";
} else {
@@ -50,7 +50,7 @@
} else {
$pquery = "password = '$fpassword',";
}
- $q->query("update auth_user set first_name = '$ffirstname', last_name = '$flastname', email = '$femail', $pquery user_level = $usertype where user_id = '$userid'");
+ $q->query("update ".TBL_AUTH_USER." set first_name = '$ffirstname', last_name = '$flastname', email = '$femail', $pquery user_level = $usertype where user_id = '$userid'");
}
header("Location: $me?");
}
@@ -59,7 +59,7 @@
global $q, $me, $t, $firstname, $lastname, $email, $password, $usertype, $STRING;
if ($userid && !$error) {
- $row = $q->grab("select * from auth_user where user_id = '$userid'");
+ $row = $q->grab("select * from ".TBL_AUTH_USER." where user_id = '$userid'");
$t->set_var(array(
'action' => $STRING['edit'],
'fuserid' => $row['user_id'],
@@ -90,7 +90,7 @@
$t->set_block('content','row','rows');
if (!$order) { $order = '1'; $sort = 'asc'; }
- $nr = $q->grab_field("select count(*) from user");
+ $nr = $q->grab_field("select count(*) from ".TBL_AUTH_USER);
list($selrange, $llimit, $npages, $pages) = multipages($nr,$page,
"order=$order&sort=$sort");
@@ -102,7 +102,7 @@
'records' => $nr));
$q->query("select user_id, concat(first_name,' ',last_name) as fullname, email,
- created_date, user_level from auth_user order by $order $sort
+ created_date, user_level from ".TBL_AUTH_USER." order by $order $sort
limit $llimit, $selrange");
if (!$q->num_rows()) {
Index: version.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/version.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- version.php 2001/08/23 01:39:03 1.11
+++ version.php 2001/09/01 15:44:20 1.12
@@ -35,9 +35,9 @@
if (!$active) $active = 0;
if (!$versionid) {
- $q->query("insert into version (version_id, project_id, version_name, active, created_by, created_date) values (".$q->nextid('version').", $projectid, '$version', '$active', $u, $now)");
+ $q->query("insert into ".TBL_VERSION." (version_id, project_id, version_name, active, created_by, created_date) values (".$q->nextid('version').", $projectid, '$version', '$active', $u, $now)");
} else {
- $q->query("update version set project_id = $projectid, version_name = '$version', active = '$active' where version_id = '$versionid'");
+ $q->query("update ".TBL_VERSION." set project_id = $projectid, version_name = '$version', active = '$active' where version_id = '$versionid'");
}
header("Location: project.php?op=edit&id=$projectid");
}
@@ -47,7 +47,9 @@
$t->set_file('content','versionform.html');
if ($versionid && !$error) {
- $row = $q->grab("select v.*, p.project_name as project_name from version v left join project p using(project_id) where version_id = '$versionid'");
+ $row = $q->grab("select v.*, p.project_name as project_name"
+ ." from ".TBL_VERSION." v left join ".TBL_PROJECT." p using(project_id)"
+ ." where version_id = '$versionid'");
$t->set_var(array(
'versionid' => $row['version_id'],
'projectid' => $row['project_id'],
@@ -62,7 +64,7 @@
'error' => $error,
'versionid' => $versionid,
'projectid' => $projectid,
- 'project' => $q->grab_field("select project_name from project where project_id = $projectid"),
+ 'project' => $q->grab_field("select project_name from ".TBL_PROJECT." where project_id = $projectid"),
'version' => $version,
'active' => $active ? ' checked' : '',
'TITLE' => $id ? $TITLE['editversion'] : $TITLE['addversion']));
|
