Merge branch 'master' into patch-1
Conflicts: locale/de_DE/LC_MESSAGES/messages.pomaster
Art4
10 years ago
commit
d9c042c4c5
@ -1,3 +1,3 @@
|
||||
<?php # This file has been generated at: Fri Sep 27 13:42:37 MSK 2013
|
||||
<?php # This file has been generated at: Tue Feb 3 14:45: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', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'SMTP_SECURE', 'CHECK_FOR_NEW_VERSION', 'DETECT_ARTICLE_LANGUAGE', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?>
|
||||
$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', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'SMTP_SECURE', 'CHECK_FOR_UPDATES', 'DETECT_ARTICLE_LANGUAGE', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?>
|
||||
|
||||
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
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,32 @@
|
||||
<?php
|
||||
class Af_Comics_Tfd extends Af_ComicFilter {
|
||||
|
||||
function supported() {
|
||||
return array("Toothpaste For Dinner");
|
||||
}
|
||||
|
||||
function process(&$article) {
|
||||
$owner_uid = $article["owner_uid"];
|
||||
|
||||
if (strpos($article["link"], "toothpastefordinner.com") !== FALSE) {
|
||||
$doc = new DOMDocument();
|
||||
|
||||
@$doc->loadHTML(fetch_file_contents($article["link"]));
|
||||
|
||||
$basenode = false;
|
||||
|
||||
if ($doc) {
|
||||
$xpath = new DOMXPath($doc);
|
||||
$basenode = $xpath->query('//img[@class="comic"]')->item(0);
|
||||
|
||||
if ($basenode) {
|
||||
$article["content"] = $doc->saveXML($basenode);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
?>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 523 B |
@ -0,0 +1,25 @@
|
||||
function showTrgmRelated(id) {
|
||||
try {
|
||||
|
||||
var query = "backend.php?op=pluginhandler&plugin=af_psql_trgm&method=showrelated¶m=" + param_escape(id);
|
||||
|
||||
if (dijit.byId("trgmRelatedDlg"))
|
||||
dijit.byId("trgmRelatedDlg").destroyRecursive();
|
||||
|
||||
dialog = new dijit.Dialog({
|
||||
id: "trgmRelatedDlg",
|
||||
title: __("Related articles"),
|
||||
style: "width: 600px",
|
||||
execute: function() {
|
||||
|
||||
},
|
||||
href: query,
|
||||
});
|
||||
|
||||
dialog.show();
|
||||
|
||||
} catch (e) {
|
||||
exception_error("showTrgmRelated", e);
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,280 @@
|
||||
<?php
|
||||
class Af_Psql_Trgm extends Plugin {
|
||||
|
||||
private $host;
|
||||
|
||||
function about() {
|
||||
return array(1.0,
|
||||
"Marks similar articles as read (requires pg_trgm)",
|
||||
"fox");
|
||||
}
|
||||
|
||||
function save() {
|
||||
$similarity = (float) db_escape_string($_POST["similarity"]);
|
||||
$min_title_length = (int) db_escape_string($_POST["min_title_length"]);
|
||||
|
||||
if ($similarity < 0) $similarity = 0;
|
||||
if ($similarity > 1) $similarity = 1;
|
||||
|
||||
if ($min_title_length < 0) $min_title_length = 0;
|
||||
|
||||
$similarity = sprintf("%.2f", $similarity);
|
||||
|
||||
$this->host->set($this, "similarity", $similarity);
|
||||
$this->host->set($this, "min_title_length", $min_title_length);
|
||||
|
||||
echo T_sprintf("Data saved (%s)", $similarity);
|
||||
}
|
||||
|
||||
function init($host) {
|
||||
$this->host = $host;
|
||||
|
||||
$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
|
||||
$host->add_hook($host::HOOK_PREFS_TAB, $this);
|
||||
$host->add_hook($host::HOOK_PREFS_EDIT_FEED, $this);
|
||||
$host->add_hook($host::HOOK_PREFS_SAVE_FEED, $this);
|
||||
$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
|
||||
|
||||
}
|
||||
|
||||
function get_js() {
|
||||
return file_get_contents(__DIR__ . "/init.js");
|
||||
}
|
||||
|
||||
function showrelated() {
|
||||
$id = (int) db_escape_string($_REQUEST['param']);
|
||||
$owner_uid = $_SESSION["uid"];
|
||||
|
||||
$result = db_query("SELECT title FROM ttrss_entries, ttrss_user_entries
|
||||
WHERE ref_id = id AND id = $id AND owner_uid = $owner_uid");
|
||||
|
||||
$title = db_fetch_result($result, 0, "title");
|
||||
|
||||
print "<h2>$title</h2>";
|
||||
|
||||
$title = db_escape_string($title);
|
||||
$result = db_query("SELECT ttrss_entries.id AS id,
|
||||
feed_id,
|
||||
ttrss_entries.title AS title,
|
||||
updated, link,
|
||||
ttrss_feeds.title AS feed_title,
|
||||
SIMILARITY(ttrss_entries.title, '$title') AS sm
|
||||
FROM
|
||||
ttrss_entries, ttrss_user_entries LEFT JOIN ttrss_feeds ON (ttrss_feeds.id = feed_id)
|
||||
WHERE
|
||||
ttrss_entries.id = ref_id AND
|
||||
ttrss_user_entries.owner_uid = $owner_uid AND
|
||||
ttrss_entries.id != $id AND
|
||||
score >= 0 AND
|
||||
date_entered >= NOW() - INTERVAL '2 weeks'
|
||||
ORDER BY
|
||||
sm DESC, date_entered DESC
|
||||
LIMIT 10");
|
||||
|
||||
print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">";
|
||||
|
||||
while ($line = db_fetch_assoc($result)) {
|
||||
print "<li>";
|
||||
print "<div class='insensitive small' style='margin-left : 20px; float : right'>" .
|
||||
smart_date_time(strtotime($line["updated"]))
|
||||
. "</div>";
|
||||
|
||||
print "<img src='images/score_high.png' title='".sprintf("%.2f", $line['sm'])."'
|
||||
style='vertical-align : middle'>";
|
||||
|
||||
$article_link = htmlspecialchars($line["link"]);
|
||||
print " <a target=\"_blank\" href=\"$article_link\">".
|
||||
$line["title"]."</a>";
|
||||
|
||||
print " (<a href=\"#\" onclick=\"viewfeed(".$line["feed_id"].")\">".
|
||||
htmlspecialchars($line["feed_title"])."</a>)";
|
||||
|
||||
print "</li>";
|
||||
}
|
||||
|
||||
print "</ul>";
|
||||
|
||||
print "<div style='text-align : center'>";
|
||||
print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('trgmRelatedDlg').hide()\">".__('Close this window')."</button>";
|
||||
print "</div>";
|
||||
|
||||
|
||||
}
|
||||
|
||||
function hook_article_button($line) {
|
||||
return "<img src=\"plugins/af_psql_trgm/button.png\"
|
||||
style=\"cursor : pointer\" style=\"cursor : pointer\"
|
||||
onclick=\"showTrgmRelated(".$line["id"].")\"
|
||||
class='tagsPic' title='".__('Show related articles')."'>";
|
||||
}
|
||||
|
||||
function hook_prefs_tab($args) {
|
||||
if ($args != "prefFeeds") return;
|
||||
|
||||
print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Mark similar articles as read')."\">";
|
||||
|
||||
if (DB_TYPE != "pgsql") {
|
||||
print_error("Database type not supported.");
|
||||
}
|
||||
|
||||
$result = db_query("select 'similarity'::regproc");
|
||||
|
||||
if (db_num_rows($result) == 0) {
|
||||
print_error("pg_trgm extension not found.");
|
||||
}
|
||||
|
||||
$similarity = $this->host->get($this, "similarity");
|
||||
$min_title_length = $this->host->get($this, "min_title_length");
|
||||
|
||||
if (!$similarity) $similarity = '0.75';
|
||||
if (!$min_title_length) $min_title_length = '32';
|
||||
|
||||
print "<form dojoType=\"dijit.form.Form\">";
|
||||
|
||||
print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
|
||||
evt.preventDefault();
|
||||
if (this.validate()) {
|
||||
console.log(dojo.objectToQuery(this.getValues()));
|
||||
new Ajax.Request('backend.php', {
|
||||
parameters: dojo.objectToQuery(this.getValues()),
|
||||
onComplete: function(transport) {
|
||||
notify_info(transport.responseText);
|
||||
}
|
||||
});
|
||||
//this.reset();
|
||||
}
|
||||
</script>";
|
||||
|
||||
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pluginhandler\">";
|
||||
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"save\">";
|
||||
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"af_psql_trgm\">";
|
||||
|
||||
print_notice("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.");
|
||||
|
||||
print "<br/>";
|
||||
print_notice("Enable the plugin for specific feeds in the feed editor.");
|
||||
|
||||
print "<h3>" . __("Global settings") . "</h3>";
|
||||
|
||||
print "<table>";
|
||||
|
||||
print "<tr><td width=\"40%\">".__("Minimum similarity:")."</td>";
|
||||
print "<td>
|
||||
<input dojoType=\"dijit.form.ValidationTextBox\"
|
||||
placeholder=\"0.75\"
|
||||
required=\"1\" name=\"similarity\" value=\"$similarity\"></td></tr>";
|
||||
print "<tr><td width=\"40%\">".__("Minimum title length:")."</td>";
|
||||
print "<td>
|
||||
<input dojoType=\"dijit.form.ValidationTextBox\"
|
||||
placeholder=\"32\"
|
||||
required=\"1\" name=\"min_title_length\" value=\"$min_title_length\"></td></tr>";
|
||||
|
||||
print "</table>";
|
||||
|
||||
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
|
||||
__("Save")."</button>";
|
||||
|
||||
print "</form>";
|
||||
|
||||
$enabled_feeds = $this->host->get($this, "enabled_feeds");
|
||||
if (!array($enabled_feeds)) $enabled_feeds = array();
|
||||
|
||||
if (count($enabled_feeds) > 0) {
|
||||
print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
|
||||
|
||||
print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">";
|
||||
foreach ($enabled_feeds as $f) {
|
||||
print "<li>" .
|
||||
"<img src='images/pub_set.png'
|
||||
style='vertical-align : middle'> <a href='#'
|
||||
onclick='editFeed($f)'>".
|
||||
getFeedTitle($f) . "</a></li>";
|
||||
}
|
||||
print "</ul>";
|
||||
}
|
||||
|
||||
print "</div>";
|
||||
}
|
||||
|
||||
function hook_prefs_edit_feed($feed_id) {
|
||||
print "<div class=\"dlgSec\">".__("Similarity (pg_trgm)")."</div>";
|
||||
print "<div class=\"dlgSecCont\">";
|
||||
|
||||
$enabled_feeds = $this->host->get($this, "enabled_feeds");
|
||||
if (!array($enabled_feeds)) $enabled_feeds = array();
|
||||
|
||||
$key = array_search($feed_id, $enabled_feeds);
|
||||
$checked = $key !== FALSE ? "checked" : "";
|
||||
|
||||
print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"trgm_similarity_enabled\"
|
||||
name=\"trgm_similarity_enabled\"
|
||||
$checked> <label for=\"trgm_similarity_enabled\">".__('Mark similar articles as read')."</label>";
|
||||
|
||||
print "</div>";
|
||||
}
|
||||
|
||||
function hook_prefs_save_feed($feed_id) {
|
||||
$enabled_feeds = $this->host->get($this, "enabled_feeds");
|
||||
if (!is_array($enabled_feeds)) $enabled_feeds = array();
|
||||
|
||||
$enable = checkbox_to_sql_bool($_POST["trgm_similarity_enabled"]) == 'true';
|
||||
$key = array_search($feed_id, $enabled_feeds);
|
||||
|
||||
if ($enable) {
|
||||
if ($key === FALSE) {
|
||||
array_push($enabled_feeds, $feed_id);
|
||||
}
|
||||
} else {
|
||||
if ($key !== FALSE) {
|
||||
unset($enabled_feeds[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
$this->host->set($this, "enabled_feeds", $enabled_feeds);
|
||||
}
|
||||
|
||||
function hook_article_filter($article) {
|
||||
|
||||
if (DB_TYPE != "pgsql") return $article;
|
||||
|
||||
$result = db_query("select 'similarity'::regproc");
|
||||
if (db_num_rows($result) == 0) return $article;
|
||||
|
||||
$enabled_feeds = $this->host->get($this, "enabled_feeds");
|
||||
$key = array_search($article["feed"]["id"], $enabled_feeds);
|
||||
if ($key === FALSE) return $article;
|
||||
|
||||
$similarity = (float) $this->host->get($this, "similarity");
|
||||
if ($similarity < 0.01) return $article;
|
||||
|
||||
$min_title_length = (int) $this->host->get($this, "min_length");
|
||||
if (mb_strlen($article["title"]) < $min_title_length) return $article;
|
||||
|
||||
$owner_uid = $article["owner_uid"];
|
||||
$feed_id = $article["feed"]["id"];
|
||||
|
||||
$title_escaped = db_escape_string($article["title"]);
|
||||
|
||||
$result = db_query("SELECT MAX(SIMILARITY(title, '$title_escaped')) AS ms
|
||||
FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id AND
|
||||
date_entered >= NOW() - interval '1 day' AND
|
||||
owner_uid = $owner_uid");
|
||||
|
||||
$similarity_result = db_fetch_result($result, 0, "ms");
|
||||
|
||||
//_debug("similarity result: $similarity_result");
|
||||
|
||||
if ($similarity_result >= $similarity) {
|
||||
$article["force_catchup"] = true;
|
||||
}
|
||||
|
||||
return $article;
|
||||
|
||||
}
|
||||
|
||||
function api_version() {
|
||||
return 2;
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
@ -0,0 +1,79 @@
|
||||
<?php
|
||||
class Af_Tumblr_1280 extends Plugin {
|
||||
private $host;
|
||||
|
||||
function about() {
|
||||
return array(1.0,
|
||||
"Replace Tumblr pictures with largest size if available",
|
||||
"fox");
|
||||
}
|
||||
|
||||
function init($host) {
|
||||
$this->host = $host;
|
||||
|
||||
if (function_exists("curl_init")) {
|
||||
$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
|
||||
}
|
||||
}
|
||||
|
||||
function hook_article_filter($article) {
|
||||
|
||||
$owner_uid = $article["owner_uid"];
|
||||
|
||||
$charset_hack = '<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
</head>';
|
||||
|
||||
$doc = new DOMDocument();
|
||||
$doc->loadHTML($charset_hack . $article["content"]);
|
||||
|
||||
$found = false;
|
||||
|
||||
if ($doc) {
|
||||
$xpath = new DOMXpath($doc);
|
||||
|
||||
$images = $xpath->query('(//img[contains(@src, \'media.tumblr.com\')])');
|
||||
|
||||
foreach ($images as $img) {
|
||||
$src = $img->getAttribute("src");
|
||||
|
||||
$test_src = preg_replace("/_\d{3}.(jpg|gif|png)/", "_1280.$1", $src);
|
||||
|
||||
if ($src != $test_src) {
|
||||
|
||||
$ch = curl_init($test_src);
|
||||
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_USERAGENT, SELF_USER_AGENT);
|
||||
|
||||
@$result = curl_exec($ch);
|
||||
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||
|
||||
if ($result && $http_code == 200) {
|
||||
$img->setAttribute("src", $test_src);
|
||||
$found = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($found) {
|
||||
$doc->removeChild($doc->firstChild); //remove doctype
|
||||
$article["content"] = $doc->saveHTML();
|
||||
}
|
||||
}
|
||||
|
||||
return $article;
|
||||
|
||||
}
|
||||
|
||||
|
||||
function api_version() {
|
||||
return 2;
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
@ -0,0 +1,88 @@
|
||||
<?php
|
||||
class Af_Zz_ImgSetSizes extends Plugin {
|
||||
private $host;
|
||||
|
||||
function about() {
|
||||
return array(1.0,
|
||||
"Set width/height attributes for images in articles (requires CURL and GD)",
|
||||
"fox");
|
||||
}
|
||||
|
||||
function init($host) {
|
||||
$this->host = $host;
|
||||
|
||||
if (function_exists("curl_init") && function_exists("getimagesize")) {
|
||||
$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
|
||||
}
|
||||
}
|
||||
|
||||
function hook_article_filter($article) {
|
||||
|
||||
$owner_uid = $article["owner_uid"];
|
||||
|
||||
$charset_hack = '<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
</head>';
|
||||
|
||||
$doc = new DOMDocument();
|
||||
$doc->loadHTML($charset_hack . $article["content"]);
|
||||
|
||||
$found = false;
|
||||
|
||||
if ($doc) {
|
||||
$xpath = new DOMXpath($doc);
|
||||
|
||||
$images = $xpath->query('(//img[@src])');
|
||||
|
||||
foreach ($images as $img) {
|
||||
$src = $img->getAttribute("src");
|
||||
|
||||
$ch = curl_init($src);
|
||||
curl_setopt($ch, CURLOPT_HEADER, 0);
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
|
||||
curl_setopt($ch, CURLOPT_BINARYTRANSFER,1);
|
||||
curl_setopt($ch, CURLOPT_RANGE, "0-32768");
|
||||
|
||||
@$result = curl_exec($ch);
|
||||
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||
|
||||
if ($result && ($http_code == 200 || $http_code == 206)) {
|
||||
$filename = tempnam(sys_get_temp_dir(), "ttsizecheck");
|
||||
|
||||
if ($filename) {
|
||||
$fh = fopen($filename, "w");
|
||||
if ($fh) {
|
||||
fwrite($fh, $result);
|
||||
fclose($fh);
|
||||
|
||||
@$info = getimagesize($filename);
|
||||
|
||||
if ($info && $info[0] > 0 && $info[1] > 0) {
|
||||
$img->setAttribute("width", $info[0]);
|
||||
$img->setAttribute("height", $info[1]);
|
||||
$found = true;
|
||||
}
|
||||
|
||||
unlink($filename);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($found) {
|
||||
$doc->removeChild($doc->firstChild); //remove doctype
|
||||
$article["content"] = $doc->saveHTML();
|
||||
}
|
||||
}
|
||||
|
||||
return $article;
|
||||
|
||||
}
|
||||
|
||||
|
||||
function api_version() {
|
||||
return 2;
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
@ -1,395 +0,0 @@
|
||||
<?php
|
||||
class Updater extends Plugin {
|
||||
|
||||
private $host;
|
||||
|
||||
function about() {
|
||||
return array(1.0,
|
||||
"Updates tt-rss installation to latest version.",
|
||||
"fox",
|
||||
true);
|
||||
}
|
||||
|
||||
function init($host) {
|
||||
$this->host = $host;
|
||||
|
||||
$host->add_hook($host::HOOK_PREFS_TAB, $this);
|
||||
|
||||
$host->add_command("update-self",
|
||||
"update tt-rss installation to latest version",
|
||||
$this);
|
||||
}
|
||||
|
||||
function update_self_step($step, $params, $force = false) {
|
||||
// __FILE__ is in plugins/updater so we need to go one level up
|
||||
$work_dir = dirname(dirname(dirname(__FILE__)));
|
||||
$parent_dir = dirname($work_dir);
|
||||
// Set PATH to run "which"
|
||||
putenv('PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"');
|
||||
|
||||
$log = array();
|
||||
if (!is_array($params)) $params = array();
|
||||
|
||||
$stop = false;
|
||||
|
||||
if (!chdir($work_dir)) {
|
||||
array_push($log, "Unable to change to work directory: $work_dir");
|
||||
$stop = true;
|
||||
}
|
||||
|
||||
if (!$stop) {
|
||||
switch ($step) {
|
||||
case 0:
|
||||
array_push($log, "Work directory: $work_dir");
|
||||
|
||||
if (!is_writable($work_dir) || !is_writable("$parent_dir")) {
|
||||
$user = posix_getpwuid(posix_geteuid());
|
||||
$user = $user["name"];
|
||||
array_push($log, "Both tt-rss and parent directories should be writable as current user ($user).");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
if (!file_exists("$work_dir/config.php") || !file_exists("$work_dir/include/sanity_check.php")) {
|
||||
array_push($log, "Work directory $work_dir doesn't look like tt-rss installation.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
if (!is_writable(sys_get_temp_dir())) {
|
||||
array_push($log, "System temporary directory should be writable as current user.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
// bah, also humbug
|
||||
putenv("PATH=" . getenv("PATH") . PATH_SEPARATOR . "/bin" .
|
||||
PATH_SEPARATOR . "/usr/bin");
|
||||
|
||||
array_push($log, "Checking for tar...");
|
||||
|
||||
$system_rc = 0;
|
||||
system("which tar >/dev/null", $system_rc);
|
||||
|
||||
if ($system_rc != 0) {
|
||||
array_push($log, "Could not run tar executable (RC=$system_rc).");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
array_push($log, "Checking for gunzip...");
|
||||
|
||||
$system_rc = 0;
|
||||
system("which gunzip >/dev/null", $system_rc);
|
||||
|
||||
if ($system_rc != 0) {
|
||||
array_push($log, "Could not run gunzip executable (RC=$system_rc).");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
array_push($log, "Checking for latest version...");
|
||||
|
||||
$version_info = json_decode(fetch_file_contents("http://tt-rss.org/version.php"),
|
||||
true);
|
||||
|
||||
if (!is_array($version_info)) {
|
||||
array_push($log, "Unable to fetch version information.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
$target_version = $version_info["version"];
|
||||
$target_dir = "$parent_dir/Tiny-Tiny-RSS-$target_version";
|
||||
|
||||
array_push($log, "Target version: $target_version");
|
||||
$params["target_version"] = $target_version;
|
||||
|
||||
if (version_compare(VERSION, $target_version) != -1 && !$force) {
|
||||
array_push($log, "Your Tiny Tiny RSS installation is up to date.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
if (file_exists($target_dir)) {
|
||||
array_push($log, "Target directory $target_dir already exists.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
break;
|
||||
case 1:
|
||||
$target_version = $params["target_version"];
|
||||
|
||||
/* array_push($log, "Downloading checksums...");
|
||||
$md5sum_data = fetch_file_contents("http://tt-rss.org/download/md5sum.txt");
|
||||
|
||||
if (!$md5sum_data) {
|
||||
array_push($log, "Could not download checksums.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
$md5sum_data = explode("\n", $md5sum_data);
|
||||
|
||||
foreach ($md5sum_data as $line) {
|
||||
$pair = explode(" ", $line);
|
||||
|
||||
if ($pair[1] == "tt-rss-$target_version.tar.gz") {
|
||||
$target_md5sum = $pair[0];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$target_md5sum) {
|
||||
array_push($log, "Unable to locate checksum for target version.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
$params["target_md5sum"] = $target_md5sum; */
|
||||
|
||||
array_push($log, "Proceeding to download...");
|
||||
|
||||
break;
|
||||
case 2:
|
||||
$target_version = $params["target_version"];
|
||||
// $target_md5sum = $params["target_md5sum"];
|
||||
|
||||
array_push($log, "Downloading distribution tarball...");
|
||||
|
||||
$tarball_url = "https://github.com/gothfox/Tiny-Tiny-RSS/archive/$target_version.tar.gz";
|
||||
$data = fetch_file_contents($tarball_url);
|
||||
|
||||
if (!$data) {
|
||||
array_push($log, "Could not download distribution tarball ($tarball_url).");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
/* array_push($log, "Verifying tarball checksum...");
|
||||
|
||||
$test_md5sum = md5($data);
|
||||
|
||||
if ($test_md5sum != $target_md5sum) {
|
||||
array_push($log, "Downloaded checksum doesn't match (got $test_md5sum, expected $target_md5sum).");
|
||||
$stop = true; break;
|
||||
} */
|
||||
|
||||
$tmp_file = tempnam(sys_get_temp_dir(), 'tt-rss');
|
||||
array_push($log, "Saving download to $tmp_file");
|
||||
|
||||
if (!file_put_contents($tmp_file, $data)) {
|
||||
array_push($log, "Unable to save download.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
$params["tmp_file"] = $tmp_file;
|
||||
|
||||
break;
|
||||
case 3:
|
||||
$tmp_file = $params["tmp_file"];
|
||||
$target_version = $params["target_version"];
|
||||
|
||||
if (!chdir($parent_dir)) {
|
||||
array_push($log, "Unable to change into parent directory.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
array_push($log, "Extracting tarball...");
|
||||
system("tar zxf $tmp_file", $system_rc);
|
||||
|
||||
if ($system_rc != 0) {
|
||||
array_push($log, "Error while extracting tarball (RC=$system_rc).");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
$target_dir = "$parent_dir/Tiny-Tiny-RSS-$target_version";
|
||||
|
||||
if (!is_dir($target_dir)) {
|
||||
array_push($log, "Target directory ($target_dir) not found.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
$old_dir = tmpdirname($parent_dir, "tt-rss-old");
|
||||
|
||||
array_push($log, "Renaming tt-rss directory to ".basename($old_dir));
|
||||
if (!rename($work_dir, $old_dir)) {
|
||||
array_push($log, "Unable to rename tt-rss directory.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
array_push($log, "Renaming target directory...");
|
||||
if (!rename($target_dir, $work_dir)) {
|
||||
array_push($log, "Unable to rename target directory.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
if (!chdir($work_dir)) {
|
||||
array_push($log, "Unable to change to work directory: $work_dir");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
array_push($log, "Copying config.php...");
|
||||
if (!copy("$old_dir/config.php", "$work_dir/config.php")) {
|
||||
array_push($log, "Unable to copy config.php to $work_dir.");
|
||||
$stop = true; break;
|
||||
}
|
||||
|
||||
array_push($log, "Cleaning up...");
|
||||
unlink($tmp_file);
|
||||
|
||||
array_push($log, "Fixing permissions...");
|
||||
|
||||
$directories = array(
|
||||
CACHE_DIR,
|
||||
CACHE_DIR . "/export",
|
||||
CACHE_DIR . "/images",
|
||||
CACHE_DIR . "/js",
|
||||
CACHE_DIR . "/simplepie",
|
||||
CACHE_DIR . "/upload",
|
||||
ICONS_DIR,
|
||||
LOCK_DIRECTORY);
|
||||
|
||||
foreach ($directories as $dir) {
|
||||
array_push($log, "-> $dir");
|
||||
chmod($dir, 0777);
|
||||
}
|
||||
|
||||
if (ICONS_DIR == "feed-icons") {
|
||||
array_push($log, "Migrating feed icons...");
|
||||
|
||||
$icons = glob("$old_dir/feed-icons/*.ico");
|
||||
$icons_copied = 0;
|
||||
|
||||
foreach ($icons as $icon) {
|
||||
$icon = basename($icon);
|
||||
|
||||
if (copy("$old_dir/feed-icons/$icon", "$work_dir/feed-icons/$icon")) {
|
||||
++$icons_copied;
|
||||
}
|
||||
}
|
||||
|
||||
array_push($log, "Done; $icons_copied files copied");
|
||||
|
||||
} else {
|
||||
array_push($log, "Not migrating feed icons, ICONS_DIR modified.");
|
||||
}
|
||||
|
||||
array_push($log, "Upgrade completed.");
|
||||
array_push($log, "Your old tt-rss directory is saved at $old_dir. ".
|
||||
"Please migrate locally modified files (if any) and remove it.");
|
||||
array_push($log, "You might need to re-enter current directory in shell to see new files.");
|
||||
|
||||
$stop = true;
|
||||
break;
|
||||
default:
|
||||
$stop = true;
|
||||
}
|
||||
}
|
||||
|
||||
return array("step" => $step, "stop" => $stop, "params" => $params, "log" => $log);
|
||||
}
|
||||
|
||||
function update_self_cli($force = false) {
|
||||
$step = 0;
|
||||
$stop = false;
|
||||
$params = array();
|
||||
|
||||
while (!$stop) {
|
||||
$rc = $this->update_self_step($step, $params, $force);
|
||||
|
||||
$params = $rc['params'];
|
||||
$stop = $rc['stop'];
|
||||
|
||||
foreach ($rc['log'] as $line) {
|
||||
_debug($line);
|
||||
}
|
||||
++$step;
|
||||
}
|
||||
}
|
||||
|
||||
function update_self($args) {
|
||||
_debug("READ THE FOLLOWING BEFORE CONTINUING!");
|
||||
_debug("* It is suggested to backup your tt-rss directory first.");
|
||||
_debug("* Your database will not be modified.");
|
||||
_debug("* Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes.");
|
||||
_debug("Type 'yes' to continue.");
|
||||
|
||||
$input = read_stdin();
|
||||
|
||||
if ($input != 'yes' && $input != 'force')
|
||||
exit;
|
||||
|
||||
$this->update_self_cli($input == 'force');
|
||||
}
|
||||
|
||||
function get_prefs_js() {
|
||||
return file_get_contents(dirname(__FILE__) . "/updater.js");
|
||||
}
|
||||
|
||||
function hook_prefs_tab($args) {
|
||||
if ($args != "prefPrefs") return;
|
||||
|
||||
if (($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) && CHECK_FOR_NEW_VERSION) {
|
||||
print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Update Tiny Tiny RSS')."\">";
|
||||
|
||||
if ($_SESSION["pref_last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
|
||||
$_SESSION["version_data"] = @check_for_update();
|
||||
$_SESSION["pref_last_version_check"] = time();
|
||||
}
|
||||
|
||||
if (is_array($_SESSION["version_data"])) {
|
||||
$version = $_SESSION["version_data"]["version"];
|
||||
$version_id = $_SESSION["version_data"]["version_id"];
|
||||
print_notice(T_sprintf("New version of Tiny Tiny RSS is available (%s).", "<b>$version</b>"));
|
||||
|
||||
$details = "http://tt-rss.org/redmine/versions/$version_id";
|
||||
|
||||
print "<p><button onclick=\"window.open('$details')\" dojoType=\"dijit.form.Button\">".__("See the release notes")."</button>";
|
||||
|
||||
print " <button dojoType=\"dijit.form.Button\" onclick=\"return updateSelf()\">".
|
||||
__('Update Tiny Tiny RSS')."</button></p>";
|
||||
|
||||
} else {
|
||||
print_notice(__("Your Tiny Tiny RSS installation is up to date."));
|
||||
|
||||
print "<br/> <button dojoType=\"dijit.form.Button\" onclick=\"return updateSelf()\">".
|
||||
__('Force update')."</button></p>";
|
||||
|
||||
}
|
||||
|
||||
print "</div>"; #pane
|
||||
}
|
||||
}
|
||||
|
||||
function updateSelf() {
|
||||
print_warning(__("Do not close this dialog until updating is finished."));
|
||||
|
||||
print "<form style='display : block' name='self_update_form' id='self_update_form'>";
|
||||
|
||||
print "<style type='text/css'>
|
||||
li.notice { font-style : italic; color : red; }
|
||||
</style>";
|
||||
|
||||
print "<ul class='selfUpdateList' id='self_update_log'>";
|
||||
print "<li class='notice'>" .__("It is suggested to backup your tt-rss directory first.") . "</li>";
|
||||
print "<li class='notice'>" . __("Your database will not be modified.") . "</li>";
|
||||
print "<li class='notice'>" . __("Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes.") . "</li>";
|
||||
print "<li>" . __("Ready to update.") . "</li>";
|
||||
print "</ul>";
|
||||
|
||||
print "<div class='dlgButtons'>";
|
||||
print "<button id=\"self_update_start_btn\" dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('updateSelfDlg').start()\" >".
|
||||
__("Start update")."</button>";
|
||||
print "<button id=\"self_update_stop_btn\" onclick=\"return dijit.byId('updateSelfDlg').close()\" dojoType=\"dijit.form.Button\">".
|
||||
__("Close this window")."</button>";
|
||||
print "</div>";
|
||||
print "</form>";
|
||||
}
|
||||
|
||||
function performUpdate() {
|
||||
$step = (int) $_REQUEST["step"];
|
||||
$params = json_decode($_REQUEST["params"], true);
|
||||
$force = (bool) $_REQUEST["force"];
|
||||
|
||||
if (($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) && CHECK_FOR_NEW_VERSION) {
|
||||
print json_encode($this->update_self_step($step, $params, $force));
|
||||
}
|
||||
}
|
||||
|
||||
function api_version() {
|
||||
return 2;
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
@ -1,69 +0,0 @@
|
||||
function updateSelf() {
|
||||
try {
|
||||
var query = "backend.php?op=pluginhandler&plugin=updater&method=updateSelf";
|
||||
|
||||
if (dijit.byId("updateSelfDlg"))
|
||||
dijit.byId("updateSelfDlg").destroyRecursive();
|
||||
|
||||
var dialog = new dijit.Dialog({
|
||||
id: "updateSelfDlg",
|
||||
title: __("Update Tiny Tiny RSS"),
|
||||
style: "width: 600px",
|
||||
closable: false,
|
||||
performUpdate: function(step) {
|
||||
dijit.byId("self_update_start_btn").attr("disabled", true);
|
||||
dijit.byId("self_update_stop_btn").attr("disabled", true);
|
||||
|
||||
notify_progress("Loading, please wait...", true);
|
||||
new Ajax.Request("backend.php", {
|
||||
parameters: "op=pluginhandler&plugin=updater&method=performUpdate&step=" + step +
|
||||
"¶ms=" + param_escape(JSON.stringify(dialog.attr("update-params"))),
|
||||
onComplete: function(transport) {
|
||||
try {
|
||||
rv = JSON.parse(transport.responseText);
|
||||
if (rv) {
|
||||
notify('');
|
||||
|
||||
rv['log'].each(function(line) {
|
||||
$("self_update_log").innerHTML += "<li>" + line + "</li>";
|
||||
});
|
||||
|
||||
dialog.attr("update-params", rv['params']);
|
||||
|
||||
if (!rv['stop']) {
|
||||
window.setTimeout("dijit.byId('updateSelfDlg').performUpdate("+(step+1)+")", 500);
|
||||
} else {
|
||||
dijit.byId("self_update_stop_btn").attr("disabled", false);
|
||||
}
|
||||
|
||||
} else {
|
||||
console.log(transport.responseText);
|
||||
notify_error("Received invalid data from server.");
|
||||
}
|
||||
|
||||
dialog.attr("updated", true);
|
||||
} catch (e) {
|
||||
exception_error("updateSelf/inner", e);
|
||||
}
|
||||
} });
|
||||
},
|
||||
close: function() {
|
||||
if (dialog.attr("updated")) {
|
||||
window.location.reload();
|
||||
} else {
|
||||
dialog.hide();
|
||||
}
|
||||
},
|
||||
start: function() {
|
||||
if (prompt(__("Backup your tt-rss directory before continuing. Please type 'yes' to continue.")) == 'yes') {
|
||||
dialog.performUpdate(0);
|
||||
}
|
||||
},
|
||||
href: query});
|
||||
|
||||
dialog.show();
|
||||
} catch (e) {
|
||||
exception_error("batchSubscribe", e);
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
BEGIN;
|
||||
|
||||
ALTER TABLE ttrss_enclosures DROP INDEX post_id;
|
||||
ALTER TABLE ttrss_entries DROP INDEX ttrss_entries_guid_index;
|
||||
ALTER TABLE ttrss_feeds DROP INDEX owner_uid;
|
||||
ALTER TABLE ttrss_feeds DROP INDEX cat_id;
|
||||
ALTER TABLE ttrss_prefs DROP INDEX ttrss_prefs_pref_name_idx;
|
||||
ALTER TABLE ttrss_sessions DROP INDEX id_2;
|
||||
ALTER TABLE ttrss_sessions DROP INDEX id;
|
||||
ALTER TABLE ttrss_user_entries DROP INDEX ref_id;
|
||||
ALTER TABLE ttrss_user_entries DROP INDEX owner_uid;
|
||||
ALTER TABLE ttrss_user_entries DROP INDEX feed_id;
|
||||
ALTER TABLE ttrss_user_prefs DROP INDEX pref_name;
|
||||
ALTER TABLE ttrss_user_prefs DROP INDEX owner_uid;
|
||||
|
||||
UPDATE ttrss_version SET schema_version = 127;
|
||||
|
||||
COMMIT;
|
||||
@ -0,0 +1,8 @@
|
||||
BEGIN;
|
||||
|
||||
DROP INDEX ttrss_entries_guid_index;
|
||||
DROP INDEX ttrss_prefs_pref_name_idx;
|
||||
|
||||
UPDATE ttrss_version SET schema_version = 127;
|
||||
|
||||
COMMIT;
|
||||
Loading…
Reference in New Issue