From 815c6633191c10206808512ccecfb3200a862d73 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Mon, 6 Sep 2021 22:52:08 +0300
Subject: [PATCH] * fix incorrect title in browser history in some cases

---
 src/content/themes/default/index.php |  2 +-
 src/includes/common.php              |  5 +++++
 src/init.php                         |  5 ++---
 src/settings.php                     | 10 +++++-----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/content/themes/default/index.php b/src/content/themes/default/index.php
index c79ec50..4b597ea 100644
--- a/src/content/themes/default/index.php
+++ b/src/content/themes/default/index.php
@@ -28,7 +28,7 @@
 <script type="text/javascript">
 $().ready(function(){
 	mytinytodo.init({
-		title: "<?php mttinfo('title', false); ?>",
+		title: <?php echo json_encode(get_unsafe_mttinfo('title'), JSON_UNESCAPED_UNICODE); ?> ,
 		lang: <?php echo Lang::instance()->makeJS() ?>,
 		mttUrl: "<?php mttinfo('mtt_url'); ?>",
 		homeUrl: "<?php mttinfo('url'); ?>",
diff --git a/src/includes/common.php b/src/includes/common.php
index 24d30fa..e1d8285 100644
--- a/src/includes/common.php
+++ b/src/includes/common.php
@@ -228,6 +228,11 @@ function escapeTags($s)
 	return $s;
 }
 
+function removeNewLines($s)
+{
+	return str_replace( ["\r","\n"], '', $s );
+}
+
 /* found in comments on http://www.php.net/manual/en/function.uniqid.php#94959 */
 function generateUUID()
 {
diff --git a/src/init.php b/src/init.php
index df7869f..53d3c96 100644
--- a/src/init.php
+++ b/src/init.php
@@ -141,10 +141,9 @@ function __($s)
 	return Lang::instance()->get($s);
 }
 
-function mttinfo($v, $escape = true)
+function mttinfo($v)
 {
-	global $_mttinfo;
-	echo $escape ? get_mttinfo($v) : get_unsafe_mttinfo($v);
+	echo get_mttinfo($v);
 }
 
 /*
diff --git a/src/settings.php b/src/settings.php
index 761f50c..890e60a 100644
--- a/src/settings.php
+++ b/src/settings.php
@@ -41,13 +41,13 @@ if(isset($_POST['save']))
 	catch (Exception $e) {
 	}
 	Config::set('autotag', (int)_post('autotag'));
-	Config::set('session', _post('session'));
+	Config::set('session', trim(_post('session')) );
 	Config::set('firstdayofweek', (int)_post('firstdayofweek'));
 	Config::set('clock', (int)_post('clock'));
-	Config::set('dateformat', _post('dateformat'));
-	Config::set('dateformat2', _post('dateformat2'));
-	Config::set('dateformatshort', _post('dateformatshort'));
-	Config::set('title', trim(_post('title')));
+	Config::set('dateformat', removeNewLines(_post('dateformat')) );
+	Config::set('dateformat2', removeNewLines(_post('dateformat2')) );
+	Config::set('dateformatshort', removeNewLines(_post('dateformatshort')) );
+	Config::set('title', removeNewLines(trim(_post('title'))) );
 	Config::set('showdate', (int)_post('showdate'));
 	Config::save();
 	$t['saved'] = 1;