]> git.wh0rd.org - tt-rss.git/commitdiff
experimental new plugin system
authorAndrew Dolgov <fox@fakecake.org>
Sun, 23 Dec 2012 10:52:18 +0000 (14:52 +0400)
committerAndrew Dolgov <fox@fakecake.org>
Sun, 23 Dec 2012 10:52:18 +0000 (14:52 +0400)
39 files changed:
backend.php
classes/button.php [deleted file]
classes/button/mail.php [deleted file]
classes/button/note.php [deleted file]
classes/button/share.php [deleted file]
classes/button/tweet.php [deleted file]
classes/feeds.php
classes/filter.php [deleted file]
classes/filter/redditimgur.php [deleted file]
classes/pluginhandler.php [new file with mode: 0644]
classes/pluginhost.php [new file with mode: 0644]
classes/rpc.php
config.php-dist
images/art-email.png [deleted file]
images/art-pub-note.png [deleted file]
images/art-share.png [deleted file]
images/art-tweet.png [deleted file]
include/functions.php
include/rssfuncs.php
include/sanity_config.php
index.php
js/mail_button.js [deleted file]
js/note_button.js [deleted file]
js/share_button.js [deleted file]
js/tweet_button.js [deleted file]
plugins/mail/README.txt [new file with mode: 0644]
plugins/mail/mail.js [new file with mode: 0644]
plugins/mail/mail.php [new file with mode: 0644]
plugins/mail/mail.png [new file with mode: 0644]
plugins/note/README.txt [new file with mode: 0644]
plugins/note/note.js [new file with mode: 0644]
plugins/note/note.php [new file with mode: 0644]
plugins/note/note.png [new file with mode: 0644]
plugins/redditimgur/README.txt [new file with mode: 0644]
plugins/redditimgur/redditimgur.php [new file with mode: 0644]
plugins/share/README.txt [new file with mode: 0644]
plugins/share/share.js [new file with mode: 0644]
plugins/share/share.php [new file with mode: 0644]
plugins/share/share.png [new file with mode: 0644]

index 511bb35528245b5b015aa44660372184e731f2e9..8aaf1001657c573c9dd3dabec24405674ccd2bdf 100644 (file)
                                if ($handler->before($method)) {
                                        if ($method && method_exists($handler, $method)) {
                                                $handler->$method();
+                                       } else {
+                                               if (method_exists($handler, "catchall")) {
+                                                       $handler->catchall($method);
+                                               }
                                        }
                                        $handler->after();
                                        return;
diff --git a/classes/button.php b/classes/button.php
deleted file mode 100644 (file)
index 24d576d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-class Button {
-
-       protected $link;
-
-       function __construct($link) {
-               $this->link = $link;
-       }
-
-}
-?>
diff --git a/classes/button/mail.php b/classes/button/mail.php
deleted file mode 100644 (file)
index 309493b..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-class Button_Mail extends Button {
-       function render($article_id) {
-               return "<img src=\"".theme_image($link, 'images/art-email.png')."\"
-                                       class='tagsPic' style=\"cursor : pointer\"
-                                       onclick=\"emailArticle($article_id)\"
-                                       alt='Zoom' title='".__('Forward by email')."'>";
-       }
-
-       function emailArticle() {
-
-               $param = db_escape_string($_REQUEST['param']);
-
-               $secretkey = sha1(uniqid(rand(), true));
-
-               $_SESSION['email_secretkey'] = $secretkey;
-
-               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=\"method\" value=\"buttonPlugin\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"mail\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin_method\" value=\"sendEmail\">";
-
-               $result = db_query($this->link, "SELECT email, full_name FROM ttrss_users WHERE
-                       id = " . $_SESSION["uid"]);
-
-               $user_email = htmlspecialchars(db_fetch_result($result, 0, "email"));
-               $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;
-
-               require_once "lib/MiniTemplator.class.php";
-
-               $tpl = new MiniTemplator;
-               $tpl_t = new MiniTemplator;
-
-               $tpl->readTemplateFromFile("templates/email_article_template.txt");
-
-               $tpl->setVariable('USER_NAME', $_SESSION["name"]);
-               $tpl->setVariable('USER_EMAIL', $user_email);
-               $tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"]);
-
-
-               $result = db_query($this->link, "SELECT link, content, title
-                       FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
-                       id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
-
-               if (db_num_rows($result) > 1) {
-                       $subject = __("[Forwarded]") . " " . __("Multiple articles");
-               }
-
-               while ($line = db_fetch_assoc($result)) {
-
-                       if (!$subject)
-                               $subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
-
-                       $tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
-                       $tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
-
-                       $tpl->addBlock('article');
-               }
-
-               $tpl->addBlock('email');
-
-               $content = "";
-               $tpl->generateOutputToString($content);
-
-               print "<table width='100%'><tr><td>";
-
-               print __('From:');
-
-               print "</td><td>";
-
-               print "<input dojoType=\"dijit.form.TextBox\" disabled=\"1\" style=\"width : 30em;\"
-                               value=\"$user_name <$user_email>\">";
-
-               print "</td></tr><tr><td>";
-
-               print __('To:');
-
-               print "</td><td>";
-
-               print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
-                               style=\"width : 30em;\"
-                               name=\"destination\" id=\"emailArticleDlg_destination\">";
-
-               print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
-                               style=\"z-index: 30; display : none\"></div>";
-
-               print "</td></tr><tr><td>";
-
-               print __('Subject:');
-
-               print "</td><td>";
-
-               print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
-                               style=\"width : 30em;\"
-                               name=\"subject\" value=\"$subject\" id=\"subject\">";
-
-               print "</td></tr>";
-
-               print "<tr><td colspan='2'><textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 100%' rows=\"20\"
-                       name='content'>$content</textarea>";
-
-               print "</td></tr></table>";
-
-               print "<div class='dlgButtons'>";
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
-               print "</div>";
-
-               //return;
-       }
-
-       function sendEmail() {
-               $secretkey = $_REQUEST['secretkey'];
-
-               require_once 'lib/phpmailer/class.phpmailer.php';
-
-               $reply = array();
-
-               if ($_SESSION['email_secretkey'] &&
-               $secretkey == $_SESSION['email_secretkey']) {
-
-                       $_SESSION['email_secretkey'] = '';
-
-                       $destination = $_REQUEST['destination'];
-                       $subject = $_REQUEST['subject'];
-                       $content = $_REQUEST['content'];
-
-                       $replyto = strip_tags($_SESSION['email_replyto']);
-                       $fromname = strip_tags($_SESSION['email_fromname']);
-
-                       $mail = new PHPMailer();
-
-                       $mail->PluginDir = "lib/phpmailer/";
-                       $mail->SetLanguage("en", "lib/phpmailer/language/");
-
-                       $mail->CharSet = "UTF-8";
-
-                       $mail->From = $replyto;
-                       $mail->FromName = $fromname;
-                       $mail->AddAddress($destination);
-
-                       if (SMTP_HOST) {
-                               $mail->Host = SMTP_HOST;
-                               $mail->Mailer = "smtp";
-                               $mail->SMTPAuth = SMTP_LOGIN != '';
-                               $mail->Username = SMTP_LOGIN;
-                               $mail->Password = SMTP_PASSWORD;
-                       }
-
-                       $mail->IsHTML(false);
-                       $mail->Subject = $subject;
-                       $mail->Body = $content;
-
-                       $rc = $mail->Send();
-
-                       if (!$rc) {
-                               $reply['error'] =  $mail->ErrorInfo;
-                       } else {
-                               save_email_address($this->link, db_escape_string($destination));
-                               $reply['message'] = "UPDATE_COUNTERS";
-                       }
-
-               } else {
-                       $reply['error'] = "Not authorized.";
-               }
-
-               print json_encode($reply);
-       }
-
-       function completeEmails() {
-               $search = db_escape_string($_REQUEST["search"]);
-
-               print "<ul>";
-
-               foreach ($_SESSION['stored_emails'] as $email) {
-                       if (strpos($email, $search) !== false) {
-                               print "<li>$email</li>";
-                       }
-               }
-
-               print "</ul>";
-       }
-
-
-}
-?>
diff --git a/classes/button/note.php b/classes/button/note.php
deleted file mode 100644 (file)
index d5b6e38..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-class Button_Note extends Button {
-       function render($article_id) {
-               return "<img src=\"".theme_image($this->link, "images/art-pub-note.png")."\"
-                               style=\"cursor : pointer\" style=\"cursor : pointer\"
-                               onclick=\"editArticleNote($article_id)\"
-                               class='tagsPic' title='".__('Edit article note')."'>";
-       }
-
-       function edit() {
-               $param = db_escape_string($_REQUEST['param']);
-
-               $result = db_query($this->link, "SELECT note FROM ttrss_user_entries WHERE
-                       ref_id = '$param' AND owner_uid = " . $_SESSION['uid']);
-
-               $note = db_fetch_result($result, 0, "note");
-
-               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=\"method\" value=\"buttonPlugin\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"note\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin_method\" value=\"setNote\">";
-
-               print "<table width='100%'><tr><td>";
-               print "<textarea dojoType=\"dijit.form.SimpleTextarea\"
-                       style='font-size : 12px; width : 100%; height: 100px;'
-                       placeHolder='body#ttrssMain { font-size : 14px; };'
-                       name='note'>$note</textarea>";
-               print "</td></tr></table>";
-
-               print "<div class='dlgButtons'>";
-               print "<button dojoType=\"dijit.form.Button\"
-                       onclick=\"dijit.byId('editNoteDlg').execute()\">".__('Save')."</button> ";
-               print "<button dojoType=\"dijit.form.Button\"
-                       onclick=\"dijit.byId('editNoteDlg').hide()\">".__('Cancel')."</button>";
-               print "</div>";
-
-       }
-
-       function setNote() {
-               $id = db_escape_string($_REQUEST["id"]);
-               $note = trim(strip_tags(db_escape_string($_REQUEST["note"])));
-
-               db_query($this->link, "UPDATE ttrss_user_entries SET note = '$note'
-                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-
-               $formatted_note = format_article_note($id, $note);
-
-               print json_encode(array("note" => $formatted_note,
-                               "raw_length" => mb_strlen($note)));
-       }
-
-
-}
-?>
diff --git a/classes/button/share.php b/classes/button/share.php
deleted file mode 100644 (file)
index 74d7128..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-class Button_Share extends Button {
-       function render($article_id, $line) {
-               return "<img src=\"".theme_image($this->link, 'images/art-share.png')."\"
-                       class='tagsPic' style=\"cursor : pointer\"
-                       onclick=\"shareArticle(".$line['int_id'].")\"
-                       title='".__('Share by URL')."'>";
-       }
-
-       function shareArticle() {
-               $param = db_escape_string($_REQUEST['param']);
-
-               $result = db_query($this->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($this->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($this->link, __('Shared'), $_SESSION["uid"]))
-                               label_create($this->link, __('Shared'), $_SESSION["uid"]);
-
-                       label_add_article($this->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>";
-       }
-
-
-}
-?>
diff --git a/classes/button/tweet.php b/classes/button/tweet.php
deleted file mode 100644 (file)
index 3157fb7..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-class Button_Tweet extends Button {
-       function render($article_id) {
-               $rv = "<img src=\"".theme_image($this->link, 'images/art-tweet.png')."\"
-                       class='tagsPic' style=\"cursor : pointer\"
-                       onclick=\"tweetArticle($article_id)\"
-                       title='".__('Share on Twitter')."'>";
-
-               return $rv;
-       }
-
-       function getTweetInfo() {
-               $id = db_escape_string($_REQUEST['id']);
-
-               $result = db_query($this->link, "SELECT title, link
-                               FROM ttrss_entries, ttrss_user_entries
-                               WHERE id = '$id' AND ref_id = id AND owner_uid = " .$_SESSION['uid']);
-
-               if (db_num_rows($result) != 0) {
-                       $title = truncate_string(strip_tags(db_fetch_result($result, 0, 'title')),
-                               100, '...');
-                       $article_link = db_fetch_result($result, 0, 'link');
-               }
-
-               print json_encode(array("title" => $title, "link" => $article_link,
-                               "id" => $id));
-       }
-
-
-}
-?>
index 49adf38795b8381d0182ab43d08e383a051971f7..a90b1c8ed7059679231df43ac86b32d53972a7cd 100644 (file)
@@ -249,7 +249,7 @@ class Feeds extends Handler_Protected {
 \r
                $headlines_count = db_num_rows($result);\r
 \r
-               if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {\r
+               /* if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {\r
                        $button_plugins = array();\r
                        foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {\r
                                $pclass = "button_" . trim($p);\r
@@ -259,7 +259,9 @@ class Feeds extends Handler_Protected {
                                        array_push($button_plugins, $plugin);\r
                                }\r
                        }\r
-               }\r
+               } */\r
+\r
+               global $pluginhost;\r
 \r
                if (db_num_rows($result) > 0) {\r
 \r
@@ -706,8 +708,8 @@ class Feeds extends Handler_Protected {
 \r
                                        //$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);\r
 \r
-                                       foreach ($button_plugins as $p) {\r
-                                               $reply['content'] .= $p->render($id, $line);\r
+                                       foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_BUTTON) as $p) {\r
+                                               $reply['content'] .= $p->hook_article_button($line);\r
                                        }\r
 \r
                                        $reply['content'] .= "<img src=\"images/digest_checkbox.png\"\r
diff --git a/classes/filter.php b/classes/filter.php
deleted file mode 100644 (file)
index 8d6bf6f..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Filter {
-       protected $link;
-
-       function __construct($link) {
-               $this->link = $link;
-       }
-
-       function filter_article($article) {
-               return $article;
-       }
-
-}
-?>
diff --git a/classes/filter/redditimgur.php b/classes/filter/redditimgur.php
deleted file mode 100644 (file)
index b9ed243..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-class Filter_RedditImgur {
-
-       function filter_article($article) {
-
-               if (strpos($article["link"], "reddit.com/r/") !== FALSE) {
-                       if (strpos($article["content"], "i.imgur.com") !== FALSE) {
-
-                               $doc = new DOMDocument();
-                               @$doc->loadHTML($article["content"]);
-
-                               if ($doc) {
-                                       $xpath = new DOMXPath($doc);
-                                       $entries = $xpath->query('(//a[@href]|//img[@src])');
-
-                                       foreach ($entries as $entry) {
-                                               if ($entry->hasAttribute("href")) {
-                                                       if (preg_match("/\.(jpg|jpeg|gif|png)$/i", $entry->getAttribute("href"))) {
-
-                                                               $img = $doc->createElement('img');
-                                                               $img->setAttribute("src", $entry->getAttribute("href"));
-
-                                                               $entry->parentNode->replaceChild($img, $entry);
-                                                       }
-                                               }
-
-                                               // remove tiny thumbnails
-                                               if ($entry->hasAttribute("src")) {
-                                                       if ($entry->parentNode && $entry->parentNode->parentNode) {
-                                                               $entry->parentNode->parentNode->removeChild($entry->parentNode);
-                                                       }
-                                               }
-                                       }
-
-                                       $node = $doc->getElementsByTagName('body')->item(0);
-
-                                       if ($node) {
-                                               $article["content"] = $doc->saveXML($node, LIBXML_NOEMPTYTAG);
-                                       }
-                               }
-                       }
-               }
-
-               return $article;
-       }
-}
-?>
diff --git a/classes/pluginhandler.php b/classes/pluginhandler.php
new file mode 100644 (file)
index 0000000..df7058d
--- /dev/null
@@ -0,0 +1,18 @@
+<?php
+class PluginHandler extends Handler_Protected {
+       function csrf_ignore($method) {
+               return true;
+       }
+
+       function catchall($method) {
+               global $pluginhost;
+
+               $plugin = $pluginhost->get_plugin($_REQUEST["plugin"]);
+
+               if (method_exists($plugin, $method)) {
+                       $plugin->$method();
+               }
+       }
+}
+
+?>
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
new file mode 100644 (file)
index 0000000..4274ec3
--- /dev/null
@@ -0,0 +1,71 @@
+<?php
+class PluginHost {
+       private $link;
+       private $hooks = array();
+       private $plugins = array();
+
+       const HOOK_ARTICLE_BUTTON = 1;
+       const HOOK_ARTICLE_FILTER = 2;
+
+       function __construct($link) {
+               $this->link = $link;
+       }
+
+       private function register_plugin($name, $plugin) {
+               //array_push($this->plugins, $plugin);
+               $this->plugins[$name] = $plugin;
+       }
+
+       function get_link() {
+               return $this->link;
+       }
+
+       function get_plugins() {
+               return $this->plugins;
+       }
+
+       function get_plugin($name) {
+               return $this->plugins[$name];
+       }
+
+       function add_hook($type, $sender) {
+               if (!is_array($this->hooks[$type])) {
+                       $this->hooks[$type] = array();
+               }
+
+               array_push($this->hooks[$type], $sender);
+       }
+
+       function del_hook($type, $sender) {
+               if (is_array($this->hooks[$type])) {
+                       $key = array_Search($this->hooks[$type], $sender);
+                       if ($key !== FALSE) {
+                               unset($this->hooks[$type][$key]);
+                       }
+               }
+       }
+
+       function get_hooks($type) {
+               return $this->hooks[$type];
+       }
+
+       function load($classlist) {
+               $plugins = explode(",", $classlist);
+
+               foreach ($plugins as $class) {
+                       $class = trim($class);
+                       $class_file = str_replace("_", "/", strtolower(basename($class)));
+                       $file = dirname(__FILE__)."/../plugins/$class_file/$class_file.php";
+
+                       if (file_exists($file)) require_once $file;
+
+                       if (class_exists($class)) {
+                               $plugin = new $class($this);
+
+                               $this->register_plugin($class, $plugin);
+                       }
+               }
+       }
+
+}
+?>
index 984187915e79e694fe94223a79c48af4d2654b57..2bec8c54a9068bbe514cb2acbbcd5fdbf855ad83 100644 (file)
@@ -706,7 +706,7 @@ class RPC extends Handler_Protected {
                print json_encode(array("status" => $status));
        }
 
-       function buttonPlugin() {
+       /* function buttonPlugin() {
                $pclass = "button_" . basename($_REQUEST['plugin']);
                $method = $_REQUEST['plugin_method'];
 
@@ -716,7 +716,7 @@ class RPC extends Handler_Protected {
                                return $plugin->$method();
                        }
                }
-       }
+       } */
 
        function genHash() {
                $hash = sha1(uniqid(rand(), true));
index 53f5dc87b5cad13f01821fbb3416f88754ba7351..2975d680ae46cbb4609d48ae3db3278c3415d7f1 100644 (file)
        // if you experience weird errors and tt-rss failing to start, blank pages
        // after login, or content encoding errors, disable it.
 
+       define('PLUGINS', '');
+       // Plugins to load. Check plugins/ directory for additional information.
+
        define('FEEDBACK_URL', '');
        // Displays an URL for users to provide feedback or comments regarding
        // this instance of tt-rss. Can lead to a forum, contact email, etc.
 
-       define('ARTICLE_BUTTON_PLUGINS', 'note,tweet,share,mail');
-       // Comma-separated list of additional article action button plugins
-       // to enable, like tweet button, etc.
-       // The following plugins are available: note, tweet, share, mail
-       // More plugins: http://tt-rss.org/wiki/Plugins
-
        define('CONFIG_VERSION', 26);
        // Expected config version. Please update this option in config.php
        // if necessary (after migrating all new options from this file).
diff --git a/images/art-email.png b/images/art-email.png
deleted file mode 100644 (file)
index 4d3fe77..0000000
Binary files a/images/art-email.png and /dev/null differ
diff --git a/images/art-pub-note.png b/images/art-pub-note.png
deleted file mode 100644 (file)
index 7f9f3fc..0000000
Binary files a/images/art-pub-note.png and /dev/null differ
diff --git a/images/art-share.png b/images/art-share.png
deleted file mode 100644 (file)
index 92a69df..0000000
Binary files a/images/art-share.png and /dev/null differ
diff --git a/images/art-tweet.png b/images/art-tweet.png
deleted file mode 100644 (file)
index ad3c177..0000000
Binary files a/images/art-tweet.png and /dev/null differ
index 53aaa92b33155c390d2660429c1d8762c4d618ef..da676798636a2db5eedb6b6629a91cb49f244b6e 100644 (file)
@@ -7,13 +7,6 @@
        function __autoload($class) {
                $class_file = str_replace("_", "/", strtolower(basename($class)));
 
-               $file = dirname(__FILE__)."/../plugins/$class_file.php";
-
-               if (file_exists($file)) {
-                       require $file;
-                       return;
-               }
-
                $file = dirname(__FILE__)."/../classes/$class_file.php";
 
                if (file_exists($file)) {
                                                onclick=\"postOpenInNewTab(event, $id)\"
                                                alt='Zoom' title='".__('Open article in new tab')."'>";
 
-                               $button_plugins = explode(",", ARTICLE_BUTTON_PLUGINS);
+                               global $pluginhost;
 
-                               foreach ($button_plugins as $p) {
-                                       $pclass = "button_" . trim($p);
-
-                                       if (class_exists($pclass)) {
-                                               $plugin = new $pclass($link);
-                                               $rv['content'] .= $plugin->render($id, $line);
-                                       }
+                               foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_BUTTON) as $p) {
+                                       $rv['content'] .= $p->hook_article_button($line);
                                }
 
                                $rv['content'] .= "<img src=\"".theme_image($link, 'images/digest_checkbox.png')."\"
                                        db_query($link, "SET NAMES " . MYSQL_CHARSET);
                                }
                        }
+
+                       global $pluginhost;
+
+                       $pluginhost = new PluginHost($link);
+                       $pluginhost->load(PLUGINS);
+
                        return true;
                } else {
                        print "Unable to connect to database:" . db_last_error();
index f844aaeb9825befd20a50562adf002b1a0de2373..4a5bd7680f3bff998af546c9c97976659a4a5cf9 100644 (file)
                                _debug("update_rss_feed: " . count($filters) . " filters loaded.");
                        }
 
-                       $filter_plugins = array();
-
-                       if (defined('_ARTICLE_FILTER_PLUGINS')) {
-                               foreach (explode(",", _ARTICLE_FILTER_PLUGINS) as $p) {
-                                       $pclass = "filter_" . trim($p);
-
-                                       if (class_exists($pclass)) {
-                                               $plugin = new $pclass($link);
-                                               array_push($filter_plugins, $plugin);
-                                       }
-                               }
-                       }
-
-                       if ($debug_enabled) {
-                               _debug("update_rss_feed: " . count($filter_plugins) . " filter plugins loaded.");
-                       }
-
                        if ($use_simplepie) {
                                $iterator = $rss->get_items();
                        } else {
                                }
 
                                // TODO: less memory-hungry implementation
-                               if (count($filter_plugins) > 0) {
+                               global $pluginhost;
+
+                               foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_FILTER) as $p) {
                                        if ($debug_enabled) {
                                                _debug("update_rss_feed: applying plugin filters...");
                                        }
                                                "author" => $entry_author);
 
                                        foreach ($filter_plugins as $plugin) {
-                                               $article = $plugin->filter_article($article);
+                                               $article = $plugin->hook_article_filter($article);
                                        }
 
                                        $entry_title = $article["title"];
index c0626243d12a41eac885d726833b1b17a8dc53e5..475f81f1b075188e3b6607b165a128c1416134a4 100644 (file)
@@ -1,3 +1,3 @@
-<?php # This file has been generated at:  Fri Sep 7 10:20:51 MSK 2012
+<?php # This file has been generated at:  Sun Dec 23 13:56:09 MSK 2012
 define('GENERATED_CONFIG_CHECK', 26);
-$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_MODULES', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'DEFAULT_UPDATE_METHOD', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_HOST', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'FEEDBACK_URL', 'ARTICLE_BUTTON_PLUGINS', 'CONFIG_VERSION'); ?>
+$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_MODULES', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'DEFAULT_UPDATE_METHOD', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_HOST', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'FEEDBACK_URL', 'CONFIG_VERSION'); ?>
index 445a8fa75e2b5b8da50990b62d3f6f545cb7f907..d958e2b891d76078c4671ce04d4e6db393db3b76 100644 (file)
--- a/index.php
+++ b/index.php
        <?php
                require 'lib/jsmin.php';
 
-               foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {
-                       $jsf = "js/".trim($p)."_button.js";
-                       if (file_exists($jsf)) {
-                               echo JSMin::minify(file_get_contents($jsf));
+               global $pluginhost;
+
+               foreach ($pluginhost->get_plugins() as $n => $p) {
+                       if (method_exists($p, "get_js")) {
+                               echo JSMin::minify($p->get_js());
                        }
                }
 
diff --git a/js/mail_button.js b/js/mail_button.js
deleted file mode 100644 (file)
index 0fcb0d8..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-function emailArticle(id) {
-       try {
-               if (!id) {
-                       var ids = getSelectedArticleIds2();
-
-                       if (ids.length == 0) {
-                               alert(__("No articles are selected."));
-                               return;
-                       }
-
-                       id = ids.toString();
-               }
-
-               if (dijit.byId("emailArticleDlg"))
-                       dijit.byId("emailArticleDlg").destroyRecursive();
-
-               var query = "backend.php?op=rpc&method=buttonPlugin&plugin=mail&plugin_method=emailArticle&param=" + param_escape(id);
-
-               dialog = new dijit.Dialog({
-                       id: "emailArticleDlg",
-                       title: __("Forward article by email"),
-                       style: "width: 600px",
-                       execute: function() {
-                               if (this.validate()) {
-
-                                       new Ajax.Request("backend.php", {
-                                               parameters: dojo.objectToQuery(this.attr('value')),
-                                               onComplete: function(transport) {
-
-                                                       var reply = JSON.parse(transport.responseText);
-
-                                                       var error = reply['error'];
-
-                                                       if (error) {
-                                                               alert(__('Error sending email:') + ' ' + error);
-                                                       } else {
-                                                               notify_info('Your message has been sent.');
-                                                               dialog.hide();
-                                                       }
-
-                                       } });
-                               }
-                       },
-                       href: query});
-
-               var tmph = dojo.connect(dialog, 'onLoad', function() {
-               dojo.disconnect(tmph);
-
-                  new Ajax.Autocompleter('emailArticleDlg_destination', 'emailArticleDlg_dst_choices',
-                          "backend.php?op=rpc&method=buttonPlugin&plugin=mail&plugin_method=completeEmails",
-                          { tokens: '', paramName: "search" });
-               });
-
-               dialog.show();
-
-       } catch (e) {
-               exception_error("emailArticle", e);
-       }
-}
-
-
diff --git a/js/note_button.js b/js/note_button.js
deleted file mode 100644 (file)
index c9347ab..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-function editArticleNote(id) {
-       try {
-
-               var query = "backend.php?op=rpc&method=buttonPlugin&plugin=note&plugin_method=edit&param=" + param_escape(id);
-
-               if (dijit.byId("editNoteDlg"))
-                       dijit.byId("editNoteDlg").destroyRecursive();
-
-               dialog = new dijit.Dialog({
-                       id: "editNoteDlg",
-                       title: __("Edit article note"),
-                       style: "width: 600px",
-                       execute: function() {
-                               if (this.validate()) {
-                                       var query = dojo.objectToQuery(this.attr('value'));
-
-                                       notify_progress("Saving article note...", true);
-
-                                       new Ajax.Request("backend.php", {
-                                       parameters: query,
-                                       onComplete: function(transport) {
-                                               notify('');
-                                               dialog.hide();
-
-                                               var reply = JSON.parse(transport.responseText);
-
-                                               cache_delete("article:" + id);
-
-                                               var elem = $("POSTNOTE-" + id);
-
-                                               if (elem) {
-                                                       Element.hide(elem);
-                                                       elem.innerHTML = reply.note;
-
-                                                       if (reply.raw_length != 0)
-                                                               new Effect.Appear(elem);
-                                               }
-
-                                       }});
-                               }
-                       },
-                       href: query,
-               });
-
-               dialog.show();
-
-       } catch (e) {
-               exception_error("editArticleNote", e);
-       }
-}
-
diff --git a/js/share_button.js b/js/share_button.js
deleted file mode 100644 (file)
index 7645940..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-function shareArticle(id) {
-       try {
-               if (dijit.byId("shareArticleDlg"))
-                       dijit.byId("shareArticleDlg").destroyRecursive();
-
-               var query = "backend.php?op=rpc&method=buttonPlugin&plugin=share&plugin_method=shareArticle&param=" + param_escape(id);
-
-               dialog = new dijit.Dialog({
-                       id: "shareArticleDlg",
-                       title: __("Share article by URL"),
-                       style: "width: 600px",
-                       href: query});
-
-               dialog.show();
-
-       } catch (e) {
-               exception_error("emailArticle", e);
-       }
-}
-
-
diff --git a/js/tweet_button.js b/js/tweet_button.js
deleted file mode 100644 (file)
index d127010..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-       function tweetArticle(id) {
-       try {
-               var query = "?op=rpc&method=buttonPlugin&plugin=tweet&plugin_method=getTweetInfo&id=" + param_escape(id);
-
-               console.log(query);
-
-               var d = new Date();
-      var ts = d.getTime();
-
-               var w = window.open('backend.php?op=backend&method=loading', 'ttrss_tweet',
-                       "status=0,toolbar=0,location=0,width=500,height=400,scrollbars=1,menubar=0");
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               var ti = JSON.parse(transport.responseText);
-
-                               var share_url = "http://twitter.com/share?_=" + ts +
-                                       "&text=" + param_escape(ti.title) +
-                                       "&url=" + param_escape(ti.link);
-
-                               w.location.href = share_url;
-
-                       } });
-
-
-       } catch (e) {
-               exception_error("tweetArticle", e);
-       }
-       }
-
diff --git a/plugins/mail/README.txt b/plugins/mail/README.txt
new file mode 100644 (file)
index 0000000..d499a5d
--- /dev/null
@@ -0,0 +1 @@
+Shares article by email
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
new file mode 100644 (file)
index 0000000..39f753c
--- /dev/null
@@ -0,0 +1,61 @@
+function emailArticle(id) {
+       try {
+               if (!id) {
+                       var ids = getSelectedArticleIds2();
+
+                       if (ids.length == 0) {
+                               alert(__("No articles are selected."));
+                               return;
+                       }
+
+                       id = ids.toString();
+               }
+
+               if (dijit.byId("emailArticleDlg"))
+                       dijit.byId("emailArticleDlg").destroyRecursive();
+
+               var query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + param_escape(id);
+
+               dialog = new dijit.Dialog({
+                       id: "emailArticleDlg",
+                       title: __("Forward article by email"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: dojo.objectToQuery(this.attr('value')),
+                                               onComplete: function(transport) {
+
+                                                       var reply = JSON.parse(transport.responseText);
+
+                                                       var error = reply['error'];
+
+                                                       if (error) {
+                                                               alert(__('Error sending email:') + ' ' + error);
+                                                       } else {
+                                                               notify_info('Your message has been sent.');
+                                                               dialog.hide();
+                                                       }
+
+                                       } });
+                               }
+                       },
+                       href: query});
+
+               var tmph = dojo.connect(dialog, 'onLoad', function() {
+               dojo.disconnect(tmph);
+
+                  new Ajax.Autocompleter('emailArticleDlg_destination', 'emailArticleDlg_dst_choices',
+                          "backend.php?op=pluginhandler&plugin=mail&method=completeEmails",
+                          { tokens: '', paramName: "search" });
+               });
+
+               dialog.show();
+
+       } catch (e) {
+               exception_error("emailArticle", e);
+       }
+}
+
+
diff --git a/plugins/mail/mail.php b/plugins/mail/mail.php
new file mode 100644 (file)
index 0000000..a633d81
--- /dev/null
@@ -0,0 +1,206 @@
+<?php
+class Mail {
+
+       private $link;
+       private $host;
+
+       function __construct($host) {
+               $this->link = $host->get_link();
+               $this->host = $host;
+
+               $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+       }
+
+       function get_js() {
+               return file_get_contents(dirname(__FILE__) . "/mail.js");
+       }
+
+       function hook_article_button($line) {
+               return "<img src=\"".theme_image($link, 'plugins/mail/mail.png')."\"
+                                       class='tagsPic' style=\"cursor : pointer\"
+                                       onclick=\"emailArticle(".$line["id"].")\"
+                                       alt='Zoom' title='".__('Forward by email')."'>";
+       }
+
+       function emailArticle() {
+
+               $param = db_escape_string($_REQUEST['param']);
+
+               $secretkey = sha1(uniqid(rand(), true));
+
+               $_SESSION['email_secretkey'] = $secretkey;
+
+               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=\"pluginhandler\">";
+               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"mail\">";
+               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"sendEmail\">";
+
+               $result = db_query($this->link, "SELECT email, full_name FROM ttrss_users WHERE
+                       id = " . $_SESSION["uid"]);
+
+               $user_email = htmlspecialchars(db_fetch_result($result, 0, "email"));
+               $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;
+
+               require_once "lib/MiniTemplator.class.php";
+
+               $tpl = new MiniTemplator;
+               $tpl_t = new MiniTemplator;
+
+               $tpl->readTemplateFromFile("templates/email_article_template.txt");
+
+               $tpl->setVariable('USER_NAME', $_SESSION["name"]);
+               $tpl->setVariable('USER_EMAIL', $user_email);
+               $tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"]);
+
+
+               $result = db_query($this->link, "SELECT link, content, title
+                       FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
+                       id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
+
+               if (db_num_rows($result) > 1) {
+                       $subject = __("[Forwarded]") . " " . __("Multiple articles");
+               }
+
+               while ($line = db_fetch_assoc($result)) {
+
+                       if (!$subject)
+                               $subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
+
+                       $tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
+                       $tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
+
+                       $tpl->addBlock('article');
+               }
+
+               $tpl->addBlock('email');
+
+               $content = "";
+               $tpl->generateOutputToString($content);
+
+               print "<table width='100%'><tr><td>";
+
+               print __('From:');
+
+               print "</td><td>";
+
+               print "<input dojoType=\"dijit.form.TextBox\" disabled=\"1\" style=\"width : 30em;\"
+                               value=\"$user_name <$user_email>\">";
+
+               print "</td></tr><tr><td>";
+
+               print __('To:');
+
+               print "</td><td>";
+
+               print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
+                               style=\"width : 30em;\"
+                               name=\"destination\" id=\"emailArticleDlg_destination\">";
+
+               print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
+                               style=\"z-index: 30; display : none\"></div>";
+
+               print "</td></tr><tr><td>";
+
+               print __('Subject:');
+
+               print "</td><td>";
+
+               print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
+                               style=\"width : 30em;\"
+                               name=\"subject\" value=\"$subject\" id=\"subject\">";
+
+               print "</td></tr>";
+
+               print "<tr><td colspan='2'><textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 100%' rows=\"20\"
+                       name='content'>$content</textarea>";
+
+               print "</td></tr></table>";
+
+               print "<div class='dlgButtons'>";
+               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
+               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
+               print "</div>";
+
+               //return;
+       }
+
+       function sendEmail() {
+               $secretkey = $_REQUEST['secretkey'];
+
+               require_once 'lib/phpmailer/class.phpmailer.php';
+
+               $reply = array();
+
+               if ($_SESSION['email_secretkey'] &&
+               $secretkey == $_SESSION['email_secretkey']) {
+
+                       $_SESSION['email_secretkey'] = '';
+
+                       $destination = $_REQUEST['destination'];
+                       $subject = $_REQUEST['subject'];
+                       $content = $_REQUEST['content'];
+
+                       $replyto = strip_tags($_SESSION['email_replyto']);
+                       $fromname = strip_tags($_SESSION['email_fromname']);
+
+                       $mail = new PHPMailer();
+
+                       $mail->PluginDir = "lib/phpmailer/";
+                       $mail->SetLanguage("en", "lib/phpmailer/language/");
+
+                       $mail->CharSet = "UTF-8";
+
+                       $mail->From = $replyto;
+                       $mail->FromName = $fromname;
+                       $mail->AddAddress($destination);
+
+                       if (SMTP_HOST) {
+                               $mail->Host = SMTP_HOST;
+                               $mail->Mailer = "smtp";
+                               $mail->SMTPAuth = SMTP_LOGIN != '';
+                               $mail->Username = SMTP_LOGIN;
+                               $mail->Password = SMTP_PASSWORD;
+                       }
+
+                       $mail->IsHTML(false);
+                       $mail->Subject = $subject;
+                       $mail->Body = $content;
+
+                       $rc = $mail->Send();
+
+                       if (!$rc) {
+                               $reply['error'] =  $mail->ErrorInfo;
+                       } else {
+                               save_email_address($this->link, db_escape_string($destination));
+                               $reply['message'] = "UPDATE_COUNTERS";
+                       }
+
+               } else {
+                       $reply['error'] = "Not authorized.";
+               }
+
+               print json_encode($reply);
+       }
+
+       function completeEmails() {
+               $search = db_escape_string($_REQUEST["search"]);
+
+               print "<ul>";
+
+               foreach ($_SESSION['stored_emails'] as $email) {
+                       if (strpos($email, $search) !== false) {
+                               print "<li>$email</li>";
+                       }
+               }
+
+               print "</ul>";
+       }
+
+
+}
+?>
diff --git a/plugins/mail/mail.png b/plugins/mail/mail.png
new file mode 100644 (file)
index 0000000..4d3fe77
Binary files /dev/null and b/plugins/mail/mail.png differ
diff --git a/plugins/note/README.txt b/plugins/note/README.txt
new file mode 100644 (file)
index 0000000..1efec8f
--- /dev/null
@@ -0,0 +1 @@
+Support for article notes
diff --git a/plugins/note/note.js b/plugins/note/note.js
new file mode 100644 (file)
index 0000000..022fc88
--- /dev/null
@@ -0,0 +1,51 @@
+function editArticleNote(id) {
+       try {
+
+               var query = "backend.php?op=pluginhandler&plugin=note&method=edit&param=" + param_escape(id);
+
+               if (dijit.byId("editNoteDlg"))
+                       dijit.byId("editNoteDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "editNoteDlg",
+                       title: __("Edit article note"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+                                       var query = dojo.objectToQuery(this.attr('value'));
+
+                                       notify_progress("Saving article note...", true);
+
+                                       new Ajax.Request("backend.php", {
+                                       parameters: query,
+                                       onComplete: function(transport) {
+                                               notify('');
+                                               dialog.hide();
+
+                                               var reply = JSON.parse(transport.responseText);
+
+                                               cache_delete("article:" + id);
+
+                                               var elem = $("POSTNOTE-" + id);
+
+                                               if (elem) {
+                                                       Element.hide(elem);
+                                                       elem.innerHTML = reply.note;
+
+                                                       if (reply.raw_length != 0)
+                                                               new Effect.Appear(elem);
+                                               }
+
+                                       }});
+                               }
+                       },
+                       href: query,
+               });
+
+               dialog.show();
+
+       } catch (e) {
+               exception_error("editArticleNote", e);
+       }
+}
+
diff --git a/plugins/note/note.php b/plugins/note/note.php
new file mode 100644 (file)
index 0000000..a856b5a
--- /dev/null
@@ -0,0 +1,68 @@
+<?php
+class Note {
+       private $link;
+       private $host;
+
+       function __construct($host) {
+               $this->link = $host->get_link();
+               $this->host = $host;
+
+               $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+       }
+
+       function get_js() {
+               return file_get_contents(dirname(__FILE__) . "/note.js");
+       }
+
+
+       function hook_article_button($line) {
+               return "<img src=\"".theme_image($this->link, "plugins/note/note.png")."\"
+                       style=\"cursor : pointer\" style=\"cursor : pointer\"
+                       onclick=\"editArticleNote(".$line["id"].")\"
+                       class='tagsPic' title='".__('Edit article note')."'>";
+       }
+
+       function edit() {
+               $param = db_escape_string($_REQUEST['param']);
+
+               $result = db_query($this->link, "SELECT note FROM ttrss_user_entries WHERE
+                       ref_id = '$param' AND owner_uid = " . $_SESSION['uid']);
+
+               $note = db_fetch_result($result, 0, "note");
+
+               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=\"pluginhandler\">";
+               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"setNote\">";
+               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"note\">";
+
+               print "<table width='100%'><tr><td>";
+               print "<textarea dojoType=\"dijit.form.SimpleTextarea\"
+                       style='font-size : 12px; width : 100%; height: 100px;'
+                       placeHolder='body#ttrssMain { font-size : 14px; };'
+                       name='note'>$note</textarea>";
+               print "</td></tr></table>";
+
+               print "<div class='dlgButtons'>";
+               print "<button dojoType=\"dijit.form.Button\"
+                       onclick=\"dijit.byId('editNoteDlg').execute()\">".__('Save')."</button> ";
+               print "<button dojoType=\"dijit.form.Button\"
+                       onclick=\"dijit.byId('editNoteDlg').hide()\">".__('Cancel')."</button>";
+               print "</div>";
+
+       }
+
+       function setNote() {
+               $id = db_escape_string($_REQUEST["id"]);
+               $note = trim(strip_tags(db_escape_string($_REQUEST["note"])));
+
+               db_query($this->link, "UPDATE ttrss_user_entries SET note = '$note'
+                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+
+               $formatted_note = format_article_note($id, $note);
+
+               print json_encode(array("note" => $formatted_note,
+                               "raw_length" => mb_strlen($note)));
+       }
+
+}
+?>
diff --git a/plugins/note/note.png b/plugins/note/note.png
new file mode 100644 (file)
index 0000000..7f9f3fc
Binary files /dev/null and b/plugins/note/note.png differ
diff --git a/plugins/redditimgur/README.txt b/plugins/redditimgur/README.txt
new file mode 100644 (file)
index 0000000..3913e26
--- /dev/null
@@ -0,0 +1 @@
+Inline image links in Reddit RSS
diff --git a/plugins/redditimgur/redditimgur.php b/plugins/redditimgur/redditimgur.php
new file mode 100644 (file)
index 0000000..21aaed6
--- /dev/null
@@ -0,0 +1,57 @@
+<?php
+class RedditImgur {
+
+       private $link;
+       private $host;
+
+       function __construct($host) {
+               $this->link = $host->get_link();
+               $this->host = $host;
+
+               $host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
+       }
+
+       function hook_article_filter($article) {
+
+               if (strpos($article["link"], "reddit.com/r/") !== FALSE) {
+                       if (strpos($article["content"], "i.imgur.com") !== FALSE) {
+
+                               $doc = new DOMDocument();
+                               @$doc->loadHTML($article["content"]);
+
+                               if ($doc) {
+                                       $xpath = new DOMXPath($doc);
+                                       $entries = $xpath->query('(//a[@href]|//img[@src])');
+
+                                       foreach ($entries as $entry) {
+                                               if ($entry->hasAttribute("href")) {
+                                                       if (preg_match("/\.(jpg|jpeg|gif|png)$/i", $entry->getAttribute("href"))) {
+
+                                                               $img = $doc->createElement('img');
+                                                               $img->setAttribute("src", $entry->getAttribute("href"));
+
+                                                               $entry->parentNode->replaceChild($img, $entry);
+                                                       }
+                                               }
+
+                                               // remove tiny thumbnails
+                                               if ($entry->hasAttribute("src")) {
+                                                       if ($entry->parentNode && $entry->parentNode->parentNode) {
+                                                               $entry->parentNode->parentNode->removeChild($entry->parentNode);
+                                                       }
+                                               }
+                                       }
+
+                                       $node = $doc->getElementsByTagName('body')->item(0);
+
+                                       if ($node) {
+                                               $article["content"] = $doc->saveXML($node, LIBXML_NOEMPTYTAG);
+                                       }
+                               }
+                       }
+               }
+
+               return $article;
+       }
+}
+?>
diff --git a/plugins/share/README.txt b/plugins/share/README.txt
new file mode 100644 (file)
index 0000000..087c928
--- /dev/null
@@ -0,0 +1 @@
+Support for sharing articles by URL
diff --git a/plugins/share/share.js b/plugins/share/share.js
new file mode 100644 (file)
index 0000000..6752189
--- /dev/null
@@ -0,0 +1,21 @@
+function shareArticle(id) {
+       try {
+               if (dijit.byId("shareArticleDlg"))
+                       dijit.byId("shareArticleDlg").destroyRecursive();
+
+               var query = "backend.php?op=pluginhandler&plugin=share&method=shareArticle&param=" + param_escape(id);
+
+               dialog = new dijit.Dialog({
+                       id: "shareArticleDlg",
+                       title: __("Share article by URL"),
+                       style: "width: 600px",
+                       href: query});
+
+               dialog.show();
+
+       } catch (e) {
+               exception_error("emailArticle", e);
+       }
+}
+
+
diff --git a/plugins/share/share.php b/plugins/share/share.php
new file mode 100644 (file)
index 0000000..157c937
--- /dev/null
@@ -0,0 +1,68 @@
+<?php
+class Share {
+       private $link;
+       private $host;
+
+       function __construct($host) {
+               $this->link = $host->get_link();
+               $this->host = $host;
+
+               $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+       }
+
+       function get_js() {
+               return file_get_contents(dirname(__FILE__) . "/share.js");
+       }
+
+       function hook_article_button($line) {
+               return "<img src=\"".theme_image($this->link, 'images/art-share.png')."\"
+                       class='tagsPic' style=\"cursor : pointer\"
+                       onclick=\"shareArticle(".$line['int_id'].")\"
+                       title='".__('Share by URL')."'>";
+       }
+
+       function shareArticle() {
+               $param = db_escape_string($_REQUEST['param']);
+
+               $result = db_query($this->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($this->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($this->link, __('Shared'), $_SESSION["uid"]))
+                               label_create($this->link, __('Shared'), $_SESSION["uid"]);
+
+                       label_add_article($this->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>";
+       }
+
+
+}
+?>
diff --git a/plugins/share/share.png b/plugins/share/share.png
new file mode 100644 (file)
index 0000000..92a69df
Binary files /dev/null and b/plugins/share/share.png differ