|
From: Benjamin C. <bc...@us...> - 2001-09-03 20:43:12
|
Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv12866
Modified Files:
query.php
Log Message:
Indenting is fun
Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- query.php 2001/09/01 15:44:20 1.26
+++ query.php 2001/09/03 20:43:09 1.27
@@ -20,6 +20,7 @@
// along with phpBugTracker; if not, write to the Free Software Foundation,
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// ------------------------------------------------------------------------
+// $Id$
include 'include.php';
@@ -169,14 +170,14 @@
if ($savedqueryname) {
$savedquerystring = ereg_replace('&savedqueryname=.*(&?)', '\\1', $GLOBALS['QUERY_STRING']);
$q->query("insert into ".TBL_SAVED_QUERY." (user_id, saved_query_name, saved_query_string)"
- ." values ($u, '$savedqueryname', '$savedquerystring')");
+ ." values ($u, '$savedqueryname', '$savedquerystring')");
}
if (!$order) { $order = 'bug_id'; $sort = 'asc'; }
if (!$querystring or $op) build_query($assignedto, $reportedby, $open);
$nr = $q->grab_field("select count(*) from ".TBL_BUG." bug"
- ." left join ".TBL_AUTH_USER." owner on bug.assigned_to = owner.user_id"
- ." left join ".TBL_AUTH_USER." reporter on bug.created_by = reporter.user_id "
- .($querystring != '' ? "where $querystring": ''));
+ ." left join ".TBL_AUTH_USER." owner on bug.assigned_to = owner.user_id"
+ ." left join ".TBL_AUTH_USER." reporter on bug.created_by = reporter.user_id "
+ .($querystring != '' ? "where $querystring": ''));
list($selrange, $llimit, $npages, $pages) = multipages($nr,$page,
"order=$order&sort=$sort");
@@ -189,20 +190,20 @@
'project' => build_select('project'),
'TITLE' => $TITLE['buglist']));
- $q->query("select bug.*, reporter.login as reporter, owner.login as owner, lastmodifier.login as lastmodifier,"
- ." project_name, severity_name, status_name, os_name, version_name, component_name, resolution_name,"
- ." severity_color"
- ." from ".TBL_BUG." bug left join ".TBL_RESOLUTION." resolution using (resolution_id),"
- . TBL_SEVERITY." severity, ".TBL_STATUS." status, ".TBL_OS." os, ".TBL_VERSION." version, "
- . TBL_COMPONENT." component, ".TBL_PROJECT." project"
- ." left join ".TBL_AUTH_USER." owner on bug.assigned_to = owner.user_id"
- ." left join ".TBL_AUTH_USER." reporter on bug.created_by = reporter.user_id"
- ." left join ".TBL_AUTH_USER." lastmodifier on bug.last_modified_by = lastmodifier.user_id"
- ." where bug.severity_id = severity.severity_id and bug.status_id = status.status_id"
- ." and bug.os_id = os.os_id and bug.version_id = version.version_id"
- ." and bug.component_id = component.component_id and bug.project_id = project.project_id "
- . ($querystring != '' ? "and $querystring " : '')
- ." order by $order $sort limit $llimit, $selrange");
+ $q->query("select bug.*, reporter.login as reporter, owner.login as owner,
+ lastmodifier.login as lastmodifier, project_name, severity_name,
+ status_name, os_name, version_name, component_name, resolution_name, severity_color"
+ ." from ".TBL_BUG." bug left join ".TBL_RESOLUTION." resolution using (resolution_id),"
+ . TBL_SEVERITY." severity, ".TBL_STATUS." status, ".TBL_OS." os, ".TBL_VERSION." version, "
+ . TBL_COMPONENT." component, ".TBL_PROJECT." project"
+ ." left join ".TBL_AUTH_USER." owner on bug.assigned_to = owner.user_id"
+ ." left join ".TBL_AUTH_USER." reporter on bug.created_by = reporter.user_id"
+ ." left join ".TBL_AUTH_USER." lastmodifier on bug.last_modified_by = lastmodifier.user_id"
+ ." where bug.severity_id = severity.severity_id and bug.status_id = status.status_id"
+ ." and bug.os_id = os.os_id and bug.version_id = version.version_id"
+ ." and bug.component_id = component.component_id and bug.project_id = project.project_id "
+ . ($querystring != '' ? "and $querystring " : '')
+ ." order by $order $sort limit $llimit, $selrange");
$headers = array(
'bug_id' => 'bug_id',
|