Merge remote-tracking branch 'origin/master' into german-translation
This commit is contained in:
Heiko Adams
commit
05761788b7
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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 '<link rel="stylesheet" type="text/css" href="css/tt-rss.css"/>';
|
||||
}
|
||||
|
||||
$article = format_article($id, false);
|
||||
$article = format_article($id, false, isset($_REQUEST["zoom"]));
|
||||
print $article['content'];
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1461,8 +1461,10 @@ class Pref_Feeds extends Handler_Protected {
|
|||
|
||||
print "<hr>";
|
||||
|
||||
$opml_export_filename = "TinyTinyRSS_".date("Y-m-d").".opml";
|
||||
|
||||
print "<p>" . __('Filename:') .
|
||||
" <input type=\"text\" id=\"filename\" value=\"TinyTinyRSS.opml\" /> " .
|
||||
" <input type=\"text\" id=\"filename\" value=\"$opml_export_filename\" /> " .
|
||||
__('Include settings') . "<input type=\"checkbox\" id=\"settings\" checked=\"1\"/>";
|
||||
|
||||
print "</p><button dojoType=\"dijit.form.Button\"
|
||||
|
|
|
|||
|
|
@ -43,8 +43,12 @@ class Pref_Filters extends Handler_Protected {
|
|||
return;
|
||||
}
|
||||
|
||||
function testFilterDo() {
|
||||
require_once "include/rssfuncs.php";
|
||||
|
||||
$offset = (int) db_escape_string($_REQUEST["offset"]);
|
||||
$limit = (int) db_escape_string($_REQUEST["limit"]);
|
||||
|
||||
function testFilter() {
|
||||
$filter = array();
|
||||
|
||||
$filter["enabled"] = true;
|
||||
|
|
@ -94,24 +98,14 @@ class Pref_Filters extends Handler_Protected {
|
|||
}
|
||||
}
|
||||
|
||||
$found = 0;
|
||||
$offset = 0;
|
||||
$limit = 30;
|
||||
$started = time();
|
||||
|
||||
print __("Articles matching this filter:");
|
||||
|
||||
require_once "include/rssfuncs.php";
|
||||
|
||||
print "<div class=\"filterTestHolder\">";
|
||||
print "<table width=\"100%\" cellspacing=\"0\" id=\"prefErrorFeedList\">";
|
||||
|
||||
$glue = $filter['match_any_rule'] ? " OR " : " AND ";
|
||||
$scope_qpart = join($glue, $scope_qparts);
|
||||
|
||||
if (!$scope_qpart) $scope_qpart = "true";
|
||||
|
||||
while ($found < $limit && $offset < $limit * 10 && time() - $started < ini_get("max_execution_time") * 0.7) {
|
||||
$rv = array();
|
||||
|
||||
//while ($found < $limit && $offset < $limit * 1000 && time() - $started < ini_get("max_execution_time") * 0.7) {
|
||||
|
||||
$result = db_query("SELECT ttrss_entries.id,
|
||||
ttrss_entries.title,
|
||||
|
|
@ -119,6 +113,7 @@ class Pref_Filters extends Handler_Protected {
|
|||
ttrss_feeds.title AS feed_title,
|
||||
ttrss_feed_categories.id AS cat_id,
|
||||
content,
|
||||
date_entered,
|
||||
link,
|
||||
author,
|
||||
tag_cache
|
||||
|
|
@ -139,7 +134,7 @@ class Pref_Filters extends Handler_Protected {
|
|||
|
||||
if (count($rc) > 0) {
|
||||
|
||||
$line["content_preview"] = truncate_string(strip_tags($line["content"]), 100, '...');
|
||||
$line["content_preview"] = truncate_string(strip_tags($line["content"]), 200, '…');
|
||||
|
||||
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
|
||||
$line = $p->hook_query_headlines($line, 100);
|
||||
|
|
@ -147,16 +142,16 @@ class Pref_Filters extends Handler_Protected {
|
|||
|
||||
$content_preview = $line["content_preview"];
|
||||
|
||||
if ($line["feed_title"]) $feed_title = "(" . $line["feed_title"] . ")";
|
||||
$tmp = "<tr style='margin-top : 5px'>";
|
||||
|
||||
print "<tr>";
|
||||
#$tmp .= "<td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\"
|
||||
# checked=\"1\" disabled=\"1\" type=\"checkbox\"></td>";
|
||||
|
||||
print "<td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\"
|
||||
checked=\"1\" disabled=\"1\" type=\"checkbox\"></td>";
|
||||
print "<td>";
|
||||
$id = $line['id'];
|
||||
$tmp .= "<td width='5%' align='center'><img style='cursor : pointer' title='".__("Preview article")."'
|
||||
src='images/information.png' onclick='openArticlePopup($id)'></td><td>";
|
||||
|
||||
/*foreach ($filter['rules'] as $rule) {
|
||||
$reg_exp = $rule['reg_exp'];
|
||||
$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
|
||||
|
||||
$line["title"] = preg_replace("/($reg_exp)/i",
|
||||
|
|
@ -166,25 +161,42 @@ class Pref_Filters extends Handler_Protected {
|
|||
"<span class=\"highlight\">$1</span>", $content_preview);
|
||||
}*/
|
||||
|
||||
print $line["title"];
|
||||
print "<div class='small' style='float : right'>" . $feed_title . "</div>";
|
||||
print "<div class=\"insensitive\">" . $content_preview . "</div>";
|
||||
print " " . mb_substr($line["date_entered"], 0, 16);
|
||||
$tmp .= "<strong>" . $line["title"] . "</strong><br/>";
|
||||
$tmp .= $line['feed_title'] . ", " . mb_substr($line["date_entered"], 0, 16);
|
||||
$tmp .= "<div class='insensitive'>" . $content_preview . "</div>";
|
||||
$tmp .= "</td></tr>";
|
||||
|
||||
print "</td></tr>";
|
||||
array_push($rv, $tmp);
|
||||
|
||||
/*array_push($rv, array("title" => $line["title"],
|
||||
"content" => $content_preview,
|
||||
"date" => $line["date_entered"],
|
||||
"feed" => $line["feed_title"])); */
|
||||
|
||||
$found++;
|
||||
}
|
||||
}
|
||||
|
||||
$offset += $limit;
|
||||
}
|
||||
//$offset += $limit;
|
||||
//}
|
||||
|
||||
if ($found == 0) {
|
||||
/*if ($found == 0) {
|
||||
print "<tr><td align='center'>" .
|
||||
__("No recent articles matching this filter have been found.");
|
||||
}
|
||||
}*/
|
||||
|
||||
print json_encode($rv);
|
||||
}
|
||||
|
||||
function testFilter() {
|
||||
|
||||
if (isset($_REQUEST["offset"])) return $this->testFilterDo();
|
||||
|
||||
//print __("Articles matching this filter:");
|
||||
|
||||
print "<div><img id='prefFilterLoadingIndicator' src='images/indicator_tiny.gif'> <span id='prefFilterProgressMsg'>Looking for articles...</span></div>";
|
||||
|
||||
print "<br/><div class=\"filterTestHolder\">";
|
||||
print "<table width=\"100%\" cellspacing=\"0\" id=\"prefFilterTestResultList\">";
|
||||
print "</table></div>";
|
||||
|
||||
print "<div style='text-align : center'>";
|
||||
|
|
|
|||
|
|
@ -746,7 +746,7 @@ class Pref_Prefs extends Handler_Protected {
|
|||
$user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS")));
|
||||
|
||||
$tmppluginhost = new PluginHost();
|
||||
$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
|
||||
$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true);
|
||||
$tmppluginhost->load_data(true);
|
||||
|
||||
foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ class RPC extends Handler_Protected {
|
|||
$key = $_REQUEST['key'];
|
||||
$value = str_replace("\n", "<br/>", $_REQUEST['value']);
|
||||
|
||||
set_pref($key, $value, $_SESSION['uid'], $key != 'USER_STYLESHEET');
|
||||
set_pref($key, $value, false, $key != 'USER_STYLESHEET');
|
||||
|
||||
print json_encode(array("param" =>$key, "value" => $value));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
define('EXPECTED_CONFIG_VERSION', 26);
|
||||
define('SCHEMA_VERSION', 129);
|
||||
define('SCHEMA_VERSION', 130);
|
||||
|
||||
define('LABEL_BASE_INDEX', -1024);
|
||||
define('PLUGIN_FEED_BASE_INDEX', -128);
|
||||
|
|
@ -351,16 +351,7 @@
|
|||
|
||||
$fetch_curl_used = true;
|
||||
|
||||
if (ini_get("safe_mode") || ini_get("open_basedir") || defined("FORCE_GETURL")) {
|
||||
$new_url = geturl($url);
|
||||
if (!$new_url) {
|
||||
// geturl has already populated $fetch_last_error
|
||||
return false;
|
||||
}
|
||||
$ch = curl_init($new_url);
|
||||
} else {
|
||||
$ch = curl_init($url);
|
||||
}
|
||||
$ch = curl_init($url);
|
||||
|
||||
if ($timestamp && !$post_query) {
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER,
|
||||
|
|
@ -369,7 +360,7 @@
|
|||
|
||||
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
|
||||
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT);
|
||||
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode") && !ini_get("open_basedir"));
|
||||
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
|
||||
curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
|
||||
curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
||||
|
|
@ -379,7 +370,7 @@
|
|||
curl_setopt($ch, CURLOPT_ENCODING, "");
|
||||
//curl_setopt($ch, CURLOPT_REFERER, $url);
|
||||
|
||||
if (!ini_get("safe_mode") && !ini_get("open_basedir")) {
|
||||
if (!ini_get("open_basedir")) {
|
||||
curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null");
|
||||
}
|
||||
|
||||
|
|
@ -456,7 +447,7 @@
|
|||
'method' => 'GET',
|
||||
'protocol_version'=> 1.1
|
||||
)));
|
||||
}
|
||||
}
|
||||
|
||||
$old_error = error_get_last();
|
||||
|
||||
|
|
@ -1582,7 +1573,8 @@
|
|||
FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
|
||||
(ttrss_labels2.id = label_id)
|
||||
LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id
|
||||
WHERE ttrss_labels2.owner_uid = $owner_uid GROUP BY ttrss_labels2.id,
|
||||
WHERE ttrss_labels2.owner_uid = $owner_uid AND u1.owner_uid = $owner_uid
|
||||
GROUP BY ttrss_labels2.id,
|
||||
ttrss_labels2.caption");
|
||||
|
||||
while ($line = db_fetch_assoc($result)) {
|
||||
|
|
|
|||
|
|
@ -465,7 +465,7 @@
|
|||
$override_vfeed = isset($params["override_vfeed"]) ? $params["override_vfeed"] : false;
|
||||
$start_ts = isset($params["start_ts"]) ? $params["start_ts"] : false;
|
||||
$check_first_id = isset($params["check_first_id"]) ? $params["check_first_id"] : false;
|
||||
$api_request = isset($params["api_request"]) ? $params["api_request"] : false;
|
||||
$skip_first_id_check = isset($params["skip_first_id_check"]) ? $params["skip_first_id_check"] : false;
|
||||
|
||||
$ext_tables_part = "";
|
||||
$query_strategy_part = "";
|
||||
|
|
@ -494,7 +494,6 @@
|
|||
}
|
||||
|
||||
$view_query_part = "";
|
||||
$disable_offsets = false;
|
||||
|
||||
if ($view_mode == "adaptive") {
|
||||
if ($search) {
|
||||
|
|
@ -508,7 +507,6 @@
|
|||
|
||||
if ($unread > 0) {
|
||||
$view_query_part = " unread = true AND ";
|
||||
$disable_offsets = !$api_request && get_pref("CDM_AUTO_CATCHUP") && get_pref("CDM_EXPANDED");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -527,7 +525,6 @@
|
|||
|
||||
if ($view_mode == "unread" && $feed != -6) {
|
||||
$view_query_part = " unread = true AND ";
|
||||
$disable_offsets = !$api_request && get_pref("CDM_AUTO_CATCHUP") && get_pref("CDM_EXPANDED");
|
||||
}
|
||||
|
||||
if ($limit > 0) {
|
||||
|
|
@ -608,9 +605,9 @@
|
|||
$query_strategy_part = "unread = false AND last_read IS NOT NULL";
|
||||
|
||||
if (DB_TYPE == "pgsql") {
|
||||
$query_strategy_part .= " AND date_entered > NOW() - INTERVAL '1 DAY' ";
|
||||
$query_strategy_part .= " AND last_read > NOW() - INTERVAL '1 DAY' ";
|
||||
} else {
|
||||
$query_strategy_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL 1 DAY) ";
|
||||
$query_strategy_part .= " AND last_read > DATE_SUB(NOW(), INTERVAL 1 DAY) ";
|
||||
}
|
||||
|
||||
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
|
||||
|
|
@ -735,7 +732,7 @@
|
|||
$sanity_interval_qpart = "date_entered >= DATE_SUB(NOW(), INTERVAL 1 hour) AND";
|
||||
}
|
||||
|
||||
if (!$search && !$disable_offsets) {
|
||||
if (!$search && !$skip_first_id_check) {
|
||||
// if previous topmost article id changed that means our current pagination is no longer valid
|
||||
$query = "SELECT DISTINCT
|
||||
ttrss_feeds.title,
|
||||
|
|
@ -775,10 +772,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
if ($disable_offsets) {
|
||||
$offset_query_part = "";
|
||||
}
|
||||
|
||||
$query = "SELECT DISTINCT
|
||||
date_entered,
|
||||
guid,
|
||||
|
|
@ -832,6 +825,7 @@
|
|||
marked,
|
||||
num_comments,
|
||||
comments,
|
||||
int_id,
|
||||
tag_cache,
|
||||
label_cache,
|
||||
link,
|
||||
|
|
@ -865,7 +859,7 @@
|
|||
}
|
||||
|
||||
function iframe_whitelisted($entry) {
|
||||
$whitelist = array("youtube.com", "youtu.be", "vimeo.com");
|
||||
$whitelist = array("youtube.com", "youtu.be", "vimeo.com", "player.vimeo.com");
|
||||
|
||||
@$src = parse_url($entry->getAttribute("src"), PHP_URL_HOST);
|
||||
|
||||
|
|
@ -1953,9 +1947,9 @@
|
|||
if (!$hide_images) {
|
||||
$encsize = '';
|
||||
if ($entry['height'] > 0)
|
||||
$encsize .= ' height="' . intval($entry['width']) . '"';
|
||||
$encsize .= ' height="' . intval($entry['height']) . '"';
|
||||
if ($entry['width'] > 0)
|
||||
$encsize .= ' width="' . intval($entry['height']) . '"';
|
||||
$encsize .= ' width="' . intval($entry['width']) . '"';
|
||||
$rv .= "<p><img
|
||||
alt=\"".htmlspecialchars($entry["filename"])."\"
|
||||
src=\"" .htmlspecialchars($entry["url"]) . "\"
|
||||
|
|
@ -2256,77 +2250,6 @@
|
|||
return in_array($interface, class_implements($class));
|
||||
}
|
||||
|
||||
function geturl($url, $depth = 0, $nobody = true){
|
||||
|
||||
if ($depth == 20) return $url;
|
||||
|
||||
if (!function_exists('curl_init'))
|
||||
return user_error('CURL Must be installed for geturl function to work. Ask your host to enable it or uncomment extension=php_curl.dll in php.ini', E_USER_ERROR);
|
||||
|
||||
$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_NOBODY, $nobody);
|
||||
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);
|
||||
|
||||
if (defined('_CURL_HTTP_PROXY')) {
|
||||
curl_setopt($curl, CURLOPT_PROXY, _CURL_HTTP_PROXY);
|
||||
}
|
||||
|
||||
$html = curl_exec($curl);
|
||||
|
||||
$status = curl_getinfo($curl);
|
||||
|
||||
if($status['http_code']!=200){
|
||||
|
||||
// idiot site not allowing http head
|
||||
if($status['http_code'] == 405) {
|
||||
curl_close($curl);
|
||||
return geturl($url, $depth +1, false);
|
||||
}
|
||||
|
||||
if($status['http_code'] == 301 || $status['http_code'] == 302) {
|
||||
curl_close($curl);
|
||||
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, $depth + 1):'';
|
||||
}
|
||||
|
||||
global $fetch_last_error;
|
||||
|
||||
$fetch_last_error = curl_errno($curl) . " " . curl_error($curl);
|
||||
curl_close($curl);
|
||||
|
||||
# $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;
|
||||
}
|
||||
curl_close($curl);
|
||||
return $url;
|
||||
}
|
||||
|
||||
function get_minified_js($files) {
|
||||
require_once 'lib/jshrink/Minifier.php';
|
||||
|
||||
|
|
|
|||
|
|
@ -134,14 +134,10 @@
|
|||
array_push($errors, "PHP support for hash() function is required but was not found.");
|
||||
}
|
||||
|
||||
if (!function_exists("ctype_lower")) {
|
||||
array_push($errors, "PHP support for ctype functions are required by HTMLPurifier.");
|
||||
if (ini_get("safe_mode")) {
|
||||
array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
|
||||
}
|
||||
|
||||
/* if (ini_get("safe_mode")) {
|
||||
array_push($errors, "PHP safe mode setting is not supported.");
|
||||
} */
|
||||
|
||||
if ((PUBSUBHUBBUB_HUB || PUBSUBHUBBUB_ENABLED) && !function_exists("curl_init")) {
|
||||
array_push($errors, "PHP support for CURL is required for PubSubHubbub.");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<?php # This file has been generated at: Fri, Jun 19, 2015 10:11:43 AM
|
||||
<?php # This file has been generated at: Fri Aug 21 19:34:46 MSK 2015
|
||||
define('GENERATED_CONFIG_CHECK', 26);
|
||||
$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'SMTP_SECURE', 'CHECK_FOR_UPDATES', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?>
|
||||
|
|
|
|||
|
|
@ -67,17 +67,13 @@
|
|||
array_push($errors, "PHP support for hash() function is required but was not found.");
|
||||
}
|
||||
|
||||
if (!function_exists("ctype_lower")) {
|
||||
array_push($errors, "PHP support for ctype functions are required by HTMLPurifier.");
|
||||
}
|
||||
|
||||
if (!function_exists("iconv")) {
|
||||
array_push($errors, "PHP support for iconv is required to handle multiple charsets.");
|
||||
}
|
||||
|
||||
/* if (ini_get("safe_mode")) {
|
||||
array_push($errors, "PHP safe mode setting is not supported.");
|
||||
} */
|
||||
if (ini_get("safe_mode")) {
|
||||
array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
|
||||
}
|
||||
|
||||
if (!class_exists("DOMDocument")) {
|
||||
array_push($errors, "PHP support for DOMDocument is required, but was not found.");
|
||||
|
|
@ -329,6 +325,10 @@
|
|||
array_push($notices, "It is highly recommended to enable support for CURL in PHP.");
|
||||
}
|
||||
|
||||
if (function_exists("curl_init") && ini_get("open_basedir")) {
|
||||
array_push($notices, "CURL and open_basedir combination breaks support for HTTP redirects. See the FAQ for more information.");
|
||||
}
|
||||
|
||||
if (count($notices) > 0) {
|
||||
print_notice("Configuration check succeeded with minor problems:");
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,8 @@ function loadMoreHeadlines() {
|
|||
offset = unread_in_buffer;
|
||||
} else if (_search_query) {
|
||||
offset = num_all;
|
||||
} else if (view_mode == "adaptive") {
|
||||
} else if (view_mode == "adaptive" && !(getActiveFeedId() == -1 && !activeFeedIsCat())) {
|
||||
// ^ starred feed shows both unread & read articles in adaptive mode
|
||||
offset = num_unread > 0 ? unread_in_buffer : num_all;
|
||||
} else {
|
||||
offset = num_all;
|
||||
|
|
@ -59,6 +60,7 @@ function viewfeed(params) {
|
|||
var infscroll_req = params.infscroll_req;
|
||||
var can_wait = params.can_wait;
|
||||
var viewfeed_debug = params.viewfeed_debug;
|
||||
var method = params.method;
|
||||
|
||||
if (is_cat == undefined)
|
||||
is_cat = false;
|
||||
|
|
@ -102,6 +104,8 @@ function viewfeed(params) {
|
|||
var query = "?op=feeds&method=view&feed=" + param_escape(feed) + "&" +
|
||||
toolbar_query;
|
||||
|
||||
if (method) query += "&m=" + param_escape(method);
|
||||
|
||||
if (offset > 0) {
|
||||
if (current_first_id) {
|
||||
query = query + "&fid=" + param_escape(current_first_id);
|
||||
|
|
@ -123,7 +127,7 @@ function viewfeed(params) {
|
|||
query = query + "&vgrlf=" + param_escape(vgroup_last_feed);
|
||||
}
|
||||
} else {
|
||||
if (!is_cat && feed == getActiveFeedId()) {
|
||||
if (!is_cat && feed == getActiveFeedId() && !params.method) {
|
||||
query = query + "&m=ForceUpdate";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1051,6 +1051,100 @@ function addFilterAction(replaceNode, actionStr) {
|
|||
}
|
||||
}
|
||||
|
||||
function editFilterTest(query) {
|
||||
try {
|
||||
|
||||
if (dijit.byId("filterTestDlg"))
|
||||
dijit.byId("filterTestDlg").destroyRecursive();
|
||||
|
||||
var test_dlg = new dijit.Dialog({
|
||||
id: "filterTestDlg",
|
||||
title: "Test Filter",
|
||||
style: "width: 600px",
|
||||
results: 0,
|
||||
limit: 100,
|
||||
max_offset: 10000,
|
||||
getTestResults: function(query, offset) {
|
||||
var updquery = query + "&offset=" + offset + "&limit=" + test_dlg.limit;
|
||||
|
||||
console.log("getTestResults:" + offset);
|
||||
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: updquery,
|
||||
onComplete: function (transport) {
|
||||
try {
|
||||
var result = JSON.parse(transport.responseText);
|
||||
|
||||
if (result && dijit.byId("filterTestDlg") && dijit.byId("filterTestDlg").open) {
|
||||
test_dlg.results += result.size();
|
||||
|
||||
console.log("got results:" + result.size());
|
||||
|
||||
$("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...")
|
||||
.replace("%f", test_dlg.results)
|
||||
.replace("%d", offset);
|
||||
|
||||
console.log(offset + " " + test_dlg.max_offset);
|
||||
|
||||
for (var i = 0; i < result.size(); i++) {
|
||||
var tmp = new Element("table");
|
||||
tmp.innerHTML = result[i];
|
||||
dojo.parser.parse(tmp);
|
||||
|
||||
$("prefFilterTestResultList").innerHTML += tmp.innerHTML;
|
||||
}
|
||||
|
||||
if (test_dlg.results < 30 && offset < test_dlg.max_offset) {
|
||||
|
||||
// get the next batch
|
||||
window.setTimeout(function () {
|
||||
test_dlg.getTestResults(query, offset + test_dlg.limit);
|
||||
}, 0);
|
||||
|
||||
} else {
|
||||
// all done
|
||||
|
||||
Element.hide("prefFilterLoadingIndicator");
|
||||
|
||||
if (test_dlg.results == 0) {
|
||||
$("prefFilterTestResultList").innerHTML = "<tr><td align='center'>No recent articles matching this filter have been found.</td></tr>";
|
||||
$("prefFilterProgressMsg").innerHTML = "Articles matching this filter:";
|
||||
} else {
|
||||
$("prefFilterProgressMsg").innerHTML = __("Found %d articles matching this filter:")
|
||||
.replace("%d", test_dlg.results);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
} else if (!result) {
|
||||
console.log("getTestResults: can't parse results object");
|
||||
|
||||
Element.hide("prefFilterLoadingIndicator");
|
||||
|
||||
notify_error("Error while trying to get filter test results.");
|
||||
|
||||
} else {
|
||||
console.log("getTestResults: dialog closed, bailing out.");
|
||||
}
|
||||
} catch (e) {
|
||||
exception_error("editFilterTest/inner", e);
|
||||
}
|
||||
|
||||
} });
|
||||
},
|
||||
href: query});
|
||||
|
||||
dojo.connect(test_dlg, "onLoad", null, function(e) {
|
||||
test_dlg.getTestResults(query, 0);
|
||||
});
|
||||
|
||||
test_dlg.show();
|
||||
|
||||
} catch (e) {
|
||||
exception_error("editFilterTest", e);
|
||||
}
|
||||
}
|
||||
|
||||
function quickAddFilter() {
|
||||
try {
|
||||
var query = "";
|
||||
|
|
@ -1077,16 +1171,7 @@ function quickAddFilter() {
|
|||
test: function() {
|
||||
var query = "backend.php?" + dojo.formToQuery("filter_new_form") + "&savemode=test";
|
||||
|
||||
if (dijit.byId("filterTestDlg"))
|
||||
dijit.byId("filterTestDlg").destroyRecursive();
|
||||
|
||||
var test_dlg = new dijit.Dialog({
|
||||
id: "filterTestDlg",
|
||||
title: "Test Filter",
|
||||
style: "width: 600px",
|
||||
href: query});
|
||||
|
||||
test_dlg.show();
|
||||
editFilterTest(query);
|
||||
},
|
||||
selectRules: function(select) {
|
||||
$$("#filterDlg_Matches input[type=checkbox]").each(function(e) {
|
||||
|
|
@ -1968,3 +2053,10 @@ function getSelectionText() {
|
|||
|
||||
return text.stripTags();
|
||||
}
|
||||
|
||||
function openArticlePopup(id) {
|
||||
window.open("backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id +
|
||||
"&csrf_token=" + getInitParam("csrf_token"),
|
||||
"ttrss_article_popup",
|
||||
"height=900,width=900,resizable=yes,status=no,location=no,menubar=no,directories=no,scrollbars=yes,toolbar=no");
|
||||
}
|
||||
|
|
@ -146,19 +146,11 @@ function editFilter(id) {
|
|||
id: "filterEditDlg",
|
||||
title: __("Edit Filter"),
|
||||
style: "width: 600px",
|
||||
|
||||
test: function() {
|
||||
var query = "backend.php?" + dojo.formToQuery("filter_edit_form") + "&savemode=test";
|
||||
|
||||
if (dijit.byId("filterTestDlg"))
|
||||
dijit.byId("filterTestDlg").destroyRecursive();
|
||||
|
||||
var test_dlg = new dijit.Dialog({
|
||||
id: "filterTestDlg",
|
||||
title: "Test Filter",
|
||||
style: "width: 600px",
|
||||
href: query});
|
||||
|
||||
test_dlg.show();
|
||||
editFilterTest(query);
|
||||
},
|
||||
selectRules: function(select) {
|
||||
$$("#filterDlg_Matches input[type=checkbox]").each(function(e) {
|
||||
|
|
|
|||
|
|
@ -146,11 +146,11 @@ function catchupAllFeeds() {
|
|||
}
|
||||
}
|
||||
|
||||
function viewCurrentFeed() {
|
||||
console.log("viewCurrentFeed");
|
||||
function viewCurrentFeed(method) {
|
||||
console.log("viewCurrentFeed: " + method);
|
||||
|
||||
if (getActiveFeedId() != undefined) {
|
||||
viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat()});
|
||||
viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), method: method});
|
||||
}
|
||||
return false; // block unneeded form submits
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,13 +92,29 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
|
|||
reply['headlines']['toolbar'],
|
||||
{parseContent: true});
|
||||
|
||||
dojo.html.set($("headlines-frame"),
|
||||
/*dojo.html.set($("headlines-frame"),
|
||||
reply['headlines']['content'],
|
||||
{parseContent: true});
|
||||
|
||||
$$("#headlines-frame div[id*='RROW']").each(function(row) {
|
||||
loaded_article_ids.push(row.id);
|
||||
});
|
||||
});*/
|
||||
|
||||
$("headlines-frame").innerHTML = '';
|
||||
|
||||
var tmp = new Element("div");
|
||||
tmp.innerHTML = reply['headlines']['content'];
|
||||
dojo.parser.parse(tmp);
|
||||
|
||||
while (tmp.hasChildNodes()) {
|
||||
var row = tmp.removeChild(tmp.firstChild);
|
||||
|
||||
if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
|
||||
dijit.byId("headlines-frame").domNode.appendChild(row);
|
||||
|
||||
loaded_article_ids.push(row.id);
|
||||
}
|
||||
}
|
||||
|
||||
var hsp = $("headlines-spacer");
|
||||
if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
|
||||
|
|
@ -138,8 +154,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
|
|||
|
||||
if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
|
||||
dijit.byId("headlines-frame").domNode.appendChild(row);
|
||||
//Element.hide(row);
|
||||
//new Effect.Appear(row, {duration:0.5});
|
||||
|
||||
loaded_article_ids.push(row.id);
|
||||
}
|
||||
}
|
||||
|
|
@ -2185,6 +2200,12 @@ function initHeadlinesMenu() {
|
|||
catchupFeedInGroup(menu.callerRowId);
|
||||
}}));
|
||||
|
||||
menu.addChild(new dijit.MenuItem({
|
||||
label: __("Edit feed"),
|
||||
onClick: function(event) {
|
||||
editFeed(menu.callerRowId);
|
||||
}}));
|
||||
|
||||
menu.startup();
|
||||
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
2433
messages.pot
2433
messages.pot
File diff suppressed because it is too large
Load Diff
|
|
@ -2,7 +2,7 @@
|
|||
class Af_Comics_ComicPress extends Af_ComicFilter {
|
||||
|
||||
function supported() {
|
||||
return array("Buni", "Buttersafe", "Whomp!", "Happy Jar", "CSection",
|
||||
return array("Buni", "Buttersafe", "Happy Jar", "CSection",
|
||||
"Extra Fabulous Comics");
|
||||
}
|
||||
|
||||
|
|
@ -11,7 +11,6 @@ class Af_Comics_ComicPress extends Af_ComicFilter {
|
|||
|
||||
if (strpos($article["guid"], "bunicomic.com") !== FALSE ||
|
||||
strpos($article["guid"], "buttersafe.com") !== FALSE ||
|
||||
strpos($article["guid"], "whompcomic.com") !== FALSE ||
|
||||
strpos($article["guid"], "extrafabulouscomics.com") !== FALSE ||
|
||||
strpos($article["guid"], "happyjar.com") !== FALSE ||
|
||||
strpos($article["guid"], "csectioncomics.com") !== FALSE) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
<?php
|
||||
class Af_Comics_Whomp extends Af_ComicFilter {
|
||||
|
||||
function supported() {
|
||||
return array("Whomp!");
|
||||
}
|
||||
|
||||
function process(&$article) {
|
||||
if (strpos($article["guid"], "whompcomic.com") !== FALSE) {
|
||||
|
||||
$res = fetch_file_contents($article["link"], false, false, false,
|
||||
false, false, 0,
|
||||
"Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)");
|
||||
|
||||
global $fetch_last_error_content;
|
||||
|
||||
if (!$res && $fetch_last_error_content)
|
||||
$res = $fetch_last_error_content;
|
||||
|
||||
$doc = new DOMDocument();
|
||||
|
||||
if (@$doc->loadHTML($res)) {
|
||||
$xpath = new DOMXPath($doc);
|
||||
$basenode = $xpath->query('//img[@id="cc-comic"]')->item(0);
|
||||
|
||||
if ($basenode) {
|
||||
$article["content"] = $doc->saveXML($basenode);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -100,14 +100,15 @@ class Af_Readability extends Plugin {
|
|||
|
||||
if (!class_exists("Readability")) require_once(dirname(dirname(__DIR__)). "/lib/readability/Readability.php");
|
||||
|
||||
if (function_exists("curl_init")) {
|
||||
if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) {
|
||||
|
||||
$ch = curl_init($article["link"]);
|
||||
|
||||
curl_setopt($ch, CURLOPT_TIMEOUT, 5);
|
||||
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);
|
||||
|
|
@ -119,7 +120,7 @@ class Af_Readability extends Plugin {
|
|||
|
||||
$tmp = fetch_file_contents($article["link"]);
|
||||
|
||||
if ($tmp) {
|
||||
if ($tmp && mb_strlen($tmp) < 65535 * 4) {
|
||||
$tmpdoc = new DOMDocument("1.0", "UTF-8");
|
||||
|
||||
if (!$tmpdoc->loadHTML($tmp))
|
||||
|
|
|
|||
|
|
@ -88,9 +88,8 @@ class Af_RedditImgur extends Plugin {
|
|||
|
||||
if ($tmp) {
|
||||
$tmpdoc = new DOMDocument();
|
||||
@$tmpdoc->loadHTML($tmp);
|
||||
|
||||
if ($tmpdoc) {
|
||||
if (@$tmpdoc->loadHTML($tmp)) {
|
||||
$tmpxpath = new DOMXPath($tmpdoc);
|
||||
|
||||
$source_meta = $tmpxpath->query("//meta[@name='twitter:player:stream' and contains(@content, '.mp4')]")->item(0);
|
||||
|
|
@ -177,9 +176,8 @@ class Af_RedditImgur extends Plugin {
|
|||
|
||||
if ($album_content) {
|
||||
$adoc = new DOMDocument();
|
||||
@$adoc->loadHTML($album_content);
|
||||
|
||||
if ($adoc) {
|
||||
if (@$adoc->loadHTML($album_content)) {
|
||||
$axpath = new DOMXPath($adoc);
|
||||
$aentries = $axpath->query("//meta[@property='og:image']");
|
||||
$urls = array();
|
||||
|
|
@ -208,6 +206,20 @@ class Af_RedditImgur extends Plugin {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// wtf is this even
|
||||
if (preg_match("/^https?:\/\/gyazo\.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {
|
||||
$img_id = $matches[1];
|
||||
|
||||
$img = $doc->createElement('img');
|
||||
$img->setAttribute("src", "https://i.gyazo.com/$img_id.jpg");
|
||||
|
||||
$br = $doc->createElement('br');
|
||||
$entry->parentNode->insertBefore($img, $entry);
|
||||
$entry->parentNode->insertBefore($br, $entry);
|
||||
|
||||
$found = true;
|
||||
}
|
||||
}
|
||||
|
||||
// remove tiny thumbnails
|
||||
|
|
@ -232,7 +244,7 @@ class Af_RedditImgur extends Plugin {
|
|||
|
||||
$found = $this->inline_stuff($article, $doc, $xpath);
|
||||
|
||||
if (function_exists("curl_init") && !$found && $this->host->get($this, "enable_readability") &&
|
||||
if (!defined('NO_CURL') && function_exists("curl_init") && !$found && $this->host->get($this, "enable_readability") &&
|
||||
mb_strlen(strip_tags($article["content"])) <= 150) {
|
||||
|
||||
if (!class_exists("Readability")) require_once(dirname(dirname(__DIR__)). "/lib/readability/Readability.php");
|
||||
|
|
@ -250,8 +262,7 @@ class Af_RedditImgur 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, !ini_get("open_basedir"));
|
||||
curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
|
||||
|
||||
@$result = curl_exec($ch);
|
||||
|
|
@ -261,7 +272,10 @@ class Af_RedditImgur extends Plugin {
|
|||
|
||||
$tmp = fetch_file_contents($content_link->getAttribute("href"));
|
||||
|
||||
if ($tmp) {
|
||||
//_debug("tmplen: " . mb_strlen($tmp));
|
||||
|
||||
if ($tmp && mb_strlen($tmp) < 65535 * 4) {
|
||||
|
||||
$r = new Readability($tmp, $content_link->getAttribute("href"));
|
||||
|
||||
if ($r->init()) {
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 541 B |
|
|
@ -1,81 +0,0 @@
|
|||
function bayesTrain(id, train_up, event) {
|
||||
try {
|
||||
|
||||
event.stopPropagation();
|
||||
|
||||
var query = "backend.php?op=pluginhandler&plugin=af_sort_bayes&method=trainArticle&article_id=" + param_escape(id) +
|
||||
"&train_up=" + param_escape(train_up);
|
||||
|
||||
notify_progress("Loading, please wait...");
|
||||
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: query,
|
||||
onComplete: function(transport) {
|
||||
notify(transport.responseText);
|
||||
updateScore(id);
|
||||
} });
|
||||
|
||||
} catch (e) {
|
||||
exception_error("showTrgmRelated", e);
|
||||
}
|
||||
}
|
||||
|
||||
function bayesClearDatabase() {
|
||||
try {
|
||||
|
||||
if (confirm(__("Clear classifier database?"))) {
|
||||
|
||||
var query = "backend.php?op=pluginhandler&plugin=af_sort_bayes&method=clearDatabase";
|
||||
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: query,
|
||||
onComplete: function (transport) {
|
||||
notify(transport.responseText);
|
||||
bayesUpdateUI();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
exception_error("showTrgmRelated", e);
|
||||
}
|
||||
}
|
||||
|
||||
function bayesUpdateUI() {
|
||||
try {
|
||||
|
||||
var query = "backend.php?op=pluginhandler&plugin=af_sort_bayes&method=renderPrefsUI";
|
||||
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: query,
|
||||
onComplete: function (transport) {
|
||||
dijit.byId("af_sort_bayes_prefs").attr("content", transport.responseText);
|
||||
}
|
||||
});
|
||||
|
||||
} catch (e) {
|
||||
exception_error("showTrgmRelated", e);
|
||||
}
|
||||
}
|
||||
|
||||
function bayesShow(id) {
|
||||
try {
|
||||
if (dijit.byId("bayesShowDlg"))
|
||||
dijit.byId("bayesShowDlg").destroyRecursive();
|
||||
|
||||
var query = "backend.php?op=pluginhandler&plugin=af_sort_bayes&method=showArticleStats&article_id=" + param_escape(id);
|
||||
|
||||
dialog = new dijit.Dialog({
|
||||
id: "bayesShowDlg",
|
||||
title: __("Classifier information"),
|
||||
style: "width: 600px",
|
||||
href: query});
|
||||
|
||||
dialog.show();
|
||||
|
||||
} catch (e) {
|
||||
exception_error("shareArticle", e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,413 +0,0 @@
|
|||
<?php
|
||||
|
||||
class Af_Sort_Bayes extends Plugin {
|
||||
|
||||
private $host;
|
||||
private $filters = array();
|
||||
private $dbh;
|
||||
private $score_modifier = 50;
|
||||
private $sql_prefix = "ttrss_plugin_af_sort_bayes";
|
||||
private $auto_categorize_threshold = 10000;
|
||||
private $max_document_length = 3000; // classifier can't rescale output for very long strings apparently
|
||||
|
||||
function about() {
|
||||
return array(1.0,
|
||||
"Bayesian classifier for tt-rss (WIP)",
|
||||
"fox");
|
||||
}
|
||||
|
||||
function init($host) {
|
||||
require_once __DIR__ . "/lib/class.naivebayesian.php";
|
||||
//require_once __DIR__ . "/lib/class.naivebayesian_ngram.php";
|
||||
require_once __DIR__ . "/lib/class.naivebayesianstorage.php";
|
||||
|
||||
$this->host = $host;
|
||||
$this->dbh = Db::get();
|
||||
|
||||
$this->init_database();
|
||||
|
||||
$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
|
||||
$host->add_hook($host::HOOK_PREFS_TAB, $this);
|
||||
$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
|
||||
|
||||
}
|
||||
|
||||
function trainArticle() {
|
||||
$article_id = (int) $_REQUEST["article_id"];
|
||||
$train_up = sql_bool_to_bool($_REQUEST["train_up"]);
|
||||
|
||||
//$category = $train_up ? "GOOD" : "UGLY";
|
||||
$dst_category = "UGLY";
|
||||
|
||||
$nbs = new NaiveBayesianStorage($_SESSION["uid"]);
|
||||
$nb = new NaiveBayesian($nbs);
|
||||
|
||||
$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);
|
||||
$score = $this->dbh->fetch_result($result, 0, "score");
|
||||
|
||||
$this->dbh->query("BEGIN");
|
||||
|
||||
$ref = $nbs->getReference($guid, false);
|
||||
|
||||
if (isset($ref['category_id'])) {
|
||||
$current_category = $nbs->getCategoryById($ref['category_id']);
|
||||
} else {
|
||||
$current_category = "UGLY";
|
||||
}
|
||||
|
||||
// set score to fixed value for now
|
||||
|
||||
if ($train_up) {
|
||||
switch ($current_category) {
|
||||
case "UGLY":
|
||||
$dst_category = "GOOD";
|
||||
$score = $this->score_modifier;
|
||||
break;
|
||||
case "BAD":
|
||||
$dst_category = "UGLY";
|
||||
$score = 0;
|
||||
break;
|
||||
case "GOOD":
|
||||
$dst_category = "GOOD";
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
switch ($current_category) {
|
||||
case "UGLY":
|
||||
$dst_category = "BAD";
|
||||
$score = -$this->score_modifier;
|
||||
break;
|
||||
case "BAD":
|
||||
$dst_category = "BAD";
|
||||
break;
|
||||
case "GOOD":
|
||||
$dst_category = "UGLY";
|
||||
$score = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$nb->untrain($guid, $content);
|
||||
$nb->train($guid, $nbs->getCategoryByName($dst_category), $content);
|
||||
|
||||
$this->dbh->query("UPDATE ttrss_user_entries SET score = '$score' WHERE ref_id = $article_id AND owner_uid = " . $_SESSION["uid"]);
|
||||
|
||||
$nb->updateProbabilities();
|
||||
|
||||
$this->dbh->query("COMMIT");
|
||||
|
||||
}
|
||||
|
||||
print "$article_id :: $dst_category :: $score";
|
||||
}
|
||||
|
||||
function get_js() {
|
||||
return file_get_contents(__DIR__ . "/init.js");
|
||||
}
|
||||
|
||||
function get_prefs_js() {
|
||||
return file_get_contents(__DIR__ . "/init.js");
|
||||
}
|
||||
|
||||
function hook_article_button($line) {
|
||||
return "<img src=\"plugins/af_sort_bayes/thumb_up.png\"
|
||||
style=\"cursor : pointer\" style=\"cursor : pointer\"
|
||||
onclick=\"bayesTrain(".$line["id"].", true, event)\"
|
||||
class='tagsPic' title='".__('+1')."'>" .
|
||||
"<img src=\"plugins/af_sort_bayes/thumb_down.png\"
|
||||
style=\"cursor : pointer\" style=\"cursor : pointer\"
|
||||
onclick=\"bayesTrain(".$line["id"].", false, event)\"
|
||||
class='tagsPic' title='".__('-1')."'>" .
|
||||
"<img src=\"plugins/af_sort_bayes/chart_bar.png\"
|
||||
style=\"cursor : pointer\" style=\"cursor : pointer\"
|
||||
onclick=\"bayesShow(".$line["id"].")\"
|
||||
class='tagsPic' title='".__('Show classifier info')."'>";
|
||||
|
||||
}
|
||||
|
||||
function init_database() {
|
||||
$prefix = $this->sql_prefix;
|
||||
|
||||
// TODO there probably should be a way for plugins to determine their schema version to upgrade tables
|
||||
|
||||
/*$this->dbh->query("DROP TABLE IF EXISTS ${prefix}_wordfreqs", false);
|
||||
$this->dbh->query("DROP TABLE IF EXISTS ${prefix}_references", false);
|
||||
$this->dbh->query("DROP TABLE IF EXISTS ${prefix}_categories", false);*/
|
||||
|
||||
$this->dbh->query("BEGIN");
|
||||
|
||||
// PG only for the time being
|
||||
|
||||
if (DB_TYPE == "mysql") {
|
||||
|
||||
$this->dbh->query("CREATE TABLE IF NOT EXISTS ${prefix}_categories (
|
||||
id INTEGER NOT NULL PRIMARY KEY auto_increment,
|
||||
category varchar(100) NOT NULL DEFAULT '',
|
||||
probability DOUBLE NOT NULL DEFAULT '0',
|
||||
owner_uid INTEGER NOT NULL,
|
||||
FOREIGN KEY (owner_uid) REFERENCES ttrss_users(id) ON DELETE CASCADE,
|
||||
word_count BIGINT NOT NULL DEFAULT '0') ENGINE=InnoDB");
|
||||
|
||||
$this->dbh->query("CREATE TABLE IF NOT EXISTS ${prefix}_references (
|
||||
id INTEGER NOT NULL PRIMARY KEY auto_increment,
|
||||
document_id VARCHAR(255) NOT NULL,
|
||||
category_id INTEGER NOT NULL,
|
||||
FOREIGN KEY (category_id) REFERENCES ${prefix}_categories(id) ON DELETE CASCADE,
|
||||
owner_uid INTEGER NOT NULL,
|
||||
FOREIGN KEY (owner_uid) REFERENCES ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB");
|
||||
|
||||
$this->dbh->query("CREATE TABLE IF NOT EXISTS ${prefix}_wordfreqs (
|
||||
word varchar(100) NOT NULL DEFAULT '',
|
||||
category_id INTEGER NOT NULL,
|
||||
FOREIGN KEY (category_id) REFERENCES ${prefix}_categories(id) ON DELETE CASCADE,
|
||||
owner_uid INTEGER NOT NULL,
|
||||
FOREIGN KEY (owner_uid) REFERENCES ttrss_users(id) ON DELETE CASCADE,
|
||||
count BIGINT NOT NULL DEFAULT '0') ENGINE=InnoDB");
|
||||
|
||||
|
||||
} else {
|
||||
$this->dbh->query("CREATE TABLE IF NOT EXISTS ${prefix}_categories (
|
||||
id SERIAL NOT NULL PRIMARY KEY,
|
||||
category varchar(100) NOT NULL DEFAULT '',
|
||||
probability DOUBLE PRECISION NOT NULL DEFAULT '0',
|
||||
owner_uid INTEGER NOT NULL REFERENCES ttrss_users(id) ON DELETE CASCADE,
|
||||
word_count BIGINT NOT NULL DEFAULT '0')");
|
||||
|
||||
$this->dbh->query("CREATE TABLE IF NOT EXISTS ${prefix}_references (
|
||||
id SERIAL NOT NULL PRIMARY KEY,
|
||||
document_id VARCHAR(255) NOT NULL,
|
||||
category_id INTEGER NOT NULL REFERENCES ${prefix}_categories(id) ON DELETE CASCADE,
|
||||
owner_uid INTEGER NOT NULL REFERENCES ttrss_users(id) ON DELETE CASCADE)");
|
||||
|
||||
$this->dbh->query("CREATE TABLE IF NOT EXISTS ${prefix}_wordfreqs (
|
||||
word varchar(100) NOT NULL DEFAULT '',
|
||||
category_id INTEGER NOT NULL REFERENCES ${prefix}_categories(id) ON DELETE CASCADE,
|
||||
owner_uid INTEGER NOT NULL REFERENCES ttrss_users(id) ON DELETE CASCADE,
|
||||
count BIGINT NOT NULL DEFAULT '0')");
|
||||
}
|
||||
|
||||
$owner_uid = @$_SESSION["uid"];
|
||||
|
||||
if ($owner_uid) {
|
||||
$result = $this->dbh->query("SELECT id FROM ${prefix}_categories WHERE owner_uid = $owner_uid LIMIT 1");
|
||||
|
||||
if ($this->dbh->num_rows($result) == 0) {
|
||||
$this->dbh->query("INSERT INTO ${prefix}_categories (category, owner_uid) VALUES ('GOOD', $owner_uid)");
|
||||
$this->dbh->query("INSERT INTO ${prefix}_categories (category, owner_uid) VALUES ('BAD', $owner_uid)");
|
||||
$this->dbh->query("INSERT INTO ${prefix}_categories (category, owner_uid) VALUES ('UGLY', $owner_uid)");
|
||||
}
|
||||
}
|
||||
|
||||
$this->dbh->query("COMMIT");
|
||||
}
|
||||
|
||||
function renderPrefsUI() {
|
||||
$result = $this->dbh->query("SELECT category, probability, word_count,
|
||||
(SELECT COUNT(id) FROM {$this->sql_prefix}_references WHERE
|
||||
category_id = {$this->sql_prefix}_categories.id) as doc_count
|
||||
FROM {$this->sql_prefix}_categories WHERE owner_uid = " . $_SESSION["uid"]);
|
||||
|
||||
print "<h3>" . __("Statistics") . "</h3>";
|
||||
|
||||
print "<p>".T_sprintf("Required UGLY word count for automatic matching: %d", $this->auto_categorize_threshold)."</p>";
|
||||
|
||||
print "<table>";
|
||||
print "<tr><th>Category</th><th>Probability</th><th>Words</th><th>Articles</th></tr>";
|
||||
|
||||
while ($line = $this->dbh->fetch_assoc($result)) {
|
||||
print "<tr>";
|
||||
foreach ($line as $k => $v) {
|
||||
if ($k == "probability") $v = sprintf("%.3f", $v);
|
||||
|
||||
print "<td>$v</td>";
|
||||
}
|
||||
print "</tr>";
|
||||
}
|
||||
|
||||
print "</table>";
|
||||
|
||||
print "<h3>" . __("Last matched articles") . "</h3>";
|
||||
|
||||
$result = $this->dbh->query("SELECT te.title, category, tf.title AS feed_title
|
||||
FROM ttrss_entries AS te, ttrss_user_entries AS tu, ttrss_feeds AS tf, {$this->sql_prefix}_references AS tr, {$this->sql_prefix}_categories AS tc
|
||||
WHERE tf.id = tu.feed_id AND tu.ref_id = te.id AND tc.id = tr.category_id AND tr.document_id = te.guid ORDER BY te.id DESC LIMIT 20");
|
||||
|
||||
print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">";
|
||||
|
||||
while ($line = $this->dbh->fetch_assoc($result)) {
|
||||
print "<li>" . $line["category"] . ": " . $line["title"] . " (" . $line["feed_title"] . ")</li>";
|
||||
}
|
||||
|
||||
print "</ul>";
|
||||
|
||||
print "<button dojoType=\"dijit.form.Button\" onclick=\"return bayesUpdateUI()\">".
|
||||
__('Refresh')."</button> ";
|
||||
|
||||
print "<button dojoType=\"dijit.form.Button\" onclick=\"return bayesClearDatabase()\">".
|
||||
__('Clear database')."</button> ";
|
||||
|
||||
//
|
||||
}
|
||||
|
||||
function hook_prefs_tab($args) {
|
||||
if ($args != "prefPrefs") return;
|
||||
|
||||
print "<div id=\"af_sort_bayes_prefs\" dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Bayesian classifier (af_sort_bayes)')."\">";
|
||||
|
||||
$this->renderPrefsUI();
|
||||
|
||||
print "</div>";
|
||||
}
|
||||
|
||||
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 "<h2>" . $title . "</h2>";
|
||||
|
||||
$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 "<p>" . T_sprintf("Currently stored as: %s", $current_cat) . "</p>";
|
||||
|
||||
$result = $nb->categorize($content);
|
||||
|
||||
print "<h3>" . __("Classifier result") . "</h3>";
|
||||
|
||||
print "<table>";
|
||||
print "<tr><th>Category</th><th>Probability</th></tr>";
|
||||
|
||||
foreach ($result as $k => $v) {
|
||||
print "<tr>";
|
||||
print "<td>" . $categories[$k]["category"] . "</td>";
|
||||
print "<td>" . $v . "</td>";
|
||||
|
||||
print "</tr>";
|
||||
}
|
||||
|
||||
print "</table>";
|
||||
|
||||
} else {
|
||||
print_error("Article not found");
|
||||
}
|
||||
|
||||
print "<div align='center'>";
|
||||
|
||||
print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('bayesShowDlg').hide()\">".
|
||||
__('Close this window')."</button>";
|
||||
|
||||
print "</div>";
|
||||
|
||||
}
|
||||
|
||||
function api_version() {
|
||||
return 2;
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
2003/11/02 - Sortie de la version initiale 1.0
|
||||
|
|
@ -1,339 +0,0 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
|
||||
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.
|
||||
|
|
@ -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]: <http://www.xhtml.net/php/PHPNaiveBayesianFilter>
|
||||
[Internet Archive]: <https://archive.org/>
|
||||
[Original Page]: <https://web.archive.org/web/20111211215027/http://www.xhtml.net/php/PHPNaiveBayesianFilter>
|
||||
|
||||
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
|
||||
|
|
@ -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 données 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/
|
||||
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
1.0
|
||||
|
|
@ -1,297 +0,0 @@
|
|||
<?php
|
||||
/*
|
||||
***** BEGIN LICENSE BLOCK *****
|
||||
This file is part of PHP Naive Bayesian Filter.
|
||||
|
||||
The Initial Developer of the Original Code is
|
||||
Loic d'Anterroches [loic_at_xhtml.net].
|
||||
Portions created by the Initial Developer are Copyright (C) 2003
|
||||
the Initial Developer. All Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
See the source
|
||||
|
||||
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
|
||||
|
||||
Alternatively, the contents of this file may be used under the terms of
|
||||
the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
in which case the provisions of the LGPL are applicable instead
|
||||
of those above.
|
||||
|
||||
***** END LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
class NaiveBayesian {
|
||||
/** min token length for it to be taken into consideration */
|
||||
var $min_token_length = 3;
|
||||
/** max token length for it to be taken into consideration */
|
||||
var $max_token_length = 15;
|
||||
/** list of token to ignore
|
||||
@see getIgnoreList()
|
||||
*/
|
||||
var $ignore_list = array();
|
||||
/** storage object
|
||||
@see class NaiveBayesianStorage
|
||||
*/
|
||||
var $nbs = null;
|
||||
|
||||
function NaiveBayesian($nbs) {
|
||||
$this->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'));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
<?php
|
||||
|
||||
class NaiveBayesianNgram extends NaiveBayesian {
|
||||
var $N = 2;
|
||||
|
||||
/**
|
||||
* add Parameter for ngram
|
||||
*
|
||||
* @param NaiveBayesianStorage $nbs
|
||||
* @param ngram's N $n
|
||||
* @return boolean
|
||||
*/
|
||||
function __construct($nbs, $n = 2) {
|
||||
parent::__construct($nbs);
|
||||
|
||||
$this->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;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,261 +0,0 @@
|
|||
<?php
|
||||
/*
|
||||
***** BEGIN LICENSE BLOCK *****
|
||||
This file is part of PHP Naive Bayesian Filter.
|
||||
|
||||
The Initial Developer of the Original Code is
|
||||
Loic d'Anterroches [loic_at_xhtml.net].
|
||||
Portions created by the Initial Developer are Copyright (C) 2003
|
||||
the Initial Developer. All Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
|
||||
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
|
||||
|
||||
Alternatively, the contents of this file may be used under the terms of
|
||||
the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
in which case the provisions of the LGPL are applicable instead
|
||||
of those above.
|
||||
|
||||
***** END LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/** Access to the storage of the data for the filter.
|
||||
|
||||
To avoid dependency with respect to any database, this class handle all the
|
||||
access to the data storage. You can provide your own class as long as
|
||||
all the methods are available. The current one rely on a MySQL database.
|
||||
|
||||
methods:
|
||||
- array getCategories()
|
||||
- bool wordExists(string $word)
|
||||
- array getWord(string $word, string $categoryid)
|
||||
|
||||
*/
|
||||
class NaiveBayesianStorage {
|
||||
var $con = null;
|
||||
var $owner_uid = null;
|
||||
var $max_document_length = 3000; // classifier can't rescale output for very long strings apparently
|
||||
|
||||
function NaiveBayesianStorage($owner_uid) {
|
||||
$this->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);
|
||||
}
|
||||
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 601 B |
Binary file not shown.
|
Before Width: | Height: | Size: 619 B |
|
|
@ -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 = '<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 = '<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,384 +0,0 @@
|
|||
<?php
|
||||
class GoogleReaderImport extends Plugin {
|
||||
private $host;
|
||||
|
||||
function about() {
|
||||
return array(1.0,
|
||||
"Import starred/shared items from Google Reader takeout",
|
||||
"fox",
|
||||
false,
|
||||
"");
|
||||
}
|
||||
|
||||
function init($host) {
|
||||
$this->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 "<p style='text-align : center'>" . T_sprintf("All done. %d out of %d articles imported.", $imported, $processed) . "</p>";
|
||||
}
|
||||
|
||||
} else {
|
||||
print_error(__('The document has incorrect format.'));
|
||||
}
|
||||
|
||||
} else {
|
||||
print_error(__('Error while parsing document.'));
|
||||
}
|
||||
|
||||
if (!$file) {
|
||||
print "<div align='center'>";
|
||||
print "<button dojoType=\"dijit.form.Button\"
|
||||
onclick=\"dijit.byId('starredImportDlg').execute()\">".
|
||||
__('Close this window')."</button>";
|
||||
print "</div>";
|
||||
}
|
||||
}
|
||||
|
||||
// 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 "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__("Import starred or shared items from Google Reader")."\">";
|
||||
|
||||
print_notice("Your imported articles will appear in Starred (in file is named starred.json) and Archived feeds.");
|
||||
|
||||
print "<p>".__("Paste your starred.json or shared.json into the form below."). "</p>";
|
||||
|
||||
print "<iframe id=\"starred_upload_iframe\"
|
||||
name=\"starred_upload_iframe\" onload=\"starredImportComplete(this)\"
|
||||
style=\"width: 400px; height: 100px; display: none;\"></iframe>";
|
||||
|
||||
print "<form name=\"starred_form\" style='display : block' target=\"starred_upload_iframe\"
|
||||
enctype=\"multipart/form-data\" method=\"POST\"
|
||||
action=\"backend.php\">
|
||||
<input id=\"starred_file\" name=\"starred_file\" type=\"file\">
|
||||
<input type=\"hidden\" name=\"op\" value=\"pluginhandler\">
|
||||
<input type=\"hidden\" name=\"method\" value=\"import\">
|
||||
<input type=\"hidden\" name=\"plugin\" value=\"googlereaderimport\">
|
||||
<button dojoType=\"dijit.form.Button\" onclick=\"return starredImport();\" type=\"submit\">" .
|
||||
__('Import my Starred items') . "</button>";
|
||||
|
||||
print "</form>";
|
||||
|
||||
print "</div>"; #pane
|
||||
}
|
||||
|
||||
function api_version() {
|
||||
return 2;
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
|
|
@ -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'] . "<br/>";
|
||||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
BEGIN;
|
||||
|
||||
alter table ttrss_feeds alter column last_updated set default null;
|
||||
|
||||
UPDATE ttrss_version SET schema_version = 130;
|
||||
|
||||
COMMIT;
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
BEGIN;
|
||||
|
||||
UPDATE ttrss_version SET schema_version = 130;
|
||||
|
||||
COMMIT;
|
||||
|
|
@ -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";
|
||||
|
|
|
|||
Loading…
Reference in New Issue