From c665385ff6ed7a6924717fe6dfe97e1e0cc112aa Mon Sep 17 00:00:00 2001
From: Sergio Giraldo <sergio@giraldo.com.br>
Date: Sat, 9 Sep 2023 22:26:11 +0200
Subject: [PATCH 1/3] feat: make the email button optional. Issue #1031 ::by
 sergio giraldo @ 20230909T2226CEST, gpg signed

---
 cfg/conf.sample.php   | 10 ++++++++--
 lib/Configuration.php |  1 +
 lib/Controller.php    |  1 +
 tpl/bootstrap.php     | 11 +++++++++++
 tpl/page.php          |  5 +++++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/cfg/conf.sample.php b/cfg/conf.sample.php
index 09bb9e19..f65fbb35 100644
--- a/cfg/conf.sample.php
+++ b/cfg/conf.sample.php
@@ -1,4 +1,5 @@
-;<?php http_response_code(403); /*
+;<?php http_response_code(403); 
+/*
 ; config file for PrivateBin
 ;
 ; An explanation of each setting can be find online at https://github.com/PrivateBin/PrivateBin/wiki/Configuration.
@@ -65,6 +66,10 @@ languageselection = false
 ; It works both when a new paste is created and when you view a paste.
 ; qrcode = true
 
+; (optional) Let users send an email sharing the paste URL with one click.
+; It works both when a new paste is created and when you view a paste.
+; email = true
+
 ; (optional) IP based icons are a weak mechanism to detect if a comment was from
 ; a different user when the same username was used in a comment. It might get
 ; used to get the IP of a comment poster if the server salt is leaked and a
@@ -258,4 +263,5 @@ dir = PATH "data"
 ; (optional) the "signature" (access key) issued by YOURLS for the using account
 ; signature = ""
 ; (optional) the URL of the YOURLS API, called to shorten a PrivateBin URL
-; apiurl = "https://yourls.example.com/yourls-api.php"
\ No newline at end of file
+; apiurl = "https://yourls.example.com/yourls-api.php"
+*/
\ No newline at end of file
diff --git a/lib/Configuration.php b/lib/Configuration.php
index 523bf289..4eedfc43 100644
--- a/lib/Configuration.php
+++ b/lib/Configuration.php
@@ -53,6 +53,7 @@ class Configuration
             'languagedefault'          => '',
             'urlshortener'             => '',
             'qrcode'                   => true,
+            'email'                    => true,
             'icon'                     => 'identicon',
             'cspheader'                => 'default-src \'none\'; base-uri \'self\'; form-action \'none\'; manifest-src \'self\'; connect-src * blob:; script-src \'self\' \'unsafe-eval\'; style-src \'self\'; font-src \'self\'; frame-ancestors \'none\'; img-src \'self\' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads',
             'zerobincompatibility'     => false,
diff --git a/lib/Controller.php b/lib/Controller.php
index bb5450ca..6a68a2e5 100644
--- a/lib/Controller.php
+++ b/lib/Controller.php
@@ -411,6 +411,7 @@ class Controller
         $page->assign('EXPIREDEFAULT', $this->_conf->getKey('default', 'expire'));
         $page->assign('URLSHORTENER', $this->_conf->getKey('urlshortener'));
         $page->assign('QRCODE', $this->_conf->getKey('qrcode'));
+        $page->assign('EMAIL', $this->_conf->getKey('email'));
         $page->assign('HTTPWARNING', $this->_conf->getKey('httpwarning'));
         $page->assign('HTTPSLINK', 'https://' . $this->_request->getHost() . $this->_request->getRequestUri());
         $page->assign('COMPRESSION', $this->_conf->getKey('compression'));
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 7d1d1879..2190be2f 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -144,6 +144,7 @@ if ($QRCODE) :
 		</div>
 <?php
 endif;
+if ($EMAIL) :
 ?>
 		<div id="emailconfirmmodal" tabindex="-1" class="modal fade" aria-labelledby="emailconfirmmodalTitle" role="dialog" aria-hidden="true">
 			<div class="modal-dialog" role="document">
@@ -167,6 +168,9 @@ endif;
 				</div>
 			</div>
 		</div>
+<?php
+endif;
+?>
 		<nav class="navbar navbar-<?php echo $isDark ? 'inverse' : 'default'; ?> navbar-<?php echo $isCpct ? 'fixed' : 'static'; ?>-top"><?php
 if ($isCpct) :
 ?><div class="container"><?php
@@ -216,10 +220,17 @@ endif;
 						<button id="downloadtextbutton" type="button" class="hidden btn btn-<?php echo $isDark ? 'warning' : 'default'; ?> navbar-btn">
 							<span class="glyphicon glyphicon glyphicon-download-alt" aria-hidden="true"></span> <?php echo I18n::_('Save paste'), PHP_EOL; ?>
 						</button>
+<?php
+if ($EMAIL) :
+?>
+
 						<button id="emaillink" type="button" class="hidden btn btn-<?php echo $isDark ? 'warning' : 'default'; ?> navbar-btn">
 							<span class="glyphicon glyphicon-envelope" aria-hidden="true"></span> <?php echo I18n::_('Email'), PHP_EOL; ?>
 						</button>
 <?php
+endif;
+?>
+<?php
 if ($QRCODE) :
 ?>
 						<button id="qrcodelink" type="button" data-toggle="modal" data-target="#qrcodemodal" class="hidden btn btn-<?php echo $isDark ? 'warning' : 'default'; ?> navbar-btn">
diff --git a/tpl/page.php b/tpl/page.php
index b158614f..5d0c7f53 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -129,8 +129,13 @@ endif;
 					<button id="clonebutton" class="hidden"><img src="img/icon_clone.png" width="15" height="17" alt="" /><?php echo I18n::_('Clone'); ?></button>
 					<button id="rawtextbutton" class="hidden"><img src="img/icon_raw.png" width="15" height="15" alt="" /><?php echo I18n::_('Raw text'); ?></button>
 					<button id="downloadtextbutton" class="hidden"><?php echo I18n::_('Save paste'), PHP_EOL; ?></button>
+<?php
+if ($EMAIL):
+?>
+
 					<button id="emaillink" class="hidden"><img src="img/icon_email.png" width="15" height="15" alt="" /><?php echo I18n::_('Email'); ?></button>
 <?php
+endif;
 if ($QRCODE):
 ?>
 					<button id="qrcodelink" class="hidden"><img src="img/icon_qr.png" width="15" height="15" alt="" /><?php echo I18n::_('QR code'); ?></button>

From 6728053ab0beb79a46a4b32d74ac4e9a7f83e691 Mon Sep 17 00:00:00 2001
From: Sergio Giraldo <sergio@giraldo.com.br>
Date: Sun, 10 Sep 2023 09:58:04 +0200
Subject: [PATCH 2/3] test: default value for email configuration item;nit
 necessary to close php comment ::by sergio giraldo @ 20230910T0958CEST, gpg
 signed

---
 cfg/conf.sample.php | 6 ++----
 tst/ViewTest.php    | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cfg/conf.sample.php b/cfg/conf.sample.php
index f65fbb35..8c8eeb6a 100644
--- a/cfg/conf.sample.php
+++ b/cfg/conf.sample.php
@@ -1,5 +1,4 @@
-;<?php http_response_code(403); 
-/*
+;<?php http_response_code(403); /*
 ; config file for PrivateBin
 ;
 ; An explanation of each setting can be find online at https://github.com/PrivateBin/PrivateBin/wiki/Configuration.
@@ -263,5 +262,4 @@ dir = PATH "data"
 ; (optional) the "signature" (access key) issued by YOURLS for the using account
 ; signature = ""
 ; (optional) the URL of the YOURLS API, called to shorten a PrivateBin URL
-; apiurl = "https://yourls.example.com/yourls-api.php"
-*/
\ No newline at end of file
+; apiurl = "https://yourls.example.com/yourls-api.php"
\ No newline at end of file
diff --git a/tst/ViewTest.php b/tst/ViewTest.php
index 535abf13..8043534a 100644
--- a/tst/ViewTest.php
+++ b/tst/ViewTest.php
@@ -58,6 +58,7 @@ class ViewTest extends TestCase
         $page->assign('EXPIREDEFAULT', self::$expire_default);
         $page->assign('URLSHORTENER', '');
         $page->assign('QRCODE', true);
+        $page->assign('EMAIL', true);
         $page->assign('HTTPWARNING', true);
         $page->assign('HTTPSLINK', 'https://example.com/');
         $page->assign('COMPRESSION', 'zlib');

From bf090fabb86079041540c7a3187121490129b43d Mon Sep 17 00:00:00 2001
From: Sergio Giraldo <sergio@giraldo.com.br>
Date: Sun, 10 Sep 2023 16:50:00 +0200
Subject: [PATCH 3/3] refactor: removed unnecessary php tag ::by sergio giraldo
 @ 20230910T1650CEST, gpg signed

---
 tpl/bootstrap.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 2190be2f..f2c2c078 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -229,8 +229,6 @@ if ($EMAIL) :
 						</button>
 <?php
 endif;
-?>
-<?php
 if ($QRCODE) :
 ?>
 						<button id="qrcodelink" type="button" data-toggle="modal" data-target="#qrcodemodal" class="hidden btn btn-<?php echo $isDark ? 'warning' : 'default'; ?> navbar-btn">