X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fdlg.php;h=9ac5cd12fef16f8a1bcec52a7ab24edec59aa239;hb=07fd4f8d9d4f301f5ad88ff9e80f042fc3eb0c36;hp=32a3b230afbbb7d6d48663bf42e7ec691001ce93;hpb=9d76e754513ec1119a010ab2e9abcf9fb9df52d1;p=tt-rss.git

diff --git a/classes/dlg.php b/classes/dlg.php
index 32a3b230..9ac5cd12 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -1,12 +1,13 @@
 <?php
 class Dlg extends Handler_Protected {
 	private $param;
+    private $params;
 
-	function before($method) {
+    function before($method) {
 		if (parent::before($method)) {
 			header("Content-Type: text/html"); # required for iframe
 
-			$this->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.") . "</p>";
 
 		print "<div class=\"prefFeedOPMLHolder\">";
-		$owner_uid = $_SESSION["uid"];
-
-		db_query($this->link, "BEGIN");
 
 		print "<ul class='nomarks'>";
 
-		$opml = new Opml($this->link, $_REQUEST);
+		$opml = new Opml($_REQUEST);
 
 		$opml->opml_import($_SESSION["uid"]);
 
-		db_query($this->link, "COMMIT");
-
 		print "</ul>";
 		print "</div>";
 
@@ -43,7 +39,7 @@ class Dlg extends Handler_Protected {
 	}
 
 	function pubOPMLUrl() {
-		$url_path = Opml::opml_publish_url($this->link);
+		$url_path = Opml::opml_publish_url();
 
 		print __("Your Public OPML URL is:");
 
@@ -102,19 +98,18 @@ class Dlg extends Handler_Protected {
 
 		// 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);
 
@@ -144,7 +139,7 @@ class Dlg extends Handler_Protected {
 
 			$key_escaped = str_replace("'", "\\'", $key);
 
-			echo "<a href=\"javascript:viewfeed('$key_escaped') \" style=\"font-size: " .
+			echo "<a href=\"javascript:viewfeed({feed:'$key_escaped'}) \" style=\"font-size: " .
 				$size . "px\" title=\"$value articles tagged with " .
 				$key . '">' . $key . '</a> ';
 		}
@@ -161,44 +156,13 @@ class Dlg extends Handler_Protected {
 
 	}
 
-	function printTagSelect() {
-
-		print __("Match:"). "&nbsp;" .
-			"<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" checked value=\"any\" name=\"tag_mode\" id=\"tag_mode_any\">";
-		print "<label for=\"tag_mode_any\">".__("Any")."</label>";
-		print "&nbsp;";
-		print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" value=\"all\" name=\"tag_mode\" id=\"tag_mode_all\">";
-		print "<label for=\"tag_mode_all\">".__("All tags.")."</input>";
-
-		print "<select id=\"all_tags\" name=\"all_tags\" title=\"" . __('Which Tags?') . "\" multiple=\"multiple\" size=\"10\" style=\"width : 100%\">";
-		$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 "<option value=\"" . str_replace(" ", "%20", $tmp) . "\">$tmp</option>";
-		}
-
-		print "</select>";
-
-		print "<div align='right'>";
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"viewfeed(get_all_tags($('all_tags')),
-			get_radio_checked($('tag_mode')));\">" . __('Display entries') . "</button>";
-		print "&nbsp;";
-		print "<button dojoType=\"dijit.form.Button\"
-		onclick=\"return closeInfoBox()\">" .
-			__('Close this window') . "</button>";
-		print "</div>";
-
-	}
-
 	function generatedFeed() {
 
 		$this->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;
 
@@ -221,100 +185,16 @@ class Dlg extends Handler_Protected {
 		//return;
 	}
 
-	function newVersion() {
-
-		$version_data = check_for_update($this->link);
-		$version = $version_data['version'];
-		$id = $version_data['version_id'];
-
-		if ($version && $id) {
-			print "<div class='tagCloudContainer'>";
-
-			print T_sprintf("New version of Tiny Tiny RSS is available (%s).",
-				"<b>$version</b>");
-
-			print "</div>";
+	function defaultPasswordWarning() {
 
-			$details = "http://tt-rss.org/redmine/versions/$id";
-			$download = "http://tt-rss.org/#Download";
+    	print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
 
-			print "<p align='center'>".__("You can update using built-in updater in the Preferences or by using update.php")."</p>";
-
-			print "<div style='text-align : center'>";
-			print "<button dojoType=\"dijit.form.Button\"
-				onclick=\"return window.open('$details')\">".__("See the release notes")."</button>";
-			print "<button dojoType=\"dijit.form.Button\"
-				onclick=\"return window.open('$download')\">".__("Download")."</button>";
-			print "<button dojoType=\"dijit.form.Button\"
-				onclick=\"return dijit.byId('newVersionDlg').hide()\">".
-				__('Close this window')."</button>";
-
-		} else {
-			print "<div class='tagCloudContainer'>";
-
-			print "<p align='center'>".__("Error receiving version information or no new version available.")."</p>";
-
-			print "</div>";
-
-			print "<div style='text-align : center'>";
-			print "<button dojoType=\"dijit.form.Button\"
-				onclick=\"return dijit.byId('newVersionDlg').hide()\">".
-				__('Close this window')."</button>";
-			print "</div>";
-
-		}
+		print "<div align='center'>";
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"gotoPreferences()\">".
+			__('Open Preferences')."</button> ";
+		print "<button dojoType=\"dijit.form.Button\"
+			onclick=\"return closeInfoBox()\">".
+			__('Close this window')."</button>";
 		print "</div>";
-
 	}
-
-
-	function batchSubscribe() {
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"batchaddfeeds\">";
-
-		print "<table width='100%'><tr><td>
-			".__("Add one valid RSS feed per line (no feed detection is done)")."
-		</td><td align='right'>";
-		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 "</td></tr><tr><td colspan='2'>";
-		print "<textarea
-			style='font-size : 12px; width : 100%; height: 200px;'
-			placeHolder=\"".__("Feeds to subscribe, One per line")."\"
-			dojoType=\"dijit.form.SimpleTextarea\" required=\"1\" name=\"feeds\"></textarea>";
-
-		print "</td></tr><tr><td colspan='2'>";
-
-		print "<div id='feedDlg_loginContainer' style='display : none'>
-				" .
-				" <input dojoType=\"dijit.form.TextBox\" name='login'\"
-					placeHolder=\"".__("Login")."\"
-					style=\"width : 10em;\"> ".
-				" <input
-					placeHolder=\"".__("Password")."\"
-					dojoType=\"dijit.form.TextBox\" type='password'
-					style=\"width : 10em;\" name='pass'\">".
-				"</div>";
-
-		print "</td></tr><tr><td colspan='2'>";
-
-		print "<div style=\"clear : both\">
-			<input type=\"checkbox\" name=\"need_auth\" dojoType=\"dijit.form.CheckBox\" id=\"feedDlg_loginCheck\"
-					onclick='checkboxToggleElement(this, \"feedDlg_loginContainer\")'>
-				<label for=\"feedDlg_loginCheck\">".
-				__('Feeds require authentication.')."</div>";
-
-		print "</form>";
-
-		print "</td></tr></table>";
-
-		print "<div class=\"dlgButtons\">
-			<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('batchSubDlg').execute()\">".__('Subscribe')."</button>
-			<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('batchSubDlg').hide()\">".__('Cancel')."</button>
-			</div>";
-	}
-
-}
-?>
+}
\ No newline at end of file