Stop false alarms (displaying prompts-reporting form and reporting for 'false' (user warnings) errors).

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>

1 files changed, 49 insertions, 47 deletions

diff --git a/error_report.php b/error_report.php
index 91dd8c3820..20c6f9772b 100644
--- a/error_report.php
+++ b/error_report.php
@@ -80,57 +80,59 @@ if (isset($_REQUEST['exception_type'])
             && $_REQUEST['send_error_report'] == '1'
             ) {
             $reportData = PMA_getReportData('php');
-            $server_response = PMA_sendErrorReport($reportData);
-            if ($server_response === false) {
-                $success = false;
-            } else {
-                $decoded_response = json_decode($server_response, true);
-                $success = !empty($decoded_response) ? $decoded_response["success"] : false;
-            }
-            
-            if($GLOBALS['cfg']['SendErrorReports'] == 'ask'){
-                if($success) {
-                    $errSubmitMsg = PMA_Message::error(
-                                __('Thank You for subitting error report!!')
-                                . '<br/>'
-                                . __('Report has been succesfully submitted.')
-                            );
+            if ($reportData) {
+                $server_response = PMA_sendErrorReport($reportData);
+                if ($server_response === false) {
+                    $success = false;
                 } else {
-                    $errSubmitMsg = PMA_Message::error(
-                                __('Thank You for subitting error report!!')
-                                . '<br/>'
-                                . __(' Unfortunately submission failed.')
-                                . '<br/>'
-                                . __(' If you experience any problems please submit a bug report manually.')
-                            );
+                    $decoded_response = json_decode($server_response, true);
+                    $success = !empty($decoded_response) ? $decoded_response["success"] : false;
                 }
-            } elseif($GLOBALS['cfg']['SendErrorReports'] == 'always') {
-                if($success) {
-                    $errSubmitMsg = PMA_Message::error(
-                                __(
-                                    'An error has been detected on the server and an error report has been '
-                                    . 'automatically submitted based on your settings.'
-                                )
-                            );
-                } else {
-                    $errSubmitMsg = PMA_Message::error(
-                                __(
-                                    'An error has been detected and an error report has been '
-                                    . 'generated but failed to be sent.'
-                                )
-                                . '<br/>'
-                                . __('If you experience any problems please submit a bug report manually.')
-                            );
+            
+                if($GLOBALS['cfg']['SendErrorReports'] == 'ask'){
+                    if($success) {
+                        $errSubmitMsg = PMA_Message::error(
+                                    __('Thank You for subitting error report!!')
+                                    . '<br/>'
+                                    . __('Report has been succesfully submitted.')
+                                );
+                    } else {
+                        $errSubmitMsg = PMA_Message::error(
+                                    __('Thank You for subitting error report!!')
+                                    . '<br/>'
+                                    . __(' Unfortunately submission failed.')
+                                    . '<br/>'
+                                    . __(' If you experience any problems please submit a bug report manually.')
+                                );
+                    }
+                } elseif($GLOBALS['cfg']['SendErrorReports'] == 'always') {
+                    if($success) {
+                        $errSubmitMsg = PMA_Message::error(
+                                    __(
+                                        'An error has been detected on the server and an error report has been '
+                                        . 'automatically submitted based on your settings.'
+                                    )
+                                );
+                    } else {
+                        $errSubmitMsg = PMA_Message::error(
+                                    __(
+                                        'An error has been detected and an error report has been '
+                                        . 'generated but failed to be sent.'
+                                    )
+                                    . '<br/>'
+                                    . __('If you experience any problems please submit a bug report manually.')
+                                );
+                    }
                 }
-            }
 
-            if($response->isAjax()) {
-                $response->addJSON('_errSubmitMsg',$errSubmitMsg);
-            } else {
-                $jsCode = 'PMA_ajaxShowMessage("<div class=\"error\">'
-                        .$errSubmitMsg
-                        .'</div>", false);';
-                $response->getFooter()->getScripts()->addCode($jsCode);
+                if($response->isAjax()) {
+                    $response->addJSON('_errSubmitMsg',$errSubmitMsg);
+                } else {
+                    $jsCode = 'PMA_ajaxShowMessage("<div class=\"error\">'
+                            .$errSubmitMsg
+                            .'</div>", false);';
+                    $response->getFooter()->getScripts()->addCode($jsCode);
+                }
             }
         }
         // clear previous errors & save new ones.