From: Andrew Dolgov Date: Sun, 23 Dec 2012 10:52:18 +0000 (+0400) Subject: experimental new plugin system X-Git-Tag: 1.7.0~157 X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=19c7350770788edf3ae0bb1fd6d95876667adbf6 experimental new plugin system --- diff --git a/backend.php b/backend.php index 511bb355..8aaf1001 100644 --- a/backend.php +++ b/backend.php @@ -126,6 +126,10 @@ 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 index 24d576da..00000000 --- a/classes/button.php +++ /dev/null @@ -1,11 +0,0 @@ -link = $link; - } - -} -?> diff --git a/classes/button/mail.php b/classes/button/mail.php deleted file mode 100644 index 309493bb..00000000 --- a/classes/button/mail.php +++ /dev/null @@ -1,192 +0,0 @@ -"; - } - - function emailArticle() { - - $param = db_escape_string($_REQUEST['param']); - - $secretkey = sha1(uniqid(rand(), true)); - - $_SESSION['email_secretkey'] = $secretkey; - - print ""; - print ""; - print ""; - print ""; - print ""; - - $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 ""; - - print "
"; - - print __('From:'); - - print ""; - - print "\">"; - - print "
"; - - print __('To:'); - - print ""; - - print ""; - - print "
"; - - print "
"; - - print __('Subject:'); - - print ""; - - print ""; - - print "
"; - - print "
"; - - print "
"; - print " "; - print ""; - print "
"; - - //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 ""; - } - - -} -?> diff --git a/classes/button/note.php b/classes/button/note.php deleted file mode 100644 index d5b6e380..00000000 --- a/classes/button/note.php +++ /dev/null @@ -1,55 +0,0 @@ -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 ""; - print ""; - print ""; - print ""; - print ""; - - print "
"; - print ""; - print "
"; - - print "
"; - print " "; - print ""; - print "
"; - - } - - 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 index 74d7128d..00000000 --- a/classes/button/share.php +++ /dev/null @@ -1,54 +0,0 @@ -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 "
"; - print "$url_path"; - print "
"; - - /* 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 "
"; - - print ""; - - print "
"; - } - - -} -?> diff --git a/classes/button/tweet.php b/classes/button/tweet.php deleted file mode 100644 index 3157fb77..00000000 --- a/classes/button/tweet.php +++ /dev/null @@ -1,31 +0,0 @@ -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)); - } - - -} -?> diff --git a/classes/feeds.php b/classes/feeds.php index 49adf387..a90b1c8e 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -249,7 +249,7 @@ class Feeds extends Handler_Protected { $headlines_count = db_num_rows($result); - if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) { + /* if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) { $button_plugins = array(); foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) { $pclass = "button_" . trim($p); @@ -259,7 +259,9 @@ class Feeds extends Handler_Protected { array_push($button_plugins, $plugin); } } - } + } */ + + global $pluginhost; if (db_num_rows($result) > 0) { @@ -706,8 +708,8 @@ class Feeds extends Handler_Protected { //$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES); - foreach ($button_plugins as $p) { - $reply['content'] .= $p->render($id, $line); + foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_BUTTON) as $p) { + $reply['content'] .= $p->hook_article_button($line); } $reply['content'] .= "link = $link; - } - - function filter_article($article) { - return $article; - } - -} -?> diff --git a/classes/filter/redditimgur.php b/classes/filter/redditimgur.php deleted file mode 100644 index b9ed2435..00000000 --- a/classes/filter/redditimgur.php +++ /dev/null @@ -1,47 +0,0 @@ -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 index 00000000..df7058dc --- /dev/null +++ b/classes/pluginhandler.php @@ -0,0 +1,18 @@ +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 index 00000000..4274ec37 --- /dev/null +++ b/classes/pluginhost.php @@ -0,0 +1,71 @@ +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); + } + } + } + +} +?> diff --git a/classes/rpc.php b/classes/rpc.php index 98418791..2bec8c54 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -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)); diff --git a/config.php-dist b/config.php-dist index 53f5dc87..2975d680 100644 --- a/config.php-dist +++ b/config.php-dist @@ -176,16 +176,13 @@ // 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 index 4d3fe775..00000000 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 index 7f9f3fc3..00000000 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 index 92a69dfe..00000000 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 index ad3c177a..00000000 Binary files a/images/art-tweet.png and /dev/null differ diff --git a/include/functions.php b/include/functions.php index 53aaa92b..da676798 100644 --- a/include/functions.php +++ b/include/functions.php @@ -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)) { @@ -3265,15 +3258,10 @@ 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'] .= "load(PLUGINS); + return true; } else { print "Unable to connect to database:" . db_last_error(); diff --git a/include/rssfuncs.php b/include/rssfuncs.php index f844aaeb..4a5bd768 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -399,23 +399,6 @@ _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 { @@ -782,7 +765,9 @@ } // 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..."); } @@ -795,7 +780,7 @@ "author" => $entry_author); foreach ($filter_plugins as $plugin) { - $article = $plugin->filter_article($article); + $article = $plugin->hook_article_filter($article); } $entry_title = $article["title"]; diff --git a/include/sanity_config.php b/include/sanity_config.php index c0626243..475f81f1 100644 --- a/include/sanity_config.php +++ b/include/sanity_config.php @@ -1,3 +1,3 @@ - +$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'); ?> diff --git a/index.php b/index.php index 445a8fa7..d958e2b8 100644 --- a/index.php +++ b/index.php @@ -71,10 +71,11 @@ 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 index 0fcb0d80..00000000 --- a/js/mail_button.js +++ /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¶m=" + 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 index c9347ab1..00000000 --- a/js/note_button.js +++ /dev/null @@ -1,51 +0,0 @@ -function editArticleNote(id) { - try { - - var query = "backend.php?op=rpc&method=buttonPlugin&plugin=note&plugin_method=edit¶m=" + 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 index 7645940e..00000000 --- a/js/share_button.js +++ /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¶m=" + 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 index d127010a..00000000 --- a/js/tweet_button.js +++ /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 index 00000000..d499a5de --- /dev/null +++ b/plugins/mail/README.txt @@ -0,0 +1 @@ +Shares article by email diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js new file mode 100644 index 00000000..39f753cc --- /dev/null +++ b/plugins/mail/mail.js @@ -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¶m=" + 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 index 00000000..a633d815 --- /dev/null +++ b/plugins/mail/mail.php @@ -0,0 +1,206 @@ +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 "Zoom"; + } + + function emailArticle() { + + $param = db_escape_string($_REQUEST['param']); + + $secretkey = sha1(uniqid(rand(), true)); + + $_SESSION['email_secretkey'] = $secretkey; + + print ""; + print ""; + print ""; + print ""; + + $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 ""; + + print "
"; + + print __('From:'); + + print ""; + + print "\">"; + + print "
"; + + print __('To:'); + + print ""; + + print ""; + + print "
"; + + print "
"; + + print __('Subject:'); + + print ""; + + print ""; + + print "
"; + + print "
"; + + print "
"; + print " "; + print ""; + print "
"; + + //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 ""; + } + + +} +?> diff --git a/plugins/mail/mail.png b/plugins/mail/mail.png new file mode 100644 index 00000000..4d3fe775 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 index 00000000..1efec8f0 --- /dev/null +++ b/plugins/note/README.txt @@ -0,0 +1 @@ +Support for article notes diff --git a/plugins/note/note.js b/plugins/note/note.js new file mode 100644 index 00000000..022fc88e --- /dev/null +++ b/plugins/note/note.js @@ -0,0 +1,51 @@ +function editArticleNote(id) { + try { + + var query = "backend.php?op=pluginhandler&plugin=note&method=edit¶m=" + 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 index 00000000..a856b5ac --- /dev/null +++ b/plugins/note/note.php @@ -0,0 +1,68 @@ +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 "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 ""; + print ""; + print ""; + print ""; + + print "
"; + print ""; + print "
"; + + print "
"; + print " "; + print ""; + print "
"; + + } + + 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 index 00000000..7f9f3fc3 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 index 00000000..3913e264 --- /dev/null +++ b/plugins/redditimgur/README.txt @@ -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 index 00000000..21aaed6e --- /dev/null +++ b/plugins/redditimgur/redditimgur.php @@ -0,0 +1,57 @@ +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 index 00000000..087c9281 --- /dev/null +++ b/plugins/share/README.txt @@ -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 index 00000000..6752189e --- /dev/null +++ b/plugins/share/share.js @@ -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¶m=" + 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 index 00000000..157c937e --- /dev/null +++ b/plugins/share/share.php @@ -0,0 +1,68 @@ +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 "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 "
"; + print "$url_path"; + print "
"; + + /* 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 "
"; + + print ""; + + print "
"; + } + + +} +?> diff --git a/plugins/share/share.png b/plugins/share/share.png new file mode 100644 index 00000000..92a69dfe Binary files /dev/null and b/plugins/share/share.png differ