Fix indentation

CHANGELOG

@@ -23,6 +23,7 @@ CHANGELOG Roundcube Webmail
 - Managesieve: Add option managesieve_forward to enable settings dialog for simple forwarding (#6021)
 - Managesieve: Support filter action with custom IMAP flags (#6011)
 - Managesieve: Support 'mime' extension tests - RFC5703 (#5832)
+- Managesieve: Support GSSAPI authentication with krb_authentication plugin (#5779)
 - Changed defaults for smtp_user (%u), smtp_pass (%p) and smtp_port (587)
 - Composer: Fix certificate validation errors by using packagist only (#5148)
 - Enigma: Add button to send mail unencrypted if no key was found (#5913)

plugins/krb_authentication/krb_authentication.php

@@ -24,7 +24,7 @@ class krb_authentication extends rcube_plugin
         $this->add_hook('authenticate', array($this, 'authenticate'));
         $this->add_hook('login_after', array($this, 'login'));
         $this->add_hook('storage_connect', array($this, 'storage_connect'));
-	$this->add_hook('managesieve_connect', array($this, 'managesieve_connect'));
+        $this->add_hook('managesieve_connect', array($this, 'managesieve_connect'));
     }
 
     /**
@@ -108,19 +108,20 @@ class krb_authentication extends rcube_plugin
         return $args;
     }
 
-
     /**
      * managesieve_connect hook handler
      */
     function managesieve_connect($args)
     {
-	if ((!isset($args['auth_type']) || $args['auth_type'] == 'GSSAPI') && !empty($_SERVER['REMOTE_USER']) && !empty($_SERVER['KRB5CCNAME'])) {
+        if ((!isset($args['auth_type']) || $args['auth_type'] == 'GSSAPI') && !empty($_SERVER['REMOTE_USER']) && !empty($_SERVER['KRB5CCNAME'])) {
             $rcmail  = rcmail::get_instance();
             $context = $rcmail->config->get('krb_authentication_context');
-	    $args['gssapi_context'] = $context ?: 'imap/kolab.example.org@EXAMPLE.ORG';
-	    $args['gssapi_cn'] = $_SERVER['KRB5CCNAME'];
-	    $args['auth_type'] = 'GSSAPI';
-	}
-	return $args;
+
+            $args['gssapi_context'] = $context ?: 'imap/kolab.example.org@EXAMPLE.ORG';
+            $args['gssapi_cn']      = $_SERVER['KRB5CCNAME'];
+            $args['auth_type']      = 'GSSAPI';
+        }
+
+        return $args;
     }
 }

plugins/managesieve/Changelog

@@ -1,4 +1,4 @@
-- Added GSSAPI support(#5779) - requires updated Net_Sieve class
+- Added GSSAPI support (#5779)
 - Added option managesieve_default_headers
 - Added option managesieve_forward to enable settings dialog for simple forwarding (#6021)
 - Support filter action with custom IMAP flags (#6011)

plugins/managesieve/lib/Roundcube/rcube_sieve.php

@@ -63,7 +63,7 @@ class rcube_sieve
     public function __construct($username, $password='', $host='localhost', $port=2000,
         $auth_type=null, $usetls=true, $disabled=array(), $debug=false,
         $auth_cid=null, $auth_pw=null, $options=array(), $gssapi_principal=null,
-	$gssapi_cname=null)
+        $gssapi_cname=null)
     {
         $this->sieve = new Net_Sieve();
 
@@ -71,13 +71,13 @@ class rcube_sieve
             $this->sieve->setDebug(true, array($this, 'debug_handler'));
         }
 
-	if (isset($gssapi_principal)) {
-	    $this->sieve->setServicePrincipal($gssapi_principal);
-	}
+        if (isset($gssapi_principal)) {
+            $this->sieve->setServicePrincipal($gssapi_principal);
+        }
 
-	if (isset($gssapi_cname)) {
-	    $this->sieve->setServiceCN($gssapi_cname);
-	}
+        if (isset($gssapi_cname)) {
+            $this->sieve->setServiceCN($gssapi_cname);
+        }
 
         $result = $this->sieve->connect($host, $port, $options, $usetls);