From 5ddc750427ddb693785b01beb0b9cca0c3138f36 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 28 May 2013 16:21:19 +0400
Subject: [PATCH 1/8] schema: fix reinitialization not working for older
 databases

---
 schema/ttrss_schema_mysql.sql | 1 +
 schema/ttrss_schema_pgsql.sql | 1 +
 2 files changed, 2 insertions(+)

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index aa1197091..e8d5f64b9 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -14,6 +14,7 @@ drop table if exists ttrss_labels;
 drop table if exists ttrss_filters2_actions;
 drop table if exists ttrss_filters2_rules;
 drop table if exists ttrss_filters2;
+drop table if exists ttrss_filters;
 drop table if exists ttrss_filter_types;
 drop table if exists ttrss_filter_actions;
 drop table if exists ttrss_user_prefs;
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 79634678d..feb5cece3 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -11,6 +11,7 @@ drop table if exists ttrss_labels;
 drop table if exists ttrss_filters2_rules;
 drop table if exists ttrss_filters2_actions;
 drop table if exists ttrss_filters2;
+drop table if exists ttrss_filters;
 drop table if exists ttrss_filter_types;
 drop table if exists ttrss_filter_actions;
 drop table if exists ttrss_user_prefs;

From 4f70f13f268ef674a3e47b794b708c1178d8a31f Mon Sep 17 00:00:00 2001
From: gitawego <gitawego@gmail.com>
Date: Tue, 28 May 2013 22:59:27 +0300
Subject: [PATCH 2/8] @FIXED dijit modules aren't cached even all the js files
 are compressed

---
 include/login_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/login_form.php b/include/login_form.php
index 0637c453a..7cf975a9e 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -6,12 +6,12 @@
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<script type="text/javascript" src="lib/dojo/dojo.js"></script>
-	<script type="text/javascript" src="lib/dijit/dijit.js"></script>
 	<script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script>
 	<script type="text/javascript" src="lib/prototype.js"></script>
 	<script type="text/javascript" src="js/functions.js"></script>
 	<script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
 	<script type="text/javascript">
+		require({cache:{}});
 		Event.observe(window, 'load', function() {
 			init();
 		});

From 4077f72cedf20a9e3aa8376f9bdfa6b1b63a49ee Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 29 May 2013 00:17:19 +0400
Subject: [PATCH 3/8] Revert "@FIXED dijit modules aren't cached even all the
 js files are compressed"

This reverts commit 4f70f13f268ef674a3e47b794b708c1178d8a31f.
---
 include/login_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/login_form.php b/include/login_form.php
index 7cf975a9e..0637c453a 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -6,12 +6,12 @@
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<script type="text/javascript" src="lib/dojo/dojo.js"></script>
+	<script type="text/javascript" src="lib/dijit/dijit.js"></script>
 	<script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script>
 	<script type="text/javascript" src="lib/prototype.js"></script>
 	<script type="text/javascript" src="js/functions.js"></script>
 	<script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
 	<script type="text/javascript">
-		require({cache:{}});
 		Event.observe(window, 'load', function() {
 			init();
 		});

From 4e46e90ef7cca9ab5b9f2ddcc260f1423265dbab Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 29 May 2013 00:32:23 +0400
Subject: [PATCH 4/8] installer: use mysqli_error when using mysqli (closes
 #696)

---
 install/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/index.php b/install/index.php
index efa917d95..06f13fe14 100644
--- a/install/index.php
+++ b/install/index.php
@@ -191,7 +191,7 @@
 			if (!$result) {
 				$query = htmlspecialchars($query);
 				if ($die_on_error) {
-					die("Query <i>$query</i> failed: " . ($link ? mysql_error($link) : "No connection"));
+					die("Query <i>$query</i> failed: " . ($link ? function_exists("mysqli_connect") ? mysqli_error($link) : mysql_error($link) : "No connection"));
 				}
 			}
 			return $result;

From 44bf49d4148a1e4068f01ae20e4a1e2af8c3ce70 Mon Sep 17 00:00:00 2001
From: gitawego <gitawego@gmail.com>
Date: Tue, 28 May 2013 23:40:17 +0300
Subject: [PATCH 5/8] @FIXED dijit modules aren't cached even all the js files
 are compressed

@CHANGED use require to load all the dependencies
@FIXED dojo.parser isn't loaded in cached mode, it has to be loaded via require.
---
 include/login_form.php | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/include/login_form.php b/include/login_form.php
index 0637c453a..b401fdac0 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -6,12 +6,12 @@
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<script type="text/javascript" src="lib/dojo/dojo.js"></script>
-	<script type="text/javascript" src="lib/dijit/dijit.js"></script>
 	<script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script>
 	<script type="text/javascript" src="lib/prototype.js"></script>
 	<script type="text/javascript" src="js/functions.js"></script>
 	<script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
 	<script type="text/javascript">
+		require({cache:{}});
 		Event.observe(window, 'load', function() {
 			init();
 		});
@@ -104,20 +104,19 @@
 
 <script type="text/javascript">
 function init() {
-	dojo.require("dijit.form.Button");
-	dojo.require("dijit.form.CheckBox");
-	dojo.require("dijit.form.Form");
-	dojo.require("dijit.form.Select");
-	dojo.require("dijit.form.TextBox");
-	dojo.require("dijit.form.ValidationTextBox");
 
-	dojo.parser.parse();
+	require(['dojo/parser','dijit/form/Button','dijit/form/CheckBox','dijit/form/Form',
+    	'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'],function(parser){
+    		parser.parse();
+    		//show tooltip node only after this widget is instaniated. 
+    		dojo.query('div[dojoType="dijit.Tooltip"]').style({
+    			display:''
+    		});
+		fetchProfiles();
+		dijit.byId("bw_limit").attr("checked", getCookie("ttrss_bwlimit") == 'true');
+		document.forms.loginForm.login.focus();
+    	});	
 
-	fetchProfiles();
-
-	dijit.byId("bw_limit").attr("checked", getCookie("ttrss_bwlimit") == 'true');
-
-	document.forms.loginForm.login.focus();
 }
 
 function fetchProfiles() {
@@ -217,7 +216,7 @@ function bwLimitChange(elem) {
 			<label id="bw_limit_label" style='display : inline' for="bw_limit"><?php echo __("Use less traffic") ?></label>
 		</div>
 
-		<div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below">
+		<div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below" style="display:none">
 <?php echo __("Does not display images in articles, reduces automatic refreshes."); ?>
 		</div>
 

From 8ff2a86cf33ed573602a4c6abf8ed8e4ee7c45f9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 29 May 2013 07:46:14 +0400
Subject: [PATCH 6/8] fix file_is_locked

---
 include/functions.php | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 01ffa751f..bad01eb96 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -961,23 +961,28 @@
 	}
 
 	function file_is_locked($filename) {
-		if (function_exists('flock') && file_exists(LOCK_DIRECTORY . "/$filename")) {
-			$fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
-			if ($fp) {
-				if (flock($fp, LOCK_EX | LOCK_NB)) {
-					flock($fp, LOCK_UN);
+		if (file_exists(LOCK_DIRECTORY . "/$filename")) {
+			if (function_exists('flock')) {
+				$fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
+				if ($fp) {
+					if (flock($fp, LOCK_EX | LOCK_NB)) {
+						flock($fp, LOCK_UN);
+						fclose($fp);
+						return false;
+					}
 					fclose($fp);
+					return true;
+				} else {
 					return false;
 				}
-				fclose($fp);
-				return true;
-			} else {
-				return false;
 			}
+			return true; // consider the file always locked and skip the test
+		} else {
+			return false;
 		}
-		return true; // consider the file always locked and skip the test
 	}
 
+
 	function make_lockfile($filename) {
 		$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
 

From 642432fc39956e92b599f204d64e0b365f36edf2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 29 May 2013 15:11:46 +0400
Subject: [PATCH 7/8] daemon: add sigterm handler for master

---
 update_daemon2.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/update_daemon2.php b/update_daemon2.php
index d5b6a45e3..9d948a64d 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -203,6 +203,7 @@
 					if (!$master_handlers_installed) {
 						_debug("[MASTER] installing shutdown handlers");
 						pcntl_signal(SIGINT, 'sigint_handler');
+						pcntl_signal(SIGTERM, 'sigint_handler');
 						register_shutdown_function('shutdown', posix_getpid());
 						$master_handlers_installed = true;
 					}

From 67e0cf9a371fca46405e7df26ccc970ce6b408cc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 29 May 2013 15:41:19 +0400
Subject: [PATCH 8/8] add startup_gettext() calls to several endpoints for
 unregistered users so the output would be translated based on accept-language
 header

---
 classes/handler/public.php | 4 ++++
 include/login_form.php     | 5 +++--
 register.php               | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 3e868d56e..727976a82 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -732,6 +732,8 @@ class Handler_Public extends Handler {
 	}
 
 	function forgotpass() {
+		startup_gettext();
+
 		header('Content-Type: text/html; charset=utf-8');
 		print "<html><head><title>Tiny Tiny RSS</title>";
 
@@ -825,6 +827,8 @@ class Handler_Public extends Handler {
 	}
 
 	function dbupdate() {
+		startup_gettext();
+
 		if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
 			$_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
 			render_login_form();
diff --git a/include/login_form.php b/include/login_form.php
index b401fdac0..891e25e13 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -1,3 +1,4 @@
+<?php startup_gettext(); ?>
 <html>
 <head>
 	<title>Tiny Tiny RSS : Login</title>
@@ -108,14 +109,14 @@ function init() {
 	require(['dojo/parser','dijit/form/Button','dijit/form/CheckBox','dijit/form/Form',
     	'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'],function(parser){
     		parser.parse();
-    		//show tooltip node only after this widget is instaniated. 
+    		//show tooltip node only after this widget is instaniated.
     		dojo.query('div[dojoType="dijit.Tooltip"]').style({
     			display:''
     		});
 		fetchProfiles();
 		dijit.byId("bw_limit").attr("checked", getCookie("ttrss_bwlimit") == 'true');
 		document.forms.loginForm.login.focus();
-    	});	
+    	});
 
 }
 
diff --git a/register.php b/register.php
index f50ef14a4..eaab98e04 100644
--- a/register.php
+++ b/register.php
@@ -15,6 +15,8 @@
 	require_once "config.php";
 	require_once "db.php";
 
+	startup_gettext();
+
 	$action = $_REQUEST["action"];
 
 	if (!init_plugins()) return;