From 2a883f8ba1f61c53275a358db47ab0d51a041cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 4 Sep 2017 16:51:19 +0200
Subject: [PATCH 1/3] Include error detail in the error message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue #13183

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 js/ajax.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/ajax.js b/js/ajax.js
index a874a71880..d06c40272d 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -801,7 +801,7 @@ $(document).ajaxError(function (event, request, settings) {
     // Don't handle aborted requests
     if (request.status !== 0 || request.statusText !== 'abort') {
         var errorCode = PMA_sprintf(PMA_messages.strErrorCode, request.status);
-        var errorText = PMA_sprintf(PMA_messages.strErrorText, request.statusText);
+        var errorText = PMA_sprintf(PMA_messages.strErrorText, request.statusText + ' (' + request.state() + ')');
         PMA_ajaxShowMessage(
             '<div class="error">' +
             PMA_messages.strErrorProcessingRequest +

From 0fcceb9b2f821852c8f1aa75c805f7c090116788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 4 Sep 2017 16:53:56 +0200
Subject: [PATCH 2/3] Do not include error code 0 in the message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It really is not useful information.

Issue #13183

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 js/ajax.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/js/ajax.js b/js/ajax.js
index d06c40272d..ced1ac168f 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -800,13 +800,16 @@ $(document).ajaxError(function (event, request, settings) {
     }
     // Don't handle aborted requests
     if (request.status !== 0 || request.statusText !== 'abort') {
-        var errorCode = PMA_sprintf(PMA_messages.strErrorCode, request.status);
-        var errorText = PMA_sprintf(PMA_messages.strErrorText, request.statusText + ' (' + request.state() + ')');
+        var details = ''
+
+        if (request.status !== 0) {
+            details += '<div>' + escapeHtml(PMA_sprintf(PMA_messages.strErrorCode, request.status)) + '</div>';
+        }
+        details += '<div>' + escapeHtml(PMA_sprintf(PMA_messages.strErrorText, request.statusText + ' (' + request.state() + ')')) + '</div>';
         PMA_ajaxShowMessage(
             '<div class="error">' +
             PMA_messages.strErrorProcessingRequest +
-            '<div>' + escapeHtml(errorCode) + '</div>' +
-            '<div>' + escapeHtml(errorText) + '</div>' +
+            details +
             '</div>',
             false
         );

From 04add7c9180e65f7a66a0236e5ef979e9833d7c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 4 Sep 2017 16:57:27 +0200
Subject: [PATCH 3/3] Better report connection errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Provide verbose error description when we can't connect to the server
from client.

Fixes #13183

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 js/ajax.js      | 6 +++++-
 js/messages.php | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/js/ajax.js b/js/ajax.js
index ced1ac168f..e2a0cebcdf 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -801,11 +801,15 @@ $(document).ajaxError(function (event, request, settings) {
     // Don't handle aborted requests
     if (request.status !== 0 || request.statusText !== 'abort') {
         var details = ''
+        var state = request.state();
 
         if (request.status !== 0) {
             details += '<div>' + escapeHtml(PMA_sprintf(PMA_messages.strErrorCode, request.status)) + '</div>';
         }
-        details += '<div>' + escapeHtml(PMA_sprintf(PMA_messages.strErrorText, request.statusText + ' (' + request.state() + ')')) + '</div>';
+        details += '<div>' + escapeHtml(PMA_sprintf(PMA_messages.strErrorText, request.statusText + ' (' + state + ')')) + '</div>';
+        if (state == 'rejected' || state == 'timeout') {
+            details += '<div>' + escapeHtml(PMA_messages.strErrorConnection) + '</div>';
+        }
         PMA_ajaxShowMessage(
             '<div class="error">' +
             PMA_messages.strErrorProcessingRequest +
diff --git a/js/messages.php b/js/messages.php
index a7f4c8547b..2368cd2d07 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -365,6 +365,10 @@ $js_messages['strRequestFailed'] = __('Request failed!!');
 $js_messages['strErrorProcessingRequest'] = __('Error in processing request');
 $js_messages['strErrorCode'] = __('Error code: %s');
 $js_messages['strErrorText'] = __('Error text: %s');
+$js_messages['strErrorConnection'] = __(
+    'It seems that the connection to server has been lost. Please check your ' .
+    'network connectivity and server status.'
+);
 $js_messages['strNoDatabasesSelected'] = __('No databases selected.');
 $js_messages['strDroppingColumn'] = __('Dropping column');
 $js_messages['strAddingPrimaryKey'] = __('Adding primary key');