code cleanup; remove unnecessary callbacks; rework subscribtion dialog

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

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 7967eb70b4bb61a9c98358b2f0e20775e07713d8..b5aae1846dcb0c118a86bbc6a27be21f9f6c1dc1 100644 (file)
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -3,6 +3,33 @@
                $id = $_REQUEST["id"];
                $param = db_escape_string($_REQUEST["param"]);
 
+               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 == "explainError") {
 
                        print "<div id=\"infoBoxTitle\">".__('Notice')."</div>";
@@ -63,9 +90,9 @@
 
                        print "<form id='feed_add_form' onsubmit='return false'>";
 
-                       print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">";
-                       print "<input type=\"hidden\" name=\"subop\" value=\"add\">"; 
-                       print "<input type=\"hidden\" name=\"from\" value=\"tt-rss\">"; 
+                       print "<input type=\"hidden\" name=\"op\" value=\"rpc\">";
+                       print "<input type=\"hidden\" name=\"subop\" value=\"addfeed\">"; 
+                       //print "<input type=\"hidden\" name=\"from\" value=\"tt-rss\">"; 
 
                        print "<div class=\"dlgSec\">".__("Feed")."</div>";
                        print "<div class=\"dlgSecCont\">";
@@ -74,13 +101,13 @@
 
                        print "<input size=\"40\"
                                        onkeypress=\"return filterCR(event, subscribeToFeed)\"
-                                       name=\"feed_url\"></td></tr>";
+                                       name=\"feed\" id=\"feed_url\"></td></tr>";
 
                        print "<br/>";
 
                        if (get_pref($link, 'ENABLE_FEED_CATS')) {
                                print __('Place in category:') . " ";
-                               print_feed_cat_select($link, "cat_id");                 
+                               print_feed_cat_select($link, "cat");                    
                        }
 
                        print "</div>";
@@ -90,10 +117,10 @@
                                        <div class=\"dlgSec\">".__("Authentication")."</div>
                                        <div class=\"dlgSecCont\">".
 
-                                       __('Login:') . " <input name='auth_login' size=\"20\" 
+                                       __('Login:') . " <input name='login' size=\"20\" 
                                                        onkeypress=\"return filterCR(event, subscribeToFeed)\"> ".
                                        __('Password:') . "<input type='password'
-                                                       name='auth_pass' size=\"20\" 
+                                                       name='pass' size=\"20\" 
                                                        onkeypress=\"return filterCR(event, subscribeToFeed)\">
                                </div></div>";
 
@@ -363,41 +390,14 @@
                                        style=\"display:none\"></div>   
                        </td></tr>";
 
-/*                     print "<tr><td>".__('Add existing tag:')."</td>";
-
-                       $result = db_query($link, "SELECT DISTINCT tag_name FROM ttrss_tags 
-                               WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY tag_name");
-
-                       $found_tags = array();
-
-                       array_push($found_tags, '');
-
-                       while ($line = db_fetch_assoc($result)) {
-                               array_push($found_tags, truncate_string($line["tag_name"], 20));
-                       }
-
-                       print "<td align='right'>";
-
-                       print_select("found_tags", '', $found_tags, "onchange=\"javascript:editTagsInsert()\"");
-
-                       print "</td>"; 
-
-                       print "</tr>"; */
-
                        print "</table>";
 
                        print "</form>";
 
                        print "<div align='right'>";
 
-                       print "<input class=\"button\"
-                               type=\"submit\" onclick=\"return editTagsSave()\" 
-                               value=\"".__('Save')."\"> ";
-
-                       print "<input class=\"button\"
-                               type=\"submit\" onclick=\"return closeInfoBox()\" 
-                               value=\"".__('Cancel')."\">";
-
+                       print "<button onclick=\"return editTagsSave()\">".__('Save')."</button> ";
+                       print "<button onclick=\"return closeInfoBox()\">".__('Cancel')."</button>";
 
                        print "</div>";