[Svn] r3253 - in trunk/roundcubemail/plugins: archive help markasjunk

[trac at roundcube.net]

Author: alec
Date: 2010-02-05 08:06:53 -0600 (Fri, 05 Feb 2010)
New Revision: 3253

Modified:
   trunk/roundcubemail/plugins/archive/archive.php
   trunk/roundcubemail/plugins/help/help.php
   trunk/roundcubemail/plugins/markasjunk/markasjunk.php
Log:
- don't load some stuff before login (#1486475)


Modified: trunk/roundcubemail/plugins/archive/archive.php
===================================================================
--- trunk/roundcubemail/plugins/archive/archive.php	2010-02-05 13:10:42 UTC (rev 3252)
+++ trunk/roundcubemail/plugins/archive/archive.php	2010-02-05 14:06:53 UTC (rev 3253)
@@ -15,15 +15,17 @@
 
   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');

Modified: trunk/roundcubemail/plugins/help/help.php
===================================================================
--- trunk/roundcubemail/plugins/help/help.php	2010-02-05 13:10:42 UTC (rev 3252)
+++ trunk/roundcubemail/plugins/help/help.php	2010-02-05 14:06:53 UTC (rev 3253)
@@ -14,6 +14,11 @@
 {
     function init()
     {
+      $rcmail = rcmail::get_instance();
+      
+      if (!$rcmail->user->ID)
+        return;
+
       $this->add_texts('localization/', false);
       
       // register actions
@@ -29,7 +34,7 @@
 	'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';
 

Modified: trunk/roundcubemail/plugins/markasjunk/markasjunk.php
===================================================================
--- trunk/roundcubemail/plugins/markasjunk/markasjunk.php	2010-02-05 13:10:42 UTC (rev 3252)
+++ trunk/roundcubemail/plugins/markasjunk/markasjunk.php	2010-02-05 14:06:53 UTC (rev 3253)
@@ -15,9 +15,13 @@
 
   function init()
   {
+    $rcmail = rcmail::get_instance();
+
+    if (!$rcmail->user->ID)
+      return;
+
     $this->register_action('plugin.markasjunk', array($this, 'request_action'));
-    
-    $rcmail = rcmail::get_instance();
+      
     if ($rcmail->action == '' || $rcmail->action == 'show') {
       $skin_path = $this->local_skin_path();
       $this->include_script('markasjunk.js');

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn