X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=modules%2Fpopup-dialog.php;h=13abc947f1febcfca57b7b9844f3f4a76d94721d;hb=667a82727cd95cc75e006b8509b6249e3f7f46e6;hp=351d4b0f90717638cfa8e18df6d7c75f30d9926f;hpb=11b9d0becdfc894c04afaa912798917911ff35a8;p=tt-rss.git

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 351d4b0f..13abc947 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -6,10 +6,8 @@
 		print "<dlg id=\"$id\">";
 
 		if ($id == "importOpml") {
-			print "<title>".__('OPML Import')."</title>";
-			print "<content><![CDATA[";
-
-			print "<div class=\"prefFeedCatHolder\">";
+			print "<div class=\"prefFeedOPMLHolder\">";
+			header("Content-Type: text/html"); # required for iframe
 
 			$owner_uid = $_SESSION["uid"];
 
@@ -23,7 +21,7 @@
 
 			if (db_num_rows($result) == 0) {
 				db_query($link, "INSERT INTO ttrss_feed_categories
-					(title,owner_uid) 
+					(title,owner_uid)
 						VALUES ('Imported feeds', '$owner_uid')");
 			}
 
@@ -50,54 +48,56 @@
 			print "</div>";
 
 			print "<div align='center'>";
-
-			print "<button onclick=\"return opmlImportDone()\">".
+			print "<button dojoType=\"dijit.form.Button\"
+				onclick=\"dijit.byId('opmlImportDlg').hide()\">".
 				__('Close this window')."</button>";
-
 			print "</div>";
 
-			print "<script type=\"text/javascript\">";
-			print "parent.opmlImportHandler(this)";
-			print "</script>";
-
 			print "</div>";
-			print "]]></content>";
 
 			//return;
 		}
 
 		if ($id == "editPrefProfiles") {
 
-			print "<title>".__('Settings Profiles')."</title>";
-			print "<content><![CDATA[";
-
-			print "<div><input id=\"fadd_profile\" 
-					onkeypress=\"return filterCR(event, addPrefProfile)\"
-					size=\"40\">
-					<button onclick=\"javascript:addPrefProfile()\">".
+			print "<div dojoType=\"dijit.Toolbar\">";
+
+#			TODO: depends on selectTableRows() being broken for this list
+#			print "<div dojoType=\"dijit.form.DropDownButton\">".
+#				"<span>" . __('Select')."</span>";
+#			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+#			print "<div onclick=\"selectTableRows('prefFeedProfileList', 'all')\"
+#				dojoType=\"dijit.MenuItem\">".__('All')."</div>";
+#			print "<div onclick=\"selectTableRows('prefFeedProfileList', 'none')\"
+#				dojoType=\"dijit.MenuItem\">".__('None')."</div>";
+#			print "</div></div>";
+
+#			print "<div style='float : right'>";
+			print "<input name=\"newprofile\" dojoType=\"dijit.form.ValidationTextBox\"
+					required=\"1\">
+				<button dojoType=\"dijit.form.Button\"
+				onclick=\"dijit.byId('profileEditDlg').addProfile()\">".
 					__('Create profile')."</button></div>";
 
-			print "<p>";
+#			print "</div>";
+
 
 			$result = db_query($link, "SELECT title,id FROM ttrss_settings_profiles
 				WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
-			print	__('Select:')." 
-				<a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'all')\">".__('All')."</a>,
-				<a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'none')\">".__('None')."</a>";
-
 			print "<div class=\"prefFeedCatHolder\">";
 
 			print "<form id=\"profile_edit_form\" onsubmit=\"return false\">";
 
-			print "<table width=\"100%\" class=\"prefFeedCatList\" 
-				cellspacing=\"0\" id=\"prefFeedCatList\">";
+			print "<table width=\"100%\" class=\"prefFeedProfileList\"
+				cellspacing=\"0\" id=\"prefFeedProfileList\">";
 
-			print "<tr class=\"odd\" id=\"FCATR-0\">";
+			print "<tr class=\"\" id=\"FCATR-0\">"; #odd
 
-			print "<td width='5%' align='center'><input 
-				onclick='toggleSelectRow(this);' 
-				type=\"checkbox\" id=\"FCCHK-0\"></td>";
+			print "<td width='5%' align='center'><input
+				onclick='toggleSelectRow2(this);'
+				dojoType=\"dijit.form.CheckBox\"
+				type=\"checkbox\"></td>";
 
 			if (!$_SESSION["profile"]) {
 				$is_active = __("(active)");
@@ -105,27 +105,28 @@
 				$is_active = "";
 			}
 
-			print "<td><span id=\"FCATT-0\">" . 
+			print "<td><span>" .
 				__("Default profile") . " $is_active</span></td>";
-				
+
 			print "</tr>";
 
 			$lnum = 1;
-			
+
 			while ($line = db_fetch_assoc($result)) {
-	
+
 				$class = ($lnum % 2) ? "even" : "odd";
-	
-				$cat_id = $line["id"];
-				$this_row_id = "id=\"FCATR-$cat_id\"";
-	
-				print "<tr class=\"$class\" $this_row_id>";
-	
+
+				$profile_id = $line["id"];
+				$this_row_id = "id=\"FCATR-$profile_id\"";
+
+				print "<tr class=\"\" $this_row_id>";
+
 				$edit_title = htmlspecialchars($line["title"]);
-	
-				print "<td width='5%' align='center'><input 
-					onclick='toggleSelectRow(this);' 
-					type=\"checkbox\" id=\"FCCHK-$cat_id\"></td>";
+
+				print "<td width='5%' align='center'><input
+					onclick='toggleSelectRow2(this);'
+					dojoType=\"dijit.form.CheckBox\"
+					type=\"checkbox\"></td>";
 
 				if ($_SESSION["profile"] == $line["id"]) {
 					$is_active = __("(active)");
@@ -133,11 +134,25 @@
 					$is_active = "";
 				}
 
-				print "<td><span id=\"FCATT-$cat_id\">" . 
-					$edit_title . "</span> $is_active</td>";
-				
+				print "<td><span dojoType=\"dijit.InlineEditBox\"
+					width=\"300px\" autoSave=\"false\"
+					profile-id=\"$profile_id\">" . $edit_title .
+					"<script type=\"dojo/method\" event=\"onChange\" args=\"item\">
+						var elem = this;
+						dojo.xhrPost({
+							url: 'backend.php',
+							content: {op: 'rpc', method: 'saveprofile',
+								value: this.value,
+								id: this.srcNodeRef.getAttribute('profile-id')},
+								load: function(response) {
+									elem.attr('value', response);
+							}
+						});
+					</script>
+				</span> $is_active</td>";
+
 				print "</tr>";
-	
+
 				++$lnum;
 			}
 
@@ -147,19 +162,16 @@
 
 			print "<div class='dlgButtons'>
 				<div style='float : left'>
-				<button onclick=\"return removeSelectedPrefProfiles()\">".
-				__('Remove')."</button>
-				<button onclick=\"return activatePrefProfile()\">".
-				__('Activate')."</button>
+				<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').removeSelected()\">".
+				__('Remove selected profiles')."</button>
+				<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').activateProfile()\">".
+				__('Activate profile')."</button>
 				</div>";
 
-			print "<button onclick=\"return closeInfoBox()\">".
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').hide()\">".
 				__('Close this window')."</button>";
-
 			print "</div>";
-			print "]]></content>";
 
-			//return;
 		}
 
 		if ($id == "pubOPMLUrl") {
@@ -177,10 +189,10 @@
 
 			print "<div align='center'>";
 
-			print "<button onclick=\"return opmlRegenKey()\">".
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"return opmlRegenKey()\">".
 				__('Generate new URL')."</button> ";
 
-			print "<button onclick=\"return closeInfoBox()\">".
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"return closeInfoBox()\">".
 				__('Close this window')."</button>";
 
 			print "</div>";
@@ -201,18 +213,7 @@
 
 				$stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
 
-				print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp); 
-
-			}
-
-			if ($param == 2) {
-				$msg = check_for_update($link);
-
-				if (!$msg) {
-					print __("You are running the latest version of Tiny Tiny RSS. The fact that you are seeing this dialog is probably a bug.");
-				} else {
-					print $msg;
-				}
+				print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
 
 			}
 
@@ -221,15 +222,15 @@
 
 				$stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
 
-				print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp); 
+				print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
 
 			}
 
 			print "</div>";
-			
+
 			print "<div align='center'>";
 
-			print "<button onclick=\"return closeInfoBox()\"".
+			print "<button onclick=\"return closeInfoBox()\">".
 				__('Close this window')."</button>";
 
 			print "</div>";
@@ -241,7 +242,7 @@
 		if ($id == "quickAddFeed") {
 
 			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
-			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"subop\" value=\"addfeed\">"; 
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"addfeed\">";
 
 			print "<div class=\"dlgSec\">".__("Feed")."</div>";
 			print "<div class=\"dlgSecCont\">";
@@ -250,11 +251,11 @@
 				placeHolder=\"".__("Feed URL")."\"
 				dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"feed\" id=\"feedDlg_feedUrl\">";
 
-			print "<br/>";
+			print "<hr/>";
 
 			if (get_pref($link, 'ENABLE_FEED_CATS')) {
 				print __('Place in category:') . " ";
-				print_feed_cat_select($link, "cat", false, 'dojoType="dijit.form.Select"');			
+				print_feed_cat_select($link, "cat", false, 'dojoType="dijit.form.Select"');
 			}
 
 			print "</div>";
@@ -272,22 +273,22 @@
 					'</div></div>';
 
 			print "<div id='feedDlg_loginContainer' style='display : none'>
-	
+
 					<div class=\"dlgSec\">".__("Authentication")."</div>
 					<div class=\"dlgSecCont\">".
 
-					" <input dojoType=\"dijit.form.TextBox\" name='login'\" 
+					" <input dojoType=\"dijit.form.TextBox\" name='login'\"
 						placeHolder=\"".__("Login")."\"
 						style=\"width : 10em;\"> ".
-					" <input 
+					" <input
 						placeHolder=\"".__("Password")."\"
-						dojoType=\"dijit.form.TextBox\" type='password' 
+						dojoType=\"dijit.form.TextBox\" type='password'
 						style=\"width : 10em;\" name='pass'\">
 				</div></div>";
 
 
-			print "<div style=\"clear : both\">		
-				<input type=\"checkbox\" dojoType=\"dijit.form.CheckBox\" id=\"feedDlg_loginCheck\" 
+			print "<div style=\"clear : both\">
+				<input type=\"checkbox\" dojoType=\"dijit.form.CheckBox\" id=\"feedDlg_loginCheck\"
 						onclick='checkboxToggleElement(this, \"feedDlg_loginContainer\")'>
 					<label for=\"feedDlg_loginCheck\">".
 					__('This feed requires authentication.')."</div>";
@@ -306,16 +307,16 @@
 		if ($id == "feedBrowser") {
 
 			$browser_search = db_escape_string($_REQUEST["search"]);
-			
-#			print "<form onsubmit='return false;' display='inline' 
+
+#			print "<form onsubmit='return false;' display='inline'
 #				name='feed_browser' id='feed_browser'>";
 
 			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
-			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"subop\" value=\"updateFeedBrowser\">"; 
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"updateFeedBrowser\">";
 
 			print "<div dojoType=\"dijit.Toolbar\">
 				<div style='float : right'>
-				<img style='display : none' 
+				<img style='display : none'
 					id='feed_browser_spinner' src='".
 					theme_image($link, 'images/indicator_white.gif')."'>
 				<input name=\"search\" dojoType=\"dijit.form.TextBox\" size=\"20\" type=\"search\"
@@ -336,7 +337,7 @@
 				$issel = ($l == $limit) ? "selected=\"1\"" : "";
 				print "<option $issel value=\"$l\">$l</option>";
 			}
-			
+
 			print "</select> ";
 
 			print "</div>";
@@ -344,7 +345,7 @@
 			$owner_uid = $_SESSION["uid"];
 
 			print "<ul class='browseFeedList' id='browseFeedList'>";
-			print_feed_browser($link, $search, 25);
+			print make_feed_browser($link, $search, 25);
 			print "</ul>";
 
 			print "<div align='center'>
@@ -356,26 +357,20 @@
 
 		if ($id == "search") {
 
-			print "<title>".__('Search')."</title>";
-			print "<content><![CDATA[";
-
-			print "<form id='search_form'  onsubmit='return false'>";
-
-			#$active_feed_id = db_escape_string($_REQUEST["param"]);
-
 			$params = explode(":", db_escape_string($_REQUEST["param"]), 2);
 
 			$active_feed_id = sprintf("%d", $params[0]);
-			$is_cat = (bool) $params[1];
+			$is_cat = $params[1] != "false";
 
 			print "<div class=\"dlgSec\">".__('Look for')."</div>";
 
 			print "<div class=\"dlgSecCont\">";
 
-			if (!SPHINX_ENABLE) {
+			if (!SPHINX_ENABLED) {
 
-				print "<input onkeypress=\"return filterCR(event, search)\"
-					name=\"query\" size=\"20\" type=\"search\"	value=''>";
+				print "<input dojoType=\"dijit.form.ValidationTextBox\"
+					style=\"font-size : 16px; width : 12em;\"
+					required=\"1\" name=\"query\" type=\"search\" value=''>";
 
 				print " " . __('match on')." ";
 
@@ -383,19 +378,21 @@
 					"title" => __("Title"),
 						"content" => __("Content"),
 					"both" => __("Title or content"));
-	
-				print_select_hash("match_on", 3, $search_fields); 
+
+				print_select_hash("match_on", 3, $search_fields,
+					'dojoType="dijit.form.Select"');
 			} else {
-				print "<input onkeypress=\"return filterCR(event, search)\"
-					name=\"query\" size=\"50\" type=\"search\"	value=''>";
+				print "<input dojoType=\"dijit.form.ValidationTextBox\"
+					style=\"font-size : 16px; width : 20em;\"
+					required=\"1\" name=\"query\" type=\"search\" value=''>";
 			}
 
 
-			print "<br/>".__('Limit search to:')." ";
-			
-			print "<select name=\"search_mode\">
+			print "<hr/>".__('Limit search to:')." ";
+
+			print "<select name=\"search_mode\" dojoType=\"dijit.form.Select\">
 				<option value=\"all_feeds\">".__('All feeds')."</option>";
-			
+
 			$feed_title = getFeedTitle($link, $active_feed_id);
 
 			if (!$is_cat) {
@@ -403,15 +400,15 @@
 			} else {
 				$feed_cat_title = getCategoryTitle($link, $active_feed_id);
 			}
-			
-			if ($active_feed_id && !$is_cat) {				
-				print "<option selected value=\"this_feed\">$feed_title</option>";
+
+			if ($active_feed_id && !$is_cat) {
+				print "<option selected=\"1\" value=\"this_feed\">$feed_title</option>";
 			} else {
-				print "<option disabled>".__('This feed')."</option>";
+				print "<option disabled=\"1\" value=\"false\">".__('This feed')."</option>";
 			}
 
 			if ($is_cat) {
-			  	$cat_preselected = "selected";
+			  	$cat_preselected = "selected=\"1\"";
 			}
 
 			if (get_pref($link, 'ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) {
@@ -420,21 +417,21 @@
 				//print "<option disabled>".__('This category')."</option>";
 			}
 
-			print "</select>"; 
+			print "</select>";
 
 			print "</div>";
 
-			print "</form>";
-
-			print "<div class=\"dlgButtons\">
-			<button onclick=\"javascript:search()\">".__('Search')."</button>
-			<button onclick=\"javascript:closeInfoBox(true)\">".__('Cancel')."</button>
-			</div>";
-
-			print "]]></content>";
+			print "<div class=\"dlgButtons\">";
 
-			//return;
+			if (!SPHINX_ENABLED) {
+				print "<div style=\"float : left\">
+					<a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/redmine/wiki/tt-rss/SearchSyntax\">Search syntax</a>
+					</div>";
+			}
 
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
+			<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('searchDlg').hide()\">".__('Cancel')."</button>
+			</div>";
 		}
 
 		if ($id == "quickAddFilter") {
@@ -443,13 +440,13 @@
 
 			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-filters\">";
 			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"quiet\" value=\"1\">";
-			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"subop\" value=\"add\">"; 
-		
-			$result = db_query($link, "SELECT id,description 
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"add\">";
+
+			$result = db_query($link, "SELECT id,description
 				FROM ttrss_filter_types ORDER BY description");
-	
+
 			$filter_types = array();
-	
+
 			while ($line = db_fetch_assoc($result)) {
 				//array_push($filter_types, $line["description"]);
 				$filter_types[$line["id"]] = __($line["description"]);
@@ -465,29 +462,30 @@
 				"before" => __("before"),
 				"after" => __("after"));
 
-			print_select_hash("filter_date_modifier", "before", 
+			print_select_hash("filter_date_modifier", "before",
 				$filter_params, 'dojoType="dijit.form.Select"');
 
 			print "&nbsp;</span>";
 
-			print "<input dojoType=\"dijit.form.ValidationTextBox\" 
+			print "<input dojoType=\"dijit.form.ValidationTextBox\"
 				 required=\"true\" id=\"filterDlg_regExp\"
 				 style=\"font-size : 16px\"
 				 name=\"reg_exp\" value=\"$reg_exp\"/>";
 
 			print "<span id=\"filterDlg_dateChkBox\" style=\"display : none\">";
-			print "&nbsp;<button onclick=\"return filterDlgCheckDate()\">".
+			print "&nbsp;<button dojoType=\"dijit.form.Button\"
+				onclick=\"return filterDlgCheckDate()\">".
 				__('Check it')."</button>";
 			print "</span>";
 
-			print "<br/>" .  __("on field") . " ";
+			print "<hr/>" .  __("on field") . " ";
 			print_select_hash("filter_type", 1, $filter_types,
 				'onchange="filterDlgCheckType(this)" dojoType="dijit.form.Select"');
 
-			print "<br/>";
+			print "<hr/>";
 
 			print __("in") . " ";
-			print_feed_select($link, "feed_id", $active_feed_id, 
+			print_feed_select($link, "feed_id", $active_feed_id,
 				'dojoType="dijit.form.FilteringSelect"');
 
 			print "</div>";
@@ -498,14 +496,14 @@
 
 			print "<select name=\"action_id\" dojoType=\"dijit.form.Select\"
 				onchange=\"filterDlgCheckAction(this)\">";
-	
-			$result = db_query($link, "SELECT id,description FROM ttrss_filter_actions 
+
+			$result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
 				ORDER BY name");
 
 			while ($line = db_fetch_assoc($result)) {
 				printf("<option value='%d'>%s</option>", $line["id"], __($line["description"]));
 			}
-	
+
 			print "</select>";
 
 			print "<span id=\"filterDlg_paramBox\" style=\"display : none\">";
@@ -514,7 +512,7 @@
 				id=\"filterDlg_actionParam\"
 				name=\"action_param\">";
 
-			print_label_select($link, "action_param_label", $action_param, 
+			print_label_select($link, "action_param_label", $action_param,
 			 'id="filterDlg_actionParamLabel" dojoType="dijit.form.Select"');
 
 			print "</span>";
@@ -527,7 +525,7 @@
 			print "<div class=\"dlgSecCont\">";
 
 			print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" checked=\"1\">
-					<label for=\"enabled\">".__('Enabled')."</label><br/>";
+					<label for=\"enabled\">".__('Enabled')."</label><hr/>";
 
 			print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"inverse\" id=\"inverse\">
 				<label for=\"inverse\">".__('Inverse match')."</label>";
@@ -536,10 +534,13 @@
 
 			print "<div class=\"dlgButtons\">";
 
-			print "<button onclick=\"return dijit.byId('filterEditDlg').execute()\">".
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').test()\">".
+				__('Test')."</button> ";
+
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').execute()\">".
 				__('Create')."</button> ";
 
-			print "<button onclick=\"return dijit.byId('filterEditDlg').hide()\">".
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">".
 				__('Cancel')."</button>";
 
 			print "</div>";
@@ -547,41 +548,142 @@
 			//return;
 		}
 
-		if ($id == "feedUpdateErrors") {
+		if ($id == "inactiveFeeds") {
 
-			print "<title>".__('Update Errors')."</title>";
-			print "<content><![CDATA[";
+			if (DB_TYPE == "pgsql") {
+				$interval_qpart = "NOW() - INTERVAL '3 months'";
+			} else {
+				$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
+			}
+
+			$result = db_query($link, "SELECT ttrss_feeds.title, ttrss_feeds.site_url,
+			  		ttrss_feeds.feed_url, ttrss_feeds.id, MAX(updated) AS last_article
+				FROM ttrss_feeds, ttrss_entries, ttrss_user_entries WHERE
+					(SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
+						ttrss_entries.id = ref_id AND
+							ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart
+				AND ttrss_feeds.owner_uid = ".$_SESSION["uid"]." AND
+					ttrss_user_entries.feed_id = ttrss_feeds.id AND
+					ttrss_entries.id = ref_id
+				GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url
+				ORDER BY last_article");
+
+			print __("These feeds have not been updated with new content for 3 months (oldest first):");
+
+			print "<div class=\"inactiveFeedHolder\">";
+
+			print "<table width=\"100%\" cellspacing=\"0\" id=\"prefInactiveFeedList\">";
+
+			$lnum = 1;
+
+			while ($line = db_fetch_assoc($result)) {
+
+				$class = ($lnum % 2) ? "even" : "odd";
+				$feed_id = $line["id"];
+				$this_row_id = "id=\"FUPDD-$feed_id\"";
+
+				print "<tr class=\"\" $this_row_id>";
+
+				$edit_title = htmlspecialchars($line["title"]);
+
+				print "<td width='5%' align='center'><input
+					onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
+					type=\"checkbox\"></td>";
+				print "<td>";
+
+				print "<a class=\"visibleLink\" href=\"#\" ".
+					"title=\"".__("Click to edit feed")."\" ".
+					"onclick=\"editFeed(".$line["id"].")\">".
+					htmlspecialchars($line["title"])."</a>";
+
+				print "</td><td class=\"insensitive\" align='right'>";
+				print make_local_datetime($link, $line['last_article'], false);
+				print "</td>";
+				print "</tr>";
+
+				++$lnum;
+			}
+
+			print "</table>";
+			print "</div>";
+
+			print "<div class='dlgButtons'>";
+			print "<div style='float : left'>";
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
+				.__('Unsubscribe from selected feeds')."</button> ";
+			print "</div>";
+
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').hide()\">".
+				__('Close this window')."</button>";
+
+			print "</div>";
+
+		}
+
+		if ($id == "feedsWithErrors") {
+
+#			print "<title>".__('Feeds with update errors')."</title>";
+#			print "<content><![CDATA[";
 
 			print __("These feeds have not been updated because of errors:");
 
-			$result = db_query($link, "SELECT id,title,feed_url,last_error
+			$result = db_query($link, "SELECT id,title,feed_url,last_error,site_url
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
-			print "<ul class='feedErrorsList'>";
+			print "<div class=\"inactiveFeedHolder\">";
+
+			print "<table width=\"100%\" cellspacing=\"0\" id=\"prefErrorFeedList\">";
+
+			$lnum = 1;
 
 			while ($line = db_fetch_assoc($result)) {
-				print "<li><b>" . $line["title"] . "</b> (" . $line["feed_url"] . "): " . 
-					"<em>" . $line["last_error"] . "</em>";
+
+				$class = ($lnum % 2) ? "even" : "odd";
+				$feed_id = $line["id"];
+				$this_row_id = "id=\"FUPDD-$feed_id\"";
+
+				print "<tr class=\"\" $this_row_id>";
+
+				$edit_title = htmlspecialchars($line["title"]);
+
+				print "<td width='5%' align='center'><input
+					onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
+					type=\"checkbox\"></td>";
+				print "<td>";
+
+				print "<a class=\"visibleLink\" href=\"#\" ".
+					"title=\"".__("Click to edit feed")."\" ".
+					"onclick=\"editFeed(".$line["id"].")\">".
+					htmlspecialchars($line["title"])."</a>: ";
+
+				print "<span class=\"insensitive\">";
+				print htmlspecialchars($line["last_error"]);
+				print "</span>";
+
+				print "</td>";
+				print "</tr>";
+
+				++$lnum;
 			}
 
-			print "</ul>";
+			print "</table>";
+			print "</div>";
 
-			print "<div align='center'>";
+			print "<div class='dlgButtons'>";
+			print "<div style='float : left'>";
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
+				.__('Unsubscribe from selected feeds')."</button> ";
+			print "</div>";
 
-			print "<button onclick=\"return closeInfoBox()\">".
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').hide()\">".
 				__('Close this window')."</button>";
 
-			print "]]></content>";
-
-			//return;
+			print "</div>";
 		}
 
 		if ($id == "editArticleTags") {
 
-			print "<title>".__('Edit Tags')."</title>";
-			print "<content><![CDATA[";
-
-			print "<form id=\"tag_edit_form\" onsubmit='return false'>";
+#			print "<form id=\"tag_edit_form\" onsubmit='return false'>";
 
 			print __("Tags for this article (separated by commas):")."<br>";
 
@@ -589,36 +691,38 @@
 
 			$tags_str = join(", ", $tags);
 
-			print "<table width='100%'>";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$param\">";
+			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=\"setArticleTags\">";
 
-			print "<tr><td colspan='2'><input type=\"hidden\" name=\"id\" value=\"$param\"></td></tr>";
+			print "<table width='100%'><tr><td>";
 
-			print "<tr><td colspan='2'><textarea rows='4' class='iedit' id='tags_str' 
+			print "<textarea dojoType=\"dijit.form.SimpleTextarea\" rows='4'
+				style='font-size : 12px; width : 100%' id=\"tags_str\"
 				name='tags_str'>$tags_str</textarea>
-			<div class=\"autocomplete\" id=\"tags_choices\" 
-					style=\"display:none\"></div>	
-			</td></tr>";
-
-			print "</table>";
+			<div class=\"autocomplete\" id=\"tags_choices\"
+					style=\"display:none\"></div>";
 
-			print "</form>";
+			print "</td></tr></table>";
 
-			print "<div align='right'>";
+#			print "</form>";
 
-			print "<button onclick=\"return editTagsSave()\">".__('Save')."</button> ";
-			print "<button onclick=\"return closeInfoBox()\">".__('Cancel')."</button>";
+			print "<div class='dlgButtons'>";
 
-			print "]]></content>";
+			print "<button dojoType=\"dijit.form.Button\"
+				onclick=\"dijit.byId('editTagsDlg').execute()\">".__('Save')."</button> ";
+			print "<button dojoType=\"dijit.form.Button\"
+				onclick=\"dijit.byId('editTagsDlg').hide()\">".__('Cancel')."</button>";
+			print "</div>";
 
-			//return;
 		}
 
 		if ($id == "printTagCloud") {
 			print "<title>".__('Tag Cloud')."</title>";
 			print "<content><![CDATA[";
 
-#			print __("Showing most popular tags ")." (<a 
-#			href='javascript:toggleTags(true)'>".__('more tags')."</a>):<br/>"; 
+#			print __("Showing most popular tags ")." (<a
+#			href='javascript:toggleTags(true)'>".__('more tags')."</a>):<br/>";
 
 			print "<div class=\"tagCloudContainer\">";
 
@@ -627,29 +731,55 @@
 			print "</div>";
 
 			print "<div align='center'>";
-			print "<button onclick=\"return closeInfoBox()\">".
+			print "<button dojoType=\"dijit.form.Button\"
+				onclick=\"return closeInfoBox()\">".
 				__('Close this window')."</button>";
 			print "</div>";
 
 			print "]]></content>";
-
-			//return;
 		}
 
-		if ($id == "emailArticle") {
-
-			print "<title>".__('Forward article by email')."</title>";
+		if ($id == 'printTagSelect') {
+			print "<title>" . __('Select item(s) by tags') . "</title>";
 			print "<content><![CDATA[";
 
-			print "<form id=\"article_email_form\" onsubmit='return false'>";
+			print __("Match:"). "&nbsp;" .
+				  "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" checked value=\"any\" name=\"tag_mode\">&nbsp;Any&nbsp;";
+			print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\" type=\"radio\" value=\"all\" name=\"tag_mode\">&nbsp;All&nbsp;";
+			print "&nbsp;tags.";
+
+			print "<select id=\"all_tags\" name=\"all_tags\" title=\"" . __('Which Tags?') . "\" multiple=\"multiple\" size=\"10\" style=\"width : 100%\">";
+			$result = db_query($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>";
+
+			print "]]></content>";
+		}
+
+		if ($id == "emailArticle") {
 
 			$secretkey = sha1(uniqid(rand(), true));
 
 			$_SESSION['email_secretkey'] = $secretkey;
 
-			print "<input type=\"hidden\" name=\"secretkey\" value=\"$secretkey\">";
-			print "<input type=\"hidden\" name=\"op\" value=\"rpc\">";
-			print "<input type=\"hidden\" name=\"subop\" value=\"sendEmail\">"; 
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"secretkey\" value=\"$secretkey\">";
+			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=\"sendEmail\">";
 
 			$result = db_query($link, "SELECT email, full_name FROM ttrss_users WHERE
 				id = " . $_SESSION["uid"]);
@@ -705,8 +835,7 @@
 
 			print "</td><td>";
 
-			print "<input size=\"40\" disabled
-					onkeypress=\"return filterCR(event, false)\"
+			print "<input dojoType=\"dijit.form.TextBox\" disabled=\"1\" style=\"width : 30em;\"
 					value=\"$user_name <$user_email>\">";
 
 			print "</td></tr><tr><td>";
@@ -715,12 +844,12 @@
 
 			print "</td><td>";
 
-			print "<input size=\"40\"
-					onkeypress=\"return filterCR(event, false)\"
-					name=\"destination\" id=\"destination\">";
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
+					style=\"width : 30em;\"
+					name=\"destination\" id=\"emailArticleDlg_destination\">";
 
-			print "<div class=\"autocomplete\" id=\"destination_choices\" 
-					style=\"display:none\"></div>";	
+			print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
+					style=\"z-index: 30; display : none\"></div>";
 
 			print "</td></tr><tr><td>";
 
@@ -728,23 +857,21 @@
 
 			print "</td><td>";
 
-			print "<input size=\"60\" class=\"iedit\"
-					onkeypress=\"return filterCR(event, false)\"
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
+					style=\"width : 30em;\"
 					name=\"subject\" value=\"$subject\" id=\"subject\">";
 
-			print "</td></tr></table>";
+			print "</td></tr>";
 
-			print "<textarea rows='10' class='iedit' style='font-size : small'
+			print "<tr><td colspan='2'><textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 100%' rows=\"20\"
 				name='content'>$content</textarea>";
 
-			print "</form>";
+			print "</td></tr></table>";
 
 			print "<div class='dlgButtons'>";
-
-			print "<button onclick=\"return emailArticleDo()\">".__('Send e-mail')."</button> ";
-			print "<button onclick=\"return closeInfoBox()\">".__('Cancel')."</button>";
-
-			print "]]></content>";
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
+			print "</div>";
 
 			//return;
 		}
@@ -753,7 +880,7 @@
 
 			print "<title>".__('View as RSS')."</title>";
 			print "<content><![CDATA[";
-	
+
 			$params = explode(":", $param, 3);
 			$feed_id = db_escape_string($params[0]);
 			$is_cat = (bool) $params[1];
@@ -770,10 +897,10 @@
 
 			print "<div align='center'>";
 
-			print "<button onclick=\"return genUrlChangeKey('$feed_id', '$is_cat')\">".
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"return genUrlChangeKey('$feed_id', '$is_cat')\">".
 				__('Generate new URL')."</button> ";
 
-			print "<button onclick=\"return closeInfoBox()\">".
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"return closeInfoBox()\">".
 				__('Close this window')."</button>";
 
 			print "</div>";
@@ -782,6 +909,214 @@
 			//return;
 		}
 
-		print "</dlg>";	
+		if ($id == "newVersion") {
+			$version_data = check_for_update($link);
+			$version = $version_data['version'];
+			$id = $version_data['version_id'];
+
+			print "<div class='tagCloudContainer'>";
+
+			print T_sprintf("New version of Tiny Tiny RSS is available (%s).",
+				"<b>$version</b>");
+
+			print "</div>";
+
+			$details = "http://tt-rss.org/redmine/versions/show/$id";
+			$download = "http://tt-rss.org/#Download";
+
+			print "<div style='text-align : center'>";
+			print "<button dojoType=\"dijit.form.Button\"
+				onclick=\"return window.open('$details')\">".__("Details")."</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>";
+			print "</div>";
+
+		}
+
+		if ($id == "customizeCSS") {
+
+			$value = get_pref($link, "USER_STYLESHEET");
+
+			$value = str_replace("<br/>", "\n", $value);
+
+			print T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline.", "tt-rss.css");
+
+			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=\"setpref\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"key\" value=\"USER_STYLESHEET\">";
+
+			print "<table width='100%'><tr><td>";
+			print "<textarea dojoType=\"dijit.form.SimpleTextarea\"
+				style='font-size : 12px; width : 100%; height: 200px;'
+				placeHolder='body#ttrssMain { font-size : 14px; };'
+				name='value'>$value</textarea>";
+			print "</td></tr></table>";
+
+			print "<div class='dlgButtons'>";
+			print "<button dojoType=\"dijit.form.Button\"
+				onclick=\"dijit.byId('cssEditDlg').execute()\">".__('Save')."</button> ";
+			print "<button dojoType=\"dijit.form.Button\"
+				onclick=\"dijit.byId('cssEditDlg').hide()\">".__('Cancel')."</button>";
+			print "</div>";
+
+		}
+
+		if ($id == "editArticleNote") {
+
+			$result = db_query($link, "SELECT note FROM ttrss_user_entries WHERE
+				ref_id = '$param' AND owner_uid = " . $_SESSION['uid']);
+
+			$note = db_fetch_result($result, 0, "note");
+
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$param\">";
+			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=\"setNote\">";
+
+			print "<table width='100%'><tr><td>";
+			print "<textarea dojoType=\"dijit.form.SimpleTextarea\"
+				style='font-size : 12px; width : 100%; height: 100px;'
+				placeHolder='body#ttrssMain { font-size : 14px; };'
+				name='note'>$note</textarea>";
+			print "</td></tr></table>";
+
+			print "<div class='dlgButtons'>";
+			print "<button dojoType=\"dijit.form.Button\"
+				onclick=\"dijit.byId('editNoteDlg').execute()\">".__('Save')."</button> ";
+			print "<button dojoType=\"dijit.form.Button\"
+				onclick=\"dijit.byId('editNoteDlg').hide()\">".__('Cancel')."</button>";
+			print "</div>";
+
+		}
+
+		if ($id == "about") {
+			print "<table width='100%'><tr><td align='center'>";
+			print "<img src=\"images/logo_big.png\">";
+			print "</td>";
+			print "<td width='70%'>";
+
+			print "<h1>Tiny Riny RSS</h1>
+				<strong>Version ".VERSION."</strong>
+				<p>Copyright &copy; 2005-".date('Y')."
+				<a target=\"_blank\" class=\"visibleLink\"
+				href=\"http://fakecake.org/\">Andrew Dolgov</a>
+				and other contributors.</p>
+				<p class=\"insensitive\">Licensed under GNU GPL version 2.</p>";
+
+			print "<p class=\"insensitive\">
+				<a class=\"visibleLink\" target=\"_blank\"
+					href=\"http://tt-rss.org/\">Official site</a> &mdash;
+				<a href=\"http://tt-rss.org/redmine/wiki/tt-rss/Donate\"
+				target=\"_blank\" class=\"visibleLink\">
+				Support the project.</a></p>";
+
+			print "</td></tr>";
+			print "</table>";
+
+			print "<div align='center'>";
+			print "<button dojoType=\"dijit.form.Button\"
+				type=\"submit\">".
+				__('Close this window')."</button>";
+			print "</div>";
+		}
+
+		if ($id == "addInstance") {
+
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"op\" value=\"pref-instances\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"method\" value=\"add\">";
+
+			print "<div class=\"dlgSec\">".__("Instance")."</div>";
+
+			print "<div class=\"dlgSecCont\">";
+
+			/* URL */
+
+			print __("URL:") . " ";
+
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+				placeHolder=\"".__("Instance URL")."\"
+				regExp='^(http|https)://.*'
+				style=\"font-size : 16px; width: 20em\" name=\"access_url\">";
+
+			print "<hr/>";
+
+			$access_key = sha1(uniqid(rand(), true));
+
+			/* Access key */
+
+			print __("Access key:") . " ";
+
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+				placeHolder=\"".__("Access key")."\" regExp='\w{40}'
+				style=\"width: 20em\" name=\"access_key\" id=\"instance_add_key\"
+				value=\"$access_key\">";
+
+			print "<p class='insensitive'>" . __("Use one access key for both linked instances.");
+
+			print "</div>";
+
+			print "<div class=\"dlgButtons\">
+				<div style='float : left'>
+					<button dojoType=\"dijit.form.Button\"
+						onclick=\"return dijit.byId('instanceAddDlg').regenKey()\">".
+						__('Generate new key')."</button>
+				</div>
+				<button dojoType=\"dijit.form.Button\"
+					onclick=\"return dijit.byId('instanceAddDlg').execute()\">".
+					__('Create link')."</button>
+				<button dojoType=\"dijit.form.Button\"
+					onclick=\"return dijit.byId('instanceAddDlg').hide()\"\">".
+					__('Cancel')."</button></div>";
+
+			return;
+		}
+
+		if ($id == "shareArticle") {
+
+			$result = db_query($link, "SELECT uuid, ref_id FROM ttrss_user_entries WHERE int_id = '$param'
+				AND owner_uid = " . $_SESSION['uid']);
+
+			if (db_num_rows($result) == 0) {
+				print "Article not found.";
+			} else {
+
+				$uuid = db_fetch_result($result, 0, "uuid");
+				$ref_id = db_fetch_result($result, 0, "ref_id");
+
+				if (!$uuid) {
+					$uuid = db_escape_string(sha1(uniqid(rand(), true)));
+					db_query($link, "UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$param'
+						AND owner_uid = " . $_SESSION['uid']);
+				}
+
+				print __("You can share this article by the following unique URL:");
+
+				$url_path = get_self_url_prefix();
+				$url_path .= "/public.php?op=share&key=$uuid";
+
+				print "<div class=\"tagCloudContainer\">";
+				print "<a id='pub_opml_url' href='$url_path' target='_blank'>$url_path</a>";
+				print "</div>";
+
+				/* if (!label_find_id($link, __('Shared'), $_SESSION["uid"]))
+					label_create($link, __('Shared'), $_SESSION["uid"]);
+
+				label_add_article($link, $ref_id, __('Shared'), $_SESSION['uid']); */
+			}
+
+			print "<div align='center'>";
+
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('shareArticleDlg').hide()\">".
+				__('Close this window')."</button>";
+
+			print "</div>";
+
+			return;
+		}
+
+		print "</dlg>";
+
 	}
 ?>