From 9637e018bf0bdd17ecfabe825cb12ea9a67d7553 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 23 Dec 2015 10:41:14 +0100
Subject: i18n English

https://github.com/FreshRSS/FreshRSS/issues/1043#issuecomment-165984276
---
 app/i18n/en/conf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 69162932f..38e9197e9 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -77,7 +77,7 @@ return array(
 			'warn' => 'Your account and all the related data will be deleted.',
 		),
 		'email_persona' => 'Login email address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
-		'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
+		'password_api' => 'API password<br /><small>(e.g., for mobile apps)</small>',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
 		'password_format' => 'At least 7 characters',
 		'title' => 'Profile',
-- 
cgit v1.2.3


From 0915772fe6735f6051c6b56a3b3e59dd3c44833b Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 24 Jan 2016 11:06:20 +0100
Subject: PubSubHubbub unsubscribe request

https://github.com/FreshRSS/FreshRSS/issues/1058
---
 app/Models/Feed.php | 9 ++++-----
 p/api/pshb.php      | 9 +++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 23491ee8d..986cc5015 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -451,6 +451,10 @@ class FreshRSS_Feed extends Minz_Model {
 				Minz_Log::warning('Invalid callback for PubSubHubbub: ' . $this->url);
 				return false;
 			}
+			if (!$state) {	//unsubscribe
+				$hubJson['lease_end'] = time() - 60;
+				file_put_contents($hubFilename, json_encode($hubJson));
+			}
 			$ch = curl_init();
 			curl_setopt_array($ch, array(
 				CURLOPT_URL => $this->hubUrl,
@@ -470,11 +474,6 @@ class FreshRSS_Feed extends Minz_Model {
 				'PubSubHubbub ' . ($state ? 'subscribe' : 'unsubscribe') . ' to ' . $this->selfUrl .
 				' with callback ' . $callbackUrl . ': ' . $info['http_code'] . ' ' . $response . "\n", FILE_APPEND);
 
-			if (!$state) {	//unsubscribe
-				$hubJson['lease_end'] = time() - 60;
-				file_put_contents($hubFilename, json_encode($hubJson));
-			}
-
 			if (substr($info['http_code'], 0, 1) == '2') {
 				return true;
 			} else {
diff --git a/p/api/pshb.php b/p/api/pshb.php
index 4bb4694b3..7de4cc1a2 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -68,6 +68,15 @@ if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'subscribe') {
 	exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
 }
 
+if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'unsubscribe') {
+	if (empty($hubJson['lease_end']) || $hubJson['lease_end'] < time()) {
+		exit(isset($_REQUEST['hub_challenge']) ? $_REQUEST['hub_challenge'] : '');
+	} else {
+		header('HTTP/1.1 422 Unprocessable Entity');
+		die('We did not ask to unsubscribe!');
+	}
+}
+
 if ($ORIGINAL_INPUT == '') {
 	header('HTTP/1.1 422 Unprocessable Entity');
 	die('Missing XML payload!');
-- 
cgit v1.2.3


From 362dbad0b8ff0a29241f4e29556910dfaf7d66e5 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 24 Jan 2016 13:18:48 +0100
Subject: Several position problems, in particular in the global view

Multiple small bugs in global and reader views.
Related to these old issues:
https://github.com/FreshRSS/FreshRSS/issues/634
https://github.com/FreshRSS/FreshRSS/issues/275
---
 app/layout/layout.phtml                 |  4 ++--
 app/views/helpers/javascript_vars.phtml |  7 +++----
 p/scripts/main.js                       | 30 +++++++++++-------------------
 3 files changed, 16 insertions(+), 25 deletions(-)

(limited to 'app')

diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 000a6c0d2..1d3afbf71 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -5,10 +5,10 @@
 		<meta name="viewport" content="initial-scale=1.0" />
 		<?php echo self::headTitle(); ?>
 		<?php echo self::headStyle(); ?>
-		<?php echo self::headScript(); ?>
 		<script>//<![CDATA[
 <?php $this->renderHelper('javascript_vars'); ?>
 		//]]></script>
+		<?php echo self::headScript(); ?>
 <?php
 	$url_base = Minz_Request::currentRequest();
 	if (FreshRSS_Context::$next_id !== '') {
@@ -42,7 +42,7 @@
 		<meta name="robots" content="noindex,nofollow" />
 <?php } ?>
 	</head>
-	<body class="<?php echo Minz_Request::param('output', 'normal'); ?>">
+	<body class="<?php echo Minz_Request::actionName(); ?>">
 <?php $this->partial('header'); ?>
 
 <div id="global">
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index adf0783f3..36d6e693d 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -4,8 +4,7 @@
 $mark = FreshRSS_Context::$user_conf->mark_when;
 $mail = Minz_Session::param('mail', false);
 $auto_actualize = Minz_Session::param('actualize_feeds', false);
-$hide_posts = (FreshRSS_Context::$user_conf->display_posts ||
-               Minz_Request::param('output') === 'reader');
+$hide_posts = !(FreshRSS_Context::$user_conf->display_posts || Minz_Request::actionName() === 'reader');
 $s = FreshRSS_Context::$user_conf->shortcuts;
 
 $url_login = Minz_Url::display(array(
@@ -19,7 +18,7 @@ $url_logout = Minz_Url::display(array(
 
 echo 'var context={',
 	'auto_remove_article:', FreshRSS_Context::isAutoRemoveAvailable() ? 'true' : 'false', ',',
-	'hide_posts:', $hide_posts ? 'false' : 'true', ',',
+	'hide_posts:', $hide_posts ? 'true' : 'false', ',',
 	'display_order:"', Minz_Request::param('order', FreshRSS_Context::$user_conf->sort_order), '",',
 	'auto_mark_article:', $mark['article'] ? 'true' : 'false', ',',
 	'auto_mark_site:', $mark['site'] ? 'true' : 'false', ',',
@@ -31,7 +30,7 @@ echo 'var context={',
 	'html5_notif_timeout:', FreshRSS_Context::$user_conf->html5_notif_timeout, ',',
 	'auth_type:"', FreshRSS_Context::$system_conf->auth_type, '",',
 	'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',
-	'current_view:"', Minz_Request::param('output', 'normal'), '"',
+	'current_view:"', Minz_Request::actionName(), '"',
 "},\n";
 
 echo 'shortcuts={',
diff --git a/p/scripts/main.js b/p/scripts/main.js
index f64927c14..45a028a7d 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -246,18 +246,18 @@ function toggleContent(new_active, old_active) {
 
 	var box_to_move = "html,body",
 		relative_move = false;
-	if (context['current_view'] == 'global') {
+	if (context['current_view'] === 'global') {
 		box_to_move = "#panel";
 		relative_move = true;
 	}
 
 	if (context['sticky_post']) {
 		var prev_article = new_active.prevAll('.flux'),
-			new_pos = new_active.position().top,
+			new_pos = new_active.offset().top,
 			old_scroll = $(box_to_move).scrollTop();
 
-		if (prev_article.length > 0 && new_pos - prev_article.position().top <= 150) {
-			new_pos = prev_article.position().top;
+		if (prev_article.length > 0 && new_pos - prev_article.offset().top <= 150) {
+			new_pos = prev_article.offset().top;
 		}
 
 		if (context['hide_posts']) {
@@ -451,11 +451,8 @@ function auto_share(key) {
 	}
 }
 
-function inMarkViewport(flux, box_to_follow, relative_follow) {
-	var top = flux.position().top;
-	if (relative_follow) {
-		top += box_to_follow.scrollTop();
-	}
+function inMarkViewport(flux, box_to_follow) {
+	var top = flux.offset().top;
 	var height = flux.height(),
 		begin = top + 3 * height / 4,
 		bot = Math.min(begin + 75, top + height),
@@ -466,17 +463,15 @@ function inMarkViewport(flux, box_to_follow, relative_follow) {
 }
 
 function init_posts() {
-	var box_to_follow = $(window),
-		relative_follow = false;
-	if (context['current_view'] == 'global') {
+	var box_to_follow = $(window);
+	if (context['current_view'] === 'global') {
 		box_to_follow = $("#panel");
-		relative_follow = true;
 	}
 
 	if (context['auto_mark_scroll']) {
 		box_to_follow.scroll(function () {
 			$('.not_read:visible').each(function () {
-				if ($(this).children(".flux_content").is(':visible') && inMarkViewport($(this), box_to_follow, relative_follow)) {
+				if ($(this).children(".flux_content").is(':visible') && inMarkViewport($(this), box_to_follow)) {
 					mark_read($(this), true);
 				}
 			});
@@ -490,10 +485,7 @@ function init_posts() {
 				return;
 			}
 			var boxBot = box_to_follow.scrollTop() + box_to_follow.height(),
-				load_more_top = load_more.position().top;
-			if (relative_follow) {
-				load_more_top += box_to_follow.scrollTop();
-			}
+				load_more_top = load_more.offset().top;
 			if (boxBot >= load_more_top) {
 				load_more_posts();
 			}
@@ -765,7 +757,7 @@ function init_nav_entries() {
 	$nav_entries.find('.up').click(function () {
 		var active_item = $(".flux.current"),
 			windowTop = $(window).scrollTop(),
-			item_top = active_item.position().top;
+			item_top = active_item.offset().top;
 
 		if (windowTop > item_top) {
 			$("html,body").scrollTop(item_top);
-- 
cgit v1.2.3


From b596d569f3048d3539d1a372eea269462a7a5f82 Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:20:52 +0100
Subject: Translation for Journal du hacker

---
 app/i18n/fr/gen.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 2f16f09b9..1e738e949 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -164,6 +164,7 @@ return array(
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Attention !',
-- 
cgit v1.2.3


From a51604bcbce5f2703915ab51e0d7c1d4440f132e Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:22:18 +0100
Subject: Translation for Journal du hacker

---
 app/i18n/en/gen.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index d23b12f95..3d66938d1 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -164,6 +164,7 @@ return array(
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Warning!',
-- 
cgit v1.2.3


From 8890f6ca7738666c5745837f4dad73f5e2877ce7 Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:23:58 +0100
Subject: Translation for Journal du hacker

---
 app/i18n/de/gen.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 842383498..4953610ba 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -164,6 +164,7 @@ return array(
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Achtung!',
-- 
cgit v1.2.3


From ea7891898684e3deabe084d6cfa3f74438cdd975 Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:25:55 +0100
Subject: Translation for Journal du hacker

---
 app/i18n/it/gen.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index eb545b8cf..1ac6b04a1 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -163,6 +163,7 @@ return array(
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Attenzione!',
-- 
cgit v1.2.3


From 3185498bad149b33e67f863ef406eee6e8b0114f Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:26:47 +0100
Subject: Translation for Journal du hacker

---
 app/i18n/nl/gen.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 574f0386b..21d1fba22 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -163,7 +163,8 @@ return array(
 		'print' => 'Print',
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
-		'wallabag' => 'wallabag',
+		'wallabag' => 'wallabag',                
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Attentie!',
-- 
cgit v1.2.3


From 21630599b59830fa88f0e3988e88347cdfa3b5ea Mon Sep 17 00:00:00 2001
From: danc <danc@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:35:33 +0100
Subject: Translation for Journal du hacker

---
 app/i18n/cz/gen.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index ffc138abb..4d34a8173 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -164,6 +164,7 @@ return array(
 		'shaarli' => 'Shaarli',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
 	),
 	'short' => array(
 		'attention' => 'Upozornění!',
-- 
cgit v1.2.3


From af942739137cd1c95c052157c1f44ea6d605f4c3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 25 Jan 2016 21:05:35 +0100
Subject: More PHP 5.2 install compatibility

https://github.com/FreshRSS/FreshRSS/issues/1055
---
 app/install.php |  6 +++---
 lib/lib_rss.php | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'app')

diff --git a/app/install.php b/app/install.php
index 83526b60c..7ac1c4cec 100644
--- a/app/install.php
+++ b/app/install.php
@@ -130,7 +130,7 @@ function saveStep2() {
 		$_SESSION['mail_login'] = filter_var(param('mail_login', ''), FILTER_VALIDATE_EMAIL);
 
 		$password_plain = param('passwordPlain', false);
-		if ($password_plain !== false) {
+		if ($password_plain !== false && cryptAvailable()) {
 			if (!function_exists('password_hash')) {
 				include_once(LIB_PATH . '/password_compat.php');
 			}
@@ -681,10 +681,10 @@ function printStep2() {
 						}
 						$auth_type = isset($_SESSION['auth_type']) ? $_SESSION['auth_type'] : '';
 					?>
-					<option value="form"<?php echo $auth_type === 'form' || no_auth($auth_type) ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('install.auth.form'); ?></option>
+					<option value="form"<?php echo $auth_type === 'form' || (no_auth($auth_type) && cryptAvailable()) ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('install.auth.form'); ?></option>
 					<option value="persona"<?php echo $auth_type === 'persona' ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.persona'); ?></option>
 					<option value="http_auth"<?php echo $auth_type === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('install.auth.http'); ?>(REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
-					<option value="none"<?php echo $auth_type === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.none'); ?></option>
+					<option value="none"<?php echo $auth_type === 'none' || (no_auth($auth_type) && !cryptAvailable()) ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.none'); ?></option>
 				</select>
 			</div>
 		</div>
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 4852f7217..457fada3d 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -16,19 +16,19 @@ if (!function_exists('json_encode')) {
 }
 
 if (!function_exists('array_replace_recursive')) {
-	function array_replace_recursive($array, $array1) {	//http://php.net/manual/function.array-replace-recursive.php#92574
-		function recurse($array, $array1) {
-			foreach ($array1 as $key => $value) {
-				if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) {
-					$array[$key] = array();	//create new key in $array, if it is empty or not an array
-				}
-				if (is_array($value)) {
-					$value = recurse($array[$key], $value);	// overwrite the value in the base array
-				}
-				$array[$key] = $value;
+	function arr_recurse($array, $array1) {
+		foreach ($array1 as $key => $value) {
+			if (!isset($array[$key]) || (isset($array[$key]) && !is_array($array[$key]))) {
+				$array[$key] = array();	//create new key in $array, if it is empty or not an array
 			}
-			return $array;
+			if (is_array($value)) {
+				$value = arr_recurse($array[$key], $value);	// overwrite the value in the base array
+			}
+			$array[$key] = $value;
 		}
+		return $array;
+	}
+	function array_replace_recursive($array, $array1) {	//http://php.net/manual/function.array-replace-recursive.php#92574
 		// handle the arguments, merge one by one
 		$args = func_get_args();
 		$array = $args[0];
@@ -37,7 +37,7 @@ if (!function_exists('array_replace_recursive')) {
 		}
 		for ($i = 1; $i < count($args); $i++) {
 			if (is_array($args[$i])) {
-				$array = recurse($array, $args[$i]);
+				$array = arr_recurse($array, $args[$i]);
 			}
 		}
 		return $array;
-- 
cgit v1.2.3


From 62b1a484e83ec0ead9a7d33b01c2349ffa9657cb Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:24:09 +0200
Subject: Create admin.php

---
 app/i18n/tr/admin.php | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 183 insertions(+)
 create mode 100644 app/i18n/tr/admin.php

(limited to 'app')

diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php
new file mode 100644
index 000000000..3a6f8118e
--- /dev/null
+++ b/app/i18n/tr/admin.php
@@ -0,0 +1,183 @@
+<?php
+
+return array(
+	'auth' => array(
+		'allow_anonymous' => 'Öntanımlı kullanıcının makalelerinin anonim okunmasına izin ver (%s)',
+		'allow_anonymous_refresh' => 'Anonim makale yenilemesine izin ver',
+		'api_enabled' => '<abbr>API</abbr> erişimine izin ver <small>(mobil uygulamalar için gerekli)</small>',
+		'form' => 'Web formu (geleneksel, JavaScript gerektirir)',
+		'http' => 'HTTP (ileri kullanıcılar için, HTTPS)',
+		'none' => 'Hiçbiri (tehlikeli)',
+		'persona' => 'Mozilla Persona (modern, JavaScript gerektirir)',
+		'title' => 'Kimlik doğrulama',
+		'title_reset' => 'Kimlik doğrulama sıfırla',
+		'token' => 'Kimlik doğrulama işareti',
+		'token_help' => 'Kimlik doğrulama olmaksızın öntanımlı kullanıcının RSS çıktısına erişime izin ver:',
+		'type' => 'Kimlik doğrulama yöntemi',
+		'unsafe_autologin' => 'Güvensiz otomatik girişe izin ver: ',
+	),
+	'check_install' => array(
+		'cache' => array(
+			'nok' => '<em>./data/cache</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Önbellek klasörü yetkileri sorunsuz.',
+		),
+		'categories' => array(
+			'nok' => 'Kategori tablosu kötü yapılandırılmış.',
+			'ok' => 'Kategori tablosu sorunsuz.',
+		),
+		'connection' => array(
+			'nok' => 'Veritabanı ile bağlantı kurulamıyor.',
+			'ok' => 'Veritabanı ile bağlantı sorunsuz.',
+		),
+		'ctype' => array(
+			'nok' => 'Karakter yazım kontrolü için kütüphane eksik (php-ctype).',
+			'ok' => 'Karakter yazım kontrolü için kütüphane sorunsuz (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'cURL eksik (php5-curl package).',
+			'ok' => 'cURL eklentisi sorunsuz.',
+		),
+		'data' => array(
+			'nok' => '<em>./data</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Veri klasörü yetkileri sorunsuz.',
+		),
+		'database' => 'Veritabanı kurulumu',
+		'dom' => array(
+			'nok' => 'DOM kütüpbanesi eksik (php-xml package).',
+			'ok' => 'DOM kütüphanesi sorunsuz.',
+		),
+		'entries' => array(
+			'nok' => 'Giriş tablosu kötü yapılandırılmış.',
+			'ok' => 'Giriş tablosu sorunsuz.',
+		),
+		'favicons' => array(
+			'nok' => '<em>./data/favicons</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Site ikonu klasörü yetkileri sorunsuz.',
+		),
+		'feeds' => array(
+			'nok' => 'Akış tablosu kötü yapılandırılmış.',
+			'ok' => 'Akış tablosu sorunsuz.',
+		),
+		'files' => 'Dosya kurulumu',
+		'json' => array(
+			'nok' => 'JSON eklentisi eksik (php5-json package).',
+			'ok' => 'JSON eklentisi sorunsuz.',
+		),
+		'minz' => array(
+			'nok' => 'Minz framework eksik.',
+			'ok' => 'Minz framework sorunsuz.',
+		),
+		'pcre' => array(
+			'nok' => 'Düzenli ifadeler kütüphanesi eksik (php-pcre).',
+			'ok' => 'Düzenli ifadeler kütüphanesi sorunsuz (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'PDO veya PDO destekli bir sürücü eksik (pdo_mysql, pdo_sqlite).',
+			'ok' => 'PDO sorunsuz (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => '<em>./data/persona</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Mozilla Persona klasörü yetkileri sorunsuz.',
+		),
+		'php' => array(
+			'_' => 'PHP kurulumu',
+			'nok' => 'PHP versiyonunuz %s fakat FreshRSS için gerekli olan en düşük sürüm %s.',
+			'ok' => 'PHP versiyonunuz %s, FreshRSS ile tam uyumlu.',
+		),
+		'tables' => array(
+			'nok' => 'Veritabanında bir veya daha fazla tablo eksik.',
+			'ok' => 'Veritabanı tabloları sorunsuz.',
+		),
+		'title' => 'Kurulum kontrolü',
+		'tokens' => array(
+			'nok' => '<em>./data/tokens</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'İşaretler klasörü yetkileri sorunsuz..',
+		),
+		'users' => array(
+			'nok' => '<em>./data/users</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Kullanıcılar klasörü yetkileri sorunsuz.',
+		),
+		'zip' => array(
+			'nok' => 'ZIP eklentisi eksik (php5-zip package).',
+			'ok' => 'ZIP eklentisi sorunsuz.',
+		),
+	),
+	'extensions' => array(
+		'disabled' => 'Pasif',
+		'empty_list' => 'Yüklenmiş eklenti bulunmamaktadır',
+		'enabled' => 'Aktif',
+		'no_configure_view' => 'Bu eklenti yapılandırılamaz.',
+		'system' => array(
+			'_' => 'Sistem eklentileri',
+			'no_rights' => 'Sistem eklentileri (düzenleme hakkınız yok)',
+		),
+		'title' => 'Eklentiler',
+		'user' => 'Kullanıcı eklentileri',
+	),
+	'stats' => array(
+		'_' => 'İstatistikler',
+		'all_feeds' => 'Tüm akış',
+		'category' => 'Kategori',
+		'entry_count' => 'Makale sayısı',
+		'entry_per_category' => 'Kategori başı makale sayısı',
+		'entry_per_day' => 'Günlük makale sayısı (last 30 days)',
+		'entry_per_day_of_week' => 'Haftanın günü (ortalama: %.2f makale)',
+		'entry_per_hour' => 'Saatlik (ortalama: %.2f makale)',
+		'entry_per_month' => 'Aylık (average: %.2f makale)',
+		'entry_repartition' => 'Giriş dağılımı',
+		'feed' => 'Akış',
+		'feed_per_category' => 'Kategoriye göre akışlar',
+		'idle' => 'Boştaki akışlar',
+		'main' => 'Ana istatistikler',
+		'main_stream' => 'Ana akış',
+		'menu' => array(
+			'idle' => 'Boştaki akışlar',
+			'main' => 'Ana istatistikler',
+			'repartition' => 'Makale dağılımı',
+		),
+		'no_idle' => 'Boşta akış yok!',
+		'number_entries' => '%d makale',
+		'percent_of_total' => '%% toplamın yüzdesi',
+		'repartition' => 'Makale dağılımı',
+		'status_favorites' => 'Favoriler',
+		'status_read' => 'Okunmuş',
+		'status_total' => 'Toplam',
+		'status_unread' => 'Okunmamış',
+		'title' => 'İstatistikler',
+		'top_feed' => 'İlk 10 akış',
+	),
+	'system' => array(
+		'_' => 'Sistem yapılandırması',
+		'auto-update-url' => 'Otomatik güncelleme sunucu URL',
+		'instance-name' => 'Örnek isim',
+		'max-categories' => 'Kullanıcı başına kategori limiti',
+		'max-feeds' => 'Kullanıcı başına akış limiti',
+		'registration' => array(
+			'help' => '0 sınır yok anlamındadır',
+			'number' => 'En fazla hesap sayısı',
+		),
+	),
+	'update' => array(
+		'_' => 'Sistem güncelleme',
+		'apply' => 'Uygula',
+		'check' => 'Güncelleme kontrolü',
+		'current_version' => 'Mevcut FreshRSS sürümünüz %s.',
+		'last' => 'Son kontrol: %s',
+		'none' => 'Yeni güncelleme yok',
+		'title' => 'Sistem güncelleme',
+	),
+	'user' => array(
+		'articles_and_size' => '%s makale (%s)',
+		'create' => 'Yeni kullanıcı oluştur',
+		'email_persona' => 'Giriş email adresi<br /><small>(<a href="https://persona.org/" rel="external">Mozilla Persona</a> için)</small>',
+		'language' => 'Dil',
+		'number' => 'Oluşturulmuş %d hesap var',
+		'numbers' => 'Oluşturulmuş %d hesap var',
+		'password_form' => 'Şifre<br /><small>(Tarayıcı girişi için)</small>',
+		'password_format' => 'En az 7 karakter',
+		'title' => 'Kullanıcıları yönet',
+		'user_list' => 'Kullanıcı listesi',
+		'username' => 'Kullanıcı adı',
+		'users' => 'Kullanıcılar',
+	),
+);
-- 
cgit v1.2.3


From e9363910a0c3ee276c07c3d08c665e2de9aab1d7 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:28:07 +0200
Subject: Create conf.php

---
 app/i18n/tr/conf.php | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 app/i18n/tr/conf.php

(limited to 'app')

diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.php
new file mode 100644
index 000000000..d9e275b21
--- /dev/null
+++ b/app/i18n/tr/conf.php
@@ -0,0 +1,174 @@
+<?php
+
+return array(
+	'archiving' => array(
+		'_' => 'Arşiv',
+		'advanced' => 'Gelişmiş',
+		'delete_after' => 'Makelelerin tutulacağı süre',
+		'help' => 'Akış ayarlarında daha çok ayar bulabilirsiniz',
+		'keep_history_by_feed' => 'Akışta en az tutulacak makale sayısı',
+		'optimize' => 'Veritabanı optimize et',
+		'optimize_help' => 'Bu işlem bazen veritabanı boyutunu düşürmeye yardımcı olur',
+		'purge_now' => 'Şimdi temizle',
+		'title' => 'Arşiv',
+		'ttl' => 'Şu süreden sık otomatik yenileme yapma',
+	),
+	'display' => array(
+		'_' => 'Görünüm',
+		'icon' => array(
+			'bottom_line' => 'Alt çizgi',
+			'entry' => 'Makale ikonları',
+			'publication_date' => 'Yayınlama Tarihi',
+			'related_tags' => 'İlgili etiketler',
+			'sharing' => 'Paylaşım',
+			'top_line' => 'Üst çizgi',
+		),
+		'language' => 'Dil',
+		'notif_html5' => array(
+			'seconds' => 'saniye (0 zaman aşımı yok demektir)',
+			'timeout' => 'HTML5 bildirim zaman aşımı',
+		),
+		'theme' => 'Tema',
+		'title' => 'Görünüm',
+		'width' => array(
+			'content' => 'İçerik genişliği',
+			'large' => 'Geniş',
+			'medium' => 'Orta',
+			'no_limit' => 'Sınırsız',
+			'thin' => 'Zayıf',
+		),
+	),
+	'query' => array(
+		'_' => 'Kullanıcı sorguları',
+		'deprecated' => 'Bu sorgu artık geçerli değil. İlgili akış veya kategori silinmiş.',
+		'filter' => 'Filtre uygulandı:',
+		'get_all' => 'Tüm makaleleri göster',
+		'get_category' => '"%s" kategorisini göster',
+		'get_favorite' => 'Favori makaleleri göster',
+		'get_feed' => '"%s" akışını göster',
+		'no_filter' => 'Filtre yok',
+		'none' => 'Henüz hiç kullanıcı sorgusu oluşturmadınız.',
+		'number' => 'Sorgu n°%d',
+		'order_asc' => 'Önce eski makaleleri göster',
+		'order_desc' => 'Önce yeni makaleleri göster',
+		'search' => '"%s" için arama',
+		'state_0' => 'Tüm makaleleri göster',
+		'state_1' => 'Okunmuş makaleleri göster',
+		'state_2' => 'Okunmamış makaleleri göster',
+		'state_3' => 'Tüm makaleleri göster',
+		'state_4' => 'Favori makaleleri göster',
+		'state_5' => 'Okunmuş favori makaleleri göster',
+		'state_6' => 'Okunmamış favori makaleleri göster',
+		'state_7' => 'Favori makaleleri göster',
+		'state_8' => 'Favori olmayan makaleleri göster',
+		'state_9' => 'Favori olmayan okunmuş makaleleri göster',
+		'state_10' => 'Favori olmayan okunmamış makaleleri göster',
+		'state_11' => 'Favori olmayan makaleleri göster',
+		'state_12' => 'Tüm makaleleri göster',
+		'state_13' => 'Okunmuş makaleleri göster',
+		'state_14' => 'Okunmamış makaleleri göster',
+		'state_15' => 'Tüm makaleleri göster',
+		'title' => 'Kullanıcı sorguları',
+	),
+	'profile' => array(
+		'_' => 'Profil yönetimi',
+		'delete' => array(
+			'_' => 'Hesap silme',
+			'warn' => 'Hesabınız ve tüm verileriniz silinecek.',
+		),
+		'email_persona' => 'Giriş email adresi<br /><small>(<a href="https://persona.org/" rel="external">Mozilla Persona</a> için)</small>',
+		'password_api' => 'API Şifresi<br /><small>(ör. mobil uygulamalar için)</small>',
+		'password_form' => 'Şifre<br /><small>(Tarayıcı girişi için)</small>',
+		'password_format' => 'En az 7 karakter',
+		'title' => 'Profil',
+	),
+	'reading' => array(
+		'_' => 'Okuma',
+		'after_onread' => '"Hepsini okundu say" dedinten sonra,',
+		'articles_per_page' => 'Sayfa başına makale sayısı',
+		'auto_load_more' => 'Sayfa sonunda yeni makaleleri yükle',
+		'auto_remove_article' => 'Okuduktan sonra makaleleri gizle',
+		'mark_updated_article_unread' => 'Güncellenen makaleleri okundu olarak işaretle',
+		'confirm_enabled' => '"Hepsini okundu say" eylemi için onay iste',
+		'display_articles_unfolded' => 'Show articles unfolded by default',
+		'display_categories_unfolded' => 'Show categories folded by default',
+		'hide_read_feeds' => 'Okunmamış makalesi olmayan kategori veya akışı gizle ("Tüm makaleleri göster" komutunda çalışmaz)',
+		'img_with_lazyload' => 'Resimleri yüklemek için "tembel modu" kullan',
+		'jump_next' => 'Bir sonraki benzer okunmamışa geç (akış veya kategori)',
+		'number_divided_when_reader' => 'Okuma modunda ikiye bölünecek.',
+		'read' => array(
+			'article_open_on_website' => 'orijinal makale sitesi açıldığında',
+			'article_viewed' => 'makale görüntülendiğinde',
+			'scroll' => 'kaydırma yapılırken',
+			'upon_reception' => 'makale üzerinde gelince',
+			'when' => 'Makaleyi okundu olarak işaretle…',
+		),
+		'show' => array(
+			'_' => 	'Gösterilecek makaleler',
+			'adaptive' => 'Ayarlanmış gösterim',
+			'all_articles' => 'Tüm makaleleri göster',
+			'unread' => 'Sadece okunmamış makaleleri göster',
+		),
+		'sort' => array(
+			'_' => 'Sıralama',
+			'newer_first' => 'Önce yeniler',
+			'older_first' => 'Önce eskiler',
+		),
+		'sticky_post' => 'Makale açıldığında yukarı getir',
+		'title' => 'Okuma',
+		'view' => array(
+			'default' => 'Öntanımlı görünüm',
+			'global' => 'Global görünüm',
+			'normal' => 'Normal görünüm',
+			'reader' => 'Okuma görünümü',
+		),
+	),
+	'sharing' => array(
+		'_' => 'Paylaşım',
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'more_information' => 'Daha fazla bilgi',
+		'print' => 'Yazdır',
+		'shaarli' => 'Shaarli',
+		'share_name' => 'Paylaşım ismi',
+		'share_url' => 'Paylaşım URL si',
+		'title' => 'Paylaşım',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+	),
+	'shortcut' => array(
+		'_' => 'Kısayollar',
+		'article_action' => 'Makale eylemleri',
+		'auto_share' => 'Paylaş',
+		'auto_share_help' => 'Sadece 1 paylaşım modu varsa bu kullanılır. Yoksa kendi paylaşım numaraları ile kullanılır.',
+		'close_dropdown' => 'Menüleri kapat',
+		'collapse_article' => 'Kapat',
+		'first_article' => 'İlk makaleyi atla',
+		'focus_search' => 'Arama kutusuna eriş',
+		'help' => 'Dokümantasyonu göster',
+		'javascript' => 'Kısayolları kullanabilmek için JavaScript aktif olmalıdır',
+		'last_article' => 'Son makaleyi atla',
+		'load_more' => 'Daha fazla makale yükle',
+		'mark_read' => 'Okundu olarak işaretle',
+		'mark_favorite' => 'Favori olarak işaretle',
+		'navigation' => 'Genel eylemler',
+		'navigation_help' => '"Shift" tuşu ile kısayollar akışlar için geçerli olur.<br/>"Alt" tuşu ile kısayollar kategoriler için geçerli olur.',
+		'next_article' => 'Sonraki makaleye geç',
+		'other_action' => 'Diğer eylemler',
+		'previous_article' => 'Önceki makaleye geç',
+		'see_on_website' => 'Orijinal sitede göster',
+		'shift_for_all_read' => '+ <code>shift</code> tuşu ile tüm makaleler okundu olarak işaretlenir',
+		'title' => 'Kısayollar',
+		'user_filter' => 'Kullanıcı filtrelerine eriş',
+		'user_filter_help' => 'Eğer tek filtre varsa o kullanılır. Yoksa filtrelerin kendi numaralarıyla kullanılır.',
+	),
+	'user' => array(
+		'articles_and_size' => '%s makale (%s)',
+		'current' => 'Mevcut kullanıcı',
+		'is_admin' => 'yöneticidir',
+		'users' => 'Kullanıcılar',
+	),
+);
-- 
cgit v1.2.3


From 2d3c4970f2edb170891c36dab78fec6f9341313c Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:28:36 +0200
Subject: Create feedback.php

---
 app/i18n/tr/feedback.php | 110 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 app/i18n/tr/feedback.php

(limited to 'app')

diff --git a/app/i18n/tr/feedback.php b/app/i18n/tr/feedback.php
new file mode 100644
index 000000000..0572c6da1
--- /dev/null
+++ b/app/i18n/tr/feedback.php
@@ -0,0 +1,110 @@
+<?php
+
+return array(
+	'admin' => array(
+		'optimization_complete' => 'Optimizasyon tamamlandı',
+	),
+	'access' => array(
+		'denied' => 'Bu sayfaya erişim yetkiniz yok',
+		'not_found' => 'Varolmayan bir sayfa arıyorsunuz',
+	),
+	'auth' => array(
+		'form' => array(
+			'not_set' => 'Sistem yapılandırma kimlik doğrulaması sırasında hata oldu. Lütfen daha sonra tekrar deneyin.',
+			'set' => 'Kimlik doğrulama sistemi tamamnaldı.',
+		),
+		'login' => array(
+			'invalid' => 'Giriş geçersiz',
+			'success' => 'Bağlantı kuruldu',
+		),
+		'logout' => array(
+			'success' => 'Bağlantı koptu',
+		),
+		'no_password_set' => 'Yönetici şifresi ayarlanmadı. Bu özellik kullanıma uygun değil.',
+		'not_persona' => 'Sadece Persona sistem sıfırlanabilir.',
+	),
+	'conf' => array(
+		'error' => 'Yapılandırma ayarları kaydedilirken hata oluştu',
+		'query_created' => 'Sorgu "%s" oluşturuldu.',
+		'shortcuts_updated' => 'Kısayollar yenilendi',
+		'updated' => 'Yapılandırm ayarları yenilendi',
+	),
+	'extensions' => array(
+		'already_enabled' => '%s zaten aktif',
+		'disable' => array(
+			'ko' => '%s gösterilemiyor. Detaylar için <a href="%s">FressRSS log kayıtlarını</a> kontrol edin.',
+			'ok' => '%s pasif',
+		),
+		'enable' => array(
+			'ko' => '%s aktifleştirilemiyor. Detaylar için <a href="%s">FressRSS log kayıtlarını</a> kontrol edin.',
+			'ok' => '%s aktif',
+		),
+		'no_access' => '%s de yetkiniz yok',
+		'not_enabled' => '%s henüz aktif değil',
+		'not_found' => '%s bulunmamaktadır',
+	),
+	'import_export' => array(
+		'export_no_zip_extension' => 'Zip eklentisi mevcut sunucunuzda yer almıyor. Lütfen başka dosya formatında dışarı aktarmayı deneyin.',
+		'feeds_imported' => 'Akışlarınız içe aktarıldı ve şimdi güncellenecek',
+		'feeds_imported_with_errors' => 'Akışlarınız içeri aktarıldı ama bazı hatalar meydana geldi',
+		'file_cannot_be_uploaded' => 'Dosya yüklenemedi!',
+		'no_zip_extension' => 'Zip eklentisi mevcut sunucunuzda yer almıyor.',
+		'zip_error' => 'Zip içe aktarımı sırasında hata meydana geldi.',
+	),
+	'sub' => array(
+		'actualize' => 'Güncelleme',
+		'category' => array(
+			'created' => 'Kategori %s oluşturuldu.',
+			'deleted' => 'Kategori silindi.',
+			'emptied' => 'Kategori boşaltıldı',
+			'error' => 'Kategori güncellenemedi',
+			'name_exists' => 'Kategori ismi zaten bulunmakta.',
+			'no_id' => 'Kategori id sinden emin olmalısınız.',
+			'no_name' => 'Kategori ismi boş olamaz.',
+			'not_delete_default' => 'Öntanımlı kategoriyi silemezsiniz!',
+			'not_exist' => 'Kategori bulunmamakta!',
+			'over_max' => 'Kategori limitini aştınız (%d)',
+			'updated' => 'Karegori güncellendi.',
+		),
+		'feed' => array(
+			'actualized' => '<em>%s</em> güncellendi',
+			'actualizeds' => 'RSS akışları güncellendi',
+			'added' => '<em>%s</em> RSS akışı eklendi',
+			'already_subscribed' => '<em>%s</em> için zaten aboneliğiniz bulunmakta',
+			'deleted' => 'Akış silindi',
+			'error' => 'Akış güncellenemiyor',
+			'internal_problem' => 'RSS akışı eklenemiyor. Detaylar için <a href="%s">FressRSS log kayıtlarını</a> kontrol edin.',
+			'invalid_url' => 'URL <em>%s</em> geçersiz',
+			'marked_read' => 'Akışlar okundu olarak işaretlendi',
+			'n_actualized' => '%d akışları güncellendi',
+			'n_entries_deleted' => '%d makaleleri silindi',
+			'no_refresh' => 'Yenilenecek akış yok…',
+			'not_added' => '<em>%s</em> eklenemedi',
+			'over_max' => 'Akış limitini aştınız (%d)',
+			'updated' => 'Akış güncellendi',
+		),
+		'purge_completed' => 'Temizleme tamamlandı (%d makale silindi)',
+	),
+	'update' => array(
+		'can_apply' => 'FreshRSS <strong>%s versiyonuna</strong> güncellenecek.',
+		'error' => 'Güncelleme işlemi sırasında hata: %s',
+		'file_is_nok' => '<em>%s</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+		'finished' => 'Güncelleme tamamlandı!',
+		'none' => 'Güncelleme yok',
+		'server_not_found' => 'Güncelleme sunucusu bulunamadı. [%s]',
+	),
+	'user' => array(
+		'created' => array(
+			'_' => '%s kullanıcısı oluşturuldu',
+			'error' => '%s kullanıcısı oluşturulamadı',
+		),
+		'deleted' => array(
+			'_' => '%s kullanıcısı silindi',
+			'error' => '%s kullanıcısı silinemedi',
+		),
+	),
+	'profile' => array(
+		'error' => 'Profiliniz düzenlenemedi',
+		'updated' => 'Profiliniz düzenlendi',
+	),
+);
-- 
cgit v1.2.3


From 0e84a859e6ee66a42ba7aab811ef46e4044d5544 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:28:59 +0200
Subject: Create gen.php

---
 app/i18n/tr/gen.php | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 183 insertions(+)
 create mode 100644 app/i18n/tr/gen.php

(limited to 'app')

diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
new file mode 100644
index 000000000..7284f132b
--- /dev/null
+++ b/app/i18n/tr/gen.php
@@ -0,0 +1,183 @@
+<?php
+
+return array(
+	'action' => array(
+		'actualize' => 'Yenile',
+		'back_to_rss_feeds' => '← RSS akışlarınız için geri gidin',
+		'cancel' => 'İptal',
+		'create' => 'Oluştur',
+		'disable' => 'Pasif',
+		'empty' => 'Boş',
+		'enable' => 'Aktif',
+		'export' => 'Dışa Aktar',
+		'filter' => 'Filtrele',
+		'import' => 'İçe Aktar',
+		'manage' => 'Yönet',
+		'mark_read' => 'Okundu olarak işaretle',
+		'mark_favorite' => 'Favoriye ekle',
+		'remove' => 'Sil',
+		'see_website' => 'Siteyi gör',
+		'submit' => 'Onayla',
+		'truncate' => 'Tüm makaleleri sil',
+	),
+	'auth' => array(
+		'email' => 'Email adresleri',
+		'keep_logged_in' => '<small>(1 ay)</small> oturumu açık tut',
+		'login' => 'Giriş',
+		'login_persona' => 'Persona ile giriş yap',
+		'login_persona_problem' => 'Persona ile bağlantı sorununuz mu var ?',
+		'logout' => 'Çıkış',
+		'password' => array(
+			'_' => 'Şifre',
+			'format' => '<small>En az 7 karakter</small>',
+		),
+		'registration' => array(
+			'_' => 'Yeni hesap',
+			'ask' => 'Yeni bir hesap oluştur',
+			'title' => 'Hesap oluşturma',
+		),
+		'reset' => 'Kimlik doğrulama sıfırla',
+		'username' => array(
+			'_' => 'Kullancı adı',
+			'admin' => 'Yönetici kullanıcı adı',
+			'format' => '<small>en fazla 16 alfanümerik karakter</small>',
+		),
+		'will_reset' => 'Kimlik doğrulama sistemi sıfırlanacak: Persone yerine bir form kullanılacak.',
+	),
+	'date' => array(
+		'Apr' => '\\N\\i\\s\\a\\n',
+		'Aug' => '\\A\\ğ\\u\\s\\t\\o\\s',
+		'Dec' => '\\A\\r\\a\\l\\ı\\k',
+		'Feb' => '\\Ş\\u\\b\\a\\t',
+		'Jan' => '\\O\\c\\a\\k',
+		'Jul' => '\\T\\e\\m\\m\\u\\z',
+		'Jun' => '\\H\\a\\z\\i\\r\\a\\n',
+		'Mar' => '\\M\\a\\r\\t',
+		'May' => '\\M\\a\\y\\ı\\s',
+		'Nov' => '\\K\\a\\s\\ı\\m',
+		'Oct' => '\\E\\k\\i\\m',
+		'Sep' => '\\E\\y\\l\\ü\\l',
+		'apr' => 'nis',
+		'april' => 'Nis',
+		'aug' => 'ağu',
+		'august' => 'Ağu',
+		'before_yesterday' => 'Dünden önceki gün',
+		'dec' => 'ara',
+		'december' => 'Ara',
+		'feb' => 'şub',
+		'february' => 'Şub',
+		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
+		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
+		'fri' => 'Cum',
+		'jan' => 'oca',
+		'january' => 'Oca',
+		'jul' => 'tem',
+		'july' => 'Tem',
+		'jun' => 'haz',
+		'june' => 'Haz',
+		'last_3_month' => 'Son 3 ay',
+		'last_6_month' => 'Son 6 ay',
+		'last_month' => 'Geçen ay',
+		'last_week' => 'Geçen hafta',
+		'last_year' => 'Geçen yıl',
+		'mar' => 'mar',
+		'march' => 'Mar',
+		'may' => 'May',
+		'mon' => 'Pzt',
+		'month' => 'ay',
+		'nov' => 'kas',
+		'november' => 'Kas',
+		'oct' => 'ekm',
+		'october' => 'Ekm',
+		'sat' => 'Cts',
+		'sep' => 'eyl',
+		'september' => 'Eyl',
+		'sun' => 'Pzr',
+		'thu' => 'Per',
+		'today' => 'Bugün',
+		'tue' => 'Sal',
+		'wed' => 'Çar',
+		'yesterday' => 'Dün',
+	),
+	'freshrss' => array(
+		'_' => 'FreshRSS',
+		'about' => 'FreshRSS hakkında',
+	),
+	'js' => array(
+		'category_empty' => 'Boş kategori',
+		'confirm_action' => 'Bunu yapmak istediğinize emin misiniz ? Daha sonra iptal edilemez!',
+		'confirm_action_feed_cat' => 'Bunu yapmak istediğinize emin misiniz ? Favorileriniz ve sorgularınız silinecek. Daha sonra iptal edilemez!',
+		'feedback' => array(
+			'body_new_articles' => 'FreshRSS de okunmaz üzere \\d yeni makale var.',
+			'request_failed' => 'Hata. İnternet bağlantınızı kontrol edin.',
+			'title_new_articles' => 'FreshRSS: yeni makaleler!',
+		),
+		'new_article' => 'Yeni makaleler mevcut. Sayfayı yenilemek için tıklayın.',
+		'should_be_activated' => 'JavaScript aktif olmalıdır.',
+	),
+	'lang' => array(
+		'cz' => 'Čeština',
+		'de' => 'Deutsch',
+		'en' => 'English',
+		'fr' => 'Français',
+		'it' => 'Italiano',
+		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
+	),
+	'menu' => array(
+		'about' => 'Hakkında',
+		'admin' => 'Yönetim',
+		'archiving' => 'Arşiv',
+		'authentication' => 'Kimlik doğrulama',
+		'check_install' => 'Kurulum kontrolü',
+		'configuration' => 'Yapılandırma',
+		'display' => 'Görünüm',
+		'extensions' => 'Eklentiler',
+		'logs' => 'Log kayıtları',
+		'queries' => 'Kullanıcı sorguları',
+		'reading' => 'Okuma',
+		'search' => 'Kelime veya #etiket ara',
+		'sharing' => 'Paylaşım',
+		'shortcuts' => 'Kısayollar',
+		'stats' => 'İstatistikler',
+		'system' => 'Sistem yapılandırması',
+		'update' => 'Güncelleme',
+		'user_management' => 'Kullanıcıları yönet',
+		'user_profile' => 'Profil',
+	),
+	'pagination' => array(
+		'first' => 'İlk',
+		'last' => 'Son',
+		'load_more' => 'Daha fazla makale yükle',
+		'mark_all_read' => 'Tümünü okundu say',
+		'next' => 'Sonraki',
+		'nothing_to_load' => 'Başka makale yok',
+		'previous' => 'Önceki',
+	),
+	'share' => array(
+		'blogotext' => 'Blogotext',
+		'diaspora' => 'Diaspora*',
+		'email' => 'Email',
+		'facebook' => 'Facebook',
+		'g+' => 'Google+',
+		'movim' => 'Movim',
+		'print' => 'Print',
+		'shaarli' => 'Shaarli',
+		'twitter' => 'Twitter',
+		'wallabag' => 'wallabag',
+		'jdh' => 'Journal du hacker',
+	),
+	'short' => array(
+		'attention' => 'Tehlike!',
+		'blank_to_disable' => 'Devredışı bırakmak için boş bırakın',
+		'by_author' => '<em>%s</em> tarafından',
+		'by_default' => 'Öntanımlı',
+		'damn' => 'Hay aksi!',
+		'default_category' => 'Kategorisiz',
+		'no' => 'Hayır',
+		'not_applicable' => 'Uygun değil',
+		'ok' => 'Tamam!',
+		'or' => 'ya da',
+		'yes' => 'Evet',
+	),
+);
-- 
cgit v1.2.3


From 59a69d521da4f01f62f802cbfda7df8e01a4b2c0 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:29:26 +0200
Subject: Create index.php

---
 app/i18n/tr/index.php | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 app/i18n/tr/index.php

(limited to 'app')

diff --git a/app/i18n/tr/index.php b/app/i18n/tr/index.php
new file mode 100644
index 000000000..9912203c8
--- /dev/null
+++ b/app/i18n/tr/index.php
@@ -0,0 +1,61 @@
+<?php
+
+return array(
+	'about' => array(
+		'_' => 'Hakkında',
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
+		'bugs_reports' => 'Hata raporu',
+		'credits' => 'Tanıtım',
+		'credits_content' => 'Bu frameworkü kullanmamasına rağmen FreshRSS bazı tasarım ögelerini <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> dan almıştır. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">İkonlar</a> <a href="https://www.gnome.org/">GNOME projesinden</a> alınmıştır. <em>Open Sans</em> yazı tipi <a href="https://www.google.com/webfonts/specimen/Open+Sans">Steve Matteson</a> tarafından oluşturulmuştur. Site ikonları <a href="https://getfavicon.appspot.com/">getFavicon API</a> ile oluşturuldu. FreshRSS bir PHP framework olan <a href="https://github.com/marienfressinaud/MINZ">Minz</a> i temel alır.',
+		'freshrss_description' => 'FreshRSS <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> veya <a href="http://projet.idleman.fr/leed/">Leed</a> gibi kendi hostunuzda çalışan bir RSS akış toplayıcısıdır. Güçlü ve yapılandırılabilir araçlarıyla basit ve kullanımı kolay bir uygulamadır.',
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">Github sayfası</a>',
+		'license' => 'Lisans',
+		'project_website' => 'Proje sayfası',
+		'title' => 'Hakkında',
+		'version' => 'Versiyon',
+		'website' => 'Website',
+	),
+	'feed' => array(
+		'add' => 'Akış ekleyebilirsin.',
+		'empty' => 'Gösterilecek makale yok.',
+		'rss_of' => 'RSS feed of %s',
+		'title' => 'RSS akışlarınız',
+		'title_global' => 'Global görünüm',
+		'title_fav' => 'Favorilerin',
+	),
+	'log' => array(
+		'_' => 'Log Kayıtları',
+		'clear' => 'Log kayıt dosyasını temizle',
+		'empty' => 'Log kayır dosyası boş',
+		'title' => 'Log Kayıtları',
+	),
+	'menu' => array(
+		'about' => 'FreshRSS hakkında',
+		'add_query' => 'Sorgu ekle',
+		'before_one_day' => 'Bir gün önce',
+		'before_one_week' => 'Bir hafta önce',
+		'favorites' => 'Favoriler (%s)',
+		'global_view' => 'Global görünüm',
+		'main_stream' => 'Ana akış',
+		'mark_all_read' => 'Hepsini okundu olarak işaretle',
+		'mark_cat_read' => 'Kategoriyi okundu olarak işaretle',
+		'mark_feed_read' => 'Akışı okundu olarak işaretle',
+		'newer_first' => 'Önce yeniler',
+		'non-starred' => 'Favori dışındakileri göster',
+		'normal_view' => 'Normal görünüm',
+		'older_first' => 'Önce eskiler',
+		'queries' => 'Kullanıcı sorguları',
+		'read' => 'Okunmuşları göster',
+		'reader_view' => 'Okuma görünümü',
+		'rss_view' => 'RSS akışı',
+		'search_short' => 'Ara',
+		'starred' => 'Favorileri göster',
+		'stats' => 'İstatistikler',
+		'subscription' => 'Abonelik yönetimi',
+		'unread' => 'Okunmamışları göster',
+	),
+	'share' => 'Share',
+	'tag' => array(
+		'related' => 'İlgili etiketler',
+	),
+);
-- 
cgit v1.2.3


From c03ceb107eea4ca90e931bf1018e7315ab2049c3 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:29:48 +0200
Subject: Create install.php

---
 app/i18n/tr/install.php | 113 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 app/i18n/tr/install.php

(limited to 'app')

diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
new file mode 100644
index 000000000..96c16931a
--- /dev/null
+++ b/app/i18n/tr/install.php
@@ -0,0 +1,113 @@
+<?php
+
+return array(
+	'action' => array(
+		'finish' => 'Kurulumu tamamla',
+		'fix_errors_before' => 'Lütfen sonraki adıma geçmek için hataları düzeltin.',
+		'keep_install' => 'Önceki kuruluma devam et',
+		'next_step' => 'Sonraki adım',
+		'reinstall' => 'FreshRSS i yeniden yükle',
+	),
+	'auth' => array(
+		'email_persona' => 'Giriş email adresi<br /><small>(<a href="https://persona.org/" rel="external">Mozilla Persona</a> için)</small>',
+		'form' => 'Web formu (geleneksel, JavaScript gerektirir)',
+		'http' => 'HTTP (ileri kullanıcılar için, HTTPS)',
+		'none' => 'Hiçbiri (tehlikeli)',
+		'password_form' => 'Şifre<br /><small>(Tarayıcı girişi için)</small>',
+		'password_format' => 'En az 7 karakter',
+		'persona' => 'Mozilla Persona (modern, JavaScript gerektirir)',
+		'type' => 'Kimlik doğrulama yöntemi',
+	),
+	'bdd' => array(
+		'_' => 'Veritabanı',
+		'conf' => array(
+			'_' => 'Veritabanı yapılandırılması',
+			'ko' => 'Veritabanı bilginizi doğrulayın.',
+			'ok' => 'Veritabanı yapılandırılması kayıt edildi.',
+		),
+		'host' => 'Sunucu',
+		'prefix' => 'Tablo ön eki',
+		'password' => 'HTTP şifre',
+		'type' => 'Veritabanı türü',
+		'username' => 'HTTP kullanıcı adı',
+	),
+	'check' => array(
+		'_' => 'Kontroller',
+		'already_installed' => 'FreshRSS zaten yüklü!',
+		'cache' => array(
+			'nok' => '<em>./data/cache</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Önbellek klasörü yetkileri sorunsuz.',
+		),
+		'ctype' => array(
+			'nok' => 'Karakter yazım kontrolü için kütüphane eksik (php-ctype).',
+			'ok' => 'Karakter yazım kontrolü için kütüphane sorunsuz (ctype).',
+		),
+		'curl' => array(
+			'nok' => 'cURL eksik (php5-curl package).',
+			'ok' => 'cURL eklentisi sorunsuz.',
+		),
+		'data' => array(
+			'nok' => '<em>./data</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Veri klasörü yetkileri sorunsuz.',
+		),
+		'dom' => array(
+			'nok' => 'DOM kütüpbanesi eksik (php-xml package).',
+			'ok' => 'DOM kütüphanesi sorunsuz.',
+		),
+		'favicons' => array(
+			'nok' => '<em>./data/favicons</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Site ikonu klasörü yetkileri sorunsuz.',
+		),
+		'http_referer' => array(
+			'nok' => 'Lütfen HTTP REFERER değiştirmediğinize emin olun.',
+			'ok' => 'HTTP REFERER ve sunucunuz arası iletişim sorunsuz.',
+		),
+		'minz' => array(
+			'nok' => 'Minz framework eksik.',
+			'ok' => 'Minz framework sorunsuz.',
+		),
+		'pcre' => array(
+			'nok' => 'Düzenli ifadeler kütüphanesi eksik (php-pcre).',
+			'ok' => 'Düzenli ifadeler kütüphanesi sorunsuz (PCRE).',
+		),
+		'pdo' => array(
+			'nok' => 'PDO veya PDO destekli bir sürücü eksik (pdo_mysql, pdo_sqlite).',
+			'ok' => 'PDO sorunsuz (pdo_mysql, pdo_sqlite).',
+		),
+		'persona' => array(
+			'nok' => '<em>./data/persona</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Mozilla Persona klasörü yetkileri sorunsuz.',
+		),
+		'php' => array(
+			'nok' => 'PHP versiyonunuz %s fakat FreshRSS için gerekli olan en düşük sürüm %s.',
+			'ok' => 'PHP versiyonunuz %s, FreshRSS ile tam uyumlu.',
+		),
+		'users' => array(
+			'nok' => '<em>./data/users</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+			'ok' => 'Kullanıcılar klasörü yetkileri sorunsuz.',
+		),
+	),
+	'conf' => array(
+		'_' => 'Genel yapılandırma',
+		'ok' => 'Genel yapılandırma ayarları kayıt edildi.',
+	),
+	'congratulations' => 'Tebrikler!',
+	'default_user' => 'Öntanımlı kullanıcı adı <small>(en fazla 16 alfanümerik karakter)</small>',
+	'delete_articles_after' => 'Makaleleri şu süre sonunda sil',
+	'fix_errors_before' => 'Lütfen sonraki adıma geçmek için hataları düzeltin.',
+	'javascript_is_better' => 'FreshRSS JavaScript ile daha işlevseldir',
+	'js' => array(
+		'confirm_reinstall' => 'FressRSS i yeniden kurarak önceki yapılandırma ayarlarınızı kaybedeceksiniz. Devam etmek istiyor musunuz ?',
+	),
+	'language' => array(
+		'_' => 'Dil',
+		'choose' => 'FreshRSS için bir dil seçin',
+		'defined' => 'Dil belirlendi.',
+	),
+	'not_deleted' => 'Hata meydana geldi; <em>%s</em> dosyasını elle silmelisiniz.',
+	'ok' => 'Kurulum başarıyla tamamlandı.',
+	'step' => 'adım %d',
+	'steps' => 'Adımlar',
+	'title' => 'Kurulum · FreshRSS',
+	'this_is_the_end' => 'Son Adım',
+);
-- 
cgit v1.2.3


From d1fae5145b122f0871f434e5007584fa6cb48dca Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:30:05 +0200
Subject: Create sub.php

---
 app/i18n/tr/sub.php | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 app/i18n/tr/sub.php

(limited to 'app')

diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php
new file mode 100644
index 000000000..5ab367ebb
--- /dev/null
+++ b/app/i18n/tr/sub.php
@@ -0,0 +1,62 @@
+<?php
+
+return array(
+	'category' => array(
+		'_' => 'Kategori',
+		'add' => 'Kategori ekle',
+		'empty' => 'Boş kategori',
+		'new' => 'Yeni kategori',
+	),
+	'feed' => array(
+		'add' => 'RSS akışı ekle',
+		'advanced' => 'Gelişmiş',
+		'archiving' => 'Arşiv',
+		'auth' => array(
+			'configuration' => 'Giriş',
+			'help' => 'HTTP korumalı RSS akışlarına bağlantı izni sağlar',
+			'http' => 'HTTP Kimlik Doğrulama',
+			'password' => 'HTTP şifre',
+			'username' => 'HTTP kullanıcı adı',
+		),
+		'css_help' => 'Dikkat, daha çok zaman gerekir!',
+		'css_path' => 'Makaleleri kendi CSS görünümü ile göster',
+		'description' => 'Tanım',
+		'empty' => 'Bu akış boş. Lütfen akışın aktif olduğuna emin olun.',
+		'error' => 'Bu akışda bir hatayla karşılaşıldı. Lütfen akışın sürekli ulaşılabilir olduğuna emin olun.',
+		'in_main_stream' => 'Ana akışda göster',
+		'informations' => 'Bilgi',
+		'keep_history' => 'En az tutulacak makale sayısı',
+		'moved_category_deleted' => 'Bir kategoriyi silerseniz, içerisindeki akışlar <em>%s</em> içerisine yerleşir.',
+		'no_selected' => 'Hiçbir akış seçilmedi.',
+		'number_entries' => '%d makale',
+		'stats' => 'İstatistikler',
+		'think_to_add' => 'Akış ekleyebilirsiniz.',
+		'title' => 'Başlık',
+		'title_add' => 'RSS akışı ekle',
+		'ttl' => 'Şu kadar süreden fazla otomatik yenileme yapma',
+		'url' => 'Akış URL',
+		'validator' => 'Akış geçerliliğini kontrol edin',
+		'website' => 'Site URL',
+		'pubsubhubbub' => 'PubSubHubbub ile anlık bildirim',
+	),
+	'import_export' => array(
+		'export' => 'Dışa aktar',
+		'export_opml' => 'Akış listesini dışarı aktar (OPML)',
+		'export_starred' => 'Favorileri dışarı aktar',
+		'feed_list' => '%s makalenin listesi',
+		'file_to_import' => 'Dosyadan içe aktar<br />(OPML, Json or Zip)',
+		'file_to_import_no_zip' => 'Dosyadan içe aktar<br />(OPML or Json)',
+		'import' => 'İçe aktar',
+		'starred_list' => 'Favori makaleleirn listesi',
+		'title' => 'İçe / dışa aktar',
+	),
+	'menu' => array(
+		'bookmark' => 'Abonelik (FreshRSS yer imleri)',
+		'import_export' => 'İçe / dışa aktar',
+		'subscription_management' => 'Abonelik yönetimi',
+	),
+	'title' => array(
+		'_' => 'Abonelik yönetimi',
+		'feed_management' => 'RSS  akış yönetimi',
+	),
+);
-- 
cgit v1.2.3


From b4238fa165460e8683cc9b251690247dda57b026 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:34:17 +0200
Subject: Update gen.php

---
 app/i18n/nl/gen.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 21d1fba22..bc4fd9201 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'Over',
-- 
cgit v1.2.3


From 837d77b52547c987092905f99511bcce0dcf0d5f Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:35:31 +0200
Subject: Adding Turkish language

---
 app/i18n/nl/gen.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app')

diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index bc4fd9201..21d1fba22 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -122,7 +122,6 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
-		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'Over',
-- 
cgit v1.2.3


From 27f54f44fe0f84964702925b7b1612dcdf8a6997 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:36:33 +0200
Subject: Adding Turkish language

---
 app/i18n/nl/gen.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 21d1fba22..bc4fd9201 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'Over',
-- 
cgit v1.2.3


From 89037e5fec5029826b73e5413e0f1cb6856f3808 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:36:38 +0200
Subject: Adding Turkish language

---
 app/i18n/it/gen.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 1ac6b04a1..bd311aa12 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'Informazioni',
-- 
cgit v1.2.3


From eeb7fd99090d530f3fe0af39436c714c7a3914b3 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:36:42 +0200
Subject: Adding Turkish language

---
 app/i18n/fr/gen.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 1e738e949..f8e4ac7ee 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'À propos',
-- 
cgit v1.2.3


From ff510a1282cd014f846c09fa7f84e62112dbc432 Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:36:47 +0200
Subject: Adding Turkish language

---
 app/i18n/en/gen.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 3d66938d1..f71684688 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'About',
-- 
cgit v1.2.3


From 2a7b2ef39a442162329c32578e76d6905c1c91da Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:36:51 +0200
Subject: Adding Turkish language

---
 app/i18n/de/gen.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 4953610ba..fb09e8598 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'Über',
-- 
cgit v1.2.3


From 1cdfaed8020cfa5413b606f71ee178da7a74953d Mon Sep 17 00:00:00 2001
From: hckweb <hckweb@gmail.com>
Date: Tue, 9 Feb 2016 20:36:55 +0200
Subject: Adding Turkish language

---
 app/i18n/cz/gen.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 4d34a8173..ca90cff0c 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -122,6 +122,7 @@ return array(
 		'fr' => 'Français',
 		'it' => 'Italiano',
 		'nl' => 'Nederlands',
+		'tr' => 'Türkçe',
 	),
 	'menu' => array(
 		'about' => 'O aplikaci',
-- 
cgit v1.2.3


From e4a459a6edc40b64cba7845b52f3e90666b2818a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 16 Feb 2016 23:53:39 +0100
Subject: CSP no inline javascript draft

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/FreshRSS.php                        | 62 +++++++++++++++++++++++++++++
 app/layout/layout.phtml                 |  6 +--
 app/views/helpers/javascript_vars.phtml | 70 ---------------------------------
 lib/Minz/Session.php                    | 15 ++++---
 p/scripts/main.js                       | 13 +++++-
 p/scripts/persona.js                    |  2 +-
 6 files changed, 87 insertions(+), 81 deletions(-)
 delete mode 100644 app/views/helpers/javascript_vars.phtml

(limited to 'app')

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 044de9cd4..e0e82457c 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -110,6 +110,68 @@ class FreshRSS extends Minz_FrontController {
 		}
 	}
 
+	private static function setJavascriptCookie() {
+		$mark = FreshRSS_Context::$user_conf->mark_when;
+		$mail = Minz_Session::param('mail', false);
+		$s = FreshRSS_Context::$user_conf->shortcuts;
+		$json = json_encode(array(
+			'context' => array(
+				'auto_remove_article' => !!FreshRSS_Context::isAutoRemoveAvailable(),
+				'hide_posts' => !(FreshRSS_Context::$user_conf->display_posts || Minz_Request::actionName() === 'reader'),
+				'display_order' => Minz_Request::param('order', FreshRSS_Context::$user_conf->sort_order),
+				'auto_mark_article' => !!$mark['article'],
+				'auto_mark_site' => !!$mark['site'],
+				'auto_mark_scroll' => !!$mark['scroll'],
+				'auto_load_more' => !!FreshRSS_Context::$user_conf->auto_load_more,
+				'auto_actualize_feeds' => !!Minz_Session::param('actualize_feeds', false),
+				'does_lazyload' => !!FreshRSS_Context::$user_conf->lazyload ,
+				'sticky_post' => !!FreshRSS_Context::isStickyPostEnabled(),
+				'html5_notif_timeout' => FreshRSS_Context::$user_conf->html5_notif_timeout,
+				'auth_type' => FreshRSS_Context::$system_conf->auth_type,
+				'current_user_mail' => $mail ? ('"' . $mail . '"') : null,
+				'current_view' => Minz_Request::actionName(),
+			),
+			'shortcuts' => array(
+				'mark_read' => @$s['mark_read'],
+				'mark_favorite' => @$s['mark_favorite'],
+				'go_website' => @$s['go_website'],
+				'prev_entry' => @$s['prev_entry'],
+				'next_entry' => @$s['next_entry'],
+				'first_entry' => @$s['first_entry'],
+				'last_entry' => @$s['last_entry'],
+				'collapse_entry' => @$s['collapse_entry'],
+				'load_more' => @$s['load_more'],
+				'auto_share' => @$s['auto_share'],
+				'focus_search' => @$s['focus_search'],
+				'user_filter' => @$s['user_filter'],
+				'help' => @$s['help'],
+				'close_dropdown' => @$s['close_dropdown'],
+			),
+			'url' => array(
+				'index' => _url('index', 'index'),
+				'login' => Minz_Url::display(array('c' => 'auth', 'a' => 'login'), 'php'),
+				'logout' => Minz_Url::display(array('c' => 'auth', 'a' => 'logout'), 'php'),
+				'help' => FRESHRSS_WIKI,
+			),
+			'i18n' => array(
+				'confirmation_default' => _t('gen.js.confirm_action'),
+				'notif_title_articles' => _t('gen.js.feedback.title_new_articles'),
+				'notif_body_articles' => _t('gen.js.feedback.body_new_articles'),
+				'notif_request_failed' => _t('gen.js.feedback.request_failed'),
+				'category_empty' => _t('gen.js.category_empty'),
+			),
+			'icons' => array(
+				'close' => _i('close'),
+			),
+		), JSON_UNESCAPED_UNICODE);
+		setrawcookie('FreshRSS-vars', rawurlencode($json), 0, Minz_Session::getCookieDir());
+	}
+
+	public static function preLayout() {
+		header("Content-Security-Policy: default-src 'self'; img-src * data:; media-src *; style-src 'self' 'unsafe-inline'");
+		self::setJavascriptCookie();
+	}
+
 	private function loadNotifications() {
 		$notif = Minz_Session::param('notification');
 		if ($notif) {
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 1d3afbf71..7d718efbd 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -1,3 +1,6 @@
+<?php
+	FreshRSS::preLayout();
+?>
 <!DOCTYPE html>
 <html lang="<?php echo FreshRSS_Context::$user_conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$user_conf->language; ?>">
 	<head>
@@ -5,9 +8,6 @@
 		<meta name="viewport" content="initial-scale=1.0" />
 		<?php echo self::headTitle(); ?>
 		<?php echo self::headStyle(); ?>
-		<script>//<![CDATA[
-<?php $this->renderHelper('javascript_vars'); ?>
-		//]]></script>
 		<?php echo self::headScript(); ?>
 <?php
 	$url_base = Minz_Request::currentRequest();
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
deleted file mode 100644
index 36d6e693d..000000000
--- a/app/views/helpers/javascript_vars.phtml
+++ /dev/null
@@ -1,70 +0,0 @@
-"use strict";
-<?php
-
-$mark = FreshRSS_Context::$user_conf->mark_when;
-$mail = Minz_Session::param('mail', false);
-$auto_actualize = Minz_Session::param('actualize_feeds', false);
-$hide_posts = !(FreshRSS_Context::$user_conf->display_posts || Minz_Request::actionName() === 'reader');
-$s = FreshRSS_Context::$user_conf->shortcuts;
-
-$url_login = Minz_Url::display(array(
-	'c' => 'auth',
-	'a' => 'login'
-), 'php');
-$url_logout = Minz_Url::display(array(
-	'c' => 'auth',
-	'a' => 'logout'
-), 'php');
-
-echo 'var context={',
-	'auto_remove_article:', FreshRSS_Context::isAutoRemoveAvailable() ? 'true' : 'false', ',',
-	'hide_posts:', $hide_posts ? 'true' : 'false', ',',
-	'display_order:"', Minz_Request::param('order', FreshRSS_Context::$user_conf->sort_order), '",',
-	'auto_mark_article:', $mark['article'] ? 'true' : 'false', ',',
-	'auto_mark_site:', $mark['site'] ? 'true' : 'false', ',',
-	'auto_mark_scroll:', $mark['scroll'] ? 'true' : 'false', ',',
-	'auto_load_more:', FreshRSS_Context::$user_conf->auto_load_more ? 'true' : 'false', ',',
-	'auto_actualize_feeds:', $auto_actualize ? 'true' : 'false', ',',
-	'does_lazyload:', FreshRSS_Context::$user_conf->lazyload ? 'true' : 'false', ',',
-	'sticky_post:', FreshRSS_Context::isStickyPostEnabled() ? 'true' : 'false', ',',
-	'html5_notif_timeout:', FreshRSS_Context::$user_conf->html5_notif_timeout, ',',
-	'auth_type:"', FreshRSS_Context::$system_conf->auth_type, '",',
-	'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',
-	'current_view:"', Minz_Request::actionName(), '"',
-"},\n";
-
-echo 'shortcuts={',
-	'mark_read:"', @$s['mark_read'], '",',
-	'mark_favorite:"', @$s['mark_favorite'], '",',
-	'go_website:"', @$s['go_website'], '",',
-	'prev_entry:"', @$s['prev_entry'], '",',
-	'next_entry:"', @$s['next_entry'], '",',
-	'first_entry:"', @$s['first_entry'], '",',
-	'last_entry:"', @$s['last_entry'], '",',
-	'collapse_entry:"', @$s['collapse_entry'], '",',
-	'load_more:"', @$s['load_more'], '",',
-	'auto_share:"', @$s['auto_share'], '",',
-	'focus_search:"', @$s['focus_search'], '",',
-	'user_filter:"', @$s['user_filter'], '",',
-	'help:"', @$s['help'], '",',
-	'close_dropdown:"', @$s['close_dropdown'], '"',
-"},\n";
-
-echo 'url={',
-	'index:"', _url('index', 'index'), '",',
-	'login:"', $url_login, '",',
-	'logout:"', $url_logout, '",',
-	'help:"', FRESHRSS_WIKI, '"',
-"},\n";
-
-echo 'i18n={',
-	'confirmation_default:"', _t('gen.js.confirm_action'), '",',
-	'notif_title_articles:"', _t('gen.js.feedback.title_new_articles'), '",',
-	'notif_body_articles:"', _t('gen.js.feedback.body_new_articles'), '",',
-	'notif_request_failed:"', _t('gen.js.feedback.request_failed'), '",',
-	'category_empty:"', _t('gen.js.category_empty'), '"',
-"},\n";
-
-echo 'icons={',
-	'close:\'', _i('close'), '\'',
-"}\n";
\ No newline at end of file
diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index 057e7746a..940cd27d9 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -59,18 +59,21 @@ class Minz_Session {
 		}
 	}
 
+	public static function getCookieDir() {
+		// Get the script_name (e.g. /p/i/index.php) and keep only the path.
+		$cookie_dir = empty($_SERVER['REQUEST_URI']) ? '/' : $_SERVER['REQUEST_URI'];
+		if (substr($cookie_dir, -1) !== '/') {
+			$cookie_dir = dirname($cookie_dir) . '/';
+		}
+		return $cookie_dir;
+	}
 
 	/**
 	 * Spécifie la durée de vie des cookies
 	 * @param $l la durée de vie
 	 */
 	public static function keepCookie($l) {
-		// Get the script_name (e.g. /p/i/index.php) and keep only the path.
-		$cookie_dir = empty($_SERVER['REQUEST_URI']) ? '/' : $_SERVER['REQUEST_URI'];
-		if (substr($cookie_dir, -1) !== '/') {
-			$cookie_dir = dirname($cookie_dir) . '/';
-		}
-		session_set_cookie_params($l, $cookie_dir, '', false, true);
+		session_set_cookie_params($l, self::getCookieDir(), '', false, true);
 	}
 
 
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 968c945c8..32a2ca913 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1245,8 +1245,19 @@ function init_configuration_alert() {
 	});
 }
 
+function parseJavaScriptCookie() {
+	var json = JSON.parse(decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)FreshRSS-vars\s*\=\s*([^;]*).*$)|^.*$/, "$1"))) || {};
+	document.cookie = 'FreshRSS-vars=; expires=Thu, 01 Jan 1970 00:00:00 GMT';
+	window.context = json.context;
+	window.shortcuts = json.shortcuts;
+	window.url = json.url;
+	window.i18n = json.i18n;
+	window.icons = json.icons;
+}
+
 function init_all() {
-	if (!(window.$ && window.context)) {
+	parseJavaScriptCookie();
+	if (!window.$) {
 		if (window.console) {
 			console.log('FreshRSS waiting for JS…');
 		}
diff --git a/p/scripts/persona.js b/p/scripts/persona.js
index 36aeeaf56..63ab43795 100644
--- a/p/scripts/persona.js
+++ b/p/scripts/persona.js
@@ -1,7 +1,7 @@
 "use strict";
 
 function init_persona() {
-	if (!(navigator.id && window.$)) {
+	if (!(navigator.id && window.$ && window.url)) {
 		if (window.console) {
 			console.log('FreshRSS (Persona) waiting for JS…');
 		}
-- 
cgit v1.2.3


From 8cdf44c87b7490ebc4cbdf4f2c50dd2a3bdd520d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 17 Feb 2016 01:17:56 +0100
Subject: CSP allow iframes

E.g. for YouTube videos, etc.
https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/FreshRSS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index e0e82457c..8eb862aeb 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -168,7 +168,7 @@ class FreshRSS extends Minz_FrontController {
 	}
 
 	public static function preLayout() {
-		header("Content-Security-Policy: default-src 'self'; img-src * data:; media-src *; style-src 'self' 'unsafe-inline'");
+		header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *; style-src 'self' 'unsafe-inline'");
 		self::setJavascriptCookie();
 	}
 
-- 
cgit v1.2.3


From cc1390fe9454166ee5d638aa01948f791ad7c4fe Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 00:58:51 +0100
Subject: JavaScript popup number bug

A backslash caused problem.
https://github.com/FreshRSS/FreshRSS/issues/1075
https://github.com/FreshRSS/FreshRSS/pull/1078
---
 app/i18n/cz/gen.php | 2 +-
 app/i18n/de/gen.php | 2 +-
 app/i18n/en/gen.php | 2 +-
 app/i18n/fr/gen.php | 2 +-
 app/i18n/it/gen.php | 2 +-
 app/i18n/nl/gen.php | 2 +-
 app/i18n/tr/gen.php | 2 +-
 p/scripts/main.js   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'app')

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index ca90cff0c..c30310bf3 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Jste si jist, že chcete provést tuto akci? Změny nelze vrátit zpět!',
 		'confirm_action_feed_cat' => 'Jste si jist, že chcete provést tuto akci? Přijdete o související oblíbené položky a uživatelské dotazy. Změny nelze vrátit zpět!',
 		'feedback' => array(
-			'body_new_articles' => 'Je \\d nových článků k přečtení v FreshRSS.',
+			'body_new_articles' => 'Je %d nových článků k přečtení v FreshRSS.',
 			'request_failed' => 'Požadavek selhal, což může být způsobeno problémy s připojení k internetu.',
 			'title_new_articles' => 'FreshRSS: nové články!',
 		),
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index fb09e8598..47bdee4ee 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Diese Aktion kann nicht abgebrochen werden!',
 		'confirm_action_feed_cat' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Sie werden zugehörige Favoriten und Benutzerabfragen verlieren. Dies kann nicht abgebrochen werden!',
 		'feedback' => array(
-			'body_new_articles' => 'Es gibt \\d neue Artikel zum Lesen auf FreshRSS.',
+			'body_new_articles' => 'Es gibt %d neue Artikel zum Lesen auf FreshRSS.',
 			'request_failed' => 'Eine Anfrage ist fehlgeschlagen, dies könnte durch Probleme mit der Internetverbindung verursacht worden sein.',
 			'title_new_articles' => 'FreshRSS: neue Artikel!',
 		),
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index f71684688..3af7850b8 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
 		'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
 		'feedback' => array(
-			'body_new_articles' => 'There are \\d new articles to read on FreshRSS.',
+			'body_new_articles' => 'There are %d new articles to read on FreshRSS.',
 			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',
 			'title_new_articles' => 'FreshRSS: new articles!',
 		),
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index f8e4ac7ee..4cda84c8d 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
 		'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
 		'feedback' => array(
-			'body_new_articles' => 'Il y a \\d nouveaux articles à lire sur FreshRSS.',
+			'body_new_articles' => 'Il y a %d nouveaux articles à lire sur FreshRSS.',
 			'request_failed' => 'Une requête a échoué, cela peut être dû à des problèmes de connexion à Internet.',
 			'title_new_articles' => 'FreshRSS : nouveaux articles !',
 		),
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index bd311aa12..8598ec8a7 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Sei sicuro di voler continuare?',
 		'confirm_action_feed_cat' => 'Sei sicuro di voler continuare? Verranno persi i preferiti e le ricerche utente correlate!',
 		'feedback' => array(
-			'body_new_articles' => 'Ci sono \\d nuovi articoli da leggere.',
+			'body_new_articles' => 'Ci sono %d nuovi articoli da leggere.',
 			'request_failed' => 'Richiesta fallita, probabilmente a causa di problemi di connessione',
 			'title_new_articles' => 'Feed RSS Reader: nuovi articoli!',
 		),
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index bc4fd9201..56f8424d1 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Weet u zeker dat u dit wilt doen? Het kan niet ongedaan worden gemaakt!',
 		'confirm_action_feed_cat' => 'Weet u zeker dat u dit wilt doen? U verliest alle gereleteerde favorieten en gebruikers informatie. Het kan niet ongedaan worden gemaakt!',
 		'feedback' => array(
-			'body_new_articles' => 'Er zijn \\d nieuwe artikelen om te lezen op FreshRSS.',
+			'body_new_articles' => 'Er zijn %d nieuwe artikelen om te lezen op FreshRSS.',
 			'request_failed' => 'Een opdracht is mislukt, mogelijk door Internet verbindings problemen.',
 			'title_new_articles' => 'FreshRSS: nieuwe artikelen!',
 		),
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index 7284f132b..65a20ed7a 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Bunu yapmak istediğinize emin misiniz ? Daha sonra iptal edilemez!',
 		'confirm_action_feed_cat' => 'Bunu yapmak istediğinize emin misiniz ? Favorileriniz ve sorgularınız silinecek. Daha sonra iptal edilemez!',
 		'feedback' => array(
-			'body_new_articles' => 'FreshRSS de okunmaz üzere \\d yeni makale var.',
+			'body_new_articles' => 'FreshRSS de okunmaz üzere %d yeni makale var.',
 			'request_failed' => 'Hata. İnternet bağlantınızı kontrol edin.',
 			'title_new_articles' => 'FreshRSS: yeni makaleler!',
 		),
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 32a2ca913..b7522df6a 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -863,7 +863,7 @@ function notifs_html5_show(nb) {
 
 	var notification = new window.Notification(i18n['notif_title_articles'], {
 		icon: "../themes/icons/favicon-256.png",
-		body: i18n['notif_body_articles'].replace("\d", nb),
+		body: i18n['notif_body_articles'].replace('%d', nb),
 		tag: "freshRssNewArticles"
 	});
 
-- 
cgit v1.2.3


From e3105f2135552701a4986873491a964b4e44c82e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 01:46:27 +0100
Subject: JavaScript popup number bug (percent escaping)

https://github.com/FreshRSS/FreshRSS/pull/1078

https://github.com/Alkarex/FreshRSS/commit/cc1390fe9454166ee5d638aa01948f791ad7c4fe
---
 app/i18n/cz/gen.php | 2 +-
 app/i18n/de/gen.php | 2 +-
 app/i18n/en/gen.php | 2 +-
 app/i18n/fr/gen.php | 2 +-
 app/i18n/it/gen.php | 2 +-
 app/i18n/nl/gen.php | 2 +-
 app/i18n/tr/gen.php | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index c30310bf3..78ec80f68 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Jste si jist, že chcete provést tuto akci? Změny nelze vrátit zpět!',
 		'confirm_action_feed_cat' => 'Jste si jist, že chcete provést tuto akci? Přijdete o související oblíbené položky a uživatelské dotazy. Změny nelze vrátit zpět!',
 		'feedback' => array(
-			'body_new_articles' => 'Je %d nových článků k přečtení v FreshRSS.',
+			'body_new_articles' => 'Je %%d nových článků k přečtení v FreshRSS.',
 			'request_failed' => 'Požadavek selhal, což může být způsobeno problémy s připojení k internetu.',
 			'title_new_articles' => 'FreshRSS: nové články!',
 		),
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 47bdee4ee..bd0ba08cc 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Diese Aktion kann nicht abgebrochen werden!',
 		'confirm_action_feed_cat' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Sie werden zugehörige Favoriten und Benutzerabfragen verlieren. Dies kann nicht abgebrochen werden!',
 		'feedback' => array(
-			'body_new_articles' => 'Es gibt %d neue Artikel zum Lesen auf FreshRSS.',
+			'body_new_articles' => 'Es gibt %%d neue Artikel zum Lesen auf FreshRSS.',
 			'request_failed' => 'Eine Anfrage ist fehlgeschlagen, dies könnte durch Probleme mit der Internetverbindung verursacht worden sein.',
 			'title_new_articles' => 'FreshRSS: neue Artikel!',
 		),
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 3af7850b8..6fb33a4db 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
 		'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
 		'feedback' => array(
-			'body_new_articles' => 'There are %d new articles to read on FreshRSS.',
+			'body_new_articles' => 'There are %%d new articles to read on FreshRSS.',
 			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',
 			'title_new_articles' => 'FreshRSS: new articles!',
 		),
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 4cda84c8d..6b7056f92 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !',
 		'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !',
 		'feedback' => array(
-			'body_new_articles' => 'Il y a %d nouveaux articles à lire sur FreshRSS.',
+			'body_new_articles' => 'Il y a %%d nouveaux articles à lire sur FreshRSS.',
 			'request_failed' => 'Une requête a échoué, cela peut être dû à des problèmes de connexion à Internet.',
 			'title_new_articles' => 'FreshRSS : nouveaux articles !',
 		),
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 8598ec8a7..2efbef167 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Sei sicuro di voler continuare?',
 		'confirm_action_feed_cat' => 'Sei sicuro di voler continuare? Verranno persi i preferiti e le ricerche utente correlate!',
 		'feedback' => array(
-			'body_new_articles' => 'Ci sono %d nuovi articoli da leggere.',
+			'body_new_articles' => 'Ci sono %%d nuovi articoli da leggere.',
 			'request_failed' => 'Richiesta fallita, probabilmente a causa di problemi di connessione',
 			'title_new_articles' => 'Feed RSS Reader: nuovi articoli!',
 		),
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 56f8424d1..bc2137c22 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Weet u zeker dat u dit wilt doen? Het kan niet ongedaan worden gemaakt!',
 		'confirm_action_feed_cat' => 'Weet u zeker dat u dit wilt doen? U verliest alle gereleteerde favorieten en gebruikers informatie. Het kan niet ongedaan worden gemaakt!',
 		'feedback' => array(
-			'body_new_articles' => 'Er zijn %d nieuwe artikelen om te lezen op FreshRSS.',
+			'body_new_articles' => 'Er zijn %%d nieuwe artikelen om te lezen op FreshRSS.',
 			'request_failed' => 'Een opdracht is mislukt, mogelijk door Internet verbindings problemen.',
 			'title_new_articles' => 'FreshRSS: nieuwe artikelen!',
 		),
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index 65a20ed7a..f987a8e6c 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -108,7 +108,7 @@ return array(
 		'confirm_action' => 'Bunu yapmak istediğinize emin misiniz ? Daha sonra iptal edilemez!',
 		'confirm_action_feed_cat' => 'Bunu yapmak istediğinize emin misiniz ? Favorileriniz ve sorgularınız silinecek. Daha sonra iptal edilemez!',
 		'feedback' => array(
-			'body_new_articles' => 'FreshRSS de okunmaz üzere %d yeni makale var.',
+			'body_new_articles' => 'FreshRSS de okunmaz üzere %%d yeni makale var.',
 			'request_failed' => 'Hata. İnternet bağlantınızı kontrol edin.',
 			'title_new_articles' => 'FreshRSS: yeni makaleler!',
 		),
-- 
cgit v1.2.3


From 64ec0708a1404e1f39a5fdc0131c89b2e4038bee Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 02:51:27 +0100
Subject: More work for CSP, in particular install

Install needs testing.
https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/install.php      | 92 +++++-----------------------------------------------
 p/scripts/install.js | 76 +++++++++++++++++++++++++++++++++++++++++++
 p/scripts/main.js    |  7 ++--
 3 files changed, 89 insertions(+), 86 deletions(-)
 create mode 100644 p/scripts/install.js

(limited to 'app')

diff --git a/app/install.php b/app/install.php
index 7ac1c4cec..03f6e2199 100644
--- a/app/install.php
+++ b/app/install.php
@@ -616,27 +616,6 @@ function printStep1() {
 		<a class="btn btn-attention next-step confirm" data-str-confirm="<?php echo _t('install.js.confirm_reinstall'); ?>" href="?step=2" tabindex="2" ><?php echo _t('install.action.reinstall'); ?></a>
 	</form>
 
-	<script>
-		function ask_confirmation(e) {
-			var str_confirmation = this.getAttribute('data-str-confirm');
-			if (!str_confirmation) {
-				str_confirmation = "<?php echo _t('gen.js.confirm_action'); ?>";
-			}
-
-			if (!confirm(str_confirmation)) {
-				e.preventDefault();
-			}
-		}
-
-		function init_confirm() {
-			confirms = document.getElementsByClassName('confirm');
-			for (var i = 0 ; i < confirms.length ; i++) {
-				confirms[i].addEventListener('click', ask_confirmation);
-			}
-		}
-
-		init_confirm();
-	</script>
 	<?php } elseif ($res['all'] == 'ok') { ?>
 	<a class="btn btn-important next-step" href="?step=2" tabindex="1" ><?php echo _t('install.action.next_step'); ?></a>
 	<?php } else { ?>
@@ -674,7 +653,7 @@ function printStep2() {
 		<div class="form-group">
 			<label class="group-name" for="auth_type"><?php echo _t('install.auth.type'); ?></label>
 			<div class="group-controls">
-				<select id="auth_type" name="auth_type" required="required" onchange="auth_type_change(true)" tabindex="4">
+				<select id="auth_type" name="auth_type" required="required" tabindex="4">
 					<?php
 						function no_auth($auth_type) {
 							return !in_array($auth_type, array('form', 'persona', 'http_auth', 'none'));
@@ -709,48 +688,6 @@ function printStep2() {
 			</div>
 		</div>
 
-		<script>
-			function show_password() {
-				var button = this;
-				var passwordField = document.getElementById(button.getAttribute('data-toggle'));
-				passwordField.setAttribute('type', 'text');
-				button.className += ' active';
-
-				return false;
-			}
-			function hide_password() {
-				var button = this;
-				var passwordField = document.getElementById(button.getAttribute('data-toggle'));
-				passwordField.setAttribute('type', 'password');
-				button.className = button.className.replace(/(?:^|\s)active(?!\S)/g , '');
-
-				return false;
-			}
-			toggles = document.getElementsByClassName('toggle-password');
-			for (var i = 0 ; i < toggles.length ; i++) {
-				toggles[i].addEventListener('mousedown', show_password);
-				toggles[i].addEventListener('mouseup', hide_password);
-			}
-
-			function auth_type_change() {
-				var auth_value = document.getElementById('auth_type').value,
-				    password_input = document.getElementById('passwordPlain'),
-				    mail_input = document.getElementById('mail_login');
-
-				if (auth_value === 'form') {
-					password_input.required = true;
-					mail_input.required = false;
-				} else if (auth_value === 'persona') {
-					password_input.required = false;
-					mail_input.required = true;
-				} else {
-					password_input.required = false;
-					mail_input.required = false;
-				}
-			}
-			auth_type_change();
-		</script>
-
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important" tabindex="7" ><?php echo _t('gen.action.submit'); ?></button>
@@ -778,7 +715,7 @@ function printStep3() {
 		<div class="form-group">
 			<label class="group-name" for="type"><?php echo _t('install.bdd.type'); ?></label>
 			<div class="group-controls">
-				<select name="type" id="type" onchange="mySqlShowHide()" tabindex="1" >
+				<select name="type" id="type" tabindex="1">
 				<?php if (extension_loaded('pdo_mysql')) {?>
 				<option value="mysql"
 					<?php echo(isset($_SESSION['bd_type']) && $_SESSION['bd_type'] === 'mysql') ? 'selected="selected"' : ''; ?>>
@@ -831,19 +768,6 @@ function printStep3() {
 			</div>
 		</div>
 		</div>
-		<script>
-			function mySqlShowHide() {
-				document.getElementById('mysql').style.display = document.getElementById('type').value === 'mysql' ? 'block' : 'none';
-				if (document.getElementById('type').value !== 'mysql') {
-					document.getElementById('host').value = '';
-					document.getElementById('user').value = '';
-					document.getElementById('pass').value = '';
-					document.getElementById('base').value = '';
-					document.getElementById('prefix').value = '';
-				}
-			}
-			mySqlShowHide();
-		</script>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
@@ -897,13 +821,15 @@ case 5:
 }
 ?>
 <!DOCTYPE html>
-<html lang="fr">
+<html>
 	<head>
-		<meta charset="utf-8">
-		<meta name="viewport" content="initial-scale=1.0">
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="initial-scale=1.0" />
 		<title><?php echo _t('install.title'); ?></title>
-		<link rel="stylesheet" type="text/css" media="all" href="../themes/base-theme/template.css" />
-		<link rel="stylesheet" type="text/css" media="all" href="../themes/Origine/origine.css" />
+		<link rel="stylesheet" href="../themes/base-theme/template.css?<?php echo @filemtime(PUBLIC_PATH . '/themes/base-theme/template.css'); ?>" />
+		<link rel="stylesheet" href="../themes/Origine/origine.css?<?php echo @filemtime(PUBLIC_PATH . '/themes/Origine/origine.css'); ?>" />
+		<script src="../scripts/install.js?<?php echo @filemtime(PUBLIC_PATH . '/scripts/install.js'); ?>"></script>
+		<meta name="robots" content="noindex,nofollow" />
 	</head>
 	<body>
 
diff --git a/p/scripts/install.js b/p/scripts/install.js
new file mode 100644
index 000000000..52d8bf8e0
--- /dev/null
+++ b/p/scripts/install.js
@@ -0,0 +1,76 @@
+"use strict";
+
+function show_password() {
+	var button = this;
+	var passwordField = document.getElementById(button.getAttribute('data-toggle'));
+	passwordField.setAttribute('type', 'text');
+	button.className += ' active';
+	return false;
+}
+function hide_password() {
+	var button = this;
+	var passwordField = document.getElementById(button.getAttribute('data-toggle'));
+	passwordField.setAttribute('type', 'password');
+	button.className = button.className.replace(/(?:^|\s)active(?!\S)/g , '');
+	return false;
+}
+var toggles = document.getElementsByClassName('toggle-password');
+for (var i = 0 ; i < toggles.length ; i++) {
+	toggles[i].addEventListener('mousedown', show_password);
+	toggles[i].addEventListener('mouseup', hide_password);
+}
+
+function auth_type_change() {
+	var auth_type = document.getElementById('auth_type');
+	if (auth_type) {
+		var auth_value = auth_type.value,
+			password_input = document.getElementById('passwordPlain'),
+			mail_input = document.getElementById('mail_login');
+
+		if (auth_value === 'form') {
+			password_input.required = true;
+			mail_input.required = false;
+		} else if (auth_value === 'persona') {
+			password_input.required = false;
+			mail_input.required = true;
+		} else {
+			password_input.required = false;
+			mail_input.required = false;
+		}
+	}
+}
+var auth_type = document.getElementById('auth_type');
+if (auth_type) {
+	auth_type_change();
+	auth_type_change.addEventListener('change', auth_type_change);
+}
+
+function mySqlShowHide() {
+	var mysql = document.getElementById('mysql');
+	if (mysql) {
+		mysql.style.display = document.getElementById('type').value === 'mysql' ? 'block' : 'none';
+		if (document.getElementById('type').value !== 'mysql') {
+			document.getElementById('host').value = '';
+			document.getElementById('user').value = '';
+			document.getElementById('pass').value = '';
+			document.getElementById('base').value = '';
+			document.getElementById('prefix').value = '';
+		}
+	}
+}
+var bd_type = document.getElementById('type');
+if (bd_type) {
+	mySqlShowHide();
+	bd_type.addEventListener('change', mySqlShowHide);
+}
+
+function ask_confirmation(e) {
+	var str_confirmation = this.getAttribute('data-str-confirm');
+	if (!confirm(str_confirmation)) {
+		e.preventDefault();
+	}
+}
+var confirms = document.getElementsByClassName('confirm');
+for (var i = 0 ; i < confirms.length ; i++) {
+	confirms[i].addEventListener('click', ask_confirmation);
+}
diff --git a/p/scripts/main.js b/p/scripts/main.js
index b7522df6a..31b07721a 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -871,7 +871,7 @@ function notifs_html5_show(nb) {
 		window.location.reload();
 	}
 
-	if (context['html5_notif_timeout'] !== 0){
+	if (context['html5_notif_timeout'] !== 0) {
 		setTimeout(function() {
 			notification.close();
 		}, context['html5_notif_timeout'] * 1000);
@@ -1246,8 +1246,9 @@ function init_configuration_alert() {
 }
 
 function parseJavaScriptCookie() {
-	var json = JSON.parse(decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)FreshRSS-vars\s*\=\s*([^;]*).*$)|^.*$/, "$1"))) || {};
+	var vars = decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)FreshRSS-vars\s*\=\s*([^;]*).*$)|^.*$/, "$1"));
 	document.cookie = 'FreshRSS-vars=; expires=Thu, 01 Jan 1970 00:00:00 GMT';
+	var json = JSON.parse(vars);
 	window.context = json.context;
 	window.shortcuts = json.shortcuts;
 	window.url = json.url;
@@ -1256,7 +1257,6 @@ function parseJavaScriptCookie() {
 }
 
 function init_all() {
-	parseJavaScriptCookie();
 	if (!window.$) {
 		if (window.console) {
 			console.log('FreshRSS waiting for JS…');
@@ -1264,6 +1264,7 @@ function init_all() {
 		window.setTimeout(init_all, 50);
 		return;
 	}
+	parseJavaScriptCookie();
 	init_notifications();
 	init_confirm_action();
 	$stream = $('#stream');
-- 
cgit v1.2.3


From e3dc7d46e15d97f8bd008acf3489d5e6c22b8daa Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 14:23:24 +0100
Subject: CSP: Use inline JSON instead of one-time cookie

Simpler, lighter
https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/FreshRSS.php                        | 58 ---------------------------------
 app/layout/layout.phtml                 |  3 ++
 app/views/helpers/javascript_vars.phtml | 54 ++++++++++++++++++++++++++++++
 p/scripts/main.js                       | 10 +++---
 4 files changed, 62 insertions(+), 63 deletions(-)
 create mode 100644 app/views/helpers/javascript_vars.phtml

(limited to 'app')

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 8eb862aeb..a6ed2a306 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -110,66 +110,8 @@ class FreshRSS extends Minz_FrontController {
 		}
 	}
 
-	private static function setJavascriptCookie() {
-		$mark = FreshRSS_Context::$user_conf->mark_when;
-		$mail = Minz_Session::param('mail', false);
-		$s = FreshRSS_Context::$user_conf->shortcuts;
-		$json = json_encode(array(
-			'context' => array(
-				'auto_remove_article' => !!FreshRSS_Context::isAutoRemoveAvailable(),
-				'hide_posts' => !(FreshRSS_Context::$user_conf->display_posts || Minz_Request::actionName() === 'reader'),
-				'display_order' => Minz_Request::param('order', FreshRSS_Context::$user_conf->sort_order),
-				'auto_mark_article' => !!$mark['article'],
-				'auto_mark_site' => !!$mark['site'],
-				'auto_mark_scroll' => !!$mark['scroll'],
-				'auto_load_more' => !!FreshRSS_Context::$user_conf->auto_load_more,
-				'auto_actualize_feeds' => !!Minz_Session::param('actualize_feeds', false),
-				'does_lazyload' => !!FreshRSS_Context::$user_conf->lazyload ,
-				'sticky_post' => !!FreshRSS_Context::isStickyPostEnabled(),
-				'html5_notif_timeout' => FreshRSS_Context::$user_conf->html5_notif_timeout,
-				'auth_type' => FreshRSS_Context::$system_conf->auth_type,
-				'current_user_mail' => $mail ? ('"' . $mail . '"') : null,
-				'current_view' => Minz_Request::actionName(),
-			),
-			'shortcuts' => array(
-				'mark_read' => @$s['mark_read'],
-				'mark_favorite' => @$s['mark_favorite'],
-				'go_website' => @$s['go_website'],
-				'prev_entry' => @$s['prev_entry'],
-				'next_entry' => @$s['next_entry'],
-				'first_entry' => @$s['first_entry'],
-				'last_entry' => @$s['last_entry'],
-				'collapse_entry' => @$s['collapse_entry'],
-				'load_more' => @$s['load_more'],
-				'auto_share' => @$s['auto_share'],
-				'focus_search' => @$s['focus_search'],
-				'user_filter' => @$s['user_filter'],
-				'help' => @$s['help'],
-				'close_dropdown' => @$s['close_dropdown'],
-			),
-			'url' => array(
-				'index' => _url('index', 'index'),
-				'login' => Minz_Url::display(array('c' => 'auth', 'a' => 'login'), 'php'),
-				'logout' => Minz_Url::display(array('c' => 'auth', 'a' => 'logout'), 'php'),
-				'help' => FRESHRSS_WIKI,
-			),
-			'i18n' => array(
-				'confirmation_default' => _t('gen.js.confirm_action'),
-				'notif_title_articles' => _t('gen.js.feedback.title_new_articles'),
-				'notif_body_articles' => _t('gen.js.feedback.body_new_articles'),
-				'notif_request_failed' => _t('gen.js.feedback.request_failed'),
-				'category_empty' => _t('gen.js.category_empty'),
-			),
-			'icons' => array(
-				'close' => _i('close'),
-			),
-		), JSON_UNESCAPED_UNICODE);
-		setrawcookie('FreshRSS-vars', rawurlencode($json), 0, Minz_Session::getCookieDir());
-	}
-
 	public static function preLayout() {
 		header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *; style-src 'self' 'unsafe-inline'");
-		self::setJavascriptCookie();
 	}
 
 	private function loadNotifications() {
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 7d718efbd..99a3717bc 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -8,6 +8,9 @@
 		<meta name="viewport" content="initial-scale=1.0" />
 		<?php echo self::headTitle(); ?>
 		<?php echo self::headStyle(); ?>
+		<script id="jsonVars" type="application/json">
+<?php $this->renderHelper('javascript_vars'); ?>
+		</script>
 		<?php echo self::headScript(); ?>
 <?php
 	$url_base = Minz_Request::currentRequest();
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
new file mode 100644
index 000000000..6178cacf2
--- /dev/null
+++ b/app/views/helpers/javascript_vars.phtml
@@ -0,0 +1,54 @@
+<?php
+$mark = FreshRSS_Context::$user_conf->mark_when;
+$mail = Minz_Session::param('mail', false);
+$s = FreshRSS_Context::$user_conf->shortcuts;
+echo htmlspecialchars(json_encode(array(
+	'context' => array(
+		'auto_remove_article' => !!FreshRSS_Context::isAutoRemoveAvailable(),
+		'hide_posts' => !(FreshRSS_Context::$user_conf->display_posts || Minz_Request::actionName() === 'reader'),
+		'display_order' => Minz_Request::param('order', FreshRSS_Context::$user_conf->sort_order),
+		'auto_mark_article' => !!$mark['article'],
+		'auto_mark_site' => !!$mark['site'],
+		'auto_mark_scroll' => !!$mark['scroll'],
+		'auto_load_more' => !!FreshRSS_Context::$user_conf->auto_load_more,
+		'auto_actualize_feeds' => !!Minz_Session::param('actualize_feeds', false),
+		'does_lazyload' => !!FreshRSS_Context::$user_conf->lazyload ,
+		'sticky_post' => !!FreshRSS_Context::isStickyPostEnabled(),
+		'html5_notif_timeout' => FreshRSS_Context::$user_conf->html5_notif_timeout,
+		'auth_type' => FreshRSS_Context::$system_conf->auth_type,
+		'current_user_mail' => $mail ? ('"' . $mail . '"') : null,
+		'current_view' => Minz_Request::actionName(),
+	),
+	'shortcuts' => array(
+		'mark_read' => @$s['mark_read'],
+		'mark_favorite' => @$s['mark_favorite'],
+		'go_website' => @$s['go_website'],
+		'prev_entry' => @$s['prev_entry'],
+		'next_entry' => @$s['next_entry'],
+		'first_entry' => @$s['first_entry'],
+		'last_entry' => @$s['last_entry'],
+		'collapse_entry' => @$s['collapse_entry'],
+		'load_more' => @$s['load_more'],
+		'auto_share' => @$s['auto_share'],
+		'focus_search' => @$s['focus_search'],
+		'user_filter' => @$s['user_filter'],
+		'help' => @$s['help'],
+		'close_dropdown' => @$s['close_dropdown'],
+	),
+	'url' => array(
+		'index' => _url('index', 'index'),
+		'login' => Minz_Url::display(array('c' => 'auth', 'a' => 'login'), 'php'),
+		'logout' => Minz_Url::display(array('c' => 'auth', 'a' => 'logout'), 'php'),
+		'help' => FRESHRSS_WIKI,
+	),
+	'i18n' => array(
+		'confirmation_default' => _t('gen.js.confirm_action'),
+		'notif_title_articles' => _t('gen.js.feedback.title_new_articles'),
+		'notif_body_articles' => _t('gen.js.feedback.body_new_articles'),
+		'notif_request_failed' => _t('gen.js.feedback.request_failed'),
+		'category_empty' => _t('gen.js.category_empty'),
+	),
+	'icons' => array(
+		'close' => _i('close'),
+	),
+), JSON_UNESCAPED_UNICODE), ENT_NOQUOTES);
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 31b07721a..f07cdafd7 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1245,10 +1245,10 @@ function init_configuration_alert() {
 	});
 }
 
-function parseJavaScriptCookie() {
-	var vars = decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)FreshRSS-vars\s*\=\s*([^;]*).*$)|^.*$/, "$1"));
-	document.cookie = 'FreshRSS-vars=; expires=Thu, 01 Jan 1970 00:00:00 GMT';
-	var json = JSON.parse(vars);
+function parseJsonVars() {
+	var jsonVars = document.getElementById('jsonVars'),
+		json = JSON.parse(jsonVars.innerHTML);
+	jsonVars.outerHTML = '';
 	window.context = json.context;
 	window.shortcuts = json.shortcuts;
 	window.url = json.url;
@@ -1264,7 +1264,7 @@ function init_all() {
 		window.setTimeout(init_all, 50);
 		return;
 	}
-	parseJavaScriptCookie();
+	parseJsonVars();
 	init_notifications();
 	init_confirm_action();
 	$stream = $('#stream');
-- 
cgit v1.2.3


From 264d05297c72e87b114a8e930db7eae7affe5690 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 17:26:37 +0100
Subject: CSP for statistics

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/Models/StatsDAO.php           |  20 ++++----
 app/Models/StatsDAOSQLite.php     |   4 +-
 app/views/stats/index.phtml       |  64 ++++-------------------
 app/views/stats/repartition.phtml | 103 ++++++++------------------------------
 p/scripts/repartition.js          |  72 ++++++++++++++++++++++++++
 p/scripts/stats.js                |  56 +++++++++++++++++++++
 6 files changed, 169 insertions(+), 150 deletions(-)
 create mode 100644 p/scripts/repartition.js
 create mode 100644 p/scripts/stats.js

(limited to 'app')

diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 80caccc49..5ca333396 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -55,9 +55,9 @@ SQL;
 
 	/**
 	 * Calculates entry count per day on a 30 days period.
-	 * Returns the result as a JSON string.
+	 * Returns the result as a JSON object.
 	 *
-	 * @return string
+	 * @return JSON object
 	 */
 	public function calculateEntryCount() {
 		$count = $this->initEntryCountArray();
@@ -257,9 +257,9 @@ SQL;
 
 	/**
 	 * Calculates feed count per category.
-	 * Returns the result as a JSON string.
+	 * Returns the result as a JSON object.
 	 *
-	 * @return string
+	 * @return JSON object
 	 */
 	public function calculateFeedByCategory() {
 		$sql = <<<SQL
@@ -282,7 +282,7 @@ SQL;
 	 * Calculates entry count per category.
 	 * Returns the result as a JSON string.
 	 *
-	 * @return string
+	 * @return JSON object
 	 */
 	public function calculateEntryByCategory() {
 		$sql = <<<SQL
@@ -357,7 +357,7 @@ SQL;
 			$serie[] = array($key, $value);
 		}
 
-		return json_encode($serie);
+		return $serie;
 	}
 
 	protected function convertToPieSerie($data) {
@@ -368,7 +368,7 @@ SQL;
 			$serie[] = $value;
 		}
 
-		return json_encode($serie);
+		return $serie;
 	}
 
 	/**
@@ -411,17 +411,17 @@ SQL;
 	}
 
 	/**
-	 * Translates array content and encode it as JSON
+	 * Translates array content
 	 *
 	 * @param array $data
-	 * @return string
+	 * @return JSON object
 	 */
 	private function convertToTranslatedJson($data = array()) {
 		$translated = array_map(function($a) {
 			return _t('gen.date.' . $a);
 		}, $data);
 
-		return json_encode($translated);
+		return $translated;
 	}
 
 }
diff --git a/app/Models/StatsDAOSQLite.php b/app/Models/StatsDAOSQLite.php
index bb2336532..9bfe8b20a 100644
--- a/app/Models/StatsDAOSQLite.php
+++ b/app/Models/StatsDAOSQLite.php
@@ -4,9 +4,9 @@ class FreshRSS_StatsDAOSQLite extends FreshRSS_StatsDAO {
 
 	/**
 	 * Calculates entry count per day on a 30 days period.
-	 * Returns the result as a JSON string.
+	 * Returns the result as a JSON object.
 	 *
-	 * @return string
+	 * @return JSON object
 	 */
 	public function calculateEntryCount() {
 		$count = $this->initEntryCountArray();
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index 18bcd4d99..c11b88999 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -82,58 +82,12 @@
 	</div>
 </div>
 
-<script>
-"use strict";
-function initStats() {
-	if (!window.Flotr) {
-		if (window.console) {
-			console.log('FreshRSS waiting for Flotr…');
-		}
-		window.setTimeout(initStats, 50);
-		return;
-	}
-	// Entry per day
-	var avg = [];
-	for (var i = -31; i <= 0; i++) {
-		avg.push([i, <?php echo $this->average?>]);
-	}
-	Flotr.draw(document.getElementById('statsEntryPerDay'),
-		[{
-			data: <?php echo $this->count ?>,
-			bars: {horizontal: false, show: true}
-		},{
-			data: avg,
-			lines: {show: true},
-			label: "<?php echo $this->average?>"
-		}],
-		{
-			grid: {verticalLines: false},
-			xaxis: {noTicks: 6, showLabels: false, tickDecimals: 0, min: -30.75, max: -0.25},
-			yaxis: {min: 0},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
-		});
-	// Feed per category
-	Flotr.draw(document.getElementById('statsFeedPerCategory'),
-		<?php echo $this->feedByCategory ?>,
-		{
-			grid: {verticalLines: false, horizontalLines: false},
-			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
-			xaxis: {showLabels: false},
-			yaxis: {showLabels: false},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
-			legend: {container: document.getElementById('statsFeedPerCategoryLegend'), noColumns: 3}
-		});
-	// Entry per category
-	Flotr.draw(document.getElementById('statsEntryPerCategory'),
-		<?php echo $this->entryByCategory ?>,
-		{
-			grid: {verticalLines: false, horizontalLines: false},
-			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
-			xaxis: {showLabels: false},
-			yaxis: {showLabels: false},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
-			legend: {container: document.getElementById('statsEntryPerCategoryLegend'), noColumns: 3}
-		});
-}
-initStats();
-</script>
+<script id="jsonStats" type="application/json"><?php
+echo htmlspecialchars(json_encode(array(
+	'average' => $this->average,
+	'dataCount' => $this->count,
+	'feedByCategory' => $this->feedByCategory,
+	'entryByCategory' => $this->entryByCategory,
+), JSON_UNESCAPED_UNICODE), ENT_NOQUOTES);
+?></script>
+<script src="../scripts/stats.js?<?php echo @filemtime(PUBLIC_PATH . '/scripts/stats.js'); ?>"></script>
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index b20d9bbd0..980b26a3d 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -30,20 +30,20 @@
 	<?php }?>
 
 	<div class="stat">
-	    <table>
+		<table>
 		<tr>
-		    <th><?php echo _t('admin.stats.status_total'); ?></th>
-		    <th><?php echo _t('admin.stats.status_read'); ?></th>
-		    <th><?php echo _t('admin.stats.status_unread'); ?></th>
-		    <th><?php echo _t('admin.stats.status_favorites'); ?></th>
+			<th><?php echo _t('admin.stats.status_total'); ?></th>
+			<th><?php echo _t('admin.stats.status_read'); ?></th>
+			<th><?php echo _t('admin.stats.status_unread'); ?></th>
+			<th><?php echo _t('admin.stats.status_favorites'); ?></th>
 		</tr>
 		<tr>
-		    <td class="numeric"><?php echo $this->repartition['total']; ?></td>
-		    <td class="numeric"><?php echo $this->repartition['read']; ?></td>
-		    <td class="numeric"><?php echo $this->repartition['unread']; ?></td>
-		    <td class="numeric"><?php echo $this->repartition['favorite']; ?></td>
+			<td class="numeric"><?php echo $this->repartition['total']; ?></td>
+			<td class="numeric"><?php echo $this->repartition['read']; ?></td>
+			<td class="numeric"><?php echo $this->repartition['unread']; ?></td>
+			<td class="numeric"><?php echo $this->repartition['favorite']; ?></td>
 		</tr>
-	    </table>
+		</table>
 	</div>
 
 	<div class="stat">
@@ -62,76 +62,13 @@
 	</div>
 </div>
 
-<script>
-"use strict";
-function initStats() {
-	if (!window.Flotr) {
-		if (window.console) {
-			console.log('FreshRSS waiting for Flotr…');
-		}
-		window.setTimeout(initStats, 50);
-		return;
-	}
-	// Entry per hour
-	Flotr.draw(document.getElementById('statsEntryPerHour'),
-		[{
-			data: <?php echo $this->repartitionHour ?>,
-			bars: {horizontal: false, show: true}
-		}],
-		{
-			grid: {verticalLines: false},
-			xaxis: {noTicks: 23,
-				tickFormatter: function(x) {
-					var x = parseInt(x);
-					return x + 1;
-				},
-				min: -0.9,
-				max: 23.9,
-				tickDecimals: 0},
-			yaxis: {min: 0},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
-		});
-	// Entry per day of week
-	Flotr.draw(document.getElementById('statsEntryPerDayOfWeek'),
-		[{
-			data: <?php echo $this->repartitionDayOfWeek ?>,
-			bars: {horizontal: false, show: true}
-		}],
-		{
-			grid: {verticalLines: false},
-			xaxis: {noTicks: 6,
-				tickFormatter: function(x) {
-					var x = parseInt(x),
-					    days = <?php echo $this->days?>;
-					return days[x];
-				},
-				min: -0.9,
-				max: 6.9,
-				tickDecimals: 0},
-			yaxis: {min: 0},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
-		});
-	// Entry per month
-	Flotr.draw(document.getElementById('statsEntryPerMonth'),
-		[{
-			data: <?php echo $this->repartitionMonth ?>,
-			bars: {horizontal: false, show: true}
-		}],
-		{
-			grid: {verticalLines: false},
-			xaxis: {noTicks: 12,
-				tickFormatter: function(x) {
-					var x = parseInt(x),
-					    months = <?php echo $this->months?>;
-					return months[(x - 1)];
-				},
-				min: 0.1,
-				max: 12.9,
-				tickDecimals: 0},
-			yaxis: {min: 0},
-			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
-		});
-
-}
-initStats();
-</script>
+<script id="jsonRepartition" type="application/json"><?php
+echo htmlspecialchars(json_encode(array(
+	'repartitionHour' => $this->repartitionHour,
+	'repartitionDayOfWeek' => $this->repartitionDayOfWeek,
+	'days' => $this->days,
+	'repartitionMonth' => $this->repartitionMonth,
+	'months' => $this->months,
+), JSON_UNESCAPED_UNICODE), ENT_NOQUOTES);
+?></script>
+<script src="../scripts/repartition.js?<?php echo @filemtime(PUBLIC_PATH . '/scripts/repartition.js'); ?>"></script>
diff --git a/p/scripts/repartition.js b/p/scripts/repartition.js
new file mode 100644
index 000000000..a391de2f2
--- /dev/null
+++ b/p/scripts/repartition.js
@@ -0,0 +1,72 @@
+"use strict";
+function initStats() {
+	if (!window.Flotr) {
+		if (window.console) {
+			console.log('FreshRSS waiting for Flotr…');
+		}
+		window.setTimeout(initStats, 50);
+		return;
+	}
+	var jsonRepartition = document.getElementById('jsonRepartition'),
+		stats = JSON.parse(jsonRepartition.innerHTML);
+	jsonRepartition.outerHTML = '';
+	// Entry per hour
+	Flotr.draw(document.getElementById('statsEntryPerHour'),
+		[{
+			data: stats.repartitionHour,
+			bars: {horizontal: false, show: true}
+		}],
+		{
+			grid: {verticalLines: false},
+			xaxis: {noTicks: 23,
+				tickFormatter: function(x) {
+					var x = parseInt(x);
+					return x + 1;
+				},
+				min: -0.9,
+				max: 23.9,
+				tickDecimals: 0},
+			yaxis: {min: 0},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
+		});
+	// Entry per day of week
+	Flotr.draw(document.getElementById('statsEntryPerDayOfWeek'),
+		[{
+			data: stats.repartitionDayOfWeek,
+			bars: {horizontal: false, show: true}
+		}],
+		{
+			grid: {verticalLines: false},
+			xaxis: {noTicks: 6,
+				tickFormatter: function(x) {
+					var x = parseInt(x);
+					return stats.days[x];
+				},
+				min: -0.9,
+				max: 6.9,
+				tickDecimals: 0},
+			yaxis: {min: 0},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
+		});
+	// Entry per month
+	Flotr.draw(document.getElementById('statsEntryPerMonth'),
+		[{
+			data: stats.repartitionMonth,
+			bars: {horizontal: false, show: true}
+		}],
+		{
+			grid: {verticalLines: false},
+			xaxis: {noTicks: 12,
+				tickFormatter: function(x) {
+					var x = parseInt(x);
+					return stats.months[(x - 1)];
+				},
+				min: 0.1,
+				max: 12.9,
+				tickDecimals: 0},
+			yaxis: {min: 0},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
+		});
+
+}
+initStats();
diff --git a/p/scripts/stats.js b/p/scripts/stats.js
new file mode 100644
index 000000000..2e8ab6e27
--- /dev/null
+++ b/p/scripts/stats.js
@@ -0,0 +1,56 @@
+"use strict";
+function initStats() {
+	if (!window.Flotr) {
+		if (window.console) {
+			console.log('FreshRSS waiting for Flotr…');
+		}
+		window.setTimeout(initStats, 50);
+		return;
+	}
+	var jsonStats = document.getElementById('jsonStats'),
+		stats = JSON.parse(jsonStats.innerHTML);
+	jsonStats.outerHTML = '';
+	// Entry per day
+	var avg = [];
+	for (var i = -31; i <= 0; i++) {
+		avg.push([i, stats.average]);
+	}
+	Flotr.draw(document.getElementById('statsEntryPerDay'),
+		[{
+			data: stats.dataCount,
+			bars: {horizontal: false, show: true}
+		},{
+			data: avg,
+			lines: {show: true},
+			label: stats.average,
+		}],
+		{
+			grid: {verticalLines: false},
+			xaxis: {noTicks: 6, showLabels: false, tickDecimals: 0, min: -30.75, max: -0.25},
+			yaxis: {min: 0},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return numberFormat(obj.y);}}
+		});
+	// Feed per category
+	Flotr.draw(document.getElementById('statsFeedPerCategory'),
+		stats.feedByCategory,
+		{
+			grid: {verticalLines: false, horizontalLines: false},
+			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
+			xaxis: {showLabels: false},
+			yaxis: {showLabels: false},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
+			legend: {container: document.getElementById('statsFeedPerCategoryLegend'), noColumns: 3}
+		});
+	// Entry per category
+	Flotr.draw(document.getElementById('statsEntryPerCategory'),
+		stats.entryByCategory,
+		{
+			grid: {verticalLines: false, horizontalLines: false},
+			pie: {explode: 10, show: true, labelFormatter: function(){return '';}},
+			xaxis: {showLabels: false},
+			yaxis: {showLabels: false},
+			mouse: {relative: true, track: true, trackDecimals: 0, trackFormatter: function(obj) {return obj.series.label + ' - '+ numberFormat(obj.y) + ' ('+ (obj.fraction * 100).toFixed(1) + '%)';}},
+			legend: {container: document.getElementById('statsEntryPerCategoryLegend'), noColumns: 3}
+		});
+}
+initStats();
-- 
cgit v1.2.3


From b4864149889a749042d344625d4ffbdbd3f8a3cc Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 18:06:32 +0100
Subject: CSP for bookmarklet (subscription)

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/layout/aside_subscription.phtml | 2 +-
 p/scripts/main.js                   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index 8a54e2dc2..fa10d63e8 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -10,7 +10,7 @@
 	</li>
 
 	<li class="item">
-		<a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url), '_blank');})();">
+		<a class="bookmarkClick" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url), '_blank');})();">
 			<?php echo _t('sub.menu.bookmark'); ?>
 		</a>
 	</li>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index f07cdafd7..cfde5fd4e 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1245,6 +1245,12 @@ function init_configuration_alert() {
 	});
 }
 
+function init_subscription() {
+	$('body').on('click', '.bookmarkClick', function (e) {
+		return false;
+	});
+}
+
 function parseJsonVars() {
 	var jsonVars = document.getElementById('jsonVars'),
 		json = JSON.parse(jsonVars.innerHTML);
@@ -1281,6 +1287,7 @@ function init_all() {
 		init_notifs_html5();
 		window.setInterval(refreshUnreads, 120000);
 	} else {
+		init_subscription();
 		init_crypto_form();
 		init_share_observers();
 		init_remove_observers();
-- 
cgit v1.2.3


From cb913a3a76daf357ad36ca39c26b4aaf800211d2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 19:15:23 +0100
Subject: CSP for statistics and forms

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 CHANGELOG.md                       |  2 ++
 app/FreshRSS.php                   |  6 +++++-
 app/layout/aside_feed.phtml        |  2 +-
 app/layout/nav_menu.phtml          |  2 +-
 app/views/extension/index.phtml    |  2 +-
 app/views/feed/add.phtml           |  2 +-
 app/views/helpers/pagination.phtml |  2 +-
 app/views/stats/idle.phtml         |  2 +-
 app/views/stats/index.phtml        | 10 +++++-----
 app/views/stats/repartition.phtml  | 10 +++++-----
 app/views/subscription/index.phtml |  4 ++--
 p/scripts/main.js                  |  6 +++---
 p/themes/base-theme/template.css   |  8 ++++++++
 13 files changed, 36 insertions(+), 22 deletions(-)

(limited to 'app')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f96839eb..7fc872040 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 2016-xx-xx FreshRSS 1.3.1-beta
 
+* Security
+	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/pull/1075)
 * UI
 	* Fixed several small bugs in global and reader view [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
 	* Updated to jQuery 2.2 and changed code for auto-load on scroll [#1050](https://github.com/FreshRSS/FreshRSS/pull/1050)
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index a6ed2a306..62ea18d96 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -111,7 +111,11 @@ class FreshRSS extends Minz_FrontController {
 	}
 
 	public static function preLayout() {
-		header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *; style-src 'self' 'unsafe-inline'");
+		if (Minz_Request::controllerName() === 'stats') {
+			header("Content-Security-Policy: default-src 'self'; style-src 'self' 'unsafe-inline'");
+		} else {
+			header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *");
+		}
 	}
 
 	private function loadNotifications() {
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 307db6af8..4e1903a7a 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -19,7 +19,7 @@
 	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('index.menu.about'); ?></a>
 	<?php } ?>
 
-	<form id="mark-read-aside" method="post" style="display: none"></form>
+	<form id="mark-read-aside" method="post" aria-hidden="true"></form>
 
 	<ul class="tree">
 		<li class="tree-folder category all<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 3a755b560..0f303beb8 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -79,7 +79,7 @@
 		);
 	?>
 
-	<form id="mark-read-menu" method="post" style="display: none"></form>
+	<form id="mark-read-menu" method="post" aria-hidden="true"></form>
 
 	<div class="stick" id="nav_menu_read_all">
 		<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index f2d05028f..4b0d5ebeb 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -5,7 +5,7 @@
 
 	<h1><?php echo _t('admin.extensions.title'); ?></h1>
 
-	<form id="form-extension" method="post" style="display: none"></form>
+	<form id="form-extension" method="post" aria-hidden="true"></form>
 	<?php if (!empty($this->extension_list['system'])) { ?>
 	<h2><?php echo _t('admin.extensions.system'); ?></h2>
 	<?php
diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml
index 35f6fbb12..fd6d41b1d 100644
--- a/app/views/feed/add.phtml
+++ b/app/views/feed/add.phtml
@@ -56,7 +56,7 @@
 					<option value="nc"><?php echo _t('sub.category.new'); ?></option>
 				</select>
 
-				<span style="display: none;">
+				<span aria-hidden="true">
 					<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('sub.category.new'); ?>" />
 				</span>
 			</div>
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index b20201c4b..7eca8c525 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -14,7 +14,7 @@
 	);
 ?>
 
-<form id="mark-read-pagination" method="post" style="display: none"></form>
+<form id="mark-read-pagination" method="post" aria-hidden="true"></form>
 
 <ul class="pagination">
 	<li class="item pager-next">
diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index 22117792d..11b7df8c4 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -18,7 +18,7 @@
 		<div class="stat">
 			<h2><?php echo _t('gen.date.' . $period); ?></h2>
 
-			<form id="form-delete" method="post" style="display: none"></form>
+			<form id="form-delete" method="post" aria-hidden="true"></form>
 
 			<?php foreach ($feeds as $feed) { ?>
 			<ul class="horizontal-list">
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index c11b88999..0a2fbdb10 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -66,18 +66,18 @@
 
 	<div class="stat">
 		<h2><?php echo _t('admin.stats.entry_per_day'); ?></h2>
-		<div id="statsEntryPerDay" style="height: 300px"></div>
+		<div id="statsEntryPerDay" class="statGraph"></div>
 	</div>
 
 	<div class="stat half">
 		<h2><?php echo _t('admin.stats.feed_per_category'); ?></h2>
-		<div id="statsFeedPerCategory" style="height: 300px"></div>
+		<div id="statsFeedPerCategory" class="statGraph"></div>
 		<div id="statsFeedPerCategoryLegend"></div>
-	</div><!--
+	</div>
 
-	--><div class="stat half">
+	<div class="stat half">
 		<h2><?php echo _t('admin.stats.entry_per_category'); ?></h2>
-		<div id="statsEntryPerCategory" style="height: 300px"></div>
+		<div id="statsEntryPerCategory" class="statGraph"></div>
 		<div id="statsEntryPerCategoryLegend"></div>
 	</div>
 </div>
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index 980b26a3d..ffb2c361e 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -48,17 +48,17 @@
 
 	<div class="stat">
 		<h2><?php echo _t('admin.stats.entry_per_hour', $this->averageHour); ?></h2>
-		<div id="statsEntryPerHour" style="height: 300px"></div>
+		<div id="statsEntryPerHour" class="statGraph"></div>
 	</div>
 
 	<div class="stat half">
 		<h2><?php echo _t('admin.stats.entry_per_day_of_week', $this->averageDayOfWeek); ?></h2>
-		<div id="statsEntryPerDayOfWeek" style="height: 300px"></div>
-	</div><!--
+		<div id="statsEntryPerDayOfWeek" class="statGraph"></div>
+	</div>
 
-	--><div class="stat half">
+	<div class="stat half">
 		<h2><?php echo _t('admin.stats.entry_per_month', $this->averageMonth); ?></h2>
-		<div id="statsEntryPerMonth" style="height: 300px"></div>
+		<div id="statsEntryPerMonth" class="statGraph"></div>
 	</div>
 </div>
 
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 2cfe3f33c..07cebf817 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -28,7 +28,7 @@
 						</select>
 					</li>
 
-					<li class="input" style="display:none">
+					<li class="input" aria-hidden="true">
 						<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('sub.category.new'); ?>" />
 					</li>
 
@@ -62,7 +62,7 @@
 		</ul>
 	</div>
 
-	<form id="controller-category" method="post" style="display: none;"></form>
+	<form id="controller-category" method="post" aria-hidden="true"></form>
 
 	<?php
 		foreach ($this->categories as $cat) {
diff --git a/p/scripts/main.js b/p/scripts/main.js
index cfde5fd4e..d62a6aff8 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -899,7 +899,7 @@ function refreshUnreads() {
 
 			if ((incUnreadsFeed(null, feed_id, nbUnreads - feed_unreads) || isAll) &&	//Update of current view?
 				(nbUnreads - feed_unreads > 0)) {
-				$('#new-article').show();
+				$('#new-article').attr('aria-hidden', 'false').show();
 				new_articles = true;
 			};
 		});
@@ -1122,10 +1122,10 @@ function init_feed_observers() {
 	$('select[id="category"]').on('change', function() {
 		var detail = $('#new_category_name').parent();
 		if ($(this).val() === 'nc') {
-			detail.show();
+			detail.attr('aria-hidden', 'false').show();
 			detail.find('input').focus();
 		} else {
-			detail.hide();
+			detail.attr('aria-hidden', 'true').hide();
 		}
 	});
 }
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 17a43d3ed..8a12423be 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -110,6 +110,11 @@ td.numeric {
 
 /*=== COMPONENTS */
 /*===============*/
+
+[aria-hidden="true"] {
+	display: none;
+}
+
 /*=== Forms */
 .form-group::after {
 	content: "";
@@ -620,6 +625,9 @@ br + br + br {
 .stat > table {
 	width: 100%;
 }
+.statGraph {
+	height: 300px;
+}
 
 /*=== GLOBAL VIEW */
 /*================*/
-- 
cgit v1.2.3


From 38c2d671e3480b8e9fb38491797e44fdea317006 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 21 Feb 2016 21:25:23 +0100
Subject: CSP different policies per controller

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/FreshRSS.php | 14 ++++++++++----
 app/install.php  |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 62ea18d96..bfbd7a6eb 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -111,10 +111,16 @@ class FreshRSS extends Minz_FrontController {
 	}
 
 	public static function preLayout() {
-		if (Minz_Request::controllerName() === 'stats') {
-			header("Content-Security-Policy: default-src 'self'; style-src 'self' 'unsafe-inline'");
-		} else {
-			header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *");
+		switch (Minz_Request::controllerName()) {
+			case 'index':
+				header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *");
+				break;
+			case 'stats':
+				header("Content-Security-Policy: default-src 'self'; style-src 'self' 'unsafe-inline'");
+				break;
+			default:
+				header("Content-Security-Policy: default-src 'self'");
+				break;
 		}
 	}
 
diff --git a/app/install.php b/app/install.php
index 03f6e2199..a4a888af2 100644
--- a/app/install.php
+++ b/app/install.php
@@ -2,6 +2,7 @@
 if (function_exists('opcache_reset')) {
 	opcache_reset();
 }
+header("Content-Security-Policy: default-src 'self'");
 
 define('BCRYPT_COST', 9);
 
-- 
cgit v1.2.3


From 05ba5bc569060edf88c7b2e284736dcca68249aa Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 22 Feb 2016 21:10:35 +0100
Subject: Do not log article updates

It seems to work well, and there are too many such updates.
BTW, we should have a verbose/insane log level.
---
 app/Controllers/feedController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 4ec661115..7294fe8f4 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -359,8 +359,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 							//This entry already exists and is unchanged. TODO: Remove the test with the zero'ed hash in FreshRSS v1.3
 							$oldGuids[] = $entry->guid();
 						} else {	//This entry already exists but has been updated
-							Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->id() .
-								', old hash ' . $existingHash . ', new hash ' . $entry->hash());
+							//Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->id() .
+								//', old hash ' . $existingHash . ', new hash ' . $entry->hash());
 							//TODO: Make an updated/is_read policy by feed, in addition to the global one.
 							$entry->_isRead(FreshRSS_Context::$user_conf->mark_updated_article_unread ? false : null);	//Change is_read according to policy.
 							if (!$entryDAO->hasTransaction()) {
-- 
cgit v1.2.3


From b501fd6514253d3f7e14e2f09421a614641d3e7f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 27 Feb 2016 14:53:03 +0100
Subject: PHP7 share bug

https://github.com/FreshRSS/FreshRSS/issues/1072
---
 app/Models/Share.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/Models/Share.php b/app/Models/Share.php
index 2a05f2ee9..1c8a7e767 100644
--- a/app/Models/Share.php
+++ b/app/Models/Share.php
@@ -119,11 +119,9 @@ class FreshRSS_Share {
 		);
 
 		foreach ($options as $key => $value) {
-			if (!isset($available_options[$key])) {
-				continue;
+			if (isset($available_options[$key])) {
+				$this->{$available_options[$key]} = $value;
 			}
-
-			$this->$available_options[$key] = $value;
 		}
 	}
 
-- 
cgit v1.2.3


From c9d3d78340e062b9e2fe19c8c55b8bdc75392e63 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 27 Feb 2016 17:51:13 +0100
Subject: CSP manually refreshing feeds

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/Controllers/javascriptController.php |  2 +-
 app/views/javascript/actualize.phtml     | 69 ++++++--------------------------
 p/scripts/main.js                        | 44 +++++++++++++++++---
 3 files changed, 53 insertions(+), 62 deletions(-)

(limited to 'app')

diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index e3ae3669e..00a7b5c38 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -6,7 +6,7 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
 	}
 
 	public function actualizeAction() {
-		header('Content-Type: text/javascript; charset=UTF-8');
+		header('Content-Type: application/json; charset=UTF-8');
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$user_conf->ttl_default);
 	}
diff --git a/app/views/javascript/actualize.phtml b/app/views/javascript/actualize.phtml
index 454228909..3baabf748 100644
--- a/app/views/javascript/actualize.phtml
+++ b/app/views/javascript/actualize.phtml
@@ -1,56 +1,13 @@
-"use strict";
-var feeds = [<?php foreach ($this->feeds as $feed) { ?>{<?php
-	?>url: "<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'actualize', 'params' => array('id' => $feed->id(), 'ajax' => '1')), 'php'); ?>",<?php
-	?>title: "<?php echo $feed->name(); ?>"<?php
-?>},<?php } ?>],
-	feed_processed = 0,
-	feed_count = feeds.length;
-
-function initProgressBar(init) {
-	if (init) {
-		$("body").after("\<div id=\"actualizeProgress\" class=\"notification good\">\
-			<?php echo _t('feedback.sub.actualize'); ?><br /><span class=\"title\">/</span><br />\
-			<span class=\"progress\">0 / " + feed_count + "</span>\
-		</div>");
-	} else {
-		window.location.reload();
-	}
-}
-function updateProgressBar(i, title_feed) {
-	$("#actualizeProgress .progress").html(i + " / " + feed_count);
-	$("#actualizeProgress .title").html(title_feed);
-}
-
-function updateFeeds() {
-	if (feed_count === 0) {
-		openNotification("<?php echo _t('feedback.sub.feed.no_refresh'); ?>", "good");
-		ajax_loading = false;
-		return;
-	}
-	initProgressBar(true);
-
-	for (var i = 0; i < 10; i++) {
-		updateFeed();
-	}
-}
-
-function updateFeed() {
-	var feed = feeds.pop();
-	if (feed == undefined) {
-		return;
-	}
-
-	$.ajax({
-		type: 'POST',
-		url: feed['url'],
-	}).complete(function (data) {
-		feed_processed++;
-		updateProgressBar(feed_processed, feed['title']);
-
-		if (feed_processed === feed_count) {
-			initProgressBar(false);
-		} else {
-			updateFeed();
-		}
-	});
-}
+<?php
+$feeds = array();
+foreach ($this->feeds as $feed) {
+	$feeds[] = array(
+		'url' => Minz_Url::display(array('c' => 'feed', 'a' => 'actualize', 'params' => array('id' => $feed->id(), 'ajax' => '1')), 'php'),
+		'title' => $feed->name(),
+	);
+}
+echo json_encode(array(
+	'feeds' => $feeds,
+	'feedback_no_refresh' => _t('feedback.sub.feed.no_refresh'),
+	'feedback_actualize' => _t('feedback.sub.actualize'),
+));
diff --git a/p/scripts/main.js b/p/scripts/main.js
index d62a6aff8..51c8f4cbf 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -767,6 +767,31 @@ function init_nav_entries() {
 	});
 }
 
+// <actualize>
+var feed_processed = 0;
+
+function updateFeed(feeds, feeds_count) {
+	var feed = feeds.pop();
+	if (feed == undefined) {
+		return;
+	}
+
+	$.ajax({
+		type: 'POST',
+		url: feed['url'],
+	}).complete(function (data) {
+		feed_processed++;
+		$("#actualizeProgress .progress").html(feed_processed + " / " + feeds_count);
+		$("#actualizeProgress .title").html(feed['title']);
+
+		if (feed_processed === feeds_count) {
+			window.location.reload();
+		} else {
+			updateFeed(feeds, feeds_count);
+		}
+	});
+}
+
 function init_actualize() {
 	var auto = false;
 
@@ -777,14 +802,23 @@ function init_actualize() {
 
 		ajax_loading = true;
 
-		$.getScript('./?c=javascript&a=actualize').done(function () {
-			if (auto && feed_count < 1) {
+		$.getJSON('./?c=javascript&a=actualize').done(function (data) {
+			if (auto && data.feeds.length < 1) {
 				auto = false;
 				ajax_loading = false;
 				return false;
 			}
-
-			updateFeeds();
+			if (data.feeds.length === 0) {
+				openNotification(data.feedback_no_refresh, "good");
+				ajax_loading = false;
+				return;
+			}
+			//Progress bar
+			var feeds_count = data.feeds.length;
+			$('body').after('<div id="actualizeProgress" class="notification good">' + data.feedback_actualize + '<br /><span class="title">/</span><br /><span class="progress">0 / ' + feeds_count + '</span></div>');
+			for (var i = 10; i > 0; i--) {
+				updateFeed(data.feeds, feeds_count);
+			}
 		});
 
 		return false;
@@ -795,7 +829,7 @@ function init_actualize() {
 		$("#actualize").click();
 	}
 }
-
+// </actualize>
 
 // <notification>
 var notification = null,
-- 
cgit v1.2.3


From 995cf58d249c6a2ddfd042cc5b509914295c882f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Feb 2016 00:08:57 +0100
Subject: CSP bug in install script

https://github.com/FreshRSS/FreshRSS/issues/1075
---
 app/install.php      | 2 +-
 p/scripts/install.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/install.php b/app/install.php
index a4a888af2..80e85354d 100644
--- a/app/install.php
+++ b/app/install.php
@@ -829,7 +829,6 @@ case 5:
 		<title><?php echo _t('install.title'); ?></title>
 		<link rel="stylesheet" href="../themes/base-theme/template.css?<?php echo @filemtime(PUBLIC_PATH . '/themes/base-theme/template.css'); ?>" />
 		<link rel="stylesheet" href="../themes/Origine/origine.css?<?php echo @filemtime(PUBLIC_PATH . '/themes/Origine/origine.css'); ?>" />
-		<script src="../scripts/install.js?<?php echo @filemtime(PUBLIC_PATH . '/scripts/install.js'); ?>"></script>
 		<meta name="robots" content="noindex,nofollow" />
 	</head>
 	<body>
@@ -877,5 +876,6 @@ case 5:
 		?>
 	</div>
 </div>
+	<script src="../scripts/install.js?<?php echo @filemtime(PUBLIC_PATH . '/scripts/install.js'); ?>"></script>
 	</body>
 </html>
diff --git a/p/scripts/install.js b/p/scripts/install.js
index 52d8bf8e0..9a49e6031 100644
--- a/p/scripts/install.js
+++ b/p/scripts/install.js
@@ -42,7 +42,7 @@ function auth_type_change() {
 var auth_type = document.getElementById('auth_type');
 if (auth_type) {
 	auth_type_change();
-	auth_type_change.addEventListener('change', auth_type_change);
+	auth_type.addEventListener('change', auth_type_change);
 }
 
 function mySqlShowHide() {
-- 
cgit v1.2.3


From 6b19872b1a95113aa491626a64d4c3ff02e2ee00 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 28 Feb 2016 14:07:21 +0100
Subject: Install check XML / JSON

https://github.com/FreshRSS/FreshRSS/issues/1094
https://github.com/FreshRSS/FreshRSS/issues/1092
---
 app/i18n/cz/install.php | 10 +++++++++-
 app/i18n/de/install.php | 10 +++++++++-
 app/i18n/en/install.php | 10 +++++++++-
 app/i18n/fr/install.php | 10 +++++++++-
 app/i18n/it/install.php | 10 +++++++++-
 app/i18n/nl/install.php | 10 +++++++++-
 app/i18n/tr/install.php | 10 +++++++++-
 app/install.php         | 18 +++++++++++++++++-
 8 files changed, 80 insertions(+), 8 deletions(-)

(limited to 'app')

diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index a8bc62909..969b69271 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'Oprávnění adresáře data jsou v pořádku.',
 		),
 		'dom' => array(
-			'nok' => 'Nemáte požadovanou knihovnu pro procházení DOM (balíček php-xml).',
+			'nok' => 'Nemáte požadovanou knihovnu pro procházení DOM.',
 			'ok' => 'Máte požadovanou knihovnu pro procházení DOM.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Zkontrolujte prosím že neměníte HTTP REFERER.',
 			'ok' => 'Váš HTTP REFERER je znám a odpovídá Vašemu serveru.',
 		),
+		'json' => array(
+			'nok' => 'You lack a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',
+		),
 		'minz' => array(
 			'nok' => 'Nemáte framework Minz.',
 			'ok' => 'Máte framework Minz.',
@@ -86,6 +90,10 @@ return array(
 			'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/users</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
 			'ok' => 'Oprávnění adresáře users jsou v pořádku.',
 		),
+		'xml' => array(
+			'nok' => 'You lack the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Obecná nastavení',
diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index 9bada0869..2da744cfb 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data</em> sind in Ordnung.',
 		),
 		'dom' => array(
-			'nok' => 'Ihnen fehlt eine benötigte Bibliothek um DOM zu durchstöbern (Paket php-xml).',
+			'nok' => 'Ihnen fehlt eine benötigte Bibliothek um DOM zu durchstöbern.',
 			'ok' => 'Sie haben die benötigte Bibliothek um DOM zu durchstöbern.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Bitte stellen Sie sicher, dass Sie Ihren HTTP REFERER nicht abändern.',
 			'ok' => 'Ihr HTTP REFERER ist bekannt und entspricht Ihrem Server.',
 		),
+		'json' => array(
+			'nok' => 'You lack a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',
+		),
 		'minz' => array(
 			'nok' => 'Ihnen fehlt das Minz-Framework.',
 			'ok' => 'Sie haben das Minz-Framework.',
@@ -86,6 +90,10 @@ return array(
 			'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/users</em>. Der HTTP-Server muss Schreibrechte besitzen.',
 			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
 		),
+		'xml' => array(
+			'nok' => 'You lack the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Allgemeine Konfiguration',
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index b94fbc299..4b5bbc62e 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'Permissions on data directory are good.',
 		),
 		'dom' => array(
-			'nok' => 'You lack a required library to browse the DOM (php-xml package).',
+			'nok' => 'You lack a required library to browse the DOM.',
 			'ok' => 'You have the required library to browse the DOM.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Please check that you are not altering your HTTP REFERER.',
 			'ok' => 'Your HTTP REFERER is known and corresponds to your server.',
 		),
+		'json' => array(
+			'nok' => 'You lack a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',
+		),
 		'minz' => array(
 			'nok' => 'You lack the Minz framework.',
 			'ok' => 'You have the Minz framework.',
@@ -86,6 +90,10 @@ return array(
 			'nok' => 'Check permissions on <em>./data/users</em> directory. HTTP server must have rights to write into',
 			'ok' => 'Permissions on users directory are good.',
 		),
+		'xml' => array(
+			'nok' => 'You lack the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'General configuration',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 0401e1bbd..91dfbbb09 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'Les droits sur le répertoire de data sont bons.',
 		),
 		'dom' => array(
-			'nok' => 'Il manque une librairie pour parcourir le DOM (paquet php-xml).',
+			'nok' => 'Il manque une librairie pour parcourir le DOM.',
 			'ok' => 'Vous disposez du nécessaire pour parcourir le DOM.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Veuillez vérifier que vous ne modifiez pas votre HTTP REFERER.',
 			'ok' => 'Le HTTP REFERER est connu et semble correspondre à votre serveur.',
 		),
+		'json' => array(
+			'nok' => 'Il manque une librairie recommandée pour JSON.',
+			'ok' => 'Vouz disposez de la librairie recommandée pour JSON.',
+		),
 		'minz' => array(
 			'nok' => 'Vous ne disposez pas de la librairie Minz.',
 			'ok' => 'Vous disposez du framework Minz',
@@ -86,6 +90,10 @@ return array(
 			'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/users</em>. Le serveur HTTP doit être capable d’écrire dedans',
 			'ok' => 'Les droits sur le répertoire des utilisateurs sont bons.',
 		),
+		'xml' => array(
+			'nok' => 'Il manque une librairie requise pour XML.',
+			'ok' => 'Vouz disposez de la librairie requise pour XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Configuration générale',
diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
index 3ad22c5e9..8f5300bd5 100644
--- a/app/i18n/it/install.php
+++ b/app/i18n/it/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'I permessi sulla cartella data sono corretti.',
 		),
 		'dom' => array(
-			'nok' => 'Manca una libreria richiesta per leggere DOM (pacchetto php-xml).',
+			'nok' => 'Manca una libreria richiesta per leggere DOM.',
 			'ok' => 'Libreria richiesta per leggere DOM presente.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Per favore verifica che non stai alterando il tuo HTTP REFERER.',
 			'ok' => 'Il tuo HTTP REFERER riconosciuto corrisponde al tuo server.',
 		),
+		'json' => array(
+			'nok' => 'You lack a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',
+		),
 		'minz' => array(
 			'nok' => 'Manca il framework Minz.',
 			'ok' => 'Framework Minz presente.',
@@ -87,6 +91,10 @@ return array(
 			'nok' => 'Verifica i permessi sulla cartella <em>./data/users</em>. Il server HTTP deve avere i permessi per scriverci dentro',
 			'ok' => 'I permessi sulla cartella users sono corretti.',
 		),
+		'xml' => array(
+			'nok' => 'You lack the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Configurazioni generali',
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index e788261ea..3c44f7581 100644
--- a/app/i18n/nl/install.php
+++ b/app/i18n/nl/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'Permissies van de data map zijn goed.',
 		),
 		'dom' => array(
-			'nok' => 'U mist een benodigde bibliotheek om te bladeren in de DOM (php-xml package).',
+			'nok' => 'U mist een benodigde bibliotheek om te bladeren in de DOM.',
 			'ok' => 'U hebt de benodigde bibliotheek om te bladeren in de DOM.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Controleer a.u.b. dat u niet uw HTTP REFERER wijzigd.',
 			'ok' => 'Uw HTTP REFERER is bekend en komt overeen met uw server.',
 		),
+		'json' => array(
+			'nok' => 'You lack a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',
+		),
 		'minz' => array(
 			'nok' => 'U mist het Minz framework.',
 			'ok' => 'U hebt het Minz framework.',
@@ -86,6 +90,10 @@ return array(
 			'nok' => 'Controleer permissies van de <em>./data/users</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
 			'ok' => 'Permissies van de users map zijn goed.',
 		),
+		'xml' => array(
+			'nok' => 'You lack the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Algemene configuratie',
diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
index 96c16931a..d4c7c4cd5 100644
--- a/app/i18n/tr/install.php
+++ b/app/i18n/tr/install.php
@@ -51,7 +51,7 @@ return array(
 			'ok' => 'Veri klasörü yetkileri sorunsuz.',
 		),
 		'dom' => array(
-			'nok' => 'DOM kütüpbanesi eksik (php-xml package).',
+			'nok' => 'DOM kütüpbanesi eksik.',
 			'ok' => 'DOM kütüphanesi sorunsuz.',
 		),
 		'favicons' => array(
@@ -62,6 +62,10 @@ return array(
 			'nok' => 'Lütfen HTTP REFERER değiştirmediğinize emin olun.',
 			'ok' => 'HTTP REFERER ve sunucunuz arası iletişim sorunsuz.',
 		),
+		'json' => array(
+			'nok' => 'You lack a recommended library to parse JSON.',
+			'ok' => 'You have a recommended library to parse JSON.',
+		),
 		'minz' => array(
 			'nok' => 'Minz framework eksik.',
 			'ok' => 'Minz framework sorunsuz.',
@@ -86,6 +90,10 @@ return array(
 			'nok' => '<em>./data/users</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
 			'ok' => 'Kullanıcılar klasörü yetkileri sorunsuz.',
 		),
+		'xml' => array(
+			'nok' => 'You lack the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Genel yapılandırma',
diff --git a/app/install.php b/app/install.php
index 80e85354d..b47effc84 100644
--- a/app/install.php
+++ b/app/install.php
@@ -318,6 +318,8 @@ function checkStep1() {
 	$pcre = extension_loaded('pcre');
 	$ctype = extension_loaded('ctype');
 	$dom = class_exists('DOMDocument');
+	$xml = function_exists('xml_parser_create');
+	$json = function_exists('json_encode');
 	$data = DATA_PATH && is_writable(DATA_PATH);
 	$cache = CACHE_PATH && is_writable(CACHE_PATH);
 	$users = USERS_PATH && is_writable(USERS_PATH);
@@ -335,13 +337,15 @@ function checkStep1() {
 		'pcre' => $pcre ? 'ok' : 'ko',
 		'ctype' => $ctype ? 'ok' : 'ko',
 		'dom' => $dom ? 'ok' : 'ko',
+		'xml' => $xml ? 'ok' : 'ko',
+		'json' => $json ? 'ok' : 'ko',
 		'data' => $data ? 'ok' : 'ko',
 		'cache' => $cache ? 'ok' : 'ko',
 		'users' => $users ? 'ok' : 'ko',
 		'favicons' => $favicons ? 'ok' : 'ko',
 		'persona' => $persona ? 'ok' : 'ko',
 		'http_referer' => $http_referer ? 'ok' : 'ko',
-		'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $dom &&
+		'all' => $php && $minz && $curl && $pdo && $pcre && $ctype && $dom && $xml &&
 		         $data && $cache && $users && $favicons && $persona && $http_referer ?
 		         'ok' : 'ko'
 	);
@@ -554,6 +558,12 @@ function printStep1() {
 	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.curl.nok'); ?></p>
 	<?php } ?>
 
+	<?php if ($res['json'] == 'ok') { ?>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.json.ok'); ?></p>
+	<?php } else { ?>
+	<p class="alert alert-warn"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.json.nok'); ?></p>
+	<?php } ?>
+
 	<?php if ($res['pcre'] == 'ok') { ?>
 	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.pcre.ok'); ?></p>
 	<?php } else { ?>
@@ -572,6 +582,12 @@ function printStep1() {
 	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.dom.nok'); ?></p>
 	<?php } ?>
 
+	<?php if ($res['xml'] == 'ok') { ?>
+	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.xml.ok'); ?></p>
+	<?php } else { ?>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('gen.short.damn'); ?></span> <?php echo _t('install.check.xml.nok'); ?></p>
+	<?php } ?>
+
 	<?php if ($res['data'] == 'ok') { ?>
 	<p class="alert alert-success"><span class="alert-head"><?php echo _t('gen.short.ok'); ?></span> <?php echo _t('install.check.data.ok'); ?></p>
 	<?php } else { ?>
-- 
cgit v1.2.3


From cbac2afd23daaeeb3b5d6c81fdcd5c28619f5b1d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 1 Mar 2016 21:56:19 +0100
Subject: CSP compatibility with Firefox older than 45

https://github.com/FreshRSS/FreshRSS/pull/1075
https://github.com/FreshRSS/FreshRSS/pull/1078
https://developer.mozilla.org/en-US/Firefox/Releases/45#Security
https://bugzilla.mozilla.org/show_bug.cgi?id=1045891
---
 CHANGELOG.md     | 2 +-
 app/FreshRSS.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 096c930d1..43823b536 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## 2016-03-xx FreshRSS 1.3.1-beta
 
 * Security
-	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/pull/1075)
+	* Added CSP `Content-Security-Policy: default-src 'self'; child-src *; frame-src *; img-src * data:; media-src *` [#1075](https://github.com/FreshRSS/FreshRSS/pull/1075)
 * Features
 	* New list of domains for which to force HTTPS (for images, videos, iframes…) defined in `./data/force-https.default.txt` and `./data/force-https.txt` [#1083](https://github.com/FreshRSS/FreshRSS/issues/1083)
 		* In particular useful for privacy and to avoid mixed content errors, e.g. to see YouTube videos when FreshRSS is in HTTPS
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index bfbd7a6eb..d6f4f4062 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -113,7 +113,7 @@ class FreshRSS extends Minz_FrontController {
 	public static function preLayout() {
 		switch (Minz_Request::controllerName()) {
 			case 'index':
-				header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *");
+				header("Content-Security-Policy: default-src 'self'; child-src *; frame-src *; img-src * data:; media-src *");
 				break;
 			case 'stats':
 				header("Content-Security-Policy: default-src 'self'; style-src 'self' 'unsafe-inline'");
-- 
cgit v1.2.3


From 6cd59b25f44853e7f5bbd931b33a4ecbd3e91159 Mon Sep 17 00:00:00 2001
From: ealdraed <ealdraed@users.noreply.github.com>
Date: Fri, 4 Mar 2016 12:38:16 +0100
Subject: Translate four strings for XML and JSON

---
 app/i18n/de/install.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index 2da744cfb..d16496818 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -63,8 +63,8 @@ return array(
 			'ok' => 'Ihr HTTP REFERER ist bekannt und entspricht Ihrem Server.',
 		),
 		'json' => array(
-			'nok' => 'You lack a recommended library to parse JSON.',
-			'ok' => 'You have a recommended library to parse JSON.',
+			'nok' => 'Ihnen fehlt eine empfohlene Bibliothek um JSON zu parsen.',
+			'ok' => 'Sie haben eine empfohlene Bibliothek um JSON zu parsen.',
 		),
 		'minz' => array(
 			'nok' => 'Ihnen fehlt das Minz-Framework.',
@@ -91,8 +91,8 @@ return array(
 			'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
 		),
 		'xml' => array(
-			'nok' => 'You lack the required library to parse XML.',
-			'ok' => 'You have the required library to parse XML.',
+			'nok' => 'Ihnen fehlt die benötigte Bibliothek um XML zu parsen.',
+			'ok' => 'Sie haben die benötigte Bibliothek um XML zu parsen.',
 		),
 	),
 	'conf' => array(
-- 
cgit v1.2.3


From f059e4c5ce461a171b5754491b66c24ecc7490f8 Mon Sep 17 00:00:00 2001
From: Wanabo <Wanabo@users.noreply.github.com>
Date: Sun, 6 Mar 2016 12:01:46 +0100
Subject: Added files via upload

Updated language files for v1.3.1-dev
---
 app/i18n/nl/admin.php   | 18 +++++++++---------
 app/i18n/nl/gen.php     |  2 +-
 app/i18n/nl/install.php |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'app')

diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
index c3a3062b9..bd7d63b6a 100644
--- a/app/i18n/nl/admin.php
+++ b/app/i18n/nl/admin.php
@@ -120,7 +120,7 @@ return array(
 		'category' => 'Categorie',
 		'entry_count' => 'Invoer aantallen',
 		'entry_per_category' => 'Aantallen per categorie',
-		'entry_per_day' => 'Aantallen per day (laatste 30 dagen)',
+		'entry_per_day' => 'Aantallen per dag (laatste 30 dagen)',
 		'entry_per_day_of_week' => 'Per dag of week (gemiddeld: %.2f berichten)',
 		'entry_per_hour' => 'Per uur (gemiddeld: %.2f berichten)',
 		'entry_per_month' => 'Per maand (gemiddeld: %.2f berichten)',
@@ -147,14 +147,14 @@ return array(
 		'top_feed' => 'Top tien feeds',
 	),
 	'system' => array(
-		'_' => 'System configuration', // @todo translate
-		'auto-update-url' => 'Auto-update server URL', // @todo translate
-		'instance-name' => 'Instance name', // @todo translate
-		'max-categories' => 'Categories per user limit', // @todo translate
-		'max-feeds' => 'Feeds per user limit', // @todo translate
+		'_' => 'Systeem configuratie',
+		'auto-update-url' => 'Automatische update server URL',
+		'instance-name' => 'Voorbeeld naam',
+		'max-categories' => 'Categoriën limiet per gebruiker',
+		'max-feeds' => 'Feed limiet per gebruiker',
 		'registration' => array(
-			'help' => '0 means that there is no account limit', // @todo translate
-			'number' => 'Max number of accounts', // @todo translate
+			'help' => '0 betekent geen account limiet',
+			'number' => 'Maximum aantal accounts',
 		),
 	),
 	'update' => array(
@@ -178,7 +178,7 @@ return array(
 		'registration' => array(
 			'allow' => 'Sta het maken van nieuwe accounts toe',
 			'help' => '0 betekent dat er geen account limiet is',
-			'number' => 'Max aantal van accounts',
+			'number' => 'Max aantal accounts',
 		),
 		'title' => 'Beheer gebruikers',
 		'user_list' => 'Lijst van gebruikers ',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index bc2137c22..1cafaf82a 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -140,7 +140,7 @@ return array(
 		'sharing' => 'Delen',
 		'shortcuts' => 'Snelle toegang',
 		'stats' => 'Statistieken',
-		'system' => 'System configuration', // @todo translate
+		'system' => 'Systeem configuratie',
 		'update' => 'Versie controle',
 		'user_management' => 'Beheer gebruikers',
 		'user_profile' => 'Profiel',
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index 3c44f7581..d16dda4ca 100644
--- a/app/i18n/nl/install.php
+++ b/app/i18n/nl/install.php
@@ -63,8 +63,8 @@ return array(
 			'ok' => 'Uw HTTP REFERER is bekend en komt overeen met uw server.',
 		),
 		'json' => array(
-			'nok' => 'You lack a recommended library to parse JSON.',
-			'ok' => 'You have a recommended library to parse JSON.',
+			'nok' => 'U mist een benodigede bibliotheek om JSON te gebruiken.',
+			'ok' => 'U hebt de benodigde bibliotheek om JSON te gebruiken.',
 		),
 		'minz' => array(
 			'nok' => 'U mist het Minz framework.',
@@ -91,8 +91,8 @@ return array(
 			'ok' => 'Permissies van de users map zijn goed.',
 		),
 		'xml' => array(
-			'nok' => 'You lack the required library to parse XML.',
-			'ok' => 'You have the required library to parse XML.',
+			'nok' => 'U mist de benodigde bibliotheek om XML te gebruiken.',
+			'ok' => 'U hebt de benodigde bibliotheek om XML te gebruiken.',
 		),
 	),
 	'conf' => array(
-- 
cgit v1.2.3


From 5f04462e554e4604c04c2c9ca2fe97df6f6f6376 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sun, 6 Mar 2016 12:51:39 +0100
Subject: Fix redirection while deleting a feed

Before, when deleting a feed from the statistics idle page, there was an error in the redirection process.
Now, the redirection works properly and redirects to the idle page.
---
 app/views/stats/idle.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index 11b7df8c4..ba88b679f 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -6,10 +6,10 @@
 	<h1><?php echo _t('admin.stats.idle'); ?></h1>
 
 	<?php
-		$current_url = urlencode(Minz_Url::display(
+		$current_url = Minz_Url::display(
 			array('c' => 'stats', 'a' => 'idle'),
 			'php', true
-		));
+		);
 		$nothing = true;
 		foreach ($this->idleFeeds as $period => $feeds) {
 			if (!empty($feeds)) {
-- 
cgit v1.2.3


From bb0319c1c7823471a4a2474712d8301e07a5f44e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Mar 2016 14:50:43 +0100
Subject: i18n-cz JSON XML

https://github.com/FreshRSS/FreshRSS/pull/1097#commitcomment-16382595
https://github.com/FreshRSS/FreshRSS/issues/1094
---
 app/i18n/cz/install.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index 969b69271..bc3e01992 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -63,8 +63,8 @@ return array(
 			'ok' => 'Váš HTTP REFERER je znám a odpovídá Vašemu serveru.',
 		),
 		'json' => array(
-			'nok' => 'You lack a recommended library to parse JSON.',
-			'ok' => 'You have a recommended library to parse JSON.',
+			'nok' => 'Pro parsování JSON chybí doporučená knihovna.',
+			'ok' => 'Máte doporučenou knihovnu pro parsování JSON.',
 		),
 		'minz' => array(
 			'nok' => 'Nemáte framework Minz.',
@@ -91,8 +91,8 @@ return array(
 			'ok' => 'Oprávnění adresáře users jsou v pořádku.',
 		),
 		'xml' => array(
-			'nok' => 'You lack the required library to parse XML.',
-			'ok' => 'You have the required library to parse XML.',
+			'nok' => 'Pro parsování XML chybí požadovaná knihovna.',
+			'ok' => 'Máte požadovanou knihovnu pro parsování XML.',
 		),
 	),
 	'conf' => array(
-- 
cgit v1.2.3


From 7f91dbf16dca9f824b7bbbd42ef34f39ac7c22a9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 6 Mar 2016 15:32:58 +0100
Subject: SQLite: Articles from old FreshRSS are marked as unread on update

Bug fixed https://github.com/FreshRSS/FreshRSS/issues/1049
---
 app/Controllers/feedController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 7294fe8f4..b559d3c22 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -355,7 +355,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					$entry_date = $entry->date(true);
 					if (isset($existingHashForGuids[$entry->guid()])) {
 						$existingHash = $existingHashForGuids[$entry->guid()];
-						if (strcasecmp($existingHash, $entry->hash()) === 0 || $existingHash === '00000000000000000000000000000000') {
+						if (strcasecmp($existingHash, $entry->hash()) === 0 || trim($existingHash, '0') == '') {
 							//This entry already exists and is unchanged. TODO: Remove the test with the zero'ed hash in FreshRSS v1.3
 							$oldGuids[] = $entry->guid();
 						} else {	//This entry already exists but has been updated
-- 
cgit v1.2.3


From 44be16d4fbc78c14f8ea17160585ed1bec0c8722 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 8 Mar 2016 18:28:04 +0100
Subject: X-Content-Type-Options: nosniff

https://github.com/FreshRSS/FreshRSS/issues/1114
---
 app/FreshRSS.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index d6f4f4062..bafa970da 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -122,6 +122,7 @@ class FreshRSS extends Minz_FrontController {
 				header("Content-Security-Policy: default-src 'self'");
 				break;
 		}
+		header("X-Content-Type-Options: nosniff");
 	}
 
 	private function loadNotifications() {
-- 
cgit v1.2.3