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

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 1f98edad..13abc947 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -141,7 +141,7 @@
 						var elem = this;
 						dojo.xhrPost({
 							url: 'backend.php',
-							content: {op: 'rpc', subop: 'saveprofile',
+							content: {op: 'rpc', method: 'saveprofile',
 								value: this.value,
 								id: this.srcNodeRef.getAttribute('profile-id')},
 								load: function(response) {
@@ -242,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\">";
@@ -312,7 +312,7 @@
 #				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'>
@@ -421,8 +421,15 @@
 
 			print "</div>";
 
-			print "<div class=\"dlgButtons\">
-			<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
+			print "<div class=\"dlgButtons\">";
+
+			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>";
 		}
@@ -433,7 +440,7 @@
 
 			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\">";
+			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");
@@ -686,7 +693,7 @@
 
 			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=\"subop\" value=\"setArticleTags\">";
+			print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"setArticleTags\">";
 
 			print "<table width='100%'><tr><td>";
 
@@ -730,8 +737,38 @@
 			print "</div>";
 
 			print "]]></content>";
+		}
 
-			//return;
+		if ($id == 'printTagSelect') {
+			print "<title>" . __('Select item(s) by tags') . "</title>";
+			print "<content><![CDATA[";
+
+			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") {
@@ -742,7 +779,7 @@
 
 			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=\"subop\" value=\"sendEmail\">";
+			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"]);
@@ -908,7 +945,7 @@
 			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=\"subop\" value=\"setpref\">";
+			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>";
@@ -936,7 +973,7 @@
 
 			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=\"subop\" value=\"setNote\">";
+			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\"
@@ -985,6 +1022,101 @@
 			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>";
+
 	}
 ?>