From 722d8ce7dd26864cf99dcbfd408794fc83b68374 Mon Sep 17 00:00:00 2001
From: rugk <rugk@posteo.de>
Date: Wed, 21 Feb 2018 22:28:56 +0100
Subject: [PATCH 1/7] Fix URL shortener not working

Move URL shortener out of #pastelink as that is overwritten by the JS.

Fixes https://github.com/PrivateBin/PrivateBin/issues/280
---
 tpl/bootstrap.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index c1e3a6e..3ea613b 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -468,17 +468,16 @@ endif;
 				<div id="pastesuccess" role="alert" class="hidden alert alert-success">
 					<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
 					<div id="deletelink"></div>
-					<div id="pastelink">
-<?php
-if (strlen($URLSHORTENER)):
-?>
-						<button id="shortenbutton" data-shortener="<?php echo htmlspecialchars($URLSHORTENER); ?>" type="button" class="btn btn-<?php echo $isDark ? 'warning' : 'primary'; ?>">
-							<span class="glyphicon glyphicon-send" aria-hidden="true"></span> <?php echo I18n::_('Shorten URL'), PHP_EOL; ?>
-						</button>
-<?php
-endif;
-?>
-					</div>
+					<div id="pastelink"></div>
+					<?php
+					if (strlen($URLSHORTENER)):
+					?>
+											<button id="shortenbutton" data-shortener="<?php echo htmlspecialchars($URLSHORTENER); ?>" type="button" class="btn btn-<?php echo $isDark ? 'warning' : 'primary'; ?>">
+												<span class="glyphicon glyphicon-send" aria-hidden="true"></span> <?php echo I18n::_('Shorten URL'), PHP_EOL; ?>
+											</button>
+					<?php
+					endif;
+					?>
 				</div>
 				<ul id="editorTabs" class="nav nav-tabs hidden">
 					<li role="presentation" class="active"><a id="messageedit" href="#"><?php echo I18n::_('Editor'); ?></a></li>

From 904f0de24595dbe110214a9da54495c311f7b184 Mon Sep 17 00:00:00 2001
From: rugk <rugk@posteo.de>
Date: Wed, 21 Feb 2018 22:31:01 +0100
Subject: [PATCH 2/7] Fix indendation

---
 tpl/bootstrap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 3ea613b..52960a0 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -472,9 +472,9 @@ endif;
 					<?php
 					if (strlen($URLSHORTENER)):
 					?>
-											<button id="shortenbutton" data-shortener="<?php echo htmlspecialchars($URLSHORTENER); ?>" type="button" class="btn btn-<?php echo $isDark ? 'warning' : 'primary'; ?>">
-												<span class="glyphicon glyphicon-send" aria-hidden="true"></span> <?php echo I18n::_('Shorten URL'), PHP_EOL; ?>
-											</button>
+						<button id="shortenbutton" data-shortener="<?php echo htmlspecialchars($URLSHORTENER); ?>" type="button" class="btn btn-<?php echo $isDark ? 'warning' : 'primary'; ?>">
+							<span class="glyphicon glyphicon-send" aria-hidden="true"></span> <?php echo I18n::_('Shorten URL'), PHP_EOL; ?>
+						</button>
 					<?php
 					endif;
 					?>

From d07f8d8f967aa2148123fe10ab33cfa919a36f57 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Sun, 25 Feb 2018 10:09:19 +0100
Subject: [PATCH 3/7] fixing indentation, replicating change to other template

---
 tpl/bootstrap.php | 18 +++++++++---------
 tpl/page.php      |  5 ++---
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 52960a0..2be8a76 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -469,15 +469,15 @@ endif;
 					<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
 					<div id="deletelink"></div>
 					<div id="pastelink"></div>
-					<?php
-					if (strlen($URLSHORTENER)):
-					?>
-						<button id="shortenbutton" data-shortener="<?php echo htmlspecialchars($URLSHORTENER); ?>" type="button" class="btn btn-<?php echo $isDark ? 'warning' : 'primary'; ?>">
-							<span class="glyphicon glyphicon-send" aria-hidden="true"></span> <?php echo I18n::_('Shorten URL'), PHP_EOL; ?>
-						</button>
-					<?php
-					endif;
-					?>
+<?php
+if (strlen($URLSHORTENER)):
+?>
+					<button id="shortenbutton" data-shortener="<?php echo htmlspecialchars($URLSHORTENER); ?>" type="button" class="btn btn-<?php echo $isDark ? 'warning' : 'primary'; ?>">
+						<span class="glyphicon glyphicon-send" aria-hidden="true"></span> <?php echo I18n::_('Shorten URL'), PHP_EOL; ?>
+					</button>
+<?php
+endif;
+?>
 				</div>
 				<ul id="editorTabs" class="nav nav-tabs hidden">
 					<li role="presentation" class="active"><a id="messageedit" href="#"><?php echo I18n::_('Editor'); ?></a></li>
diff --git a/tpl/page.php b/tpl/page.php
index 5992336..1c1b37a 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -206,15 +206,14 @@ if ($QRCODE):
 endif;
 ?>				<div id="pastesuccess" class="hidden">
 					<div id="deletelink"></div>
-					<div id="pastelink">
+					<div id="pastelink"></div>
 <?php
 if (strlen($URLSHORTENER)):
 ?>
-						<button id="shortenbutton" data-shortener="<?php echo htmlspecialchars($URLSHORTENER); ?>"><img src="img/icon_shorten.png" width="13" height="15" /><?php echo I18n::_('Shorten URL'); ?></button>
+					<button id="shortenbutton" data-shortener="<?php echo htmlspecialchars($URLSHORTENER); ?>"><img src="img/icon_shorten.png" width="13" height="15" /><?php echo I18n::_('Shorten URL'); ?></button>
 <?php
 endif;
 ?>
-					</div>
 				</div>
 <?php
 if ($FILEUPLOAD):

From df921ad658690d5844a435fa9c359e5c91750e11 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Sun, 25 Feb 2018 10:18:43 +0100
Subject: [PATCH 4/7] fixing licence identifier according to spdx.org for
 Packagist / composer

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2af4f7b..cd542b6 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
     "type": "project",
     "keywords": ["private", "secure", "end-to-end-encrypted", "e2e", "paste", "pastebin", "zero", "zero-knowledge", "encryption", "encrypted", "AES"],
     "homepage": "https://github.com/PrivateBin",
-    "license":"zlib",
+    "license":"zlib-acknowledgement",
     "support": {
         "issues": "https://github.com/PrivateBin/PrivateBin/issues",
         "wiki": "https://github.com/PrivateBin/PrivateBin/wiki",

From c6950b9b56d32c51f4808d439d035f5b9dc2af38 Mon Sep 17 00:00:00 2001
From: Alexander Do <alexdo@gmail.com>
Date: Sat, 7 Apr 2018 02:53:00 +0000
Subject: [PATCH 5/7] Default to en if browser does not provide a language

---
 js/privatebin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/privatebin.js b/js/privatebin.js
index a39c38a..436a7de 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -441,7 +441,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
 
             // auto-select language based on browser settings
             if (newLanguage.length === 0) {
-                newLanguage = (navigator.language || navigator.userLanguage).substring(0, 2);
+                newLanguage = (navigator.language || navigator.userLanguage || 'en').substring(0, 2);
             }
 
             // if language is already used skip update

From 944c8c291254b657ba75de1c046f3817bb8f03ea Mon Sep 17 00:00:00 2001
From: Alexander Do <alexdo@gmail.com>
Date: Sat, 7 Apr 2018 03:22:26 +0000
Subject: [PATCH 6/7] Add test for missing browser language

---
 js/test/I18n.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/js/test/I18n.js b/js/test/I18n.js
index 0d2fc08..c3a69b2 100644
--- a/js/test/I18n.js
+++ b/js/test/I18n.js
@@ -99,6 +99,28 @@ describe('I18n', function () {
                 return language === result && language === alias;
             }
         );
+
+        jsc.property(
+            'should default to en',
+            function() {
+                var clean = jsdom('', {url: 'https://privatebin.net/'});
+
+                [ 'language', 'userLanguage' ].forEach(function (key) {
+                    Object.defineProperty(navigator, key, {
+                        value: undefined,
+                        writeable: false
+                    });
+                });
+
+                $.PrivateBin.I18n.reset('en');
+                $.PrivateBin.I18n.loadTranslations();
+                var result = $.PrivateBin.I18n.translate('en'),
+                    alias  = $.PrivateBin.I18n._('en');
+
+                clean();
+                return 'en' === result && 'en' === alias;
+            }
+        );
     });
 });
 

From 09a04b96c0a7e9d1f0f9d0a2a66084e06a398462 Mon Sep 17 00:00:00 2001
From: rugk <rugk@posteo.de>
Date: Sun, 8 Apr 2018 23:09:13 +0200
Subject: [PATCH 7/7] Update SRI hashes

---
 tpl/bootstrap.php | 2 +-
 tpl/page.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index a886875..890d159 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -75,7 +75,7 @@ if ($MARKDOWN):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-9HcFkJcGWfvpGHD7tTGYzBtx4TbVfR9z7oujlX2WZ2dYWVv/2QIW5eMSjpvfxUVTJVF+DHD7Ps/80qR8GcQsIg==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-RP/Q7x1nwpIRC2bOYlYNjOe85laGtKgKioX+h+Th0QKl01Gc2FPNrWNVtr3zJvNEpm4Oq3Ksi+av71GX3S/RBQ==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->
diff --git a/tpl/page.php b/tpl/page.php
index d1e2d90..ee95728 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -54,7 +54,7 @@ if ($QRCODE):
 <?php
 endif;
 ?>
-		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-9HcFkJcGWfvpGHD7tTGYzBtx4TbVfR9z7oujlX2WZ2dYWVv/2QIW5eMSjpvfxUVTJVF+DHD7Ps/80qR8GcQsIg==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-RP/Q7x1nwpIRC2bOYlYNjOe85laGtKgKioX+h+Th0QKl01Gc2FPNrWNVtr3zJvNEpm4Oq3Ksi+av71GX3S/RBQ==" crossorigin="anonymous"></script>
 		<!--[if lt IE 10]>
 		<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
 		<![endif]-->