X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fdlg.php;h=9ac5cd12fef16f8a1bcec52a7ab24edec59aa239;hb=50052fb78a3a9d1bb3fa488e7fd7b23125c38124;hp=d13a9ecb6891d8b1859ef073a7d9f76c3a7cdc04;hpb=fb54e3b1887ae2d365c139296ebb03dc523478f5;p=tt-rss.git
diff --git a/classes/dlg.php b/classes/dlg.php
index d13a9ecb..9ac5cd12 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -1,12 +1,13 @@
param = db_escape_string($this->link, $_REQUEST["param"]);
+ $this->param = $_REQUEST["param"];
return true;
}
return false;
@@ -16,18 +17,13 @@ class Dlg extends Handler_Protected {
print __("If you have imported labels and/or filters, you might need to reload preferences to see your new data.") . "
";
print "";
- $owner_uid = $_SESSION["uid"];
-
- db_query($this->link, "BEGIN");
print "
";
- $opml = new Opml($this->link, $_REQUEST);
+ $opml = new Opml($_REQUEST);
$opml->opml_import($_SESSION["uid"]);
- db_query($this->link, "COMMIT");
-
print "
";
print "
";
@@ -42,124 +38,8 @@ class Dlg extends Handler_Protected {
//return;
}
- function editPrefProfiles() {
- print "";
-
- print "
".
- "
" . __('Select')."";
- print "
";
- print "
".__('All')."
";
- print "
".__('None')."
";
- print "
";
-
- print "
";
-
- print "
-
";
-
- print "
";
-
- $result = db_query($this->link, "SELECT title,id FROM ttrss_settings_profiles
- WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
- print "";
-
- print "
";
- print "
";
-
- print "";
-
- }
-
function pubOPMLUrl() {
- $url_path = Opml::opml_publish_url($this->link);
+ $url_path = Opml::opml_publish_url();
print __("Your Public OPML URL is:");
@@ -213,238 +93,23 @@ class Dlg extends Handler_Protected {
//return;
}
- function quickAddFeed() {
- print "";
- print "";
-
- print "".__("Feed or site URL")."
";
- print "";
-
- print "
-
";
-
- print "
";
-
- print "
";
-
- if (get_pref($this->link, 'ENABLE_FEED_CATS')) {
- print __('Place in category:') . " ";
- print_feed_cat_select($this->link, "cat", false, 'dojoType="dijit.form.Select"');
- }
-
- print "
";
-
- print '
-
-
' . __('Available feeds') . '
-
'.
- ''.
- '
';
-
- print "";
-
-
- print "
-
-
";
-
- print "";
-
- print "
- ";
-
- if (!(defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER)) {
- print "";
- }
-
- print "
-
";
-
- //return;
- }
-
- function feedBrowser() {
- if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
-
- $browser_search = db_escape_string($this->link, $_REQUEST["search"]);
-
- print "";
- print "";
-
- print "
-
-
-
-
-
";
-
- print "
";
-
- print __("limit:");
-
- print "
";
-
- print "
";
-
- $owner_uid = $_SESSION["uid"];
-
- require_once "feedbrowser.php";
-
- print "";
- print make_feed_browser($this->link, $search, 25);
- print "
";
-
- print "
-
-
-
";
-
- }
-
- function search() {
- $this->params = explode(":", db_escape_string($this->link, $_REQUEST["param"]), 2);
-
- $active_feed_id = sprintf("%d", $this->params[0]);
- $is_cat = $this->params[1] != "false";
-
- print "".__('Look for')."
";
-
- print "";
-
- print "";
-
- print "
".__('Limit search to:')." ";
-
- print "";
-
- print "";
-
- print "";
- }
-
- function editArticleTags() {
-
- print __("Tags for this article (separated by commas):")."
";
-
- $tags = get_article_tags($this->link, $this->param);
-
- $tags_str = join(", ", $tags);
-
- print "param\">";
- print "";
- print "";
-
- print "";
-
- print "
- ";
-
- print " |
";
-
- print "";
-
- print " ";
- print "";
- print "
";
-
- }
-
function printTagCloud() {
print "";
// from here: http://www.roscripts.com/Create_tag_cloud-71.html
- $query = "SELECT tag_name, COUNT(post_int_id) AS count
- FROM ttrss_tags WHERE owner_uid = ".$_SESSION["uid"]."
- GROUP BY tag_name ORDER BY count DESC LIMIT 50";
-
- $result = db_query($this->link, $query);
+ $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 = db_fetch_assoc($result)) {
+ while ($line = $sth->fetch()) {
$tags[$line["tag_name"]] = $line["count"];
}
- if( count($tags) == 0 ){ return; }
+ if(count($tags) == 0 ){ return; }
ksort($tags);
@@ -474,7 +139,7 @@ class Dlg extends Handler_Protected {
$key_escaped = str_replace("'", "\\'", $key);
- echo "
' . $key . ' ';
}
@@ -491,44 +156,13 @@ class Dlg extends Handler_Protected {
}
- function printTagSelect() {
-
- print __("Match:"). " " .
- "
";
- print "
";
- print " ";
- print "
";
- print "