- don't load some stuff before login (#1486475)

3 files changed, 17 insertions, 6 deletions

diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index 27887cef3..d2269baba 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -15,15 +15,17 @@ class archive extends rcube_plugin
 
   function init()
   {
+    $rcmail = rcmail::get_instance();
+
+    if (!$rcmail->user->ID)
+      return;
+
     $this->register_action('plugin.archive', array($this, 'request_action'));
 
     // There is no "Archived flags"
     // $GLOBALS['IMAP_FLAGS']['ARCHIVED'] = 'Archive';
-    
-    $rcmail = rcmail::get_instance();
     if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show')
       && ($archive_folder = $rcmail->config->get('archive_mbox'))) {
-
       $skin_path = $this->local_skin_path();
       
       $this->include_script('archive.js');
diff --git a/plugins/help/help.php b/plugins/help/help.php
index c02b7e991..94d06542c 100644
--- a/plugins/help/help.php
+++ b/plugins/help/help.php
@@ -14,6 +14,11 @@ class help extends rcube_plugin
 {
     function init()
     {
+      $rcmail = rcmail::get_instance();
+      
+      if (!$rcmail->user->ID)
+        return;
+
       $this->add_texts('localization/', false);
       
       // register actions
@@ -29,7 +34,7 @@ class help extends rcube_plugin
 	'href'	=> './?_task=dummy&_action=plugin.help',
         ), 'taskbar');
 
-      $skin = rcmail::get_instance()->config->get('skin');
+      $skin = $rcmail->config->get('skin');
       if (!file_exists($this->home."/skins/$skin/help.css"))
 	$skin = 'default';
 
diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php
index cf81883fc..9f75590c8 100644
--- a/plugins/markasjunk/markasjunk.php
+++ b/plugins/markasjunk/markasjunk.php
@@ -15,9 +15,13 @@ class markasjunk extends rcube_plugin
 
   function init()
   {
-    $this->register_action('plugin.markasjunk', array($this, 'request_action'));
-    
     $rcmail = rcmail::get_instance();
+
+    if (!$rcmail->user->ID)
+      return;
+
+    $this->register_action('plugin.markasjunk', array($this, 'request_action'));
+      
     if ($rcmail->action == '' || $rcmail->action == 'show') {
       $skin_path = $this->local_skin_path();
       $this->include_script('markasjunk.js');