svn: /pear/packages/Bugtracker/trunk/site/ bug.php report.php

felipernb Wed, 12 Aug 2009 18:46:52 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=287173 Log: Adding feature to PREVIEW bug report before submiting Changed paths: U pear/packages/Bugtracker/trunk/site/bug.php U pear/packages/Bugtracker/trunk/site/report.php Modified: pear/packages/Bugtracker/trunk/site/bug.php =================================================================== --- pear/packages/Bugtracker/trunk/site/bug.php 2009-08-12 18:39:28 UTC (rev 287172) +++ pear/packages/Bugtracker/trunk/site/bug.php 2009-08-12 18:46:52 UTC (rev 287173) @@ -1,19 +1,29 @@ <?php +// Start session +session_start(); /** * User interface for viewing and editing bug details */ - -// Bailout early if no/invalid bug id is passed -if (empty($_REQUEST['id']) || !((int) $_REQUEST['id'])) { - header('Location: index.php'); - exit; +if($_REQUEST['id'] == 'preview') { + $bug_id = "PREVIEW"; + $bug = $_SESSION['bug_preview']; + + if(!$bug) { + header('Location: index.php'); + exit; + } + } else { - $bug_id = (int) $_REQUEST['id']; + // Bailout early if no/invalid bug id is passed + if (empty($_REQUEST['id']) || !((int) $_REQUEST['id'])) { + header('Location: index.php'); + exit; + } else { + $bug_id = (int) $_REQUEST['id']; + } } -// Start session -session_start(); // Obtain common includes require_once '../include/prepend.inc'; @@ -115,7 +125,7 @@ $trytoforce = isset($_POST['trytoforce']) ? (int) $_POST['trytoforce'] : 0; // fetch info about the bug into $bug -$bug = bugs_get_bug($bug_id, true); +if(!$bug) $bug = bugs_get_bug($bug_id, true); // DB error if (is_object($bug)) { @@ -941,7 +951,22 @@ } echo "</div>\n"; } +if($bug_id == 'PREVIEW'): +?> +<form action='report.php?package=<?=$_SESSION['bug_preview']['package_name']?>' method='post'> +<? foreach($_SESSION['bug_preview'] as $k=>$v) { + echo "<input type='hidden' name='in[{$k}]' value='{$v}'/>"; +} + echo "<input type='hidden' name='captcha' value='{$_SESSION['captcha']}'/>"; +?> +<input type='submit' value='Send bug report'/> <input type='submit' name='edit_after_preview' value='Edit'/> +</form> + +<? +endif; + + $bug_JS = <<< bug_JS <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script> <script type="text/javascript"> Modified: pear/packages/Bugtracker/trunk/site/report.php =================================================================== --- pear/packages/Bugtracker/trunk/site/report.php 2009-08-12 18:39:28 UTC (rev 287172) +++ pear/packages/Bugtracker/trunk/site/report.php 2009-08-12 18:46:52 UTC (rev 287173) @@ -142,6 +142,11 @@ */ $ok_to_submit_report = true; } + + if($_POST['edit_after_preview']) { + $ok_to_submit_report = false; + response_header("Report - New"); + } if ($ok_to_submit_report) { $registereduser = 1; @@ -162,6 +167,13 @@ $fdesc .= "Actual result:\n--------------\n"; $fdesc .= $_POST['in']['actres'] . "\n"; } + + if($_POST['preview']) { + $_SESSION['bug_preview'] = $_POST['in']; + $_SESSION['captcha'] = $_POST['captcha']; + header("Location: bug.php?id=preview"); + exit; + } $res = $dbh->prepare(' INSERT INTO bugdb ( @@ -513,6 +525,7 @@ <th class="form-label_left">Submit:</th> <td class="form-input"> <input type="submit" value="Send bug report" /> + <input type="submit" value="Preview" name="preview"/> </td> </tr> </table>