X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=plugins%2Fupdater%2Finit.php;h=856a0cbf9a7977e42744e437535d07b398829b21;hb=6322ac79a020ab584d412d782d62b2ee77d7c6cf;hp=50a1a33efb9c6ee67a04e6e338df9b7f55c05f06;hpb=a439ac8ad29e90524fc8dfcb76ec4f1509e5e358;p=tt-rss.git

diff --git a/plugins/updater/init.php b/plugins/updater/init.php
index 50a1a33e..856a0cbf 100644
--- a/plugins/updater/init.php
+++ b/plugins/updater/init.php
@@ -1,7 +1,6 @@
 <?php
 class Updater extends Plugin {
 
-	private $link;
 	private $host;
 
 	function about() {
@@ -12,7 +11,6 @@ class Updater extends Plugin {
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_PREFS_TAB, $this);
@@ -22,236 +20,270 @@ class Updater extends Plugin {
 			$this);
 	}
 
-	function update_self_step($link, $step, $params, $force = false) {
+	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);
 
+		$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();
+		if (!$stop) {
+			switch ($step) {
+			case 0:
+				array_push($log, "Work directory: $work_dir");
 
-		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;
-			}
+				// bah, also humbug
+				putenv("PATH=" . getenv("PATH") . PATH_SEPARATOR . "/bin" .
+					PATH_SEPARATOR . "/usr/bin");
 
-			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/Tiny-Tiny-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;
+				array_push($log, "Proceeding to download...");
 
-			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 = "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;
-			}
+				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");
+				array_push($log, "Extracting tarball...");
+				system("tar zxf $tmp_file", $system_rc);
 
-			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;
-			}
+				if ($system_rc != 0) {
+					array_push($log, "Error while extracting tarball (RC=$system_rc).");
+					$stop = true; break;
+				}
 
-			array_push($log, "Extracting tarball...");
-			system("tar zxf $tmp_file", $system_rc);
+				$target_dir = "$parent_dir/Tiny-Tiny-RSS-$target_version";
 
-			if ($system_rc != 0) {
-				array_push($log, "Error while extracting tarball (RC=$system_rc).");
-				$stop = true; break;
-			}
+				if (!is_dir($target_dir)) {
+					array_push($log, "Target directory ($target_dir) not found.");
+					$stop = true; break;
+				}
 
-			$target_dir = "$parent_dir/tt-rss-$target_version";
+				$old_dir = tmpdirname($parent_dir, "tt-rss-old");
 
-			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 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;
+				}
 
-			if (!chdir($work_dir)) {
-				array_push($log, "Unable to change to work directory: $work_dir");
-				$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;
+				}
 
-			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;
-			}
+				if (!chdir($work_dir)) {
+					array_push($log, "Unable to change to work directory: $work_dir");
+					$stop = true; break;
+				}
 
-			array_push($log, "Cleaning up...");
-			unlink($tmp_file);
+				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, "Fixing permissions...");
+				array_push($log, "Cleaning up...");
+				unlink($tmp_file);
 
-			$directories = array(
-				CACHE_DIR,
-				CACHE_DIR . "/export",
-				CACHE_DIR . "/images",
-				CACHE_DIR . "/simplepie",
-				ICONS_DIR,
-				LOCK_DIRECTORY);
+				array_push($log, "Fixing permissions...");
 
-			foreach ($directories as $dir) {
-				array_push($log, "-> $dir");
-				chmod($dir, 0777);
-			}
+				$directories = array(
+					CACHE_DIR,
+					CACHE_DIR . "/export",
+					CACHE_DIR . "/images",
+					CACHE_DIR . "/js",
+					CACHE_DIR . "/simplepie",
+					ICONS_DIR,
+					LOCK_DIRECTORY);
 
-			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.");
+				foreach ($directories as $dir) {
+					array_push($log, "-> $dir");
+					chmod($dir, 0777);
+				}
 
-			$stop = true;
-			break;
-		default:
-			$stop = true;
+				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($link, $force = false) {
+	function update_self_cli( $force = false) {
 		$step = 0;
 		$stop = false;
 		$params = array();
 
 		while (!$stop) {
-			$rc = $this->update_self_step($link, $step, $params, $force);
+			$rc = $this->update_self_step( $step, $params, $force);
 
 			$params = $rc['params'];
 			$stop = $rc['stop'];
@@ -264,14 +296,18 @@ class Updater extends Plugin {
 	}
 
 	function update_self($args) {
-		_debug("Warning: self-updating is experimental. Use at your own risk.");
-		_debug("Please backup your tt-rss directory before continuing. Your database will not be modified.");
+		_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.");
 
-		if (read_stdin() != 'yes')
+		$input = read_stdin();
+
+		if ($input != 'yes' && $input != 'force')
 			exit;
 
-		$this->update_self_cli($link, in_array("-force", $args));
+		$this->update_self_cli( $input == 'force');
 	}
 
 	function get_prefs_js() {
@@ -285,15 +321,20 @@ class Updater extends Plugin {
 			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($this->link);
+				$_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>"));
 
-				print "<p><button dojoType=\"dijit.form.Button\" onclick=\"return updateSelf()\">".
+				$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 {
@@ -305,11 +346,18 @@ class Updater extends Plugin {
 	}
 
 	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 "<div class='error'>".__("Do not close this dialog until updating is finished. Backup your tt-rss directory before continuing.")."</div>";
+		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>";
 
@@ -328,7 +376,7 @@ class Updater extends Plugin {
 		$force = (bool) $_REQUEST["force"];
 
 		if (($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) && CHECK_FOR_NEW_VERSION) {
-			print	json_encode($this->update_self_step($this->link, $step, $params, $force));
+			print	json_encode($this->update_self_step( $step, $params, $force));
 		}
 	}