]> git.wh0rd.org - tt-rss.git/commitdiff
Merge branch 'master' of https://github.com/HeikoAdams/Tiny-Tiny-RSS
authorHeiko Adams <heiko.adams@gmail.com>
Tue, 2 Apr 2013 11:38:42 +0000 (13:38 +0200)
committerHeiko Adams <heiko.adams@gmail.com>
Tue, 2 Apr 2013 11:38:42 +0000 (13:38 +0200)
16 files changed:
cdm.css
classes/article.php
classes/pref/feeds.php
classes/rpc.php
include/login_form.php
include/sessions.php
index.php
install/index.php
js/functions.js
js/prefs.js
js/viewfeed.js
plugins/digest/digest.js
plugins/import_export/import_export.js
plugins/instances/init.php
plugins/instances/instances.js
plugins/updater/updater.js

diff --git a/cdm.css b/cdm.css
index 13f88dd4e1273e17c29ea1b6a384a7d921ae3c6f..9893f43fca5f10509f7ec23d85203b8c16936baf 100644 (file)
--- a/cdm.css
+++ b/cdm.css
@@ -192,23 +192,4 @@ div.cdm.expanded div.cdmHeader a.title, div.cdm.active div.cdmHeader a.title {
        font-size : 13px;
 }
 
-div#small_article_preview {
-       width : 300px;
-       max-height : 350px;
-       overflow : hidden;
-       border : 1px solid #c0c0c0;
-       background : white;
-       position : absolute;
-       box-shadow : 2px 2px 4px #c0c0c0;
-       z-index : 2;
-}
 
-div#small_article_preview div.content {
-       padding : 5px;
-       font-size : 12px;
-       color : gray;
-}
-
-div#small_article_preview div.content img {
-       max-width : 290px;
-}
index 79c94f59b482aaa81ded73851ea86ea18e55577f..9a0970140a81c0f8c07fd71644431bc232214f49 100644 (file)
@@ -185,7 +185,7 @@ class Article extends Handler_Protected {
                $tags_str = join(", ", $tags);
 
                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=\"op\" value=\"article\">";
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"setArticleTags\">";
 
                print "<table width='100%'><tr><td>";
@@ -208,5 +208,139 @@ class Article extends Handler_Protected {
 
        }
 
+       function setScore() {
+               $ids = db_escape_string($this->link, $_REQUEST['id']);
+               $score = (int)db_escape_string($this->link, $_REQUEST['score']);
+
+               db_query($this->link, "UPDATE ttrss_user_entries SET
+                       score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
+
+               print json_encode(array("id" => $id,
+                       "score_pic" => get_score_pic($score)));
+       }
+
+
+       function setArticleTags() {
+
+               $id = db_escape_string($this->link, $_REQUEST["id"]);
+
+               $tags_str = db_escape_string($this->link, $_REQUEST["tags_str"]);
+               $tags = array_unique(trim_array(explode(",", $tags_str)));
+
+               db_query($this->link, "BEGIN");
+
+               $result = db_query($this->link, "SELECT int_id FROM ttrss_user_entries WHERE
+                               ref_id = '$id' AND owner_uid = '".$_SESSION["uid"]."' LIMIT 1");
+
+               if (db_num_rows($result) == 1) {
+
+                       $tags_to_cache = array();
+
+                       $int_id = db_fetch_result($result, 0, "int_id");
+
+                       db_query($this->link, "DELETE FROM ttrss_tags WHERE
+                               post_int_id = $int_id AND owner_uid = '".$_SESSION["uid"]."'");
+
+                       foreach ($tags as $tag) {
+                               $tag = sanitize_tag($tag);
+
+                               if (!tag_is_valid($tag)) {
+                                       continue;
+                               }
+
+                               if (preg_match("/^[0-9]*$/", $tag)) {
+                                       continue;
+                               }
+
+                               //                                      print "<!-- $id : $int_id : $tag -->";
+
+                               if ($tag != '') {
+                                       db_query($this->link, "INSERT INTO ttrss_tags
+                                                               (post_int_id, owner_uid, tag_name) VALUES ('$int_id', '".$_SESSION["uid"]."', '$tag')");
+                               }
+
+                               array_push($tags_to_cache, $tag);
+                       }
+
+                       /* update tag cache */
+
+                       sort($tags_to_cache);
+                       $tags_str = join(",", $tags_to_cache);
+
+                       db_query($this->link, "UPDATE ttrss_user_entries
+                               SET tag_cache = '$tags_str' WHERE ref_id = '$id'
+                                               AND owner_uid = " . $_SESSION["uid"]);
+               }
+
+               db_query($this->link, "COMMIT");
+
+               $tags = get_article_tags($this->link, $id);
+               $tags_str = format_tags_string($tags, $id);
+               $tags_str_full = join(", ", $tags);
+
+               if (!$tags_str_full) $tags_str_full = __("no tags");
+
+               print json_encode(array("id" => (int)$id,
+                               "content" => $tags_str, "content_full" => $tags_str_full));
+       }
+
+
+       function completeTags() {
+               $search = db_escape_string($this->link, $_REQUEST["search"]);
+
+               $result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags
+                               WHERE owner_uid = '".$_SESSION["uid"]."' AND
+                               tag_name LIKE '$search%' ORDER BY tag_name
+                               LIMIT 10");
+
+               print "<ul>";
+               while ($line = db_fetch_assoc($result)) {
+                       print "<li>" . $line["tag_name"] . "</li>";
+               }
+               print "</ul>";
+       }
+
+       function assigntolabel() {
+               return $this->labelops(true);
+       }
+
+       function removefromlabel() {
+               return $this->labelops(false);
+       }
+
+       private function labelops($assign) {
+               $reply = array();
+
+               $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+               $label_id = db_escape_string($this->link, $_REQUEST["lid"]);
+
+               $label = db_escape_string($this->link, label_find_caption($this->link, $label_id,
+               $_SESSION["uid"]));
+
+               $reply["info-for-headlines"] = array();
+
+               if ($label) {
+
+                       foreach ($ids as $id) {
+
+                               if ($assign)
+                                       label_add_article($this->link, $id, $label, $_SESSION["uid"]);
+                               else
+                                       label_remove_article($this->link, $id, $label, $_SESSION["uid"]);
+
+                               $labels = get_article_labels($this->link, $id, $_SESSION["uid"]);
+
+                               array_push($reply["info-for-headlines"],
+                               array("id" => $id, "labels" => format_article_labels($labels, $id)));
+
+                       }
+               }
+
+               $reply["message"] = "UPDATE_COUNTERS";
+
+               print json_encode($reply);
+       }
+
+
 
 }
index eda03d126393d779da581af22da5bef827646cae..7fb64623e57d8e48622932e052a22d192f86afff 100644 (file)
@@ -1751,7 +1751,7 @@ class Pref_Feeds extends Handler_Protected {
        }
 
        function batchSubscribe() {
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
+               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-feeds\">";
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"batchaddfeeds\">";
 
                print "<table width='100%'><tr><td>
@@ -1798,6 +1798,90 @@ class Pref_Feeds extends Handler_Protected {
                        </div>";
        }
 
+       function batchAddFeeds() {
+               $cat_id = db_escape_string($this->link, $_REQUEST['cat']);
+               $feeds = explode("\n", db_escape_string($this->link, $_REQUEST['feeds']));
+               $login = db_escape_string($this->link, $_REQUEST['login']);
+               $pass = db_escape_string($this->link, $_REQUEST['pass']);
+
+               foreach ($feeds as $feed) {
+                       $feed = trim($feed);
+
+                       if (validate_feed_url($feed)) {
+
+                               db_query($this->link, "BEGIN");
+
+                               if ($cat_id == "0" || !$cat_id) {
+                                       $cat_qpart = "NULL";
+                               } else {
+                                       $cat_qpart = "'$cat_id'";
+                               }
+
+                               $result = db_query($this->link,
+                                       "SELECT id FROM ttrss_feeds
+                                       WHERE feed_url = '$feed' AND owner_uid = ".$_SESSION["uid"]);
+
+                               if (db_num_rows($result) == 0) {
+                                       $result = db_query($this->link,
+                                               "INSERT INTO ttrss_feeds
+                                                       (owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method)
+                                               VALUES ('".$_SESSION["uid"]."', '$feed',
+                                                       '[Unknown]', $cat_qpart, '$login', '$pass', 0)");
+                               }
+
+                               db_query($this->link, "COMMIT");
+                       }
+               }
+       }
+
+       function regenOPMLKey() {
+               $this->update_feed_access_key($this->link, 'OPML:Publish',
+               false, $_SESSION["uid"]);
+
+               $new_link = Opml::opml_publish_url($this->link);
+
+               print json_encode(array("link" => $new_link));
+       }
+
+       function regenFeedKey() {
+               $feed_id = db_escape_string($this->link, $_REQUEST['id']);
+               $is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true";
+
+               $new_key = $this->update_feed_access_key($this->link, $feed_id, $is_cat);
+
+               print json_encode(array("link" => $new_key));
+       }
+
+
+       private function update_feed_access_key($link, $feed_id, $is_cat, $owner_uid = false) {
+               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+
+               $sql_is_cat = bool_to_sql_bool($is_cat);
+
+               $result = db_query($link, "SELECT access_key FROM ttrss_access_keys
+                       WHERE feed_id = '$feed_id'      AND is_cat = $sql_is_cat
+                       AND owner_uid = " . $owner_uid);
+
+               if (db_num_rows($result) == 1) {
+                       $key = db_escape_string($this->link, sha1(uniqid(rand(), true)));
+
+                       db_query($link, "UPDATE ttrss_access_keys SET access_key = '$key'
+                               WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
+                               AND owner_uid = " . $owner_uid);
+
+                       return $key;
+
+               } else {
+                       return get_feed_access_key($link, $feed_id, $is_cat, $owner_uid);
+               }
+       }
+
+       // Silent
+       function clearKeys() {
+               db_query($this->link, "DELETE FROM ttrss_access_keys WHERE
+                       owner_uid = " . $_SESSION["uid"]);
+       }
+
 
 }
 ?>
index 34f623b061b594ec043a433d660b659f779cbafc..a6339209583ac8189dbd29bafa6501f8b00d1d60 100644 (file)
@@ -347,79 +347,6 @@ class RPC extends Handler_Protected {
                print json_encode($reply);
        }
 
-       function setArticleTags() {
-
-               $id = db_escape_string($this->link, $_REQUEST["id"]);
-
-               $tags_str = db_escape_string($this->link, $_REQUEST["tags_str"]);
-               $tags = array_unique(trim_array(explode(",", $tags_str)));
-
-               db_query($this->link, "BEGIN");
-
-               $result = db_query($this->link, "SELECT int_id FROM ttrss_user_entries WHERE
-                               ref_id = '$id' AND owner_uid = '".$_SESSION["uid"]."' LIMIT 1");
-
-               if (db_num_rows($result) == 1) {
-
-                       $tags_to_cache = array();
-
-                       $int_id = db_fetch_result($result, 0, "int_id");
-
-                       db_query($this->link, "DELETE FROM ttrss_tags WHERE
-                               post_int_id = $int_id AND owner_uid = '".$_SESSION["uid"]."'");
-
-                       foreach ($tags as $tag) {
-                               $tag = sanitize_tag($tag);
-
-                               if (!tag_is_valid($tag)) {
-                                       continue;
-                               }
-
-                               if (preg_match("/^[0-9]*$/", $tag)) {
-                                       continue;
-                               }
-
-                               //                                      print "<!-- $id : $int_id : $tag -->";
-
-                               if ($tag != '') {
-                                       db_query($this->link, "INSERT INTO ttrss_tags
-                                                               (post_int_id, owner_uid, tag_name) VALUES ('$int_id', '".$_SESSION["uid"]."', '$tag')");
-                               }
-
-                               array_push($tags_to_cache, $tag);
-                       }
-
-                       /* update tag cache */
-
-                       sort($tags_to_cache);
-                       $tags_str = join(",", $tags_to_cache);
-
-                       db_query($this->link, "UPDATE ttrss_user_entries
-                               SET tag_cache = '$tags_str' WHERE ref_id = '$id'
-                                               AND owner_uid = " . $_SESSION["uid"]);
-               }
-
-               db_query($this->link, "COMMIT");
-
-               $tags = get_article_tags($this->link, $id);
-               $tags_str = format_tags_string($tags, $id);
-               $tags_str_full = join(", ", $tags);
-
-               if (!$tags_str_full) $tags_str_full = __("no tags");
-
-               print json_encode(array("id" => (int)$id,
-                               "content" => $tags_str, "content_full" => $tags_str_full));
-       }
-
-       function regenOPMLKey() {
-               $this->update_feed_access_key($this->link, 'OPML:Publish',
-               false, $_SESSION["uid"]);
-
-               $new_link = Opml::opml_publish_url($this->link);
-
-               print json_encode(array("link" => $new_link));
-       }
-
        function completeLabels() {
                $search = db_escape_string($this->link, $_REQUEST["search"]);
 
@@ -436,22 +363,6 @@ class RPC extends Handler_Protected {
                print "</ul>";
        }
 
-
-       function completeTags() {
-               $search = db_escape_string($this->link, $_REQUEST["search"]);
-
-               $result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags
-                               WHERE owner_uid = '".$_SESSION["uid"]."' AND
-                               tag_name LIKE '$search%' ORDER BY tag_name
-                               LIMIT 10");
-
-               print "<ul>";
-               while ($line = db_fetch_assoc($result)) {
-                       print "<li>" . $line["tag_name"] . "</li>";
-               }
-               print "</ul>";
-       }
-
        function purge() {
                $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
                $days = sprintf("%d", $_REQUEST["days"]);
@@ -467,68 +378,6 @@ class RPC extends Handler_Protected {
                }
        }
 
-       function getArticles() {
-               $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
-               $articles = array();
-
-               foreach ($ids as $id) {
-                       if ($id) {
-                               array_push($articles, format_article($this->link, $id, 0, false));
-                       }
-               }
-
-               print json_encode($articles);
-       }
-
-       function checkDate() {
-               $date = db_escape_string($this->link, $_REQUEST["date"]);
-               $date_parsed = strtotime($date);
-
-               print json_encode(array("result" => (bool)$date_parsed,
-                       "date" => date("c", $date_parsed)));
-       }
-
-       function assigntolabel() {
-               return $this->labelops(true);
-       }
-
-       function removefromlabel() {
-               return $this->labelops(false);
-       }
-
-       function labelops($assign) {
-               $reply = array();
-
-               $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
-               $label_id = db_escape_string($this->link, $_REQUEST["lid"]);
-
-               $label = db_escape_string($this->link, label_find_caption($this->link, $label_id,
-               $_SESSION["uid"]));
-
-               $reply["info-for-headlines"] = array();
-
-               if ($label) {
-
-                       foreach ($ids as $id) {
-
-                               if ($assign)
-                                       label_add_article($this->link, $id, $label, $_SESSION["uid"]);
-                               else
-                                       label_remove_article($this->link, $id, $label, $_SESSION["uid"]);
-
-                               $labels = get_article_labels($this->link, $id, $_SESSION["uid"]);
-
-                               array_push($reply["info-for-headlines"],
-                               array("id" => $id, "labels" => format_article_labels($labels, $id)));
-
-                       }
-               }
-
-               $reply["message"] = "UPDATE_COUNTERS";
-
-               print json_encode($reply);
-       }
-
        function updateFeedBrowser() {
                $search = db_escape_string($this->link, $_REQUEST["search"]);
                $limit = db_escape_string($this->link, $_REQUEST["limit"]);
@@ -617,21 +466,6 @@ class RPC extends Handler_Protected {
                print_feed_cat_select($this->link, "cat_id", $id);
        }
 
-       function regenFeedKey() {
-               $feed_id = db_escape_string($this->link, $_REQUEST['id']);
-               $is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true";
-
-               $new_key = $this->update_feed_access_key($this->link, $feed_id, $is_cat);
-
-               print json_encode(array("link" => $new_key));
-       }
-
-       // Silent
-       function clearKeys() {
-               db_query($this->link, "DELETE FROM ttrss_access_keys WHERE
-                       owner_uid = " . $_SESSION["uid"]);
-       }
-
        // Silent
        function clearArticleKeys() {
                db_query($this->link, "UPDATE ttrss_user_entries SET uuid = '' WHERE
@@ -640,79 +474,6 @@ class RPC extends Handler_Protected {
                return;
        }
 
-       function verifyRegexp() {
-               $reg_exp = $_REQUEST["reg_exp"];
-
-               $status = @preg_match("/$reg_exp/i", "TEST") !== false;
-
-               print json_encode(array("status" => $status));
-       }
-
-       /* function buttonPlugin() {
-               $pclass = "button_" . basename($_REQUEST['plugin']);
-               $method = $_REQUEST['plugin_method'];
-
-               if (class_exists($pclass)) {
-                       $plugin = new $pclass($this->link);
-                       if (method_exists($plugin, $method)) {
-                               return $plugin->$method();
-                       }
-               }
-       } */
-
-       function genHash() {
-               $hash = sha1(uniqid(rand(), true));
-
-               print json_encode(array("hash" => $hash));
-       }
-
-       function batchAddFeeds() {
-               $cat_id = db_escape_string($this->link, $_REQUEST['cat']);
-               $feeds = explode("\n", db_escape_string($this->link, $_REQUEST['feeds']));
-               $login = db_escape_string($this->link, $_REQUEST['login']);
-               $pass = db_escape_string($this->link, $_REQUEST['pass']);
-
-               foreach ($feeds as $feed) {
-                       $feed = trim($feed);
-
-                       if (validate_feed_url($feed)) {
-
-                               db_query($this->link, "BEGIN");
-
-                               if ($cat_id == "0" || !$cat_id) {
-                                       $cat_qpart = "NULL";
-                               } else {
-                                       $cat_qpart = "'$cat_id'";
-                               }
-
-                               $result = db_query($this->link,
-                                       "SELECT id FROM ttrss_feeds
-                                       WHERE feed_url = '$feed' AND owner_uid = ".$_SESSION["uid"]);
-
-                               if (db_num_rows($result) == 0) {
-                                       $result = db_query($this->link,
-                                               "INSERT INTO ttrss_feeds
-                                                       (owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method)
-                                               VALUES ('".$_SESSION["uid"]."', '$feed',
-                                                       '[Unknown]', $cat_qpart, '$login', '$pass', 0)");
-                               }
-
-                               db_query($this->link, "COMMIT");
-                       }
-               }
-       }
-
-       function setScore() {
-               $ids = db_escape_string($this->link, $_REQUEST['id']);
-               $score = (int)db_escape_string($this->link, $_REQUEST['score']);
-
-               db_query($this->link, "UPDATE ttrss_user_entries SET
-                       score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
-
-               print json_encode(array("id" => $id,
-                       "score_pic" => get_score_pic($score)));
-       }
-
        function setpanelmode() {
                $wide = (int) $_REQUEST["wide"];
 
@@ -797,29 +558,6 @@ class RPC extends Handler_Protected {
 
        }
 
-       function update_feed_access_key($link, $feed_id, $is_cat, $owner_uid = false) {
-               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
-
-               $sql_is_cat = bool_to_sql_bool($is_cat);
-
-               $result = db_query($link, "SELECT access_key FROM ttrss_access_keys
-                       WHERE feed_id = '$feed_id'      AND is_cat = $sql_is_cat
-                       AND owner_uid = " . $owner_uid);
-
-               if (db_num_rows($result) == 1) {
-                       $key = db_escape_string($this->link, sha1(uniqid(rand(), true)));
-
-                       db_query($link, "UPDATE ttrss_access_keys SET access_key = '$key'
-                               WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
-                               AND owner_uid = " . $owner_uid);
-
-                       return $key;
-
-               } else {
-                       return get_feed_access_key($link, $feed_id, $is_cat, $owner_uid);
-               }
-       }
-
        private function markArticlesById($link, $ids, $cmode) {
 
                $tmp_ids = array();
@@ -896,32 +634,5 @@ class RPC extends Handler_Protected {
                }
        }
 
-       function cdmArticlePreview() {
-               $id = db_escape_string($this->link, $_REQUEST['id']);
-
-               $result = db_query($this->link, "SELECT link,
-                       ttrss_entries.title, content, feed_url
-                       FROM
-                       ttrss_entries, ttrss_user_entries
-                               LEFT JOIN ttrss_feeds ON (ttrss_user_entries.feed_id = ttrss_feeds.id)
-                       WHERE ref_id = '$id' AND ref_id = ttrss_entries.id AND
-                               ttrss_user_entries.owner_uid = ". $_SESSION["uid"]);
-
-               if (db_num_rows($result) != 0) {
-                       $link = db_fetch_result($result, 0, "link");
-                       $title = db_fetch_result($result, 0, "title");
-                       $feed_url = db_fetch_result($result, 0, "feed_url");
-
-                       $content = sanitize($this->link,
-                               db_fetch_result($result, 0, "content"), false, false, $feed_url);
-
-                       print "<div class='content'>".$content."</content>";
-
-               } else {
-                       print "Article not found.";
-               }
-
-       }
-
 }
 ?>
index 4fc08261abb58d068afac7c31d8e3e915c76316f..7ac7111c895f20fba1efdb8c4ffcea80833a850e 100644 (file)
@@ -122,7 +122,7 @@ function init() {
 
 function fetchProfiles() {
        try {
-               var query = "?op=getProfiles&login=" + param_escape(document.forms["loginForm"].login.value);
+               var query = "op=getProfiles&login=" + param_escape(document.forms["loginForm"].login.value);
 
                if (query) {
                        new Ajax.Request("public.php",  {
index dd1ca663da26ca182ebed354b7e528b4db889a5d..539b81a0619f1770779dea3b42e0f5721f475ea3 100644 (file)
@@ -19,6 +19,8 @@
        ini_set("session.use_only_cookies", true);
        ini_set("session.gc_maxlifetime", $session_expire);
 
+       global $session_connection;
+
        function session_get_schema_version($link, $nocache = false) {
                global $schema_version;
 
@@ -34,6 +36,7 @@
 
        function validate_session($link) {
                if (SINGLE_USER_MODE) return true;
+               if (!$link) return false;
 
                $check_ip = $_SESSION['ip_address'];
 
@@ -92,7 +95,6 @@
 
 
        function ttrss_open ($s, $n) {
-
                global $session_connection;
 
                $session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
index 3b905d1b1ecb1e8d4bcba480229ea7cd149a83d9..e390edffdd69a29e1d72f4201045cc6e22e827de 100644 (file)
--- a/index.php
+++ b/index.php
        </div>
 </div>
 
-<div style="display : none" onclick="Element.hide(this)" id="small_article_preview"></div>
-
 <div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
 <div id="cmdline" style="display : none"></div>
 <div id="headlines-tmp" style="display : none"></div>
index 6e141f077c3c7c7884aefa72a8b4842f20a989ef..3deb7ad23575d14404871f5c46e9315d95661a30 100644 (file)
                        exit;
                }
 
-       ?>
+               $notices = array();
+
+               if (!function_exists("curl_init")) {
+                       array_push($notices, "It is highly recommended to enable support for CURL in PHP.");
+               }
+
+               if (count($notices) > 0) {
+                       print_notice("Configuration check succeeded with minor problems:");
+
+                       print "<ul>";
 
-       <?php print_notice("Configuration check succeeded."); ?>
+                       foreach ($notices as $notice) {
+                               print "<li>$notice</li>";
+                       }
+
+                       print "</ul>";
+               } else {
+                       print_notice("Configuration check succeeded.");
+               }
+
+       ?>
 
        <h2>Checking database</h2>
 
index 0b39cc46635c3404da258bdd1b25485892f13cb7..4e4d035572ec4e06fe72cb940cc3cf8b74886a95 100644 (file)
@@ -548,28 +548,6 @@ function fatalError(code, msg, ext_info) {
        }
 }
 
-/* function filterDlgCheckType(sender) {
-
-       try {
-
-               var ftype = sender.value;
-
-               // if selected filter type is 5 (Date) enable the modifier dropbox
-               if (ftype == 5) {
-                       Element.show("filterDlg_dateModBox");
-                       Element.show("filterDlg_dateChkBox");
-               } else {
-                       Element.hide("filterDlg_dateModBox");
-                       Element.hide("filterDlg_dateChkBox");
-
-               }
-
-       } catch (e) {
-               exception_error("filterDlgCheckType", e);
-       }
-
-} */
-
 function filterDlgCheckAction(sender) {
 
        try {
@@ -603,34 +581,6 @@ function filterDlgCheckAction(sender) {
 
 }
 
-function filterDlgCheckDate() {
-       try {
-               var dialog = dijit.byId("filterEditDlg");
-
-               var reg_exp = dialog.attr('value').reg_exp;
-
-               var query = "?op=rpc&method=checkDate&date=" + reg_exp;
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-
-                               var reply = JSON.parse(transport.responseText);
-
-                               if (reply['result'] == true) {
-                                       alert(__("Date syntax appears to be correct:") + " " + reply['date']);
-                                       return;
-                               } else {
-                                       alert(__("Date syntax is incorrect."));
-                               }
-
-                       } });
-
-
-       } catch (e) {
-               exception_error("filterDlgCheckDate", e);
-       }
-}
 
 function explainError(code) {
        return displayDlg(__("Error explained"), "explainError", code);
@@ -1407,7 +1357,7 @@ function genUrlChangeKey(feed, is_cat) {
 
                        notify_progress("Trying to change address...", true);
 
-                       var query = "?op=rpc&method=regenFeedKey&id=" + param_escape(feed) +
+                       var query = "?op=pref-feeds&method=regenFeedKey&id=" + param_escape(feed) +
                                "&is_cat=" + param_escape(is_cat);
 
                        new Ajax.Request("backend.php", {
index 358625e933d86b8deddd18efcbbdb063dfc05548..b4ecd25842cda5b6ccaa0cb555f9b1a588d6c5b5 100644 (file)
@@ -1221,7 +1221,7 @@ function opmlRegenKey() {
 
                        notify_progress("Trying to change address...", true);
 
-                       var query = "?op=rpc&method=regenOPMLKey";
+                       var query = "?op=pref-feeds&method=regenOPMLKey";
 
                        new Ajax.Request("backend.php", {
                                parameters: query,
@@ -1521,7 +1521,7 @@ function clearFeedAccessKeys() {
        if (ok) {
                notify_progress("Clearing URLs...");
 
-               var query = "?op=rpc&method=clearKeys";
+               var query = "?op=pref-feeds&method=clearKeys";
 
                new Ajax.Request("backend.php", {
                        parameters: query,
index c24dec62eb3d9ad8a22e81665037784022e78eb1..48137a1360eb8d4285c48cfd16d68789d2e9bb47 100644 (file)
@@ -13,8 +13,6 @@ var catchup_timeout_id = false;
 var cids_requested = [];
 var loaded_article_ids = [];
 
-var _post_preview_timeout = false;
-
 var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null;
 
 function headlines_callback2(transport, offset, background, infscroll_req) {
@@ -680,7 +678,7 @@ function selectionRemoveLabel(id, ids) {
                        return;
                }
 
-               var query = "?op=rpc&method=removeFromLabel&ids=" +
+               var query = "?op=article&method=removeFromLabel&ids=" +
                        param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
                console.log(query);
@@ -708,7 +706,7 @@ function selectionAssignLabel(id, ids) {
                        return;
                }
 
-               var query = "?op=rpc&method=assignToLabel&ids=" +
+               var query = "?op=article&method=assignToLabel&ids=" +
                        param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
                console.log(query);
@@ -1116,7 +1114,7 @@ function editArticleTags(id) {
                dojo.disconnect(tmph);
 
                        new Ajax.Autocompleter('tags_str', 'tags_choices',
-                          "backend.php?op=rpc&method=completeTags",
+                          "backend.php?op=article&method=completeTags",
                           { tokens: ',', paramName: "search" });
                });
 
@@ -1153,53 +1151,10 @@ function getActiveArticleId() {
 
 function postMouseIn(e, id) {
        post_under_pointer = id;
-
-       if (_post_preview_timeout) window.clearTimeout(_post_preview_timeout);
-
-       /* if (!isCdmMode() || !getInitParam("cdm_expanded")) {
-               _post_preview_timeout = window.setTimeout(function() {
-                       displaySmallArticlePreview(e, id);
-               }, 1000);
-       } */
-}
-
-function displaySmallArticlePreview(e, id) {
-       try {
-               var query = "?op=rpc&method=cdmarticlepreview&id=" + id;
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               cexc = $("CEXC-" + id);
-                               preview = $("small_article_preview");
-                               row = $("RROW-" + id);
-                               ctr = $("headlines-frame");
-
-                               if (id != getActiveArticleId() && (!isCdmMode() || (cexc && Element.visible(cexc))) && row && preview) {
-                                       preview.innerHTML = transport.responseText;
-                                       new Effect.Appear(preview, {duration:0.2});
-
-                                       preview.setStyle({
-                                               left: (e.clientX + 20) + 'px',
-                                               top: (row.offsetTop + row.offsetHeight*2 + 20 - ctr.scrollTop) + 'px' });
-
-                               }
-
-                       } });
-
-
-       } catch (e) {
-               exception_error("displaySmallArticlePreview", e);
-       }
 }
 
 function postMouseOut(id) {
        post_under_pointer = false;
-
-       if (_post_preview_timeout) window.clearTimeout(_post_preview_timeout);
-
-       if (Element.visible("small_article_preview"))
-               Element.hide("small_article_preview");
 }
 
 function unpackVisibleHeadlines() {
@@ -2065,7 +2020,7 @@ function setSelectionScore() {
                        var score = prompt(__("Please enter new score for selected articles:"), score);
 
                        if (score != undefined) {
-                               var query = "op=rpc&method=setScore&id=" + param_escape(ids.toString()) +
+                               var query = "op=article&method=setScore&id=" + param_escape(ids.toString()) +
                                        "&score=" + param_escape(score);
 
                                new Ajax.Request("backend.php", {
@@ -2108,7 +2063,7 @@ function changeScore(id, pic) {
 
                if (new_score != undefined) {
 
-                       var query = "op=rpc&method=setScore&id=" + param_escape(id) +
+                       var query = "op=article&method=setScore&id=" + param_escape(id) +
                                "&score=" + param_escape(new_score);
 
                        new Ajax.Request("backend.php", {
index 6d90a9c8a4b21093f57e2559607ea870ad22d44a..5815e60e538286750af9d1016c5a083bd8475b0e 100644 (file)
@@ -29,7 +29,7 @@ function catchup_feed(feed_id, callback) {
 
                        if (feed_id < 0) is_cat = "true"; // KLUDGE
 
-                       var query = "?op=rpc&method=catchupFeed&feed_id=" +
+                       var query = "op=rpc&method=catchupFeed&feed_id=" +
                                feed_id + "&is_cat=" + is_cat;
 
                        new Ajax.Request("backend.php", {
@@ -71,7 +71,7 @@ function catchup_visible_articles(callback) {
 
                if (confirm(ngettext("Mark %d displayed article as read?", "Mark %d displayed articles as read?", ids.length).replace("%d", ids.length))) {
 
-                       var query = "?op=rpc&method=catchupSelected" +
+                       var query = "op=rpc&method=catchupSelected" +
                                "&cmode=0&ids=" + param_escape(ids);
 
                        new Ajax.Request("backend.php", {
@@ -91,7 +91,7 @@ function catchup_visible_articles(callback) {
 
 function catchup_article(article_id, callback) {
        try {
-               var query = "?op=rpc&method=catchupSelected" +
+               var query = "op=rpc&method=catchupSelected" +
                        "&cmode=0&ids=" + article_id;
 
                new Ajax.Request("backend.php", {
@@ -172,7 +172,7 @@ function update(callback) {
                window.clearTimeout(_update_timeout);
 
                new Ajax.Request("backend.php", {
-                       parameters: "?op=digest&method=digestinit",
+                       parameters: "op=digest&method=digestinit",
                        onComplete: function(transport) {
                                fatal_error_check(transport);
                                parse_feeds(transport);
@@ -223,7 +223,7 @@ function view(article_id) {
                        }, 500);
 
                new Ajax.Request("backend.php", {
-                       parameters: "?op=digest&method=digestgetcontents&article_id=" +
+                       parameters: "op=digest&method=digestgetcontents&article_id=" +
                                article_id,
                        onComplete: function(transport) {
                                fatal_error_check(transport);
@@ -331,7 +331,7 @@ function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback)
 
                if (!offset) $("headlines").scrollTop = 0;
 
-               var query = "backend.php?op=digest&method=digestupdate&feed_id=" +
+               var query = "op=digest&method=digestupdate&feed_id=" +
                                param_escape(feed_id) + "&offset=" + offset +
                                "&seq=" + _update_seq;
 
@@ -669,7 +669,7 @@ function parse_headlines(transport, replace, no_effects) {
 function init_second_stage() {
        try {
                new Ajax.Request("backend.php", {
-                       parameters: "backend.php?op=digest&method=digestinit&init=1",
+                       parameters: "op=digest&method=digestinit&init=1",
                        onComplete: function(transport) {
                                parse_feeds(transport);
                                Element.hide("overlay");
@@ -705,7 +705,7 @@ function toggle_mark(img, id) {
 
        try {
 
-               var query = "?op=rpc&id=" + id + "&method=mark";
+               var query = "op=rpc&id=" + id + "&method=mark";
 
                if (!img) return;
 
@@ -734,7 +734,7 @@ function toggle_pub(img, id, note) {
 
        try {
 
-               var query = "?op=rpc&id=" + id + "&method=publ";
+               var query = "op=rpc&id=" + id + "&method=publ";
 
                if (note != undefined) {
                        query = query + "&note=" + param_escape(note);
index 86b0458be2b476d9858126c88af40bab9c517664..780f6bfc7b672d7f7f81d53799016e6217d93ca4 100644 (file)
@@ -17,7 +17,7 @@ function exportData() {
                                notify_progress("Loading, please wait...");
 
                                new Ajax.Request("backend.php", {
-                                       parameters: "?op=pluginhandler&plugin=import_export&method=exportrun&offset=" + exported,
+                                       parameters: "op=pluginhandler&plugin=import_export&method=exportrun&offset=" + exported,
                                        onComplete: function(transport) {
                                                try {
                                                        var rv = JSON.parse(transport.responseText);
index 6a7f7003a9a90076a167652c91f374ec133c57d7..7f822c7bffc8ea26f01a1f995c6432ed84f66a09 100644 (file)
@@ -442,5 +442,12 @@ class Instances extends Plugin implements IHandler {
                return;
        }
 
+       function genHash() {
+               $hash = sha1(uniqid(rand(), true));
+
+               print json_encode(array("hash" => $hash));
+       }
+
+
 }
 ?>
index 4a60692b3ce572de0a5c548469659f22fa84d5f8..f699acf72a010b6dc6548e2fcd8dcc87360cb19e 100644 (file)
@@ -11,7 +11,7 @@ function addInstance() {
                        style: "width: 600px",
                        regenKey: function() {
                                new Ajax.Request("backend.php", {
-                                       parameters: "?op=rpc&method=genHash",
+                                       parameters: "op=pluginhandler&plugin=instances&method=genHash",
                                        onComplete: function(transport) {
                                                var reply = JSON.parse(transport.responseText);
                                                if (reply)
@@ -47,7 +47,7 @@ function addInstance() {
 
 function updateInstanceList(sort_key) {
        new Ajax.Request("backend.php", {
-               parameters: "?op=pref-instances&sort=" + param_escape(sort_key),
+               parameters: "op=pluginhandler&plugin=instances&sort=" + param_escape(sort_key),
                onComplete: function(transport) {
                        dijit.byId('instanceConfigTab').attr('content', transport.responseText);
                        selectTab("instanceConfig", true);
@@ -62,7 +62,7 @@ function editInstance(id, event) {
                selectTableRows('prefInstanceList', 'none');
                selectTableRowById('LIRR-'+id, 'LICHK-'+id, true);
 
-               var query = "backend.php?op=pref-instances&method=edit&id=" +
+               var query = "backend.php?op=pluginhandler&plugin=instances&method=edit&id=" +
                        param_escape(id);
 
                if (dijit.byId("instanceEditDlg"))
@@ -74,7 +74,7 @@ function editInstance(id, event) {
                        style: "width: 600px",
                        regenKey: function() {
                                new Ajax.Request("backend.php", {
-                                       parameters: "?op=rpc&method=genHash",
+                                       parameters: "op=pluginhandler&plugin=instances&method=genHash",
                                        onComplete: function(transport) {
                                                var reply = JSON.parse(transport.responseText);
                                                if (reply)
@@ -124,7 +124,7 @@ function removeSelectedInstances() {
                        if (ok) {
                                notify_progress("Removing selected instances...");
 
-                               var query = "?op=pref-instances&method=remove&ids="+
+                               var query = "op=pluginhandler&plugin=instances&method=remove&ids="+
                                        param_escape(sel_rows.toString());
 
                                new Ajax.Request("backend.php", {
index 17452d7342cc833c3bd18d1f9d85e8ceca0f2c58..40fcc871b15df7df5a176b822b6ea4d4a4a61c6f 100644 (file)
@@ -16,7 +16,7 @@ function updateSelf() {
 
                                notify_progress("Loading, please wait...", true);
                                new Ajax.Request("backend.php", {
-                               parameters: "?op=pluginhandler&plugin=updater&method=performUpdate&step=" + step +
+                               parameters: "op=pluginhandler&plugin=updater&method=performUpdate&step=" + step +
                                        "&params=" + param_escape(JSON.stringify(dialog.attr("update-params"))),
                                onComplete: function(transport) {
                                        try {