X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fdlg.php;h=9ac5cd12fef16f8a1bcec52a7ab24edec59aa239;hb=07fd4f8d9d4f301f5ad88ff9e80f042fc3eb0c36;hp=5789af68437386f9982c8b3aca8f181678c6d0d8;hpb=62a1f9899ebfc099720a75a7ff0476c86034d45d;p=tt-rss.git
diff --git a/classes/dlg.php b/classes/dlg.php
index 5789af68..9ac5cd12 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -1,39 +1,29 @@
param = db_escape_string($this->link, $_REQUEST["param"]);
- print "";
+ header("Content-Type: text/html"); # required for iframe
+
+ $this->param = $_REQUEST["param"];
return true;
}
return false;
}
- function after() {
- print " ";
- }
-
function importOpml() {
- header("Content-Type: text/html"); # required for iframe
-
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 "
";
@@ -48,127 +38,8 @@ class Dlg extends Handler_Protected {
//return;
}
- function editPrefProfiles() {
- print "";
-
- print "
".
- "
" . __('Select')." ";
- print "
";
- print "
".__('All')."
";
- print "
".__('None')."
";
- print "
";
-
- print "
";
-
- print "
- ".
- __('Create profile')."
";
-
- 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() {
- print "".__('Public OPML URL')." ";
- print "link);
+ $url_path = Opml::opml_publish_url();
print __("Your Public OPML URL is:");
@@ -185,15 +56,11 @@ class Dlg extends Handler_Protected {
__('Close this window')."";
print "";
- print "]]> ";
//return;
}
function explainError() {
- print "".__('Notice')." ";
- print "";
if ($this->param == 1) {
@@ -222,246 +89,27 @@ class Dlg extends Handler_Protected {
__('Close this window')."";
print "";
- print "]]> ";
-
- //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 "
-
- ".
- __('This feed requires authentication.')."
";
-
- print "";
-
- print "
- ".__('Subscribe')." ";
-
- if (!(defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER)) {
- print "".__('More feeds')." ";
- }
-
- print "".__('Cancel')."
-
";
//return;
}
- function feedBrowser() {
- if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
-
- $browser_search = db_escape_string($this->link, $_REQUEST["search"]);
-
- print " ";
- print " ";
-
- print "
-
-
-
-
".__('Search')."
-
";
-
- print "
- " . __('Popular feeds') . "
- " . __('Feed archive') . "
- ";
-
- print __("limit:");
-
- print "
";
-
- foreach (array(25, 50, 100, 200) as $l) {
- $issel = ($l == $limit) ? "selected=\"1\"" : "";
- print "$l ";
- }
-
- print " ";
-
- print "
";
-
- $owner_uid = $_SESSION["uid"];
-
- require_once "feedbrowser.php";
-
- print "";
- print make_feed_browser($this->link, $search, 25);
- print " ";
-
- print "
- ".__('Subscribe')."
- ".__('Remove')."
- ".__('Cancel')."
";
-
- }
-
- 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 "
- ".__('All feeds')." ";
-
- $feed_title = getFeedTitle($this->link, $active_feed_id);
-
- if (!$is_cat) {
- $feed_cat_title = getFeedCatTitle($this->link, $active_feed_id);
- } else {
- $feed_cat_title = getCategoryTitle($this->link, $active_feed_id);
- }
-
- if ($active_feed_id && !$is_cat) {
- print "$feed_title ";
- } else {
- print "".__('This feed')." ";
- }
-
- if ($is_cat) {
- $cat_preselected = "selected=\"1\"";
- }
-
- if (get_pref($this->link, 'ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) {
- print "$feed_cat_title ";
- } else {
- //print "".__('This category')." ";
- }
-
- 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 "".__('Save')." ";
- print "".__('Cancel')." ";
- print "
";
-
- }
-
function printTagCloud() {
- print "".__('Tag Cloud')." ";
- 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);
@@ -491,7 +139,7 @@ class Dlg extends Handler_Protected {
$key_escaped = str_replace("'", "\\'", $key);
- echo "' . $key . ' ';
}
@@ -506,58 +154,19 @@ class Dlg extends Handler_Protected {
__('Close this window')."";
print "";
- print "]]> ";
- }
-
- function printTagSelect() {
-
- print "" . __('Select item(s) by tags') . " ";
- print "";
- print "".__("Any")." ";
- print " ";
- print " ";
- print "".__("All tags.")."";
-
- print "";
- $result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
- AND LENGTH(tag_name) <= 30 ORDER BY tag_name ASC");
-
- while ($row = db_fetch_assoc($result)) {
- $tmp = htmlspecialchars($row["tag_name"]);
- print "$tmp ";
- }
-
- print " ";
-
- print "";
- print "" . __('Display entries') . " ";
- print " ";
- print "" .
- __('Close this window') . " ";
- print "
";
-
- print "]]> ";
}
function generatedFeed() {
- print "".__('View as RSS')." ";
- print "params = explode(":", $this->param, 3);
- $feed_id = db_escape_string($this->link, $this->params[0]);
+ $feed_id = $this->params[0];
$is_cat = (bool) $this->params[1];
- $key = get_feed_access_key($this->link, $feed_id, $is_cat);
+ $key = get_feed_access_key($feed_id, $is_cat);
$url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
- print "" . __("You can view this feed as RSS using the following URL:") . "
";
+ print "".__("You can view this feed as RSS using the following URL:")." ";
print "";
print "
$url_path ";
@@ -572,183 +181,20 @@ class Dlg extends Handler_Protected {
__('Close this window')."";
print "
";
- print "]]> ";
//return;
}
- function newVersion() {
+ function defaultPasswordWarning() {
- $version_data = check_for_update($this->link);
- $version = $version_data['version'];
- $id = $version_data['version_id'];
+ print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
- if ($version && $id) {
- print "";
-
- print T_sprintf("New version of Tiny Tiny RSS is available (%s).",
- "$version ");
-
- print "
";
-
- $details = "http://tt-rss.org/redmine/versions/$id";
- $download = "http://tt-rss.org/#Download";
-
- print "".__("You can update using built-in updater in the Preferences or by using update.php")."
";
-
- print "";
- print "
".__("Details")." ";
- print "
".__("Download")." ";
- print "
".
- __('Close this window')." ";
-
- } else {
- print "
";
-
- print "
".__("Error receiving version information or no new version available.")."
";
-
- print "
";
-
- print "
";
- print "".
- __('Close this window')." ";
- print "
";
-
- }
- print "
";
-
- }
-
- function customizeCSS() {
- $value = get_pref($this->link, "USER_STYLESHEET");
-
- $value = str_replace(" ", "\n", $value);
-
- print "";
- print T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here.
This file can be used as a baseline.", "tt-rss.css");
- print "
";
-
- print " ";
- print " ";
- print " ";
-
- print "";
-
- print "