Merge branch 'master' of github.com:roundcube/roundcubemail

4 files changed, 18 insertions, 6 deletions

diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php
index 83f29c84f..39d70153a 100644
--- a/plugins/http_authentication/http_authentication.php
+++ b/plugins/http_authentication/http_authentication.php
@@ -19,12 +19,14 @@
  */
 class http_authentication extends rcube_plugin
 {
+    private $redirect_query;
 
     function init()
     {
         $this->add_hook('startup', array($this, 'startup'));
         $this->add_hook('authenticate', array($this, 'authenticate'));
         $this->add_hook('logout_after', array($this, 'logout'));
+        $this->add_hook('login_after', array($this, 'login'));
     }
 
     function startup($args)
@@ -34,8 +36,9 @@ class http_authentication extends rcube_plugin
             $rcmail->add_shutdown_function(array('http_authentication', 'shutdown'));
 
             // handle login action
-            if (empty($args['action']) && empty($_SESSION['user_id'])) {
-                $args['action'] = 'login';
+            if (empty($_SESSION['user_id'])) {
+                $args['action']         = 'login';
+                $this->redirect_query   = $_SERVER['QUERY_STRING'];
             }
             // Set user password in session (see shutdown() method for more info)
             else if (!empty($_SESSION['user_id']) && empty($_SESSION['password'])
@@ -90,5 +93,15 @@ class http_authentication extends rcube_plugin
         // We'll set it back on startup (#1486553)
         rcmail::get_instance()->session->remove('password');
     }
+    
+    function login($args)
+    {
+        // Redirect to the previous QUERY_STRING
+        if($this->redirect_query){
+            header('Location: ./?' . $this->redirect_query);
+            exit;
+        }
+        return $args;
+    }
 }
 
diff --git a/plugins/password/drivers/dbmail.php b/plugins/password/drivers/dbmail.php
index 529027b8d..5cfe92cd7 100644
--- a/plugins/password/drivers/dbmail.php
+++ b/plugins/password/drivers/dbmail.php
@@ -17,7 +17,7 @@
 
 class rcube_dbmail_password
 {
-    function password_save($currpass, $newpass)
+    function save($currpass, $newpass)
     {
         $curdir   = RCUBE_PLUGINS_DIR . 'password/helpers';
         $username = escapeshellcmd($_SESSION['username']);
diff --git a/plugins/password/helpers/chgdbmailusers.c b/plugins/password/helpers/chgdbmailusers.c
index 28f79c100..22793857d 100644
--- a/plugins/password/helpers/chgdbmailusers.c
+++ b/plugins/password/helpers/chgdbmailusers.c
@@ -5,7 +5,6 @@
 // set the UID this script will run as (root user)
 #define UID 0
 #define CMD "/usr/sbin/dbmail-users"
-#define RCOK 0x100
 
 /* INSTALLING:
   gcc -o chgdbmailusers chgdbmailusers.c
@@ -38,7 +37,7 @@ main(int argc, char *argv[])
   cc = setuid(UID);
   rc = system(cmnd);
 
-  if ((rc != RCOK) || (cc != 0))
+  if ((rc != 0) || (cc != 0))
   {
     fprintf(stderr, "__ %s:  failed %d  %d\n", argv[0], rc, cc);
     return 1;
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 9d7aa30cf..aa41d6a0b 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -37,7 +37,7 @@ if (!empty($_GET['_page'])) {
 
 $a_threading        = $RCMAIL->config->get('message_threading', array());
 $message_sort_col   = $RCMAIL->config->get('message_sort_col');
-$message_sort_order = $RCMAIL->config->get('message_sort_col');
+$message_sort_order = $RCMAIL->config->get('message_sort_order');
 
 // set default sort col/order to session
 if (!isset($_SESSION['sort_col'])) {