summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cdm.css27
-rw-r--r--classes/feeds.php6
-rw-r--r--classes/pluginhandler.php10
-rw-r--r--classes/sanitizedummy.php2
-rw-r--r--images/cdm_footer_tile.pngbin0 -> 221 bytes
-rw-r--r--include/functions.php3
-rw-r--r--include/sanity_check.php2
-rw-r--r--index.php2
-rw-r--r--plugins/updater/init.php320
9 files changed, 201 insertions, 171 deletions
diff --git a/cdm.css b/cdm.css
index 83de011f7..bdbe151b7 100644
--- a/cdm.css
+++ b/cdm.css
@@ -55,7 +55,7 @@ div.cdmContent a:hover {
}
div.cdmContentInner {
- margin : 0px 10px 10px 10px;
+ margin : 10px;
}
div.cdmContentInner img {
@@ -64,7 +64,8 @@ div.cdmContentInner img {
}
div.cdmFooter {
- background : #f9f9f9;
+ background-color : #f0f0f0;
+ background-image : url("images/cdm_footer_tile.png");
padding : 5px;
font-weight : normal;
color : gray;
@@ -72,7 +73,7 @@ div.cdmFooter {
}
.Selected div.cdmFooter {
- background-color : #FFF2BF;
+ background : #FFF2BF;
}
span.cdmExcerpt {
@@ -104,3 +105,23 @@ div.cdmHeader span.hlFeed {
float : right;
font-weight : normal;
}
+
+div.cdmHeader {
+ background : #EEF6FD;
+}
+
+div.Unread div.cdmHeader {
+ background : #DCECFB;
+}
+
+div.Unread.Selected div.cdmHeader, div.Selected div.cdmHeader {
+ background : #FFF2BF;
+}
+
+div.cdm.even.Unread, div.cdm.odd.Unread {
+ background : white;
+}
+
+div.cdm.even, div.cdm.odd {
+ background : #f0f0f0;
+}
diff --git a/classes/feeds.php b/classes/feeds.php
index 8549f8a76..dd9a4f588 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -513,12 +513,12 @@ class Feeds extends Handler_Protected {
$mouseover_attrs = "onmouseover='postMouseIn($id)'
onmouseout='postMouseOut($id)'";
- $reply['content'] .= "<div class=\"$class\" $label_row_style
+ $reply['content'] .= "<div class=\"cdm $class\"
id=\"RROW-$id\" $mouseover_attrs'>";
$reply['content'] .= "<div class=\"cdmHeader\">";
- $reply['content'] .= "<div>";
+ $reply['content'] .= "<div style=\"vertical-align : middle\">";
$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" onclick=\"toggleSelectRow2(this, false, true)\"
@@ -563,7 +563,7 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "</span>";
- $reply['content'] .= "<div>";
+ $reply['content'] .= "<div style=\"vertical-align : middle\">";
$reply['content'] .= "<span class='updated'>$updated_fmt</span>";
$reply['content'] .= "$score_pic";
diff --git a/classes/pluginhandler.php b/classes/pluginhandler.php
index df7058dcd..eb859ab32 100644
--- a/classes/pluginhandler.php
+++ b/classes/pluginhandler.php
@@ -9,8 +9,14 @@ class PluginHandler extends Handler_Protected {
$plugin = $pluginhost->get_plugin($_REQUEST["plugin"]);
- if (method_exists($plugin, $method)) {
- $plugin->$method();
+ if ($plugin) {
+ if (method_exists($plugin, $method)) {
+ $plugin->$method();
+ } else {
+ print json_encode(array("error" => "METHOD_NOT_FOUND"));
+ }
+ } else {
+ print json_encode(array("error" => "PLUGIN_NOT_FOUND"));
}
}
}
diff --git a/classes/sanitizedummy.php b/classes/sanitizedummy.php
index a184bec30..7182fb7f5 100644
--- a/classes/sanitizedummy.php
+++ b/classes/sanitizedummy.php
@@ -1,6 +1,6 @@
<?php
class SanitizeDummy extends SimplePie_Sanitize {
- function sanitize($data, $type, $base) {
+ function sanitize($data, $type, $base = '') {
return $data;
}
}
diff --git a/images/cdm_footer_tile.png b/images/cdm_footer_tile.png
new file mode 100644
index 000000000..4410afed9
--- /dev/null
+++ b/images/cdm_footer_tile.png
Binary files differ
diff --git a/include/functions.php b/include/functions.php
index 3927a5b69..4e16c9f19 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2614,7 +2614,8 @@
function check_for_update($link) {
if (CHECK_FOR_NEW_VERSION && $_SESSION['access_level'] >= 10) {
- $version_url = "http://tt-rss.org/version.php?ver=" . VERSION;
+ $version_url = "http://tt-rss.org/version.php?ver=" . VERSION .
+ "&iid=" . sha1(SELF_URL_PATH);
$version_data = @fetch_file_contents($version_url);
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 2a39cfa42..5cb556746 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -20,7 +20,7 @@
array_push($errors, "Please don't run this script as root.");
}
- if (version_compare("5.3.0", phpversion()) == 1) {
+ if (version_compare(PHP_VERSION, '5.3.0', '<')) {
array_push($errors, "PHP version 5.3.0 or newer required.");
}
diff --git a/index.php b/index.php
index fa868318a..6584d8d2e 100644
--- a/index.php
+++ b/index.php
@@ -7,7 +7,7 @@
// we need a separate check here because functions.php might get parsed
// incorrectly before 5.3 because of :: syntax.
- if (version_compare("5.3.0", phpversion()) == 1) {
+ if (version_compare(PHP_VERSION, '5.3.0', '<')) {
print "<b>Fatal Error</b>: PHP version 5.3.0 or newer required.\n";
exit;
}
diff --git a/plugins/updater/init.php b/plugins/updater/init.php
index 6d1ebf36f..d940aefeb 100644
--- a/plugins/updater/init.php
+++ b/plugins/updater/init.php
@@ -27,219 +27,222 @@ class Updater extends Plugin {
$work_dir = dirname(dirname(dirname(__FILE__)));
$parent_dir = dirname($work_dir);
+ $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; break;
+ $stop = true;
}
- $stop = false;
- $log = array();
- if (!is_array($params)) $params = array();
-
- switch ($step) {
- case 0:
- array_push($log, "Work directory: $work_dir");
+ 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 (!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 (!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;
- }
+ if (!is_writable(sys_get_temp_dir())) {
+ array_push($log, "System temporary directory should be writable as current user.");
+ $stop = true; break;
+ }
- array_push($log, "Checking for tar...");
+ array_push($log, "Checking for tar...");
- $system_rc = 0;
- system("which tar >/dev/null", $system_rc);
+ $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;
- }
+ if ($system_rc != 0) {
+ array_push($log, "Could not run tar executable (RC=$system_rc).");
+ $stop = true; break;
+ }
- array_push($log, "Checking for gunzip...");
+ array_push($log, "Checking for gunzip...");
- $system_rc = 0;
- system("which gunzip >/dev/null", $system_rc);
+ $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;
- }
+ 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...");
+ array_push($log, "Checking for latest version...");
- $version_info = json_decode(fetch_file_contents("http://tt-rss.org/version.php"),
- true);
+ $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;
- }
+ 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/tt-rss-$target_version";
+ $target_version = $version_info["version"];
+ $target_dir = "$parent_dir/tt-rss-$target_version";
- array_push($log, "Target version: $target_version");
- $params["target_version"] = $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 (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;
- }
+ 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"];
+ 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");
+ 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;
- }
+ if (!$md5sum_data) {
+ array_push($log, "Could not download checksums.");
+ $stop = true; break;
+ }
- $md5sum_data = explode("\n", $md5sum_data);
+ $md5sum_data = explode("\n", $md5sum_data);
- foreach ($md5sum_data as $line) {
- $pair = explode(" ", $line);
+ foreach ($md5sum_data as $line) {
+ $pair = explode(" ", $line);
- if ($pair[1] == "tt-rss-$target_version.tar.gz") {
- $target_md5sum = $pair[0];
- break;
+ 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;
- }
+ if (!$target_md5sum) {
+ array_push($log, "Unable to locate checksum for target version.");
+ $stop = true; break;
+ }
- $params["target_md5sum"] = $target_md5sum;
+ $params["target_md5sum"] = $target_md5sum;
- break;
- case 2:
- $target_version = $params["target_version"];
- $target_md5sum = $params["target_md5sum"];
+ break;
+ case 2:
+ $target_version = $params["target_version"];
+ $target_md5sum = $params["target_md5sum"];
- array_push($log, "Downloading distribution tarball...");
+ array_push($log, "Downloading distribution tarball...");
- $tarball_url = "http://tt-rss.org/download/tt-rss-$target_version.tar.gz";
- $data = fetch_file_contents($tarball_url);
+ $tarball_url = "http://tt-rss.org/download/tt-rss-$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;
- }
+ if (!$data) {
+ array_push($log, "Could not download distribution tarball ($tarball_url).");
+ $stop = true; break;
+ }
- array_push($log, "Verifying tarball checksum...");
+ array_push($log, "Verifying tarball checksum...");
- $test_md5sum = md5($data);
+ $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;
- }
+ 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");
+ $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;
- }
+ if (!file_put_contents($tmp_file, $data)) {
+ array_push($log, "Unable to save download.");
+ $stop = true; break;
+ }
- $params["tmp_file"] = $tmp_file;
+ $params["tmp_file"] = $tmp_file;
- break;
- case 3:
- $tmp_file = $params["tmp_file"];
- $target_version = $params["target_version"];
+ 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;
- }
+ if (!chdir($parent_dir)) {
+ array_push($log, "Unable to change into parent directory.");
+ $stop = true; break;
+ }
- $old_dir = tmpdirname($parent_dir, "tt-rss-old");
+ $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 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, "Extracting tarball...");
- system("tar zxf $tmp_file", $system_rc);
+ 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;
- }
+ if ($system_rc != 0) {
+ array_push($log, "Error while extracting tarball (RC=$system_rc).");
+ $stop = true; break;
+ }
- $target_dir = "$parent_dir/tt-rss-$target_version";
+ $target_dir = "$parent_dir/tt-rss-$target_version";
- array_push($log, "Renaming target directory...");
- if (!rename($target_dir, $work_dir)) {
- array_push($log, "Unable to rename target 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;
- }
+ 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, "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, "Cleaning up...");
+ unlink($tmp_file);
- array_push($log, "Fixing permissions...");
+ array_push($log, "Fixing permissions...");
- $directories = array(
- CACHE_DIR,
- CACHE_DIR . "/export",
- CACHE_DIR . "/images",
- CACHE_DIR . "/simplepie",
- ICONS_DIR,
- LOCK_DIRECTORY);
+ $directories = array(
+ CACHE_DIR,
+ CACHE_DIR . "/export",
+ CACHE_DIR . "/images",
+ CACHE_DIR . "/simplepie",
+ ICONS_DIR,
+ LOCK_DIRECTORY);
- foreach ($directories as $dir) {
- array_push($log, "-> $dir");
- chmod($dir, 0777);
- }
+ foreach ($directories as $dir) {
+ array_push($log, "-> $dir");
+ chmod($dir, 0777);
+ }
- 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.");
+ 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;
+ $stop = true;
+ break;
+ default:
+ $stop = true;
+ }
}
return array("step" => $step, "stop" => $stop, "params" => $params, "log" => $log);
@@ -302,6 +305,7 @@ class Updater extends Plugin {
print "</div>"; #pane
}
+ }
function updateSelf() {
print "<form style='display : block' name='self_update_form' id='self_update_form'>";
@@ -331,7 +335,5 @@ class Updater extends Plugin {
}
}
-
- }
}
?>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 17:47:23 +0000