From b44e729a1aebcd12809f1e0cd601a377688b9eb0 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Sun, 19 May 2019 13:31:17 +0200
Subject: [PATCH] fixing display of version 1 pastes without attachments

---
 js/privatebin.js  | 38 ++++++++++++++++++++++----------------
 tpl/bootstrap.php |  2 +-
 tpl/page.php      |  2 +-
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/js/privatebin.js b/js/privatebin.js
index abc89409..0e5b1b55 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -4245,27 +4245,34 @@ jQuery.PrivateBin = (function($, RawDeflate) {
                 }
             }
 
-            if (paste.hasOwnProperty('attachment') && paste.hasOwnProperty('attachmentname')) {
-                // version 1 paste
-                Promise.all([
-                    CryptTool.decipher(key, password, paste.attachment),
-                    CryptTool.decipher(key, password, paste.attachmentname)
-                ]).then((attachment) => {
-                    AttachmentViewer.setAttachment(attachment[0], attachment[1]);
-                });
-                PasteViewer.setFormat(paste.meta.formatter);
-                PasteViewer.setText(pastePlain);
-            } else {
+            let format = '',
+                text   = '';
+            if (paste.hasOwnProperty('ct')) {
                 // version 2 paste
                 const pasteMessage = JSON.parse(pastePlain);
                 if (pasteMessage.hasOwnProperty('attachment') && pasteMessage.hasOwnProperty('attachment_name')) {
                     AttachmentViewer.setAttachment(pasteMessage.attachment, pasteMessage.attachment_name);
+                    AttachmentViewer.showAttachment();
                 }
-                PasteViewer.setFormat(paste.adata[1]);
-                PasteViewer.setText(pasteMessage.paste);
+                format = paste.adata[1];
+                text = pasteMessage.paste;
+            } else {
+                // version 1 paste
+                if (paste.hasOwnProperty('attachment') && paste.hasOwnProperty('attachmentname')) {
+                    Promise.all([
+                        CryptTool.decipher(key, password, paste.attachment),
+                        CryptTool.decipher(key, password, paste.attachmentname)
+                    ]).then((attachment) => {
+                        AttachmentViewer.setAttachment(attachment[0], attachment[1]);
+                        AttachmentViewer.showAttachment();
+                    });
+                }
+                format = paste.meta.formatter;
+                text = pastePlain;
             }
+            PasteViewer.setFormat(format);
+            PasteViewer.setText(text);
             PasteViewer.run();
-            AttachmentViewer.showAttachment();
         }
 
         /**
@@ -4377,7 +4384,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             });
 
             // decrypt paste & attachments
-            decryptionPromises.push(decryptPaste(paste, key, password))
+            decryptionPromises.push(decryptPaste(paste, key, password));
 
             // if the discussion is opened on this paste, display it
             if ((paste.adata && paste.adata[2]) || paste.meta.opendiscussion) {
@@ -4395,7 +4402,6 @@ jQuery.PrivateBin = (function($, RawDeflate) {
                 .catch((err) => {
                     // wait for the user to type in the password,
                     // then PasteDecrypter.run will be called again
-                    console.log(decryptionPromises);
                 });
         };
 
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 25f308c7..031fca67 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -72,7 +72,7 @@ if ($MARKDOWN):
 endif;
 ?>
 		<script type="text/javascript" data-cfasync="false" src="js/purify-1.0.7.js" integrity="sha512-VnKJHLosO8z2ojNvWk9BEKYqnhZyWK9rM90FgZUUEp/PRnUqR5OLLKE0a3BkVmn7YgB7LXRrjHgFHQYKd6DAIA==" crossorigin="anonymous"></script>
-		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-30YZX80ZfNAAMVDZdnHCp8rY1X66o9LhQ1LShA0JqGtFfvboDuoX9z9fuv/gIvo/MBs8qH6/14omf0bFlmnXkg==" crossorigin="anonymous"></script>
+		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-t9Zs9EkImSMS7DBczj95hrZi7CErcJ7w66LxUgy3dmu02AiiF0Mp/WNeq0MDIctCkepOde0o/E/0N4ETX/Z5TA==" 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 82d365ad..aabfe894 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -50,7 +50,7 @@ if ($MARKDOWN):
 endif;
 ?>
 		<script type="text/javascript" data-cfasync="false" src="js/purify-1.0.7.js" integrity="sha512-VnKJHLosO8z2ojNvWk9BEKYqnhZyWK9rM90FgZUUEp/PRnUqR5OLLKE0a3BkVmn7YgB7LXRrjHgFHQYKd6DAIA==" crossorigin="anonymous"></script>
-		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-30YZX80ZfNAAMVDZdnHCp8rY1X66o9LhQ1LShA0JqGtFfvboDuoX9z9fuv/gIvo/MBs8qH6/14omf0bFlmnXkg==" crossorigin="anonymous"></script>
+		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-t9Zs9EkImSMS7DBczj95hrZi7CErcJ7w66LxUgy3dmu02AiiF0Mp/WNeq0MDIctCkepOde0o/E/0N4ETX/Z5TA==" 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]-->