Revision: 2012
http://mrbs.svn.sourceforge.net/mrbs/?rev=2012&view=rev
Author: cimorrison
Date: 2011-09-26 09:57:13 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
Added an explicit Phase variable to the Report form, rather than relying on the
areamatch variable to determine whether one is in Phase 1 or Phase 2. This
makes it easier to adapt the Report page to being run from the CLI (eg for
producing reports from a cron job).
Modified Paths:
--------------
mrbs/trunk/web/report.php
Modified: mrbs/trunk/web/report.php
===================================================================
--- mrbs/trunk/web/report.php 2011-09-25 06:26:56 UTC (rev 2011)
+++ mrbs/trunk/web/report.php 2011-09-26 09:57:13 UTC (rev 2012)
@@ -825,6 +825,7 @@
$match_approved = get_form_var('match_approved', 'string');
$match_confirmed = get_form_var('match_confirmed', 'string');
$match_private = get_form_var('match_private', 'string');
+$phase = get_form_var('phase', 'int');
// Check the user is authorised for this page
@@ -836,6 +837,11 @@
$is_admin = ($user_level >= 2);
// Set some defaults
+if (!isset($phase))
+{
+ // The default is that we're at Phase 1
+ $phase = 1;
+}
if (!isset($match_approved))
{
$match_approved = APPROVED_BOTH;
@@ -1456,6 +1462,7 @@
</fieldset>
<div id="report_submit">
+ <input type="hidden" name="phase" value="2">
<input class="submit" type="submit" value="<?php echo
get_vocab("submitquery") ?>">
</div>
@@ -1467,7 +1474,7 @@
}
// PHASE 2: Output the results, if called with parameters:
-if (isset($areamatch))
+if ($phase == 2)
{
if ($nmatch == 0)
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
