X-Git-Url: https://git.rohieb.name/iserv-mod-error-reporter.git/blobdiff_plain/ae87133905d183987eb75369fe94bb739a2b1cb9..eb8dc5bd96af3051acc7437aee9c1825b167eea3:/src/index.php diff --git a/src/index.php b/src/index.php index f02af6c..559fb42 100644 --- a/src/index.php +++ b/src/index.php @@ -1,30 +1,30 @@ userHasAccess()) { // Probably we have to delete an error report if($getAction == "delete" and isset($getUid)) { // Are you really sure? - if(@$_POST["surely_delete"] == _("Delete")) { + if(@$_POST["surely_delete"] == _("Delete")) { $doc->deleteErrorReport($getUid); - header("Location: {$_SERVER["PHP_SELF"]}"); // Reload to get rid of POST data + // Reload to get rid of POST data + header("Location: {$_SERVER["PHP_SELF"]}"); } elseif(@$_POST["surely_cancel"] == _("Cancel")) { header("Location: {$_SERVER["PHP_SELF"]}"); } else { @@ -73,13 +74,15 @@ if($getAction == "delete" and isset($getUid)) { Option(_("Back"), null, "href='".$_SERVER["PHP_SELF"]."'", "back"); } else { if($cfgErrors->userIsAdmin() or $doc->userIsOwner($getUid)) { - echo sprintf("
\n", $view->getDeleteURL($getUid)); - echo sprintf("

%s

", - _c("error-reporter:You are about to delete the following error report:")); + echo sprintf("\n", + $view->getDeleteURL($getUid)); + echo sprintf("

%s

", _c("error-reporter:You are about to delete ". + "the following error report:")); $view->printErrorReport($doc->getErrorReportByID($getUid), true, false); - echo sprintf("

\n". - " \n". - "

", _("Delete"), _("Cancel")); + echo sprintf("

\n \n

", + _("Delete"), _("Cancel")); } else { echo sprintf("

%s

", _c("error-reporter:You are not allowed to delete this report.")); @@ -95,64 +98,74 @@ if($getAction == "delete" and isset($getUid)) { echo sprintf("
\n", $_SERVER["PHP_SELF"]); // probably we have to insert an error report -if(($getAction == "submit" and $postSubmit == _("Insert"))) +if(($getAction == "submit" and $postSubmit == _c("error-reporter:Submit"))) { // All fields must be filled out - if((trim($postMachine) == "") or (trim($postText) == "")) { - $strError = _c("error-reporter:You have to fill out all the fields in the form."); - } else { - // Write to database - $nNewUid = null; - $er = new erErrorReport(time(), $_SESSION["act"], $postMachine, $postText, $postHidden == "true"); - try { - $nNewUid = $doc->writeErrorReport($er); - } catch(Exception $e) { + if((trim($postMachine) == "") or (trim($postText) == "")) { + $strError = _c("error-reporter:You have to fill out all the fields in ". + "the form."); + } else { + // Write to database + $nNewUid = null; + $er = new erErrorReport(time(), $_SESSION["act"], $postMachine, $postText, $postHidden == "true"); + try { + $nNewUid = $doc->writeErrorReport($er); + } catch(Exception $e) { echo sprintf("

%s

", $e->getMessage()); - } - - if($nNewUid !== null) { - echo sprintf("

%s

", - _c("error-reporter:The report was submitted. Thank you for your help.")); - } - - $postText = ""; - $postMachine = ""; - $postHidden = "false"; - } + } + + if($nNewUid !== null) { + echo sprintf("

%s

", _c("error-reporter:The report was ". + "submitted. Thank you for your help.")); + } + + $postText = ""; + $postMachine = ""; + $postHidden = "false"; + } } // Show already existent (and visible) error reports -Title(_c("error-reporter:Reports that have already been submitted:")); -echo sprintf("

%s

", _c("error-reporter:These errors should not be resubmitted.")); -$view->printErrorReports($doc->getErrorReports(array(ER_ERM_SORT_DATE => ER_ERM_SORT_DESC))); +if($doc->getNumErrorReports() > 0) { + Title(_c("error-reporter:Reports that have already been submitted:")); + echo sprintf("

%s

", _c("error-reporter:These errors should not be ". + "resubmitted.")); + $view->printErrorReports($doc->getErrorReports(array(ER_ERM_SORT_DATE => + ER_ERM_SORT_DESC))); +} // Form for submitting a new error report echo "

\n"; Title(_c("error-reporter:Report an error")); -Option(_c("error-reporter:Recommened reading"), _c("error-reporter:“How to Report Bugs ". - "Effectively”, by Simon G. Tatham"), "target='_blank' href='". - _c("error-reporter:http://www.chiark.greenend.org.uk/~sgtatham/bugs.html")."'"); +Option(_c("error-reporter:Recommened reading"), _c("error-reporter:“How to ". + "Report Bugs Effectively”, by Simon G. Tatham"), "target='_blank' href='". + _c("error-reporter:http://www.chiark.greenend.org.uk/~sgtatham/bugs.html"). + "'"); // Print the error here if($strError != "") - echo "

$strError

\n"; + echo "

$strError

\n"; -echo sprintf("

%s

\n", _c("error-reporter:Please write your report as precise as possible to help ". - "us solve the problem. The more precise the report is, the faster the error can be fixed. ". - "Please include also any error messages you have recieved.")); -echo "
\n<{$GLOBALS["invtbl"]}>\n"; +echo sprintf("

%s

\n", _c("error-reporter:Please write your report as ". + "precise as possible to help us solve the problem. The more precise the ". + "report is, the faster the error can be fixed. Please include also any ". + "error messages you have recieved.")); +echo "\n". + "<{$GLOBALS["invtbl"]}>\n"; echo sprintf("%s". "\n", _c("error-reporter:Affected machine:"), q($postMachine)); echo sprintf("%s". "\n", _c("error-reporter:Description of the error:"), q($postText)); -echo sprintf("". - "\n", ($postHidden == "true") ? " checked='checked'" : "", - _c("error-reporter:Visible only for administrators (use this if your report is about security issues)")); -echo sprintf("\n", - _("Insert")); +echo sprintf("\n", + ($postHidden == "true") ? " checked='checked'" : "", _c("error-reporter:". + "Visible only for administrators (use this if your report is about security ". + "issues)")); +echo sprintf("". + "\n", _c("error-reporter:Submit")); echo "

\n"; _PageBlue();