A ton of small changes to reporter, nothing drastic. Mainly fixing bugs caused by the last few checkins. No bug.

tools/reporter/app/query/index.php

@@ -49,14 +49,18 @@ session_start();
 header("Cache-control: private"); //IE 6 Fix
 printheaders();
 
+$method = 'html';
+
 $title = "Searching Results";
+
 $content = initializeTemplate();
+$content->assign('method', $method);
 
 // Open DB
 $db = NewADOConnection($config['db_dsn']);
 $db->SetFetchMode(ADODB_FETCH_ASSOC);
+$db->debug = true;
 
-// DELETED
 $query = new query;
 $query_input = $query->getQueryInputs();
 
@@ -68,24 +72,25 @@ $result = $query->doQuery($query_input['selected'],
                           $query_input['page'],
                           $query_input['count']
           );
-$output = $query->outputHTML($result, $query_input);
 
+$output = $query->outputHTML($result, $query_input, $continuity_params, $columnHeaders);
 if (sizeof($output['data']) == 0){
     $content->assign('error', 'No Results found');
-    displayPage($content, 'query.tpl');
+    displayPage($content, 'query', 'query.tpl');
     exit;
 }
 
-$content->assign('continuityParams', $query->continuityParams($query_input));
+$continuity_params = $query->continuityParams($query_input);
+$content->assign('continuity_params', $continuity_params);
+$content->assign('column', $query->columnHeaders($query_input, $continuity_params));
+$content->assign('row', $output['data']);
+$content->assign('continuityParams', $continuity_params);
 $content->assign('count', $result['totalResults']);
 $content->assign('show', $query_input['show']);
 $content->assign('page', $query_input['page']);
 
-$content->assign('column', $output['columnHeaders']);
-$content->assign('row', $output['data']);
-displayPage($content, 'query.tpl');
+displayPage($content, 'query', 'query.tpl');
 
 // disconnect database
 $db->Close();
-
 ?>

tools/reporter/app/report/index.php

@@ -90,6 +90,6 @@ $content->assign('report_description',     $query->fields['report_description'])
 
 $title = 'Mozilla Reporter: '.$query->fields['report_id'];
 
-displayPage($content, 'report.tpl', $title);
+displayPage($content, 'report', 'report.tpl', $title);
 ?>
 

tools/reporter/app/stats/index.php

@@ -1,116 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Reporter (r.m.o).
- *
- * The Initial Developer of the Original Code is
- *      Robert Accettura <robert@accettura.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-require_once('../../config.inc.php');
-require_once($config['base_path'].'/includes/iolib.inc.php');
-require_once($config['base_path'].'/includes/contrib/adodb/adodb.inc.php');
-require_once($config['base_path'].'/includes/contrib/smarty/libs/Smarty.class.php');
-require_once($config['base_path'].'/includes/security.inc.php');
-
-// Start Session
-session_name('reportSessID');
-session_start();
-header("Cache-control: private"); //IE 6 Fix
-
-
-// Open DB
-$db = NewADOConnection($config['db_dsn']);
-if (!$db) die("Connection failed");
-$db->SetFetchMode(ADODB_FETCH_ASSOC);
-
-$content = initializeTemplate();
-
-// Total Reports
-$reports_q =& $db->Execute("SELECT COUNT(*)
-                            FROM report");
-$reports = $reports_q->fields['COUNT(*)'];
-$content->assign('reports_quant', $reports);
-
-// Total Unique Users
-$uniqueusers_q =& $db->Execute("SELECT COUNT(*)
-                                FROM sysid");
-$uniqueusers = $uniqueusers_q->fields['COUNT(*)'];
-$content->assign('users_quant', $uniqueusers);
-
-// Average # of reports per user
-$avgRepPerUsr = $reports/$uniqueusers;
-$content->assign('avgRepPerUsr', $avgRepPerUsr);
-
-// Top Users (by reports)
-// XXX TODO
-
-// Total Reports per product
-// XXX TODO
-
-// Total Reports per platform
-// XXX TODO
-
-// Total Hosts
-$uniquehosts_q =& $db->Execute("SELECT COUNT(*)
-                                FROM host");
-$uniquehosts = $uniquehosts_q->fields['COUNT(*)'];
-$content->assign('hosts_quant', $uniquehosts);
-
-// Reports in last 24 hours
-$yesterday  = mktime(date("H"), date("i"), date("s"), date("m")  , date("d")-1, date("Y"));
-$reports24_q =& $db->Execute("SELECT COUNT(*)
-                            FROM report
-                            WHERE  report_file_date > "."'".date('Y-m-d H:i:s', $yesterday)."'");
-$reports24 = $reports24_q->fields['COUNT(*)'];
-$content->assign('reports24', $reports24);
-
-// Reports in last week
-$last7days  = mktime(date("H"), date("i"), date("s"), date("m")  , date("d")-7, date("Y"));
-$last7days_q =& $db->Execute("SELECT COUNT(*)
-                            FROM report
-                            WHERE  report_file_date > "."'".date('Y-m-d H:i:s', $last7days)."'");
-$last7days = $last7days_q->fields['COUNT(*)'];
-$content->assign('last7days', $last7days);
-
-// Reports by month
-// XXX TODO
-
-
-// disconnect database
-$db->Close();
-
-$title = "Statistics";
-
-displayPage($content, 'stats.tpl', $title);
-?>
-

tools/reporter/includes/db.inc.php

@@ -4,8 +4,11 @@ require_once($config['base_path'].'/includes/contrib/adodb/adodb.inc.php');
 class db extends ADOConnection
 {
     function NewADOConnection(){
+        global $config;
         $db = NewADOConnection($config['db_dsn']);
-$db->debug = true;
+        if($config['debug']){
+            $db->debug = true;
+        }
         if (!$db) die("Connection failed");
         return $db;
     }