From f2b60d3765185e458096ba96fb0786da2d729fee Mon Sep 17 00:00:00 2001
From: parthiv-m <parthivmenon.dev@gmail.com>
Date: Sun, 13 Oct 2024 17:45:05 -0400
Subject: [PATCH] Add _is_deleted status message to Controller and prompt for
 button click after paste delete

---
 js/privatebin.js   |  6 +++---
 lib/Controller.php | 10 ++++++++++
 tpl/bootstrap.php  |  7 +++++--
 tpl/bootstrap5.php | 11 ++++++++---
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/js/privatebin.js b/js/privatebin.js
index a5ab23bd..37a077df 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -5626,11 +5626,11 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             me.initZ();
 
             // if delete token is passed (i.e. paste has been deleted by this
-            // access), redirect to baseurl after 5 seconds
+            // access), add an event listener for the 'new' paste button in the alert
             if (Model.hasDeleteToken()) {
-                setTimeout(() => {
+                $("#new-from-alert").on("click", function () {
                     UiHelper.reloadHome();
-                }, 5000);
+                });
                 return;
             }
 
diff --git a/lib/Controller.php b/lib/Controller.php
index 58d1369d..d07adda2 100644
--- a/lib/Controller.php
+++ b/lib/Controller.php
@@ -67,6 +67,14 @@ class Controller
      */
     private $_status = '';
 
+    /**
+     * status message
+     *
+     * @access private
+     * @var    boolean
+     */
+    private $_is_deleted = false;
+
     /**
      * JSON message
      *
@@ -309,6 +317,7 @@ class Controller
                     // Paste exists and deletion token is valid: Delete the paste.
                     $paste->delete();
                     $this->_status = 'Paste was properly deleted.';
+                    $this->_is_deleted = true;
                 } else {
                     $this->_error = 'Wrong deletion token. Paste was not deleted.';
                 }
@@ -412,6 +421,7 @@ class Controller
         }
         $page->assign('BASEPATH', I18n::_($this->_conf->getKey('basepath')));
         $page->assign('STATUS', I18n::_($this->_status));
+        $page->assign('ISDELETED', I18n::_(json_encode($this->_is_deleted)));
         $page->assign('VERSION', self::VERSION);
         $page->assign('DISCUSSION', $this->_conf->getKey('discussion'));
         $page->assign('OPENDISCUSSION', $this->_conf->getKey('opendiscussion'));
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 74712355..37ff6f73 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -489,10 +489,13 @@ if ($FILEUPLOAD) :
 				</div>
 <?php
 endif;
-?>
-				<div id="status" role="alert" class="alert alert-<?php echo $STATUS === 'Paste was properly deleted.' ? 'success' : 'info' ?><?php echo empty($STATUS) ? ' hidden' : '' ?>">
+?>					
+				<div id="status" role="alert" class="clearfix alert alert-<?php echo (bool)$ISDELETED ? 'success' : 'info'; echo empty($STATUS) ? ' hidden' : '' ?>">
 					<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
 					<?php echo I18n::encode($STATUS), PHP_EOL; ?>
+					<button type="button" class="btn btn-default pull-right" id="new-from-alert">
+						<span class="glyphicon glyphicon-file"></span> <?php echo I18n::_('New'), PHP_EOL; ?>
+					</button>
 				</div>
 				<div id="errormessage" role="alert" class="<?php echo empty($ERROR) ? 'hidden' : '' ?> alert alert-danger">
 					<span class="glyphicon glyphicon-alert" aria-hidden="true"></span>
diff --git a/tpl/bootstrap5.php b/tpl/bootstrap5.php
index 011e388c..b94e564c 100644
--- a/tpl/bootstrap5.php
+++ b/tpl/bootstrap5.php
@@ -353,9 +353,14 @@ if ($FILEUPLOAD) :
 <?php
 endif;
 ?>
-				<div id="status" role="alert" class="alert alert-<?php $STATUS == 'Paste was properly deleted.' ? 'success' : 'info' ?><?php echo empty($STATUS) ? ' hidden' : '' ?>">
-					<svg width="16" height="16" fill="currentColor" aria-hidden="true"><use href="img/bootstrap-icons.svg#info-circle" /></svg>
-					<?php echo I18n::encode($STATUS), PHP_EOL; ?>
+				<div id="status" role="alert" class="d-flex justify-content-between align-items-center alert alert-<?php echo (bool)$ISDELETED ? 'success' : 'info'; echo empty($STATUS) ? ' hidden' : '' ?>">
+					<div>
+						<svg width="16" height="16" fill="currentColor" aria-hidden="true"><use href="img/bootstrap-icons.svg#info-circle" /></svg>
+						<?php echo I18n::encode($STATUS), PHP_EOL; ?>
+					</div>
+					<button type="button" class="btn btn-secondary" id="new-from-alert">
+						<svg width="16" height="16" fill="currentColor" aria-hidden="true"><use href="img/bootstrap-icons.svg#file-earmark" /></svg> <?php echo I18n::_('New'), PHP_EOL; ?>
+					</button>
 				</div>
 				<div id="errormessage" role="alert" class="<?php echo empty($ERROR) ? 'hidden' : '' ?> alert alert-danger">
 					<svg width="16" height="16" fill="currentColor" aria-hidden="true"><use href="img/bootstrap-icons.svg#exclamation-triangle" /></svg>