Changeset 6ffe0be in github

Timestamp:

May 24, 2012 6:07:44 AM (13 months ago)

Author:

GDR\! <gdr@…>

Branches:

master, HEAD, dev-browser-capabilities, pdo

Children:

19cc5b9

Parents:

7eb4f2e

git-author:

GDR\! <gdr@…> (05/24/12 05:56:39)

git-committer:

GDR\! <gdr@…> (05/24/12 06:07:44)

Message:

Password plugin made compatible with modern Virtualmin

Added a new username format in Virtualmin driver,
which works for default Virtualmin settings where
username is user.postfix and domain is taken from
email address.

Example:
email - info@…
login - info.goodcof

Location:

plugins/password

Files:

• config.inc.php.dist (modified) (1 diff)
• drivers/virtualmin.php (modified) (1 diff)

plugins/password/config.inc.php.dist

@@ -309 +309 @@
 // 6: username_domain
 // 7: domain_username
-$rcmail_config['password_virtualmin_format'] = 0;
+// 8: username@domain; mbox.username
+$rcmail_config['password_virtualmin_format'] = 8;
 
 

plugins/password/drivers/virtualmin.php

@@ -49 +49 @@
             $domain = $pieces[0];
             break;
+                case 8: // domain taken from alias, username left as it was
+                        $email = $rcmail->user->data['alias'];
+                        $domain = substr(strrchr($email, "@"), 1);
+                        break
         default: // username@domain
             $domain = substr(strrchr($username, "@"), 1);