From eac7ad5d343493c7a757e85f9d9cd6229a2b4fca Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 12 Feb 2021 08:00:25 +0300
Subject: [PATCH] remove explainError server-side dlg
---
classes/dlg.php | 31 -------------------------------
js/App.js | 7 ++-----
2 files changed, 2 insertions(+), 36 deletions(-)
diff --git a/classes/dlg.php b/classes/dlg.php
index 93c1c4c51..f62a42b4d 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -35,37 +35,6 @@ class Dlg extends Handler_Protected {
//return;
}
- function explainError() {
- print "<div class=\"errorExplained\">";
-
- if ($this->param == 1) {
- print __("Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner.");
-
- $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
-
- print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
-
- }
-
- if ($this->param == 3) {
- print __("Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner.");
-
- $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
-
- print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
-
- }
-
- print "</div>";
-
- print "<footer class='text-center'>";
- print "<button onclick=\"return CommonDialogs.closeInfoBox()\">".
- __('Close this window')."</button>";
- print "</footer>";
-
- //return;
- }
-
function printTagCloud() {
print "<div class='panel text-center'>";
diff --git a/js/App.js b/js/App.js
index db7797b75..45de8cf0e 100644
--- a/js/App.js
+++ b/js/App.js
@@ -433,7 +433,7 @@ const App = {
console.log("RI:", k, "=>", v);
if (k == "daemon_is_running" && v != 1) {
- Notify.error("<span onclick=\"App.explainError(1)\">Update daemon is not running.</span>", true);
+ Notify.error("Update daemon is not running.", true);
return;
}
@@ -446,7 +446,7 @@ const App = {
}
if (k == "daemon_stamp_ok" && v != 1) {
- Notify.error("<span onclick=\"App.explainError(3)\">Update daemon is not updating feeds.</span>", true);
+ Notify.error("Update daemon is not updating feeds.", true);
return;
}
@@ -530,9 +530,6 @@ const App = {
this.initSecondStage();
},
- explainError: function(code) {
- return this.displayDlg(__("Error explained"), "explainError", code);
- },
Error: {
fatal: function (error, params) {
params = params || {};
--
GitLab