From ec86e3cb7f5e3b561528ea71d72d0dc30a82dfd7 Mon Sep 17 00:00:00 2001
From: johndoh <roundcube@tehinterweb.co.uk>
Date: Sat, 2 May 2020 09:47:18 +0100
Subject: [PATCH] Markasjunk: Fix regression in jsevent driver #7361 (#7365)

---
 plugins/markasjunk/drivers/jsevent.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/markasjunk/drivers/jsevent.php b/plugins/markasjunk/drivers/jsevent.php
index 1b0540c4a..368bf63c8 100644
--- a/plugins/markasjunk/drivers/jsevent.php
+++ b/plugins/markasjunk/drivers/jsevent.php
@@ -34,6 +34,12 @@ class markasjunk_jsevent
 
     public function init()
     {
+        $rcmail = rcmail::get_instance();
+
+        // only execute this code on page load
+        if ($rcmail->output->type != 'html')
+            return;
+
         $js_addition_spam_folders = json_encode($this->addition_spam_folders);
         $js_suspicious_folders    = json_encode($this->suspicious_folders);
 
@@ -44,7 +50,7 @@ rcmail.addEventListener('markasjunk-update', function(props) {
 
     // ignore this special code when in a multifolder listing
     if (rcmail.is_multifolder_listing())
-            return;
+        return;
 
     if ($.inArray(rcmail.env.mailbox, addition_spam_folders) > -1) {
         props.disp.spam = false;
@@ -58,14 +64,13 @@ rcmail.addEventListener('markasjunk-update', function(props) {
         props.objs.spamobj.find('a > span').text('As possibly spam');
     }
     else {
-            props.objs.spamobj.find('a > span').text(rcmail.get_label('markasjunk.markasjunk'));
+        props.objs.spamobj.find('a > span').text(rcmail.get_label('markasjunk.markasjunk'));
     }
 
     return props;
 });
 EOL;
 
-        $rcmail = rcmail::get_instance();
         $rcmail->output->add_script($script, 'docready');
     }