diff --git a/classes/api.php b/classes/api.php index 2d420e527..c3ea627fd 100644 --- a/classes/api.php +++ b/classes/api.php @@ -2,7 +2,7 @@ class API extends Handler { - const API_LEVEL = 12; + const API_LEVEL = 13; const STATUS_OK = 0; const STATUS_ERR = 1; @@ -210,6 +210,8 @@ class API extends Handler { $_SESSION['hasSandbox'] = $has_sandbox; + $skip_first_id_check = false; + $override_order = false; switch ($_REQUEST["order_by"]) { case "title": @@ -217,6 +219,7 @@ class API extends Handler { break; case "date_reverse": $override_order = "score DESC, date_entered, updated"; + $skip_first_id_check = true; break; case "feed_dates": $override_order = "updated DESC"; @@ -230,7 +233,7 @@ class API extends Handler { list($headlines, $headlines_header) = $this->api_get_headlines($feed_id, $limit, $offset, $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order, $include_attachments, $since_id, $search, - $include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id); + $include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id, $skip_first_id_check); if ($include_header) { $this->wrap(self::STATUS_OK, array($headlines_header, $headlines)); @@ -322,13 +325,17 @@ class API extends Handler { function getArticle() { $article_id = join(",", array_filter(explode(",", $this->dbh->escape_string($_REQUEST["article_id"])), is_numeric)); + $sanitize_content = !isset($_REQUEST["sanitize"]) || + sql_bool_to_bool($_REQUEST["sanitize"]); if ($article_id) { $query = "SELECT id,title,link,content,feed_id,comments,int_id, marked,unread,published,score,note,lang, ".SUBSTRING_FOR_DATE."(updated,1,16) as updated, - author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title + author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title, + (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) AS site_url, + (SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) AS hide_images FROM ttrss_entries,ttrss_user_entries WHERE id IN ($article_id) AND ref_id = id AND owner_uid = " . $_SESSION["uid"] ; @@ -354,7 +361,6 @@ class API extends Handler { "comments" => $line["comments"], "author" => $line["author"], "updated" => (int) strtotime($line["updated"]), - "content" => $line["content"], "feed_id" => $line["feed_id"], "attachments" => $attachments, "score" => (int)$line["score"], @@ -363,6 +369,15 @@ class API extends Handler { "lang" => $line["lang"] ); + if ($sanitize_content) { + $article["content"] = sanitize( + $line["content"], + sql_bool_to_bool($line['hide_images']), + false, $line["site_url"], false, $line["id"]); + } else { + $article["content"] = $line["content"]; + } + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) { $article = $p->hook_render_article_api(array("article" => $article)); } @@ -644,7 +659,7 @@ class API extends Handler { $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order, $include_attachments, $since_id, $search = "", $include_nested = false, $sanitize_content = true, - $force_update = false, $excerpt_length = 100, $check_first_id = false) { + $force_update = false, $excerpt_length = 100, $check_first_id = false, $skip_first_id_check = false) { if ($force_update && $feed_id > 0 && is_numeric($feed_id)) { // Update the feed if required with some basic flood control @@ -687,7 +702,7 @@ class API extends Handler { "since_id" => $since_id, "include_children" => $include_nested, "check_first_id" => $check_first_id, - "api_request" => true + "skip_first_id_check" => $skip_first_id_check ); $qfh_ret = queryFeedHeadlines($params); diff --git a/classes/article.php b/classes/article.php index bcd249873..01f6b5126 100644 --- a/classes/article.php +++ b/classes/article.php @@ -41,12 +41,12 @@ class Article extends Handler_Protected { } else if ($mode == "zoom") { array_push($articles, format_article($id, true, true)); } else if ($mode == "raw") { - if ($_REQUEST['html']) { + if (isset($_REQUEST['html'])) { header("Content-Type: text/html"); print ''; } - $article = format_article($id, false); + $article = format_article($id, false, isset($_REQUEST["zoom"])); print $article['content']; return; } diff --git a/classes/feeds.php b/classes/feeds.php old mode 100644 new mode 100755 index c3cb72da8..07a18741d --- a/classes/feeds.php +++ b/classes/feeds.php @@ -148,7 +148,8 @@ class Feeds extends Handler_Protected { private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, $vgr_last_feed = false, - $override_order = false, $include_children = false, $check_first_id = false) { + $override_order = false, $include_children = false, $check_first_id = false, + $skip_first_id_check = false) { $disable_cache = false; @@ -252,7 +253,8 @@ class Feeds extends Handler_Protected { "override_order" => $override_order, "offset" => $offset, "include_children" => $include_children, - "check_first_id" => $check_first_id + "check_first_id" => $check_first_id, + "skip_first_id_check" => $skip_first_id_check ); $qfh_ret = queryFeedHeadlines($params); @@ -903,6 +905,7 @@ class Feeds extends Handler_Protected { $reply['headlines'] = array(); $override_order = false; + $skip_first_id_check = false; switch ($order_by) { case "title": @@ -910,6 +913,7 @@ class Feeds extends Handler_Protected { break; case "date_reverse": $override_order = "score DESC, date_entered, updated"; + $skip_first_id_check = true; break; case "feed_dates": $override_order = "updated DESC"; @@ -920,7 +924,7 @@ class Feeds extends Handler_Protected { $ret = $this->format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, - $vgroup_last_feed, $override_order, true, $check_first_id); + $vgroup_last_feed, $override_order, true, $check_first_id, $skip_first_id_check); //$topmost_article_ids = $ret[0]; $headlines_count = $ret[1]; diff --git a/classes/pluginhost.php b/classes/pluginhost.php index 75620a191..0f3d8f37c 100644 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -133,7 +133,7 @@ class PluginHost { return array(); } } - function load_all($kind, $owner_uid = false) { + function load_all($kind, $owner_uid = false, $skip_init = false) { $plugins = array_merge(glob("plugins/*"), glob("plugins.local/*")); $plugins = array_filter($plugins, "is_dir"); @@ -141,10 +141,10 @@ class PluginHost { asort($plugins); - $this->load(join(",", $plugins), $kind, $owner_uid); + $this->load(join(",", $plugins), $kind, $owner_uid, $skip_init); } - function load($classlist, $kind, $owner_uid = false) { + function load($classlist, $kind, $owner_uid = false, $skip_init = false) { $plugins = explode(",", $classlist); $this->owner_uid = (int) $owner_uid; @@ -181,18 +181,18 @@ class PluginHost { switch ($kind) { case $this::KIND_SYSTEM: if ($this->is_system($plugin)) { - $plugin->init($this); + if (!$skip_init) $plugin->init($this); $this->register_plugin($class, $plugin); } break; case $this::KIND_USER: if (!$this->is_system($plugin)) { - $plugin->init($this); + if (!$skip_init) $plugin->init($this); $this->register_plugin($class, $plugin); } break; case $this::KIND_ALL: - $plugin->init($this); + if (!$skip_init) $plugin->init($this); $this->register_plugin($class, $plugin); break; } diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index a29b2acca..e839af34e 100644 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1461,8 +1461,10 @@ class Pref_Feeds extends Handler_Protected { print "
"; + $opml_export_filename = "TinyTinyRSS_".date("Y-m-d").".opml"; + print "

" . __('Filename:') . - "  " . + "  " . __('Include settings') . ""; print "

"; - - print " "; - - // - } - - function hook_prefs_tab($args) { - if ($args != "prefPrefs") return; - - print "
"; - - $this->renderPrefsUI(); - - print "
"; - } - - function hook_article_filter($article) { - $owner_uid = $article["owner_uid"]; - - // guid already includes owner_uid so we don't need to include it - $result = $this->dbh->query("SELECT id FROM {$this->sql_prefix}_references WHERE - document_id = '" . $this->dbh->escape_string($article['guid_hashed']) . "'"); - - if (db_num_rows($result) != 0) { - _debug("bayes: article already categorized"); - return $article; - } - - $nbs = new NaiveBayesianStorage($owner_uid); - $nb = new NaiveBayesian($nbs); - - $categories = $nbs->getCategories(); - - if (count($categories) > 0) { - - $count_neutral = 0; - - $id_good = 0; - $id_ugly = 0; - $id_bad = 0; - - foreach ($categories as $id => $cat) { - if ($cat["category"] == "GOOD") { - $id_good = $id; - } else if ($cat["category"] == "UGLY") { - $id_ugly = $id; - $count_neutral += $cat["word_count"]; - } else if ($cat["category"] == "BAD") { - $id_bad = $id; - } - } - - $dst_category = $id_ugly; - - $bayes_content = mb_substr(mb_strtolower($article["title"] . " " . strip_tags($article["content"])), 0, $this->max_document_length); - - if ($count_neutral >= $this->auto_categorize_threshold) { - // enable automatic categorization - - $result = $nb->categorize($bayes_content); - - //print_r($result); - - if (count($result) == 3) { - $prob_good = $result[$id_good]; - $prob_bad = $result[$id_bad]; - - if (!is_nan($prob_good) && $prob_good > 0.90) { - $dst_category = $id_good; - $article["score_modifier"] += $this->score_modifier; - } else if (!is_nan($prob_bad) && $prob_bad > 0.90) { - $dst_category = $id_bad; - $article["score_modifier"] -= $this->score_modifier; - } - } - - _debug("bayes, dst category: $dst_category"); - } - - $nb->train($article["guid_hashed"], $dst_category, $bayes_content); - - $nb->updateProbabilities(); - } - - return $article; - - } - - function clearDatabase() { - $prefix = $this->sql_prefix; - - $this->dbh->query("BEGIN"); - $this->dbh->query("DELETE FROM ${prefix}_references WHERE owner_uid = " . $_SESSION["uid"]); - $this->dbh->query("DELETE FROM ${prefix}_wordfreqs WHERE owner_uid = " . $_SESSION["uid"]); - $this->dbh->query("COMMIT"); - - $nbs = new NaiveBayesianStorage($_SESSION["uid"]); - $nb = new NaiveBayesian($nbs); - $nb->updateProbabilities(); - } - - function showArticleStats() { - $article_id = (int) $_REQUEST["article_id"]; - - $result = $this->dbh->query("SELECT score, guid, title, content FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id AND id = " . - $article_id . " AND owner_uid = " . $_SESSION["uid"]); - - if ($this->dbh->num_rows($result) != 0) { - $guid = $this->dbh->fetch_result($result, 0, "guid"); - $title = $this->dbh->fetch_result($result, 0, "title"); - - $content = mb_substr(mb_strtolower($title . " " . strip_tags($this->dbh->fetch_result($result, 0, "content"))), 0, $this->max_document_length); - - print "

" . $title . "

"; - - $nbs = new NaiveBayesianStorage($_SESSION["uid"]); - $nb = new NaiveBayesian($nbs); - - $categories = $nbs->getCategories(); - - $ref = $nbs->getReference($guid, false); - - $current_cat = isset($ref["category_id"]) ? $categories[$ref["category_id"]]["category"] : "N/A"; - - print "

" . T_sprintf("Currently stored as: %s", $current_cat) . "

"; - - $result = $nb->categorize($content); - - print "

" . __("Classifier result") . "

"; - - print ""; - print ""; - - foreach ($result as $k => $v) { - print ""; - print ""; - print ""; - - print ""; - } - - print "
CategoryProbability
" . $categories[$k]["category"] . "" . $v . "
"; - - } else { - print_error("Article not found"); - } - - print "
"; - - print ""; - - print "
"; - - } - - function api_version() { - return 2; - } - -} -?> diff --git a/plugins/af_sort_bayes/lib/COPYING b/plugins/af_sort_bayes/lib/COPYING deleted file mode 100644 index 207a79cbd..000000000 --- a/plugins/af_sort_bayes/lib/COPYING +++ /dev/null @@ -1,278 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - diff --git a/plugins/af_sort_bayes/lib/HISTORY b/plugins/af_sort_bayes/lib/HISTORY deleted file mode 100644 index 24cfb05d6..000000000 --- a/plugins/af_sort_bayes/lib/HISTORY +++ /dev/null @@ -1 +0,0 @@ -2003/11/02 - Sortie de la version initiale 1.0 diff --git a/plugins/af_sort_bayes/lib/LICENSE b/plugins/af_sort_bayes/lib/LICENSE deleted file mode 100644 index d7f105139..000000000 --- a/plugins/af_sort_bayes/lib/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ -GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {description} - Copyright (C) {year} {fullname} - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - {signature of Ty Coon}, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/plugins/af_sort_bayes/lib/README.md b/plugins/af_sort_bayes/lib/README.md deleted file mode 100644 index 79b16ae6a..000000000 --- a/plugins/af_sort_bayes/lib/README.md +++ /dev/null @@ -1,41 +0,0 @@ -PHP Naive Bayesian Filter -============================================================ -This library implements Naive Bayes classifier. Original Project developed by Loic d'Anterroches [loic xhtml.net]. This Library is very Usefull but is not Published now. so Salvage from [Internet Archive] and create Github Repositry. - -see more information to Original Readme.txt and [Original Page]. -And If there is a problem with the publication of this repository, I will close this repository. - - -[loic xhtml.net]: -[Internet Archive]: -[Original Page]: - -Writing by Japanese ------------------------------------------------------------- -このライブラリは単純ベイズ分類器を実装したライブラリです。元のプロジェクトはLoic d'Anterrochesが作成しています。非常に有益なライブラリですが、現在は公開されていないようです。そこでインターネットアーカイブからライブラリをサルベージし、Githubのレポジトリを作成しました。 - -より詳しい情報はオリジナルのReadme.txtを参照してください。 -もし、このレポジトリの公開に問題があるようならば、このレポジトリを削除します。 - -extract Original Readme ------------------------------------------------------------- -> This file is part of PHP Naive Bayesian Filter. -> -> The Initial Developer of the Original Code is -> Loic d'Anterroches [loic xhtml.net]. -> Portions created by the Initial Developer are Copyright (C) 2003 -> the Initial Developer. All Rights Reserved. -> -> PHP Naive Bayesian Filter is free software; you can redistribute it -> and/or modify it under the terms of the GNU General Public License as -> published by the Free Software Foundation; either version 2 of -> the License, or (at your option) any later version. -> -> PHP Naive Bayesian Filter is distributed in the hope that it will -> be useful, but WITHOUT ANY WARRANTY; without even the implied -> warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -> See the GNU General Public License for more details. -> -> You should have received a copy of the GNU General Public License -> along with Foobar; if not, write to the Free Software -> Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA \ No newline at end of file diff --git a/plugins/af_sort_bayes/lib/README.txt b/plugins/af_sort_bayes/lib/README.txt deleted file mode 100644 index e3230f32f..000000000 --- a/plugins/af_sort_bayes/lib/README.txt +++ /dev/null @@ -1,86 +0,0 @@ -/* - ***** BEGIN LICENSE BLOCK ***** - This file is part of PHP Naive Bayesian Filter. - - The Initial Developer of the Original Code is - Loic d'Anterroches [loic xhtml.net]. - Portions created by the Initial Developer are Copyright (C) 2003 - the Initial Developer. All Rights Reserved. - - PHP Naive Bayesian Filter is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. - - PHP Naive Bayesian Filter is distributed in the hope that it will - be useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Foobar; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - ***** END LICENSE BLOCK ***** -*/ - - -** Presentation ** - -Voici une implementation generale d'un filtre reposant sur le theoreme de Bayes. -L'application la plus connue est le filtre anti-spam. Vous pouvez aussi -l'utiliser pour faire de la classification automatique de documents. - -Ce programme se base sur la version simplifiee du theoreme de Bayes comme -decrite par Ken Williams, ken@mathforum.org sur la page -http://mathforum.org/~ken/bayes/bayes.html au 31/10/2003. - -Le systeme permet de maniere generale de faire la classification de documents -textes dans differentes categories. Si vous voulez l'utiliser pour une -classification de vos messages entre spam et non-spam, alors il vous faudra 2 -categories, une "spam" et une "nonspam". - -J'ai cree ce script car c'est une sujet a la mode en ce moment. Particulierement -pour filtrer les commentaires et les trackbacks dans les blogs. Le systeme -propose ici permet d'avoir plus que deux categories spam et non spam. Cela permet -donc theoriquement de l'utiliser pour la classification dans de multiples -categories. - -Un petit script 'index.php' vous permet de tester le systeme, ensuite vous -pouvez inclure la classe dans vos scripts. Les fichiers class.naivebayesian.php -et class.naivebayesianstorage.php peuvent aussi etre utilises avec la licence -GNU Lesser General Public License Version 2.1 ou ulterieure. - - -** Fonctionnalites ** - -- Une classe avec la logique de base, une autre qui est l'interface de stockage. -- Stockage des donnees dans une base de donnes pour le moment MySQL mais -vous pouvez utiliser celle que vous voulez via l'interface de stockage. -- Apprentissage -- Desapprentissage -- Archivage automatique des documents "reference" -- L'interface de stockage par defaut utilise MySQL et repose sur deux classes -d'Olivier Meunier. - -** Utilisation ** - -Regardez le code de index.php -Pour une bonne utilisation il vous faut creer une autre classe qui herite de -NaiveBayesian pour avoir votre propre fonction pour ignorer les mots qui ne -portent pas de sens particulier. Ceci n'est pas fait dans 'index.php' - -class votreclass extends NaiveBayesian -{ - function getIgnoreList() - { - return array('the', 'that', 'you', 'for', 'and'); - } -} - - -** Des questions ** - -Pouvez me contacter par email a loic xhtml.net, ou venir sur http://www.xhtml.net/ - - diff --git a/plugins/af_sort_bayes/lib/VERSION b/plugins/af_sort_bayes/lib/VERSION deleted file mode 100644 index d3827e75a..000000000 --- a/plugins/af_sort_bayes/lib/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/plugins/af_sort_bayes/lib/class.naivebayesian.php b/plugins/af_sort_bayes/lib/class.naivebayesian.php deleted file mode 100644 index 4a4ffa7eb..000000000 --- a/plugins/af_sort_bayes/lib/class.naivebayesian.php +++ /dev/null @@ -1,297 +0,0 @@ -nbs = $nbs; - - return true; - } - - /** categorize a document. - Get list of categories in which the document can be categorized - with a score for each category. - - @return array keys = category ids, values = scores - @param string document - */ - function categorize($document) { - $scores = array(); - $categories = $this->nbs->getCategories(); - $tokens = $this->_getTokens($document); - - // calculate the score in each category - $total_words = 0; - $ncat = 0; - - while (list($category, $data) = each($categories)) { - $total_words += $data['word_count']; - $ncat++; - } - - reset($categories); - - while (list($category, $data) = each($categories)) { - $scores[$category] = $data['probability']; - // small probability for a word not in the category - // maybe putting 1.0 as a 'no effect' word can also be good - - if ($data['word_count'] > 0) - $small_proba = 1.0 / ($data['word_count'] * 2); - else - $small_proba = 0; - - reset($tokens); - - while (list($token, $count) = each($tokens)) { - - if ($this->nbs->wordExists($token)) { - $word = $this->nbs->getWord($token, $category); - - if ($word['count']) { - $proba = $word['count'] / $data['word_count']; - } - else { - $proba = $small_proba; - } - - $scores[$category] *= pow($proba, $count) * pow($total_words / $ncat, $count); - // pow($total_words/$ncat, $count) is here to avoid underflow. - - } - } - } - - return $this->_rescale($scores); - } - - /** training against a document. - Set a document as being in a specific category. The document becomes a reference - and is saved in the table of references. After a set of training is done - the updateProbabilities() function must be run. - - @see updateProbabilities() - @see untrain() - @return bool success - @param string document id, must be unique - @param string category_id the category id in which the document should be - @param string content of the document - */ - function train($doc_id, $category_id, $content) { - $ret = false; - - - // if this doc_id already trained, no trained - if (!$this->nbs->getReference($doc_id, false)) { - - $tokens = $this->_getTokens($content); - - while (list($token, $count) = each($tokens)) { - $this->nbs->updateWord($token, $count, $category_id); - } - - $this->nbs->saveReference($doc_id, $category_id, $content); - - $ret = true; - } - else { - $ret = false; - } - - return $ret; - } - - /** untraining of a document. - To remove just one document from the references. - - @see updateProbabilities() - @see untrain() - @return bool success - @param string document id, must be unique - */ - function untrain($doc_id) { - $ref = $this->nbs->getReference($doc_id); - - if (isset($ref['content'])) { - - $tokens = $this->_getTokens($ref['content']); - - while (list($token, $count) = each($tokens)) { - $this->nbs->removeWord($token, $count, $ref['category_id']); - } - - $this->nbs->removeReference($doc_id); - - return true; - } else { - return false; - } - } - - /** rescale the results between 0 and 1. - - @author Ken Williams, ken@mathforum.org - @see categorize() - @return array normalized scores (keys => category, values => scores) - @param array scores (keys => category, values => scores) - */ - function _rescale($scores) { - // Scale everything back to a reasonable area in - // logspace (near zero), un-loggify, and normalize - $total = 0.0; - $max = 0.0; - reset($scores); - - while (list($cat, $score) = each($scores)) { - if ($score >= $max) - $max = $score; - } - - reset($scores); - while (list($cat, $score) = each($scores)) { - $scores[$cat] = (float) exp($score - $max); - $total += (float) pow($scores[$cat], 2); - } - - $total = (float) sqrt($total); - - reset($scores); - while (list($cat, $score) = each($scores)) { - $scores[$cat] = (float) $scores[$cat] / $total; - } - reset($scores); - - return $scores; - } - - /** update the probabilities of the categories and word count. - This function must be run after a set of training - - @see train() - @see untrain() - @return bool sucess - */ - function updateProbabilities() { - // this function is really only database manipulation - // that is why all is done in the NaiveBayesianStorage - return $this->nbs->updateProbabilities(); - } - - /** Get the list of token to ignore. - @return array ignore list - */ - function getIgnoreList() { - //return array('the', 'that', 'you', 'for', 'and'); - - // https://en.wikipedia.org/wiki/Most_common_words_in_English - return array('the', 'be', 'to', 'of', 'and', 'a', 'in', 'that', 'have', 'I', 'it', 'for', 'not', 'on', 'with', - 'he', 'as', 'you', 'do', 'at', 'this', 'but', 'his', 'by', 'from', 'they', 'we', 'say', 'her', - 'she', 'or', 'an', 'will', 'my', 'one', 'all', 'would', 'there', 'their', 'what', 'so', 'up', - 'out', 'if', 'about', 'who', 'get', 'which', 'go', 'me', 'when', 'make', 'can', 'like', 'time', - 'no', 'just', 'him', 'know', 'take', 'people', 'into', 'year', 'your', 'good', 'some', 'could', - 'them', 'see', 'other', 'than', 'then', 'now', 'look', 'only', 'come', 'its', 'over', 'think', - 'also', 'back', 'after', 'use', 'two', 'how', 'our', 'work', 'first', 'well', 'way', 'even', - 'new', 'want', 'because', 'any', 'these', 'give', 'day', 'most', 'us', 'read', 'more'); - - } - - /** get the tokens from a string - - @author James Seng. [http://james.seng.cc/] (based on his perl version) - - @return array tokens - @param string the string to get the tokens from - */ - function _getTokens($string) { - $rawtokens = array(); - $tokens = array(); - //$string = $this->_cleanString($string); - - if (count(0 >= $this->ignore_list)) { - $this->ignore_list = $this->getIgnoreList(); - } - - $rawtokens = preg_split("/[\(\),:\.;\t\r\n ]/", $string, -1, PREG_SPLIT_NO_EMPTY); - - // remove some tokens - while (list(, $token) = each($rawtokens)) { - $token = trim($token); - if (!(('' == $token) || (mb_strpos($token, "&") !== FALSE) || (mb_strlen($token) < $this->min_token_length) || (mb_strlen($token) > $this->max_token_length) || (preg_match('/^[0-9]+$/', $token)) || (in_array($token, $this->ignore_list)))) { - $tokens[$token]++; - } - } - - return $tokens; - } - - /** clean a string from the diacritics - - @author Antoine Bajolet [phpdig_at_toiletoine.net] - @author SPIP [http://uzine.net/spip/] - - @return string clean string - @param string string with accents - */ - function _cleanString($string) { - $diac = /* A */ chr(192) . chr(193) . chr(194) . chr(195) . chr(196) . chr(197) . - /* a */ chr(224) . chr(225) . chr(226) . chr(227) . chr(228) . chr(229) . - /* O */ chr(210) . chr(211) . chr(212) . chr(213) . chr(214) . chr(216) . - /* o */ chr(242) . chr(243) . chr(244) . chr(245) . chr(246) . chr(248) . - /* E */ chr(200) . chr(201) . chr(202) . chr(203) . - /* e */ chr(232) . chr(233) . chr(234) . chr(235) . - /* Cc */ chr(199) . chr(231) . - /* I */ chr(204) . chr(205) . chr(206) . chr(207) . - /* i */ chr(236) . chr(237) . chr(238) . chr(239) . - /* U */ chr(217) . chr(218) . chr(219) . chr(220) . - /* u */ chr(249) . chr(250) . chr(251) . chr(252) . - /* yNn */ chr(255) . chr(209) . chr(241); - - return strtolower(strtr($string, $diac, 'AAAAAAaaaaaaOOOOOOooooooEEEEeeeeCcIIIIiiiiUUUUuuuuyNn')); - } - - } diff --git a/plugins/af_sort_bayes/lib/class.naivebayesian_ngram.php b/plugins/af_sort_bayes/lib/class.naivebayesian_ngram.php deleted file mode 100644 index cee2bb1d7..000000000 --- a/plugins/af_sort_bayes/lib/class.naivebayesian_ngram.php +++ /dev/null @@ -1,52 +0,0 @@ -N = $n; - - return true; - } - - /** - * override method for ngram - * - * @param string $string - * @return multiple - */ - function _getTokens($string) { - $tokens = array(); - - if (mb_strlen($string)) { - for ($i = 0; $i < mb_strlen($string) - $this->N; $i++) { - $wd = mb_substr($string, $i, $this->N); - - if (mb_strlen($wd) == $this->N) { - if (!array_key_exists($wd, $tokens)) { - $tokens[$wd] = 0; - } - - $tokens[$wd]++; - } - } - } - - if (count($tokens)) { - // remove empty value - $tokens = array_filter($tokens); - } - - return $tokens; - } - - } diff --git a/plugins/af_sort_bayes/lib/class.naivebayesianstorage.php b/plugins/af_sort_bayes/lib/class.naivebayesianstorage.php deleted file mode 100644 index 99db1fc79..000000000 --- a/plugins/af_sort_bayes/lib/class.naivebayesianstorage.php +++ /dev/null @@ -1,261 +0,0 @@ -con = Db::get(); - $this->owner_uid = $owner_uid; - - return true; - } - - /** get the list of categories with basic data. - - @return array key = category ids, values = array(keys = 'probability', 'word_count') - */ - function getCategories() { - $categories = array(); - $rs = $this->con->query('SELECT * FROM ttrss_plugin_af_sort_bayes_categories WHERE owner_uid = ' . $this->owner_uid); - - while ($line = $this->con->fetch_assoc($rs)) { - $categories[$line['id']] = array('probability' => $line['probability'], - 'category' => $line['category'], - 'word_count' => $line['word_count'] - ); - } - - return $categories; - } - - function getCategoryByName($category) { - $rs = $this->con->query("SELECT id FROM ttrss_plugin_af_sort_bayes_categories WHERE category = '" . - $this->con->escape_string($category) . "' AND owner_uid = " . $this->owner_uid); - - if ($this->con->num_rows($rs) != 0) { - return $this->con->fetch_result($rs, 0, "id"); - } - - return false; - } - - function getCategoryById($category_id) { - $rs = $this->con->query("SELECT category FROM ttrss_plugin_af_sort_bayes_categories WHERE id = '" . - (int)$category_id . "' AND owner_uid = " . $this->owner_uid); - - if ($this->con->num_rows($rs) != 0) { - return $this->con->fetch_result($rs, 0, "category"); - } - - return false; - } - - /** see if the word is an already learnt word. - @return bool - @param string word - */ - function wordExists($word) { - $rs = $this->con->query("SELECT * FROM ttrss_plugin_af_sort_bayes_wordfreqs WHERE word='" . $this->con->escape_string($word) . "' AND - owner_uid = " . $this->owner_uid); - - return $this->con->num_rows($rs) != 0; - } - - /** get details of a word in a category. - @return array ('count' => count) - @param string word - @param string category id - */ - function getWord($word, $category_id) { - $details = array(); - - $rs = $this->con->query("SELECT * FROM ttrss_plugin_af_sort_bayes_wordfreqs WHERE word='" . - $this->con->escape_string($word) . "' AND category_id=" . (int)$category_id); - - if ($this->con->num_rows($rs) == 0 ) { - $details['count'] = 0; - } else { - $details['count'] = $this->con->fetch_result($rs, 0, "count"); - } - - return $details; - } - - /** update a word in a category. - If the word is new in this category it is added, else only the count is updated. - - @return bool success - @param string word - @param int count - @paran string category id - */ - function updateWord($word, $count, $category_id) { - $oldword = $this->getWord($word, $category_id); - - if (0 == $oldword['count']) { - return $this->con->query("INSERT INTO ttrss_plugin_af_sort_bayes_wordfreqs (word, category_id, count, owner_uid) - VALUES ('" . $this->con->escape_string($word) . "', '" . - (int)$category_id . "', '" . - (int)$count . "', '". - $this->owner_uid . "')"); - } - else { - return $this->con->query("UPDATE ttrss_plugin_af_sort_bayes_wordfreqs SET count = count + " . (int) $count . " WHERE category_id = '" . $this->con->escape_string($category_id) . "' AND word = '" . $this->con->escape_string($word) . "'"); - } - } - - /** remove a word from a category. - - @return bool success - @param string word - @param int count - @param string category id - */ - function removeWord($word, $count, $category_id) { - $oldword = $this->getWord($word, $category_id); - - if (0 != $oldword['count'] && 0 >= ($oldword['count'] - $count)) { - return $this->con->query("DELETE FROM ttrss_plugin_af_sort_bayes_wordfreqs WHERE word='" . - $this->con->escape_string($word) . "' AND category_id='" . - $this->con->escape_string($category_id) . "'"); - } - else { - return $this->con->query("UPDATE ttrss_plugin_af_sort_bayes_wordfreqs SET count = count - " . - (int) $count . " WHERE category_id = '" . $this->con->escape_string($category_id) . "' - AND word = '" . $this->con->escape_string($word) . "'"); - } - } - - /** update the probabilities of the categories and word count. - This function must be run after a set of training - - @return bool sucess - */ - function updateProbabilities() { - // first update the word count of each category - $rs = $this->con->query("SELECT SUM(count) AS total FROM ttrss_plugin_af_sort_bayes_wordfreqs WHERE owner_uid = ".$this->owner_uid); - - $total_words = $this->con->fetch_result($rs, 0, "total"); - - if ($total_words == 0) { - $this->con->query("UPDATE ttrss_plugin_af_sort_bayes_categories SET word_count=0, probability=0 WHERE owner_uid = " . $this->owner_uid); - return true; - } - - $rs = $this->con->query("SELECT tc.id AS category_id, SUM(count) AS total FROM ttrss_plugin_af_sort_bayes_categories AS tc - LEFT JOIN ttrss_plugin_af_sort_bayes_wordfreqs AS tw ON (tc.id = tw.category_id) WHERE tc.owner_uid = ".$this->owner_uid." GROUP BY tc.id"); - - while ($line = $this->con->fetch_assoc($rs)) { - - $proba = (int)$line['total'] / $total_words; - $this->con->query("UPDATE ttrss_plugin_af_sort_bayes_categories SET word_count=" . (int) $line['total'] . - ", probability=" . $proba . " WHERE id = '" . $line['category_id'] . "'"); - } - - return true; - } - - /** save a reference in the database. - - @return bool success - @param string reference if, must be unique - @param string category id - @param string content of the reference - */ - function saveReference($doc_id, $category_id, $content) { - return $this->con->query("INSERT INTO ttrss_plugin_af_sort_bayes_references (document_id, category_id, owner_uid) VALUES - ('" . $this->con->escape_string($doc_id) . "', '" . - (int)$category_id . "', " . - (int)$this->owner_uid . ")"); - } - - /** get a reference from the database. - - @return array reference( category_id => ...., content => ....) - @param string id - */ - function getReference($doc_id, $include_content = true) - { - - $ref = array(); - $rs = $this->con->query("SELECT * FROM ttrss_plugin_af_sort_bayes_references WHERE document_id='" . - $this->con->escape_string($doc_id) . "' AND owner_uid = " . $this->owner_uid); - - if ($this->con->num_rows($rs) == 0) { - return $ref; - } - - $ref['category_id'] = $this->con->fetch_result($rs, 0, 'category_id'); - $ref['id'] = $this->con->fetch_result($rs, 0, 'id'); - $ref['document_id'] = $this->con->fetch_result($rs, 0, 'document_id'); - - if ($include_content) { - $rs = $this->con->query("SELECT content, title FROM ttrss_entries WHERE guid = '" . - $this->con->escape_string($ref['document_id']) . "'"); - - if ($this->con->num_rows($rs) != 0) { - $ref['content'] = mb_substr(mb_strtolower($this->con->fetch_result($rs, 0, 'title') . ' ' . strip_tags($this->con->fetch_result($rs, 0, 'content'))), 0, - $this->max_document_length); - } - } - - return $ref; - } - - /** remove a reference from the database - - @return bool sucess - @param string reference id - */ - function removeReference($doc_id) { - - return $this->con->query("DELETE FROM ttrss_plugin_af_sort_bayes_references WHERE document_id='" . $this->con->escape_string($doc_id) . "' AND owner_uid = " . $this->owner_uid); - } - - } diff --git a/plugins/af_sort_bayes/thumb_down.png b/plugins/af_sort_bayes/thumb_down.png deleted file mode 100644 index 3c832d4c8..000000000 Binary files a/plugins/af_sort_bayes/thumb_down.png and /dev/null differ diff --git a/plugins/af_sort_bayes/thumb_up.png b/plugins/af_sort_bayes/thumb_up.png deleted file mode 100644 index 2bd16ccf2..000000000 Binary files a/plugins/af_sort_bayes/thumb_up.png and /dev/null differ diff --git a/plugins/af_tumblr_1280/init.php b/plugins/af_tumblr_1280/init.php old mode 100644 new mode 100755 index f9938048b..985d8c5f8 --- a/plugins/af_tumblr_1280/init.php +++ b/plugins/af_tumblr_1280/init.php @@ -4,7 +4,7 @@ class Af_Tumblr_1280 extends Plugin { function about() { return array(1.0, - "Replace Tumblr pictures with largest size if available", + "Replace Tumblr pictures with largest size if available (requires CURL)", "fox"); } @@ -18,7 +18,8 @@ class Af_Tumblr_1280 extends Plugin { function hook_article_filter($article) { - $owner_uid = $article["owner_uid"]; + if (!function_exists("curl_init") || ini_get("open_basedir")) + return $article; $charset_hack = ' @@ -46,8 +47,7 @@ class Af_Tumblr_1280 extends Plugin { curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_HEADER, true); curl_setopt($ch, CURLOPT_NOBODY, true); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, - !ini_get("safe_mode") && !ini_get("open_basedir")); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); @$result = curl_exec($ch); diff --git a/plugins/af_unburn/init.php b/plugins/af_unburn/init.php old mode 100644 new mode 100755 index 5c9bc1387..263997dbf --- a/plugins/af_unburn/init.php +++ b/plugins/af_unburn/init.php @@ -17,23 +17,19 @@ class Af_Unburn extends Plugin { function hook_article_filter($article) { $owner_uid = $article["owner_uid"]; - if (!function_exists("curl_init")) + if (defined('NO_CURL') || !function_exists("curl_init") || ini_get("open_basedir")) return $article; if ((strpos($article["link"], "feedproxy.google.com") !== FALSE || strpos($article["link"], "/~r/") !== FALSE || strpos($article["link"], "feedsportal.com") !== FALSE)) { - if (ini_get("safe_mode") || ini_get("open_basedir")) { - $ch = curl_init(geturl($article["link"])); - } else { - $ch = curl_init($article["link"]); - } + $ch = curl_init($article["link"]); curl_setopt($ch, CURLOPT_TIMEOUT, 5); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_HEADER, true); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode") && !ini_get("open_basedir")); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); if (defined('_CURL_HTTP_PROXY')) { @@ -76,55 +72,6 @@ class Af_Unburn extends Plugin { return $article; } - function geturl($url){ - - (function_exists('curl_init')) ? '' : die('cURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini'); - - $curl = curl_init(); - $header[0] = "Accept: text/xml,application/xml,application/xhtml+xml,"; - $header[0] .= "text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"; - $header[] = "Cache-Control: max-age=0"; - $header[] = "Connection: keep-alive"; - $header[] = "Keep-Alive: 300"; - $header[] = "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7"; - $header[] = "Accept-Language: en-us,en;q=0.5"; - $header[] = "Pragma: "; - - curl_setopt($curl, CURLOPT_URL, $url); - curl_setopt($curl, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 5.1; rv:5.0) Gecko/20100101 Firefox/5.0 Firefox/5.0'); - curl_setopt($curl, CURLOPT_HTTPHEADER, $header); - curl_setopt($curl, CURLOPT_HEADER, true); - curl_setopt($curl, CURLOPT_REFERER, $url); - curl_setopt($curl, CURLOPT_ENCODING, 'gzip,deflate'); - curl_setopt($curl, CURLOPT_AUTOREFERER, true); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); - //curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); //CURLOPT_FOLLOWLOCATION Disabled... - curl_setopt($curl, CURLOPT_TIMEOUT, 60); - - $html = curl_exec($curl); - - $status = curl_getinfo($curl); - curl_close($curl); - - if($status['http_code']!=200){ - if($status['http_code'] == 301 || $status['http_code'] == 302) { - list($header) = explode("\r\n\r\n", $html, 2); - $matches = array(); - preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches); - $url = trim(str_replace($matches[1],"",$matches[0])); - $url_parsed = parse_url($url); - return (isset($url_parsed))? geturl($url):''; - } - $oline=''; - foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';} - $line =$oline." \r\n ".$url."\r\n-----------------\r\n"; - $handle = @fopen('./curl.error.log', 'a'); - fwrite($handle, $line); - return FALSE; - } - return $url; - } - function api_version() { return 2; } diff --git a/plugins/af_zz_imgsetsizes/init.php b/plugins/af_zz_imgsetsizes/init.php index d71ec096e..96afbbfe0 100644 --- a/plugins/af_zz_imgsetsizes/init.php +++ b/plugins/af_zz_imgsetsizes/init.php @@ -18,7 +18,8 @@ class Af_Zz_ImgSetSizes extends Plugin { function hook_article_filter($article) { - $owner_uid = $article["owner_uid"]; + if (defined('NO_CURL') || !function_exists("curl_init")) + return $article; $charset_hack = ' diff --git a/plugins/googlereaderimport/init.js b/plugins/googlereaderimport/init.js deleted file mode 100644 index 043952c75..000000000 --- a/plugins/googlereaderimport/init.js +++ /dev/null @@ -1,53 +0,0 @@ -function starredImportComplete(iframe) { - try { - if (!iframe.contentDocument.body.innerHTML) return false; - - Element.show(iframe); - - notify(''); - - if (dijit.byId('starredImportDlg')) - dijit.byId('starredImportDlg').destroyRecursive(); - - var content = iframe.contentDocument.body.innerHTML; - - if (content) Element.hide(iframe); - - dialog = new dijit.Dialog({ - id: "starredImportDlg", - title: __("Google Reader Import"), - style: "width: 600px", - onCancel: function() { - Element.hide(iframe); - this.hide(); - }, - execute: function() { - Element.hide(iframe); - this.hide(); - }, - content: content}); - - dialog.show(); - - } catch (e) { - exception_error("starredImportComplete", e); - } -} - -function starredImport() { - - var starred_file = $("starred_file"); - - if (starred_file.value.length == 0) { - alert(__("Please choose a file first.")); - return false; - } else { - notify_progress("Importing, please wait...", true); - - Element.show("starred_upload_iframe"); - - return true; - } -} - - diff --git a/plugins/googlereaderimport/init.php b/plugins/googlereaderimport/init.php deleted file mode 100644 index dcb335a0d..000000000 --- a/plugins/googlereaderimport/init.php +++ /dev/null @@ -1,384 +0,0 @@ -host = $host; - - $host->add_command("greader-import", - "import data in Google Reader JSON format", - $this, ":", "FILE"); - - $host->add_hook($host::HOOK_PREFS_TAB, $this); - } - - function greader_import($args) { - $file = $args['greader_import']; - - if (!file_exists($file)) { - _debug("file not found: $file"); - return; - } - - _debug("please enter your username:"); - - $username = db_escape_string(trim(read_stdin())); - - _debug("looking up user: $username..."); - - $result = db_query("SELECT id FROM ttrss_users - WHERE login = '$username'"); - - if (db_num_rows($result) == 0) { - _debug("user not found."); - return; - } - - $owner_uid = db_fetch_result($result, 0, "id"); - - _debug("processing: $file (owner_uid: $owner_uid)"); - - $this->import($file, $owner_uid); - } - - function get_prefs_js() { - return file_get_contents(dirname(__FILE__) . "/init.js"); - } - - function import($file = false, $owner_uid = 0) { - - purge_orphans(); - - if (!$file) { - header("Content-Type: text/html"); - - $owner_uid = $_SESSION["uid"]; - - if ($_FILES['starred_file']['error'] != 0) { - print_error(T_sprintf("Upload failed with error code %d", - $_FILES['starred_file']['error'])); - return; - } - - $tmp_file = false; - - if (is_uploaded_file($_FILES['starred_file']['tmp_name'])) { - $tmp_file = tempnam(CACHE_DIR . '/upload', 'starred'); - - $result = move_uploaded_file($_FILES['starred_file']['tmp_name'], - $tmp_file); - - if (!$result) { - print_error(__("Unable to move uploaded file.")); - return; - } - } else { - print_error(__('Error: please upload OPML file.')); - return; - } - - if (is_file($tmp_file)) { - $doc = json_decode(file_get_contents($tmp_file), true); - unlink($tmp_file); - } else { - print_error(__('No file uploaded.')); - return; - } - } else { - $doc = json_decode(file_get_contents($file), true); - } - - if ($file) { - $sql_set_marked = strtolower(basename($file)) == 'starred.json' ? 'true' : 'false'; - _debug("will set articles as starred: $sql_set_marked"); - - } else { - $sql_set_marked = strtolower($_FILES['starred_file']['name']) == 'starred.json' ? 'true' : 'false'; - } - - if ($doc) { - if (isset($doc['items'])) { - $processed = 0; - - foreach ($doc['items'] as $item) { -// print_r($item); - - $guid = db_escape_string(mb_substr($item['id'], 0, 250)); - $title = db_escape_string($item['title']); - $updated = date('Y-m-d h:i:s', $item['updated']); - $last_marked = date('Y-m-d h:i:s', mb_substr($item['crawlTimeMsec'], 0, 10)); - $link = ''; - $content = ''; - $author = db_escape_string($item['author']); - $tags = array(); - $orig_feed_data = array(); - - if (is_array($item['alternate'])) { - foreach ($item['alternate'] as $alt) { - if (isset($alt['type']) && $alt['type'] == 'text/html') { - $link = db_escape_string($alt['href']); - } - } - } - - if (is_array($item['summary'])) { - $content = db_escape_string( - $item['summary']['content'], false); - } - - if (is_array($item['content'])) { - $content = db_escape_string( - $item['content']['content'], false); - } - - if (is_array($item['categories'])) { - foreach ($item['categories'] as $cat) { - if (strstr($cat, "com.google/") === FALSE) { - array_push($tags, sanitize_tag($cat)); - } - } - } - - if (is_array($item['origin'])) { - if (strpos($item['origin']['streamId'], 'feed/') === 0) { - - $orig_feed_data['feed_url'] = db_escape_string( - mb_substr(preg_replace("/^feed\//", - "", $item['origin']['streamId']), 0, 200)); - - $orig_feed_data['title'] = db_escape_string( - mb_substr($item['origin']['title'], 0, 200)); - - $orig_feed_data['site_url'] = db_escape_string( - mb_substr($item['origin']['htmlUrl'], 0, 200)); - } - } - - $processed++; - - $imported += (int) $this->create_article($owner_uid, $guid, $title, - $link, $updated, $content, $author, $sql_set_marked, $tags, - $orig_feed_data, $last_marked); - - if ($file && $processed % 25 == 0) { - _debug("processed $processed articles..."); - } - } - - if ($file) { - _debug(sprintf("All done. %d of %d articles imported.", $imported, $processed)); - } else { - print "

" . T_sprintf("All done. %d out of %d articles imported.", $imported, $processed) . "

"; - } - - } else { - print_error(__('The document has incorrect format.')); - } - - } else { - print_error(__('Error while parsing document.')); - } - - if (!$file) { - print "
"; - print ""; - print "
"; - } - } - - // expects ESCAPED data - private function create_article($owner_uid, $guid, $title, $link, $updated, $content, $author, $marked, $tags, $orig_feed_data, $last_marked) { - - if (!$guid) $guid = sha1($link); - - $create_archived_feeds = true; - - $guid = "$owner_uid,$guid"; - - $content_hash = sha1($content); - - if (filter_var(FILTER_VALIDATE_URL) === FALSE) return false; - - db_query("BEGIN"); - - $feed_id = 'NULL'; - - // let's check for archived feed entry - - $feed_inserted = false; - - // before dealing with archived feeds we must check ttrss_feeds to maintain id consistency - - if ($orig_feed_data['feed_url'] && $create_archived_feeds) { - $result = db_query( - "SELECT id FROM ttrss_feeds WHERE feed_url = '".$orig_feed_data['feed_url']."' - AND owner_uid = $owner_uid"); - - if (db_num_rows($result) != 0) { - $feed_id = db_fetch_result($result, 0, "id"); - } else { - // let's insert it - - if (!$orig_feed_data['title']) $orig_feed_data['title'] = '[Unknown]'; - - $result = db_query( - "INSERT INTO ttrss_feeds - (owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method) - VALUES ($owner_uid, - '".$orig_feed_data['feed_url']."', - '".$orig_feed_data['site_url']."', - '".$orig_feed_data['title']."', - NULL, '', '', 0)"); - - $result = db_query( - "SELECT id FROM ttrss_feeds WHERE feed_url = '".$orig_feed_data['feed_url']."' - AND owner_uid = $owner_uid"); - - if (db_num_rows($result) != 0) { - $feed_id = db_fetch_result($result, 0, "id"); - $feed_inserted = true; - } - } - } - - if ($feed_id && $feed_id != 'NULL') { - // locate archived entry to file entries in, we don't want to file them in actual feeds because of purging - // maybe file marked in real feeds because eh - - $result = db_query("SELECT id FROM ttrss_archived_feeds WHERE - feed_url = '".$orig_feed_data['feed_url']."' AND owner_uid = $owner_uid"); - - if (db_num_rows($result) != 0) { - $orig_feed_id = db_fetch_result($result, 0, "id"); - } else { - db_query("INSERT INTO ttrss_archived_feeds - (id, owner_uid, title, feed_url, site_url) - SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds - WHERE id = '$feed_id'"); - - $result = db_query("SELECT id FROM ttrss_archived_feeds WHERE - feed_url = '".$orig_feed_data['feed_url']."' AND owner_uid = $owner_uid"); - - if (db_num_rows($result) != 0) { - $orig_feed_id = db_fetch_result($result, 0, "id"); - } - } - } - - // delete temporarily inserted feed - if ($feed_id && $feed_inserted) { - db_query("DELETE FROM ttrss_feeds WHERE id = $feed_id"); - } - - if (!$orig_feed_id) $orig_feed_id = 'NULL'; - - $result = db_query("SELECT id FROM ttrss_entries, ttrss_user_entries WHERE - guid = '$guid' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1"); - - if (db_num_rows($result) == 0) { - $result = db_query("INSERT INTO ttrss_entries - (title, guid, link, updated, content, content_hash, date_entered, date_updated, author) - VALUES - ('$title', '$guid', '$link', '$updated', '$content', '$content_hash', NOW(), NOW(), '$author')"); - - $result = db_query("SELECT id FROM ttrss_entries WHERE guid = '$guid'"); - - if (db_num_rows($result) != 0) { - $ref_id = db_fetch_result($result, 0, "id"); - - db_query("INSERT INTO ttrss_user_entries - (ref_id, uuid, feed_id, orig_feed_id, owner_uid, marked, tag_cache, label_cache, - last_read, note, unread, last_marked) - VALUES - ('$ref_id', '', NULL, $orig_feed_id, $owner_uid, $marked, '', '', '$last_marked', '', false, '$last_marked')"); - - $result = db_query("SELECT int_id FROM ttrss_user_entries, ttrss_entries - WHERE owner_uid = $owner_uid AND ref_id = id AND ref_id = $ref_id"); - - if (db_num_rows($result) != 0 && is_array($tags)) { - - $entry_int_id = db_fetch_result($result, 0, "int_id"); - $tags_to_cache = array(); - - foreach ($tags as $tag) { - - $tag = db_escape_string(sanitize_tag($tag)); - - if (!tag_is_valid($tag)) continue; - - $result = db_query("SELECT id FROM ttrss_tags - WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND - owner_uid = '$owner_uid' LIMIT 1"); - - if ($result && db_num_rows($result) == 0) { - db_query("INSERT INTO ttrss_tags - (owner_uid,tag_name,post_int_id) - VALUES ('$owner_uid','$tag', '$entry_int_id')"); - } - - array_push($tags_to_cache, $tag); - } - - /* update the cache */ - - $tags_to_cache = array_unique($tags_to_cache); - $tags_str = db_escape_string(join(",", $tags_to_cache)); - - db_query("UPDATE ttrss_user_entries - SET tag_cache = '$tags_str' WHERE ref_id = '$ref_id' - AND owner_uid = $owner_uid"); - } - - $rc = true; - } - } - - db_query("COMMIT"); - - return $rc; - } - - function hook_prefs_tab($args) { - if ($args != "prefFeeds") return; - - print "
"; - - print_notice("Your imported articles will appear in Starred (in file is named starred.json) and Archived feeds."); - - print "

".__("Paste your starred.json or shared.json into the form below."). "

"; - - print ""; - - print "
-   - - - - "; - - print "
"; - - print "
"; #pane - } - - function api_version() { - return 2; - } - -} -?> diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php index e61b62b67..7c628909f 100644 --- a/plugins/import_export/init.php +++ b/plugins/import_export/init.php @@ -106,11 +106,13 @@ class Import_Export extends Plugin implements IHandler { if (file_exists($exportname)) { header("Content-type: text/xml"); + $timestamp_suffix = date("Y-m-d", filemtime($exportname)); + if (function_exists('gzencode')) { - header("Content-Disposition: attachment; filename=TinyTinyRSS_exported.xml.gz"); + header("Content-Disposition: attachment; filename=TinyTinyRSS_exported_${timestamp_suffix}.xml.gz"); echo gzencode(file_get_contents($exportname)); } else { - header("Content-Disposition: attachment; filename=TinyTinyRSS_exported.xml"); + header("Content-Disposition: attachment; filename=TinyTinyRSS_exported_${timestamp_suffix}.xml"); echo file_get_contents($exportname); } } else { @@ -239,10 +241,13 @@ class Import_Export extends Plugin implements IHandler { $article = array(); foreach ($article_node->childNodes as $child) { - if ($child->nodeName != 'label_cache') - $article[$child->nodeName] = db_escape_string($child->nodeValue); - else + if ($child->nodeName == 'content') { + $article[$child->nodeName] = db_escape_string($child->nodeValue, false); + } else if ($child->nodeName == 'label_cache') { $article[$child->nodeName] = $child->nodeValue; + } else { + $article[$child->nodeName] = db_escape_string($child->nodeValue); + } } //print_r($article); @@ -348,7 +353,6 @@ class Import_Export extends Plugin implements IHandler { $score = (int) $article['score']; $tag_cache = $article['tag_cache']; - $label_cache = db_escape_string($article['label_cache']); $note = $article['note']; //print "Importing " . $article['title'] . "
"; @@ -361,9 +365,9 @@ class Import_Export extends Plugin implements IHandler { published, score, tag_cache, label_cache, uuid, note) VALUES ($ref_id, $owner_uid, $feed, false, NULL, $marked, $published, $score, '$tag_cache', - '$label_cache', '', '$note')"); + '', '', '$note')"); - $label_cache = json_decode($label_cache, true); + $label_cache = json_decode($article['label_cache'], true); if (is_array($label_cache) && $label_cache["no-labels"] != 1) { foreach ($label_cache as $label) { diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 296049083..0b16eb2ea 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -101,7 +101,7 @@ create table ttrss_feeds (id integer not null auto_increment primary key, icon_url varchar(250) not null default '', update_interval integer not null default 0, purge_interval integer not null default 0, - last_updated datetime default 0, + last_updated datetime default null, last_error varchar(250) not null default '', favicon_avg_color varchar(11) default null, site_url varchar(250) not null default '', @@ -281,7 +281,7 @@ create table ttrss_tags (id integer primary key auto_increment, create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8; -insert into ttrss_version values (129); +insert into ttrss_version values (130); create table ttrss_enclosures (id integer primary key auto_increment, content_url text not null, diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index b53d375cc..237f1d3fb 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -263,7 +263,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id); create table ttrss_version (schema_version int not null); -insert into ttrss_version values (129); +insert into ttrss_version values (130); create table ttrss_enclosures (id serial not null primary key, content_url text not null, diff --git a/schema/versions/mysql/130.sql b/schema/versions/mysql/130.sql new file mode 100644 index 000000000..7b90d4d2c --- /dev/null +++ b/schema/versions/mysql/130.sql @@ -0,0 +1,7 @@ +BEGIN; + +alter table ttrss_feeds alter column last_updated set default null; + +UPDATE ttrss_version SET schema_version = 130; + +COMMIT; diff --git a/schema/versions/pgsql/130.sql b/schema/versions/pgsql/130.sql new file mode 100644 index 000000000..820f0b6a8 --- /dev/null +++ b/schema/versions/pgsql/130.sql @@ -0,0 +1,5 @@ +BEGIN; + +UPDATE ttrss_version SET schema_version = 130; + +COMMIT; diff --git a/update.php b/update.php index 0fa4db0d8..96097c56a 100755 --- a/update.php +++ b/update.php @@ -365,7 +365,7 @@ if (isset($options["list-plugins"])) { $tmppluginhost = new PluginHost(); - $tmppluginhost->load_all($tmppluginhost::KIND_ALL); + $tmppluginhost->load_all($tmppluginhost::KIND_ALL, false); $enabled = array_map("trim", explode(",", PLUGINS)); echo "List of all available plugins:\n";