X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=modules%2Fpopup-dialog.php;h=00efdcb74f9b1577fa3397d742c243526bed672f;hb=698776460d3cd7075024b8795dbbaf7132415890;hp=ff0b18bbb446b810ec7b3503e874373cb0db3761;hpb=3076c7b8ed6b9fa9cdb8019c0bdc79860fac29be;p=tt-rss.git

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index ff0b18bb..00efdcb7 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -1,25 +1,29 @@
 <?php
 	function module_popup_dialog($link) {
-		$id = $_GET["id"];
-		$param = db_escape_string($_GET["param"]);
+		$id = $_REQUEST["id"];
+		$param = db_escape_string($_REQUEST["param"]);
 
 		if ($id == "explainError") {
 
 			print "<div id=\"infoBoxTitle\">".__('Notice')."</div>";
 			print "<div class=\"infoBoxContents\">";
 
+			print "<div class=\"errorExplained\">";
+
 			if ($param == 1) {
-				print __("Update daemon is enabled in configuration, but daemon
-					process is not running, which prevents all feeds from updating. Please
-					start the daemon process or contact instance owner.");
+				print __("Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner.");
+
+				$stamp = (int)read_stampfile("update_daemon.stamp");
+
+				print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp); 
+
 			}
 
 			if ($param == 2) {
-				$msg = check_for_update($link, false);
+				$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.");
+					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;
 				}
@@ -27,51 +31,63 @@
 			}
 
 			if ($param == 3) {
-				print __("TT-RSS has detected that update daemon is taking too long to
-					perform a feed update. This could indicate a problem like crash
-					or a hang. Please check the daemon process or contact instance
-					owner.");
+				print __("Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner.");
+
+				$stamp = (int)read_stampfile("update_daemon.stamp");
+
+				print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp); 
+
 			}
 
 			print "</div>";
-
+			
 			print "<div align='center'>";
 
+			print "<input class=\"button\"
+				type=\"submit\" onclick=\"return visitOfficialSite()\" 
+				value=\"".__('Visit official site')."\"> ";
+
 			print "<input class=\"button\"
 				type=\"submit\" onclick=\"return closeInfoBox()\" 
 				value=\"".__('Close this window')."\">";
 
-			print "</div>";
+			print "</div></div>";
 
 			return;
 		}
 
 		if ($id == "quickAddFeed") {
 
-			print "<div id=\"infoBoxTitle\">".__('Subscribe to feed')."</div>";
+			print "<div id=\"infoBoxTitle\">".__('Subscribe to Feed')."</div>";
 			print "<div class=\"infoBoxContents\">";
 
 			print "<form id='feed_add_form' onsubmit='return false'>";
 
 			print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">";
-			/* print "<input type=\"hidden\" name=\"quiet\" value=\"1\">"; */
 			print "<input type=\"hidden\" name=\"subop\" value=\"add\">"; 
 			print "<input type=\"hidden\" name=\"from\" value=\"tt-rss\">"; 
 
-			print "<table width='100%'>
-			<tr><td width='20%'>".__('Feed URL:')."</td><td>
-				<input class=\"iedit\" onblur=\"javascript:enableHotkeys()\" 
-					onkeypress=\"return filterCR(event, qaddFeed)\"
+			print "<div class=\"dlgSec\">".__("Feed")."</div>";
+			print "<div class=\"dlgSecCont\">";
+
+			print __("URL:") . " ";
+
+			print "<input size=\"40\" onblur=\"javascript:enableHotkeys()\" 
+					onkeypress=\"return filterCR(event, subscribeToFeed)\"
 					onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
 					onchange=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
 					onfocus=\"javascript:disableHotkeys()\" name=\"feed_url\"></td></tr>";
-		
+
+			print "<br/>";
+
 			if (get_pref($link, 'ENABLE_FEED_CATS')) {
-				print "<tr><td>".__('Category:')."</td><td>";
+				print __('Place in category:') . " ";
 				print_feed_cat_select($link, "cat_id");			
-				print "</td></tr>";
 			}
 
+			print "</div>";
+
+
 /*			print "<tr><td colspan='2'><div class='insensitive'>";
 
 			print __("Some feeds require authentication. If you subscribe to such
@@ -79,36 +95,46 @@
 
 			print "</div></td></tr>"; */
 
-			print "</table>";
-
 /*			print "<div id='fadd_login_prompt'><br/>
 				<a href='javascript:appearBlockElement(\"fadd_login_container\", 
 				\"fadd_login_prompt\")'>".__('Click here if this feed requires authentication.')."</a></div>"; */
 
 			print "<div id='fadd_login_container' style='display:none'>
-				<table width='100%'>
-					<tr><td width='20%'>".__('Login:')."</td><td><input name='auth_login' class='iedit'></td></tr>
-					<tr><td>".__('Password:')."</td><td><input type='password'
-						name='auth_pass' class='iedit'></td></tr>
-				</table>
-				</div>";
+	
+					<div class=\"dlgSec\">".__("Authentication")."</div>
+					<div class=\"dlgSecCont\">".
+
+					__('Login:') . " <input name='auth_login' size=\"20\" 
+							onfocus=\"javascript:disableHotkeys()\" 
+							onfocus=\"javascript:disableHotkeys()\" 
+							onkeypress=\"return filterCR(event, subscribeToFeed)\"> ".
+					__('Password:') . "<input type='password'
+							name='auth_pass' size=\"20\" 
+							onfocus=\"javascript:disableHotkeys()\" 
+							onfocus=\"javascript:disableHotkeys()\" 
+							onkeypress=\"return filterCR(event, subscribeToFeed)\">
+				</div></div>";
+
+
+			print "<div style=\"clear : both\">				
+				<input type=\"checkbox\" id=\"fadd_login_check\" 
+						onclick='checkboxToggleElement(this, \"fadd_login_container\")'>
+					<label for=\"fadd_login_check\">".
+					__('This feed requires authentication.')."</div>";
 
 			print "</form>";
 
-			print "<div style='float : right'>
+			print "<div class=\"dlgButtons\">
 				<input class=\"button\"
 					id=\"fadd_submit_btn\" disabled=\"true\"
-					type=\"submit\" onclick=\"return qaddFeed()\" value=\"".__('Subscribe')."\">
+					type=\"submit\" onclick=\"return subscribeToFeed()\" value=\"".__('Subscribe')."\">
+				<input class=\"button\"					
+					type=\"submit\" onclick=\"return browseFeeds()\" value=\"".__('More feeds')."\">
+
 				<input class=\"button\"
 					type=\"submit\" onclick=\"return closeInfoBox()\" 
-					value=\"".__('Cancel')."\"></div>
-					
-				<div>
-					<input type=\"checkbox\" id=\"fadd_login_check\" 
-						onclick='checkboxToggleElement(this, \"fadd_login_container\")'>
-					<label for=\"fadd_login_check\">".
-					__('This feed requires authentication.')."</div>";
-
+					value=\"".__('Cancel')."\"></div>";
+			
 			return;
 		}
 
@@ -119,23 +145,34 @@
 
 			print "<form id='search_form'  onsubmit='return false'>";
 
-			#$active_feed_id = db_escape_string($_GET["param"]);
+			#$active_feed_id = db_escape_string($_REQUEST["param"]);
 
-			$params = split(":", db_escape_string($_GET["param"]));
+			$params = split(":", db_escape_string($_REQUEST["param"]));
 
 			$active_feed_id = sprintf("%d", $params[0]);
 			$is_cat = $params[1] == "true";
 
-			print "<table width='100%'><tr><td>".__('Search:')."</td><td>";
-			
-			print "<input name=\"query\" class=\"iedit\" 
+			print "<div class=\"dlgSec\">".__('Look for')."</div>";
+
+			print "<div class=\"dlgSecCont\">";
+
+			print "<input name=\"query\" size=\"20\" type=\"search\"
 				onkeypress=\"return filterCR(event, search)\"
 				onchange=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
 				onkeyup=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
-				value=\"\">
-			</td></tr>";
-			
-			print "<tr><td>".__('Where:')."</td><td>";
+				value=\"\">";
+
+			print " " . __('match on')." ";
+
+			$search_fields = array(
+				"title" => __("Title"),
+				"content" => __("Content"),
+				"both" => __("Title or content"));
+
+			print_select_hash("match_on", 3, $search_fields); 
+
+
+			print "<br/>".__('Limit search to:')." ";
 			
 			print "<select name=\"search_mode\">
 				<option value=\"all_feeds\">".__('All feeds')."</option>";
@@ -164,22 +201,13 @@
 				//print "<option disabled>".__('This category')."</option>";
 			}
 
-			print "</select></td></tr>"; 
-
-			print "<tr><td>".__('Match on:')."</td><td>";
+			print "</select>"; 
 
-			$search_fields = array(
-				"title" => __("Title"),
-				"content" => __("Content"),
-				"both" => __("Title or content"));
-
-			print_select_hash("match_on", 3, $search_fields); 
-				
-			print "</td></tr></table>";
+			print "</div>";
 
 			print "</form>";
 
-			print "<div align=\"right\">
+			print "<div class=\"dlgButtons\">
 			<input type=\"submit\" 
 				class=\"button\" onclick=\"javascript:search()\" 
 				id=\"search_submit_btn\" disabled=\"true\"
@@ -194,60 +222,11 @@
 
 		}
 
-		if ($id == "quickAddLabel") {
-			print "<div id=\"infoBoxTitle\">".__('Create label')."</div>";
-			print "<div class=\"infoBoxContents\">";
-
-			print "<form id=\"label_edit_form\" onsubmit='return false'>";
-
-			print "<input type=\"hidden\" name=\"op\" value=\"pref-labels\">";
-			print "<input type=\"hidden\" name=\"subop\" value=\"add\">"; 
-
-			print "<table width='100%'>";
-
-			print "<tr><td>".__('Caption:')."</td>
-				<td><input onkeypress=\"return filterCR(event, addLabel)\"
-					onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-					onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-					name=\"description\" class=\"iedit\">";
-
-			print "</td></tr>";
-
-			print "<tr><td colspan=\"2\">
-				<p>".__('SQL Expression:')."</p>";
-
-			print "<textarea onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-					 rows=\"4\" name=\"sql_exp\" class=\"iedit\"></textarea>";
-
-			print "</td></tr></table>";
-
-			print "</form>";
-
-			print "<div style=\"display : none\" id=\"label_test_result\"></div>";
-
-			print "<div align='right'>";
-
-			print "<input type=\"submit\" onclick=\"labelTest()\" value=\"".__('Test')."\">
-				";
-
-			print "<input type=\"submit\" 
-				id=\"infobox_submit\"
-				disabled=\"true\"
-				class=\"button\" onclick=\"return addLabel()\" 
-				value=\"".__('Create')."\"> ";
-
-			print "<input class=\"button\"
-				type=\"submit\" onclick=\"return labelEditCancel()\" 
-				value=\"".__('Cancel')."\">";
-
-			return;
-		}
-
 		if ($id == "quickAddFilter") {
 
-			$active_feed_id = db_escape_string($_GET["param"]);
+			$active_feed_id = db_escape_string($_REQUEST["param"]);
 
-			print "<div id=\"infoBoxTitle\">".__('Create filter')."</div>";
+			print "<div id=\"infoBoxTitle\">".__('Create Filter')."</div>";
 			print "<div class=\"infoBoxContents\">";
 
 			print "<form id=\"filter_add_form\" onsubmit='return false'>";
@@ -255,8 +234,6 @@
 			print "<input type=\"hidden\" name=\"op\" value=\"pref-filters\">";
 			print "<input type=\"hidden\" name=\"quiet\" value=\"1\">";
 			print "<input type=\"hidden\" name=\"subop\" value=\"add\">"; 
-
-//			print "<div class=\"notice\"><b>Note:</b> filter will only apply to new articles.</div>";
 		
 			$result = db_query($link, "SELECT id,description 
 				FROM ttrss_filter_types ORDER BY description");
@@ -268,28 +245,48 @@
 				$filter_types[$line["id"]] = __($line["description"]);
 			}
 
-			print "<table width='100%'>";
+			print "<div class=\"dlgSec\">".__("Match")."</div>";
 
-			print "<tr><td>".__('Match:')."</td>
-				<td><input onkeypress=\"return filterCR(event, qaddFilter)\"
-					onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
- 					onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-					 name=\"reg_exp\" class=\"iedit\">";		
+			print "<div class=\"dlgSecCont\">";
 
-			print "</td></tr><tr><td>".__('On field:')."</td><td>";
+			print "<span id=\"filter_dlg_date_mod_box\" style=\"display : none\">";
+			print __("Date") . " ";
 
-			print_select_hash("filter_type", 1, $filter_types, "class=\"_iedit\"");	
-	
-			print "</td></tr>";
-			print "<tr><td>".__('Feed:')."</td><td colspan='2'>";
+			$filter_params = array(
+				"before" => __("before"),
+				"after" => __("after"));
+
+			print_select_hash("filter_date_modifier", "before", $filter_params);
+
+			print "&nbsp;</span>";
+
+			print "<input onkeypress=\"return filterCR(event, createFilter)\"
+					 onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+					 onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+					 name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
+
+			print "<span id=\"filter_dlg_date_chk_box\" style=\"display : none\">";
+			print "&nbsp;<input class=\"button\"
+				type=\"submit\" onclick=\"return filterDlgCheckDate()\" 
+				value=\"".__('Check it')."\">";
+			print "</span>";
+
+			print "<br/> " . __("on field") . " ";
+			print_select_hash("filter_type", 1, $filter_types,
+				'onchange="filterDlgCheckType(this)"');
+
+			print "<br/>";
 
+			print __("in") . " ";
 			print_feed_select($link, "feed_id", $active_feed_id);
-			
-			print "</td></tr>";
-	
-			print "<tr><td>".__('Action:')."</td>";
-	
-			print "<td colspan='2'><select name=\"action_id\" 
+
+			print "</div>";
+
+			print "<div class=\"dlgSec\">".__("Perform Action")."</div>";
+
+			print "<div class=\"dlgSecCont\">";
+
+			print "<select name=\"action_id\"
 				onchange=\"filterDlgCheckAction(this)\">";
 	
 			$result = db_query($link, "SELECT id,description FROM ttrss_filter_actions 
@@ -301,26 +298,41 @@
 	
 			print "</select>";
 
-			print "</td></tr>";
+			print "<span id=\"filter_dlg_param_box\" style=\"display : none\">";
+			print " " . __("with parameters:") . " ";
+			print "<input size=\"20\"
+					onkeypress=\"return filterCR(event, createFilter)\"
+					name=\"action_param\">";
 
-			print "<tr><td>".__('Params:')."</td>";
+			print_label_select($link, "action_param_label", $action_param);
 
-			print "<td><input disabled class='iedit' name='action_param'></td></tr>";
+			print "</span>";
 
-			print "<tr><td valign='top'>".__('Options:')."</td><td>";
+			print "&nbsp;"; // tiny layout hack
+
+			print "</div>";
+
+			print "<div class=\"dlgSec\">".__("Options")."</div>";
+			print "<div class=\"dlgSecCont\">";
+
+			print "<div style=\"line-height : 100%\">";
+
+			print "<input type=\"checkbox\" name=\"enabled\" id=\"enabled\" checked=\"1\">
+					<label for=\"enabled\">".__('Enabled')."</label><br/>";
 
 			print "<input type=\"checkbox\" name=\"inverse\" id=\"inverse\">
-				<label for=\"inverse\">".__('Inverse match')."</label></td></tr>";
+				<label for=\"inverse\">".__('Inverse match')."</label>";
 
-			print "</table>";
+			print "</div>";
+			print "</div>";
 
 			print "</form>";
 
-			print "<div align='right'>";
+			print "<div class=\"dlgButtons\">";
 
 			print "<input type=\"submit\" 
 				id=\"infobox_submit\"
-				class=\"button\" onclick=\"return addFilter()\" 
+				class=\"button\" onclick=\"return createFilter()\" 
 				disabled=\"true\" value=\"".__('Create')."\"> ";
 
 			print "<input class=\"button\"
@@ -352,7 +364,6 @@
 			}
 
 			print "</ul>";
-			print "</div>";
 
 			print "<div align='center'>";
 
@@ -434,7 +445,7 @@
 			print "<div class=\"infoBoxContents\">";
 
 			print __("Showing most popular tags ")." (<a 
-			href='javascript:toggleTags(true)'>".__('browse more')."</a>):<br/>"; 
+			href='javascript:toggleTags(true)'>".__('more tags')."</a>):<br/>"; 
 
 			print "<div class=\"tagCloudContainer\">";
 
@@ -453,6 +464,48 @@
 			return;
 		}
 
+/*		if ($id == "offlineDownload") {
+			print "<div id=\"infoBoxTitle\">".__('Download articles')."</div>";
+			print "<div class=\"infoBoxContents\">";
+
+			print "<form name='download_ops_form' id='download_ops_form'>";
+
+			print "<div class=\"dlgSec\">".__("Download")."</div>";
+
+			print "<div class=\"dlgSecCont\">";
+
+			$amount = array(
+				50  => 50,
+				100 => 100,
+				250 => 250,
+				500 => 500);
+
+			print_select_hash("amount", 50, $amount);
+
+			print " " . __("latest articles for offline reading.");
+
+			print "<br/>";
+
+			print "<input checked='yes' type='checkbox' name='unread_only' id='unread_only'>";
+			print "<label for='unread_only'>".__('Only include unread articles')."</label>";
+
+			print "</div>";
+
+			print "</form>";
+
+			print "<div class=\"dlgButtons\">
+				<input class=\"button\"
+					type=\"submit\" onclick=\"return initiate_offline_download(0, this)\" value=\"".__('Download')."\">
+				<input class=\"button\"
+					type=\"submit\" onclick=\"return closeInfoBox()\" 
+					value=\"".__('Cancel')."\"></div>";
+
+			print "</div>";
+
+			return;
+		} */
+
+
 		print "<div id='infoBoxTitle'>Internal Error</div>
 			<div id='infoBoxContents'>
 			<p>Unknown dialog <b>$id</b></p>