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/4] 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 c1e3a6e0..3ea613b5 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/4] Fix indendation

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

diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 3ea613b5..52960a0c 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/4] 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 52960a0c..2be8a766 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 5992336c..1c1b37a9 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/4] 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 2af4f7b7..cd542b61 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",