From 1bf910480ba8aea1e8ea958c884d246a39f44d4d Mon Sep 17 00:00:00 2001
From: rugk <rugk@posteo.de>
Date: Tue, 22 May 2018 11:41:35 +0200
Subject: [PATCH] Do not show error, when paste is deleted manually

Prior to this commit, if the paste has been deleted manually (clicking
on "delete paste" after creation) it tried to fetch the now deleted
paste and display an error. This makes, of course, no sense.
---
 js/privatebin.js  | 21 ++++++++++++++++++++-
 tpl/bootstrap.php |  2 +-
 tpl/page.php      |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/js/privatebin.js b/js/privatebin.js
index 9be809d4..e3491538 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -741,6 +741,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
         me.getPasteId = function()
         {
             if (id === null) {
+                // Attention: This also returns the delete token inside of the ID, if it is specified
                 id = window.location.search.substring(1);
 
                 if (id === '') {
@@ -749,7 +750,19 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
             }
 
             return id;
-        };
+        }
+
+        /**
+         * Returns true, when the URL has a delete token and the current call was used for deleting a paste.
+         *
+         * @name   Model.hasDeleteToken
+         * @function
+         * @return {bool}
+         */
+        me.hasDeleteToken = function()
+        {
+            return window.location.search.indexOf('deletetoken') !== -1;
+        }
 
         /**
          * return the deciphering key stored in anchor part of the URL
@@ -4412,6 +4425,12 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
                 return me.newPaste();
             }
 
+            // if delete token is passed (i.e. paste has been deleted by this access)
+            // there is no more stuf we need to do
+            if (Model.hasDeleteToken()) {
+                return;
+            }
+
             // prevent bots from viewing a paste and potentially deleting data
             // when burn-after-reading is set
             // see https://github.com/elrido/ZeroBin/issues/11
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 2cf9e6d8..e5a9d0b0 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-lBUTJhcAMgpb2i75GGQfmlJ7V8uOj/um1SQDRXcsvL0zFV7lsuw5IItfbUJ2/XHX0CIr2b3LY4A8nAiFLwTtKA==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-henYzZGF1ifJSsU7o85JGbuiq851+njzq4rgiK/Wva4Ry7N49PvdE4awVaEoFYd0W0pyaT3v+6cE1ZfO2NBtwQ==" 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 4abcbce3..9c53ba99 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-lBUTJhcAMgpb2i75GGQfmlJ7V8uOj/um1SQDRXcsvL0zFV7lsuw5IItfbUJ2/XHX0CIr2b3LY4A8nAiFLwTtKA==" crossorigin="anonymous"></script>
+		<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-henYzZGF1ifJSsU7o85JGbuiq851+njzq4rgiK/Wva4Ry7N49PvdE4awVaEoFYd0W0pyaT3v+6cE1ZfO2NBtwQ==" 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]-->