misc code cleanup, allow ctrl-key selection in prefs

[tt-rss.git] / modules / popup-dialog.php

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 54f4a3e61a37e6dbf9af13868780bead63135317..364dfe7b023021d66b6245b41a0ef484f1302263 100644 (file)
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -80,8 +80,8 @@
                                WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
                        print   __('Select:')." 
-                               <a href=\"javascript:selectPrefRows('fcat', true)\">".__('All')."</a>,
-                               <a href=\"javascript:selectPrefRows('fcat', false)\">".__('None')."</a>";
+                               <a href=\"#\" onclick=\"selectPrefRows('fcat', true)\">".__('All')."</a>,
+                               <a href=\"#\" onclick=\"selectPrefRows('fcat', false)\">".__('None')."</a>";
 
                        print "<div class=\"prefFeedCatHolder\">";
 
@@ -93,7 +93,7 @@
                        print "<tr class=\"odd\" id=\"FCATR-0\">";
 
                        print "<td width='5%' align='center'><input 
-                               onclick='toggleSelectPrefRow(this, \"fcat\");' 
+                               onclick='toggleSelectRow(this);' 
                                type=\"checkbox\" id=\"FCCHK-0\"></td>";
 
                        if (!$_SESSION["profile"]) {
@@ -121,7 +121,7 @@
                                $edit_title = htmlspecialchars($line["title"]);
        
                                print "<td width='5%' align='center'><input 
-                                       onclick='toggleSelectPrefRow(this, \"fcat\");' 
+                                       onclick='toggleSelectRow(this);' 
                                        type=\"checkbox\" id=\"FCCHK-$cat_id\"></td>";
 
                                if ($_SESSION["profile"] == $line["id"]) {
@@ -158,38 +158,11 @@
                        return;
                }
 
-               if ($id == "pubUrl") {
-
-                       print "<div id=\"infoBoxTitle\">".__('Published Articles')."</div>";
-                       print "<div class=\"infoBoxContents\">";
-       
-                       $url_path = article_publish_url($link);
-
-                       print __("Your Published articles feed URL is:");
-
-                       print "<div class=\"tagCloudContainer\">";
-                       print "<a id='pub_feed_url' href='$url_path' target='_blank'>$url_path</a>";
-                       print "</div>";
-
-                       print "<div align='center'>";
-
-                       print "<button onclick=\"return pubRegenKey()\">".
-                               __('Generate new URL')."</button> ";
-
-                       print "<input class=\"button\"
-                               type=\"submit\" onclick=\"return closeInfoBox()\" 
-                               value=\"".__('Close this window')."\">";
-
-                       print "</div></div>";
-
-                       return;
-               }
-
                if ($id == "pubOPMLUrl") {
 
                        print "<div id=\"infoBoxTitle\">".__('Public OPML URL')."</div>";
                        print "<div class=\"infoBoxContents\">";
-       
+
                        $url_path = opml_publish_url($link);
 
                        print __("Your Public OPML URL is:");
@@ -290,6 +263,14 @@
 
                        print "</div>";
 
+                       print '<div id="fadd_feeds_container" style="display:none">
+
+                                       <div class="dlgSec">' . __('Available feeds') . '</div>
+                                       <div class="dlgSecCont">'
+
+                                       . ' <select name="feed" id="faad_feeds_container_select" size="3"></select>'
+                               . '</div></div>';
+
                        print "<div id='fadd_login_container' style='display:none'>
        
                                        <div class=\"dlgSec\">".__("Authentication")."</div>
@@ -390,10 +371,10 @@
 
                        #$active_feed_id = db_escape_string($_REQUEST["param"]);
 
-                       $params = split(":", db_escape_string($_REQUEST["param"]));
+                       $params = explode(":", db_escape_string($_REQUEST["param"]), 2);
 
                        $active_feed_id = sprintf("%d", $params[0]);
-                       $is_cat = $params[1] == "true";
+                       $is_cat = (bool) $params[1];
 
                        print "<div class=\"dlgSec\">".__('Look for')."</div>";
 
@@ -681,11 +662,13 @@
                        print "<input type=\"hidden\" name=\"op\" value=\"rpc\">";
                        print "<input type=\"hidden\" name=\"subop\" value=\"sendEmail\">"; 
 
-                       $result = db_query($link, "SELECT email FROM ttrss_users WHERE
+                       $result = db_query($link, "SELECT email, full_name FROM ttrss_users WHERE
                                id = " . $_SESSION["uid"]);
 
                        $user_email = htmlspecialchars(db_fetch_result($result, 0, "email"));
-                       $user_name = htmlspecialchars($_SESSION["name"]);
+                       $user_name = htmlspecialchars(db_fetch_result($result, 0, "full_name"));
+
+                       if (!$user_name) $user_name = $_SESSION['name'];
 
                        $_SESSION['email_replyto'] = $user_email;
                        $_SESSION['email_fromname'] = $user_name;
@@ -777,6 +760,39 @@
                        return;
                }
 
+               if ($id == "generatedFeed") {
+
+                       print "<div id=\"infoBoxTitle\">".__('View as RSS')."</div>";
+                       print "<div class=\"infoBoxContents\">";
+       
+                       $params = explode(":", $param, 3);
+                       $feed_id = db_escape_string($params[0]);
+                       $is_cat = (bool) $params[1];
+
+                       $key = get_feed_access_key($link, $feed_id, $is_cat);
+
+                       $url_path = htmlspecialchars($params[2]) . "&key=" . $key;
+
+                       print __("You can view this feed as RSS using the following URL:");
+
+                       print "<div class=\"tagCloudContainer\">";
+                       print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>";
+                       print "</div>";
+
+                       print "<div align='center'>";
+
+                       print "<button onclick=\"return genUrlChangeKey('$feed_id', '$is_cat')\">".
+                               __('Generate new URL')."</button> ";
+
+                       print "<input class=\"button\"
+                               type=\"submit\" onclick=\"return closeInfoBox()\" 
+                               value=\"".__('Close this window')."\">";
+
+                       print "</div></div>";
+
+                       return;
+               }
+
                print "<div id='infoBoxTitle'>Internal Error</div>
                        <div id='infoBoxContents'>
                        <p>Unknown dialog <b>$id</b></p>