From ad7842c98af21bf400c0f347455a3a8432c01140 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 12 Feb 2021 18:43:30 +0300 Subject: RIP tag cloud: last of the vanilla popup dialog system --- classes/dlg.php | 78 --------------------------------------------------------- classes/rpc.php | 2 -- js/App.js | 40 ----------------------------- 3 files changed, 120 deletions(-) delete mode 100644 classes/dlg.php diff --git a/classes/dlg.php b/classes/dlg.php deleted file mode 100644 index 4240ad222..000000000 --- a/classes/dlg.php +++ /dev/null @@ -1,78 +0,0 @@ -param = ($_REQUEST["param"] ?? false); - return true; - } - return false; - } - - function printTagCloud() { - print "
"; - - // from here: http://www.roscripts.com/Create_tag_cloud-71.html - - $sth = $this->pdo->prepare("SELECT tag_name, COUNT(post_int_id) AS count - FROM ttrss_tags WHERE owner_uid = ? - GROUP BY tag_name ORDER BY count DESC LIMIT 50"); - $sth->execute([$_SESSION['uid']]); - - $tags = array(); - - while ($line = $sth->fetch()) { - $tags[$line["tag_name"]] = $line["count"]; - } - - if(count($tags) == 0 ){ return; } - - ksort($tags); - - $max_size = 32; // max font size in pixels - $min_size = 11; // min font size in pixels - - // largest and smallest array values - $max_qty = max(array_values($tags)); - $min_qty = min(array_values($tags)); - - // find the range of values - $spread = $max_qty - $min_qty; - if ($spread == 0) { // we don't want to divide by zero - $spread = 1; - } - - // set the font-size increment - $step = ($max_size - $min_size) / ($spread); - - // loop through the tag array - foreach ($tags as $key => $value) { - // calculate font-size - // find the $value in excess of $min_qty - // multiply by the font-size increment ($size) - // and add the $min_size set above - $size = round($min_size + (($value - $min_qty) * $step)); - - $key_escaped = str_replace("'", "\\'", (string)$key); - - echo "' . $key . ' '; - } - - - - print "
"; - - print ""; - - } -} diff --git a/classes/rpc.php b/classes/rpc.php index a6ddf7004..f8af1d660 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -638,7 +638,6 @@ class RPC extends Handler_Protected { "goto_marked" => __("Starred"), "goto_published" => __("Published"), "goto_read" => __("Recently read"), - "goto_tagcloud" => __("Tag cloud"), "goto_prefs" => __("Preferences")), __("Other") => array( "create_label" => __("Create label"), @@ -711,7 +710,6 @@ class RPC extends Handler_Protected { "g s" => "goto_marked", "g p" => "goto_published", "g r" => "goto_read", - "g t" => "goto_tagcloud", "g P" => "goto_prefs", "r" => "select_article_cursor", "c l" => "create_label", diff --git a/js/App.js b/js/App.js index 8ea6c70b3..483d22211 100644 --- a/js/App.js +++ b/js/App.js @@ -321,40 +321,6 @@ const App = { dialog.show(); }); }, - displayDlg: function(title, id, param, callback) { - Notify.progress("Loading, please wait...", true); - - const query = {op: "dlg", method: id, param: param}; - - xhrPost("backend.php", query, (transport) => { - try { - const content = transport.responseText; - - let dialog = dijit.byId("infoBox"); - - if (!dialog) { - dialog = new fox.SingleUseDialog({ - title: title, - id: 'infoBox', - content: content - }); - } else { - dialog.attr('title', title); - dialog.attr('content', content); - } - - dialog.show(); - - Notify.close(); - - if (callback) callback(transport); - } catch (e) { - this.Error.report(e); - } - }); - - return false; - }, handleRpcJson: function(transport) { const netalert = $$("#toolbar .net-alert")[0]; @@ -1082,9 +1048,6 @@ const App = { this.hotkey_actions["goto_published"] = () => { Feeds.open({feed: -2}); }; - this.hotkey_actions["goto_tagcloud"] = () => { - this.displayDlg(__("Tag cloud"), "printTagCloud"); - }; this.hotkey_actions["goto_prefs"] = () => { App.openPreferences(); }; @@ -1162,9 +1125,6 @@ const App = { case "qmcLogout": App.postCurrentWindow("public.php", {op: "logout", csrf_token: __csrf_token}); break; - case "qmcTagCloud": - this.displayDlg(__("Tag cloud"), "printTagCloud"); - break; case "qmcSearch": Feeds.search(); break; -- cgit v1.2.3