Changeset 3258 in subversion

Timestamp:

Feb 6, 2010 1:12:49 PM (3 years ago)

Author:

alec

Message:

• Fix setting task name according to auth state. So, any action before user is authenticated is assigned to 'login' task instead of 'mail'. Now binding plugins to 'login' task is possible and realy usefull. It's also possible to bind to all tasks excluding 'login'.

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• index.php (modified) (5 diffs)
• plugins/archive/archive.php (modified) (1 diff)
• plugins/autologon/autologon.php (modified) (2 diffs)
• plugins/help/help.php (modified) (1 diff)
• plugins/http_authentication/http_authentication.php (modified) (2 diffs)
• plugins/markasjunk/markasjunk.php (modified) (1 diff)
• plugins/new_user_identity/new_user_identity.php (modified) (1 diff)
• plugins/squirrelmail_usercopy/squirrelmail_usercopy.php (modified) (1 diff)
• program/include/rcmail.php (modified) (5 diffs)
• program/include/rcube_plugin_api.php (modified) (1 diff)
• program/steps/mail/func.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix setting task name according to auth state
 - Password: fix vpopmaild driver (#1486478)
 - Add workaround for MySQL bug [http://bugs.mysql.com/bug.php?id=46293] (#1486474)

trunk/roundcubemail/index.php

@@ -81 +81 @@
 
 // try to log in
-if ($RCMAIL->action=='login' && $RCMAIL->task=='mail') {
+if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
   // purge the session in case of new login when a session already exists 
   $RCMAIL->kill_session();
@@ -118 +118 @@
       parse_str($url, $query);
 
+    $RCMAIL->set_task('mail');
+
     // allow plugins to control the redirect url after login success
     $redir = $RCMAIL->plugins->exec_hook('login_after', $query + array('task' => $RCMAIL->task));
@@ -133 +135 @@
 
 // end session
-else if ($RCMAIL->task=='logout' && isset($_SESSION['user_id'])) {
+else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id'])) {
   $userdata = array('user' => $_SESSION['username'], 'host' => $_SESSION['imap_host'], 'lang' => $RCMAIL->user->language);
   $OUTPUT->show_message('loggedout');
@@ -142 +144 @@
 
 // check session and auth cookie
-else if ($RCMAIL->action != 'login' && $_SESSION['user_id'] && $RCMAIL->action != 'send') {
+else if ($RCMAIL->task != 'login' && $_SESSION['user_id'] && $RCMAIL->action != 'send') {
   if (!$RCMAIL->authenticate_session()) {
     $OUTPUT->show_message('sessionerror', 'error');
@@ -169 +171 @@
   if ($OUTPUT->ajax_call)
     $OUTPUT->redirect(array(), 2000);
-  
+
   if (!empty($_REQUEST['_framed']))
     $OUTPUT->command('redirect', '?');

trunk/roundcubemail/plugins/archive/archive.php

@@ -17 +17 @@
   {
     $rcmail = rcmail::get_instance();
-
-    if (!$rcmail->user->ID)
-      return;
 
     $this->register_action('plugin.archive', array($this, 'request_action'));

trunk/roundcubemail/plugins/autologon/autologon.php

@@ -7 +7 @@
 class autologon extends rcube_plugin
 {
+  public $task = 'login';
 
   function init()
@@ -19 +20 @@
 
     // change action to login
-    if ($args['task'] == 'mail' && empty($args['action']) && empty($_SESSION['user_id']) && !empty($_GET['_autologin']) && $this->is_localhost())
+    if (empty($_SESSION['user_id']) && !empty($_GET['_autologin']) && $this->is_localhost())
       $args['action'] = 'login';
 

trunk/roundcubemail/plugins/help/help.php

@@ -13 +13 @@
 class help extends rcube_plugin
 {
+    // all task excluding 'login' and 'logout'
+    public $task = '?(?!login|logout).*';
+
     function init()
     {
       $rcmail = rcmail::get_instance();
       
-      if (!$rcmail->user->ID)
-        return;
-
       $this->add_texts('localization/', false);
       

trunk/roundcubemail/plugins/http_authentication/http_authentication.php

@@ -11 +11 @@
 class http_authentication extends rcube_plugin
 {
+  public $task = 'login';
 
   function init()
@@ -21 +22 @@
   {
     // change action to login
-    if ($args['task'] == 'mail' && empty($args['action']) && empty($_SESSION['user_id'])
+    if (empty($args['action']) && empty($_SESSION['user_id'])
         && !empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW']))
       $args['action'] = 'login';

trunk/roundcubemail/plugins/markasjunk/markasjunk.php

@@ -17 +17 @@
   {
     $rcmail = rcmail::get_instance();
-
-    if (!$rcmail->user->ID)
-      return;
 
     $this->register_action('plugin.markasjunk', array($this, 'request_action'));

trunk/roundcubemail/plugins/new_user_identity/new_user_identity.php

@@ -23 +23 @@
 class new_user_identity extends rcube_plugin
 {
+    public $task = 'login';
+
     function init()
     {

trunk/roundcubemail/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php

@@ -11 +11 @@
 class squirrelmail_usercopy extends rcube_plugin
 {
+        public $task = 'login|settings';
+
         private $prefs = null;
         private $abook = array();

trunk/roundcubemail/program/include/rcmail.php

@@ -40 +40 @@
   public $output;
   public $plugins;
-  public $task = 'mail';
+  public $task;
   public $action = '';
   public $comm_path = './';
@@ -92 +92 @@
     }
 
-    // set task and action properties
-    $this->set_task(get_input_value('_task', RCUBE_INPUT_GPC));
-    $this->action = asciiwords(get_input_value('_action', RCUBE_INPUT_GPC));
-
     // connect to database
     $GLOBALS['DB'] = $this->get_dbh();
@@ -124 +120 @@
     $this->set_user(new rcube_user($_SESSION['user_id']));
 
+    // set task and action properties
+    $this->set_task(get_input_value('_task', RCUBE_INPUT_GPC));
+    $this->action = asciiwords(get_input_value('_action', RCUBE_INPUT_GPC));
+
     // reset some session parameters when changing task
     if ($_SESSION['task'] != $this->task)
@@ -132 +132 @@
 
     // create IMAP object
-    if ($this->task == 'mail')
+    if ($this->task == 'login')
       $this->imap_init();
       
@@ -148 +148 @@
   {
     $task = asciiwords($task);
-    $this->task = $task ? $task : 'mail';
+
+    if ($this->user && $this->user->ID)
+      $task = !$task || $task == 'login' ? 'mail' : $task;
+    else
+      $task = 'login';
+
+    $this->task = $task;
     $this->comm_path = $this->url(array('task' => $this->task));
     

trunk/roundcubemail/program/include/rcube_plugin_api.php

@@ -91 +91 @@
           $plugin = new $plugin_name($this);
           // check inheritance and task specification
-          if (is_subclass_of($plugin, 'rcube_plugin') && (!$plugin->task || preg_match('/('.$plugin->task.')/i', $rcmail->task))) {
+          if (is_subclass_of($plugin, 'rcube_plugin') && (!$plugin->task || preg_match('/^('.$plugin->task.')$/i', $rcmail->task))) {
             $plugin->init();
             $this->plugins[] = $plugin;

trunk/roundcubemail/program/steps/mail/func.inc

@@ -25 +25 @@
 $NOIMAP_ACTIONS = array('spell', 'addcontact', 'autocomplete', 'upload', 'display-attachment', 'remove-attachment');
 
+// Init IMAP object
+$RCMAIL->imap_init();
 
 // log in to imap server