- Use mail_domain value for domain variables when there is no domain in username:

  sql and ldap drivers (#1486694)
- Created package.xml 


git-svn-id: https://svn.roundcube.net/trunk@3575 208e9e7b-5314-0410-a742-e7e81cd9613c

6 files changed, 312 insertions, 180 deletions

diff --git a/plugins/password/README b/plugins/password/README
index 46f1b3cac..488d7f449 100644
--- a/plugins/password/README
+++ b/plugins/password/README
@@ -19,7 +19,7 @@
  with this program; if not, write to the Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
- @version 1.2
+ @version @package_version@
  @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
  @author <see driver files for driver authors>
  -----------------------------------------------------------------------
diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php
index 0557f3e54..a8aba0f74 100644
--- a/plugins/password/drivers/ldap.php
+++ b/plugins/password/drivers/ldap.php
@@ -133,14 +133,16 @@ function search_userdn($rcmail)
  */
 function substitute_vars($str)
 {
-    $str = str_replace('%login', $_SESSION['username'], $str);
-
-    $parts = explode('@', $_SESSION['username']);
-    if (count($parts) == 2)
-    {
-        $str = str_replace('%name', $parts[0], $str);
-        $str = str_replace('%domain', $parts[1], $str);
-    }
+    $str = str_replace(array(
+            '%login',
+            '%name',
+            '%domain',
+        ), array(
+            $_SESSION['username'],
+            password::username_local(),
+            password::username_domain(),
+        ), $str
+    );
 
     return $str;
 }
diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
index 7e4907906..cb837edce 100644
--- a/plugins/password/drivers/sql.php
+++ b/plugins/password/drivers/sql.php
@@ -105,12 +105,9 @@ function password_save($curpass, $passwd)
 	    $sql = str_replace('%q', $db->quote($hash_curpass, 'text'), $sql);
     }
 
-    $user_info = explode('@', $_SESSION['username']);
-    if (count($user_info) >= 2) {
-	    $sql = str_replace('%l', $db->quote($user_info[0], 'text'), $sql);
-	    $sql = str_replace('%d', $db->quote($user_info[1], 'text'), $sql);
-    }
-    
+    // at least we should always have the local part
+    $sql = str_replace('%l', $db->quote(password::username_local(), 'text'), $sql);
+    $sql = str_replace('%d', $db->quote(password::username_domain(), 'text'), $sql);
     $sql = str_replace('%u', $db->quote($_SESSION['username'],'text'), $sql);
     $sql = str_replace('%h', $db->quote($_SESSION['imap_host'],'text'), $sql);
     $sql = str_replace('%p', $db->quote($passwd,'text'), $sql);
diff --git a/plugins/password/package.xml b/plugins/password/package.xml
new file mode 100644
index 000000000..fe37f44a2
--- /dev/null
+++ b/plugins/password/package.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+    http://pear.php.net/dtd/tasks-1.0.xsd
+    http://pear.php.net/dtd/package-2.0
+    http://pear.php.net/dtd/package-2.0.xsd">
+	<name>password</name>
+	<channel>pear.roundcube.net</channel>
+	<summary>Password Change for Roundcube</summary>
+	<description>Plugin that adds a possibility to change user password using many
+        methods (drivers) via Settings/Password tab.
+    </description>
+	<lead>
+		<name>Aleksander Machniak</name>
+		<user>alec</user>
+		<email>alec@alec.pl</email>
+		<active>yes</active>
+	</lead>
+	<date>2010-04-29</date>
+	<time>12:00:00</time>
+	<version>
+		<release>1.4</release>
+		<api>1.4</api>
+	</version>
+	<stability>
+		<release>stable</release>
+		<api>stable</api>
+	</stability>
+	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
+	<notes>
+- Use mail_domain value for domain variables when there is no domain in username:
+  sql and ldap drivers(#1486694)
+- Created package.xml
+    </notes>
+	<contents>
+		<dir baseinstalldir="/" name="/">
+			<file name="password.php" role="php">
+				<tasks:replace from="@name@" to="name" type="package-info"/>
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+			<file name="password.js" role="data">
+				<tasks:replace from="@name@" to="name" type="package-info"/>
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+            <file name="README" role="data">
+				<tasks:replace from="@name@" to="name" type="package-info"/>
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+            </file>
+			<file name="localization/bg_BG.inc" role="data"></file>
+			<file name="localization/ca_ES.inc" role="data"></file>
+			<file name="localization/cs_CZ.inc" role="data"></file>
+			<file name="localization/da_DK.inc" role="data"></file>
+			<file name="localization/de_CH.inc" role="data"></file>
+			<file name="localization/de_DE.inc" role="data"></file>
+			<file name="localization/en_US.inc" role="data"></file>
+			<file name="localization/es_ES.inc" role="data"></file>
+			<file name="localization/et_EE.inc" role="data"></file>
+			<file name="localization/fr_FR.inc" role="data"></file>
+			<file name="localization/hu_HU.inc" role="data"></file>
+			<file name="localization/it_IT.inc" role="data"></file>
+			<file name="localization/lt_LT.inc" role="data"></file>
+			<file name="localization/lv_LV.inc" role="data"></file>
+			<file name="localization/nl_NL.inc" role="data"></file>
+			<file name="localization/pl_PL.inc" role="data"></file>
+			<file name="localization/pt_BR.inc" role="data"></file>
+			<file name="localization/pt_PT.inc" role="data"></file>
+			<file name="localization/sl_SI.inc" role="data"></file>
+			<file name="localization/sv_SE.inc" role="data"></file>
+			<file name="localization/zh_TW.inc" role="data"></file>
+
+			<file name="drivers/chgsaslpasswd.c" role="data"></file>
+            <file name="drivers/chgvirtualminpasswd.c" role="data"></file>
+            <file name="drivers/chpasswd.php" role="php"></file>
+            <file name="drivers/directadmin.php" role="php"></file>
+            <file name="drivers/ldap.php" role="php"></file>
+            <file name="drivers/poppassd.php" role="php"></file>
+            <file name="drivers/sql.php" role="php"></file>
+            <file name="drivers/vpopmaild.php" role="php"></file>
+            <file name="drivers/cpanel.php" role="php"></file>
+            <file name="drivers/hmail.php" role="php"></file>
+            <file name="drivers/pam.php" role="php"></file>
+            <file name="drivers/sasl.php" role="php"></file>
+            <file name="drivers/virtualmin.php" role="php"></file>
+            <file name="drivers/ximss.php" role="php"></file>
+
+            <file name="config.inc.php.disc" role="data"></file>
+		</dir>
+		<!-- / -->
+	</contents>
+	<dependencies>
+		<required>
+			<php>
+				<min>5.2.1</min>
+			</php>
+			<pearinstaller>
+				<min>1.7.0</min>
+			</pearinstaller>
+		</required>
+	</dependencies>
+	<phprelease/>
+</package>
diff --git a/plugins/password/password.js b/plugins/password/password.js
index 8a079de2d..17fe3f7bb 100644
--- a/plugins/password/password.js
+++ b/plugins/password/password.js
@@ -1,4 +1,7 @@
-/* Password change interface (tab) */
+/*
+ * Password plugin script
+ * @version @package_version@
+ */
 
 if (window.rcmail) {
   rcmail.addEventListener('init', function(evt) {
diff --git a/plugins/password/password.php b/plugins/password/password.php
index 3121eb6fe..eb9f19bda 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -3,7 +3,7 @@
 /*
  +-------------------------------------------------------------------------+
  | Password Plugin for Roundcube                                           |
- | Version 1.3.2                                                           |
+ | @version @package_version@                                                             |
  |                                                                         |
  | Copyright (C) 2009, RoundCube Dev.                                      |
  |                                                                         |
@@ -46,203 +46,233 @@ define('PASSWORD_SUCCESS', 0);
  */
 class password extends rcube_plugin
 {
-  public $task = 'settings';
+    public $task = 'settings';
 
-  function init()
-  {
-    $rcmail = rcmail::get_instance();
-    // add Tab label
-    $rcmail->output->add_label('password');
-    $this->register_action('plugin.password', array($this, 'password_init'));
-    $this->register_action('plugin.password-save', array($this, 'password_save'));
-    $this->include_script('password.js');
-  }
+    function init()
+    {
+        $rcmail = rcmail::get_instance();
+        // add Tab label
+        $rcmail->output->add_label('password');
+        $this->register_action('plugin.password', array($this, 'password_init'));
+        $this->register_action('plugin.password-save', array($this, 'password_save'));
+        $this->include_script('password.js');
+    }
 
-  function password_init()
-  {
-    $this->add_texts('localization/');
-    $this->register_handler('plugin.body', array($this, 'password_form'));
+    function password_init()
+    {
+        $this->add_texts('localization/');
+        $this->register_handler('plugin.body', array($this, 'password_form'));
 
-    $rcmail = rcmail::get_instance();
-    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
-    $rcmail->output->send('plugin');
-  }
-  
-  function password_save()
-  {
-    $rcmail = rcmail::get_instance();
-    $this->load_config();
+        $rcmail = rcmail::get_instance();
+        $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
+        $rcmail->output->send('plugin');
+    }
 
-    $this->add_texts('localization/');
-    $this->register_handler('plugin.body', array($this, 'password_form'));
-    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
+    function password_save()
+    {
+        $rcmail = rcmail::get_instance();
+        $this->load_config();
 
-    $confirm = $rcmail->config->get('password_confirm_current');
-    $required_length = intval($rcmail->config->get('password_minimum_length'));
-    $check_strength = $rcmail->config->get('password_require_nonalpha');
+        $this->add_texts('localization/');
+        $this->register_handler('plugin.body', array($this, 'password_form'));
+        $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
 
-    if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd'])) {
-      $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');
-    }
-    else {
+        $confirm = $rcmail->config->get('password_confirm_current');
+        $required_length = intval($rcmail->config->get('password_minimum_length'));
+        $check_strength = $rcmail->config->get('password_require_nonalpha');
 
-      $charset = strtoupper($rcmail->config->get('password_charset', 'ISO-8859-1'));
-      $rc_charset = strtoupper($rcmail->output->get_charset());
+        if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd'])) {
+            $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');
+        }
+        else {
 
-      $curpwd = get_input_value('_curpasswd', RCUBE_INPUT_POST, true, $charset);
-      $newpwd = get_input_value('_newpasswd', RCUBE_INPUT_POST, true);
-      $conpwd = get_input_value('_confpasswd', RCUBE_INPUT_POST, true);
+            $charset    = strtoupper($rcmail->config->get('password_charset', 'ISO-8859-1'));
+            $rc_charset = strtoupper($rcmail->output->get_charset());
 
-      // check allowed characters according to the configured 'password_charset' option
-      // by converting the password entered by the user to this charset and back to UTF-8
-      $orig_pwd = $newpwd;
-      $chk_pwd = rcube_charset_convert($orig_pwd, $rc_charset, $charset);
-      $chk_pwd = rcube_charset_convert($chk_pwd, $charset, $rc_charset);
+            $curpwd = get_input_value('_curpasswd', RCUBE_INPUT_POST, true, $charset);
+            $newpwd = get_input_value('_newpasswd', RCUBE_INPUT_POST, true);
+            $conpwd = get_input_value('_confpasswd', RCUBE_INPUT_POST, true);
 
-      // WARNING: Default password_charset is ISO-8859-1, so conversion will
-      // change national characters. This may disable possibility of using
-      // the same password in other MUA's.
-      // We're doing this for consistence with Roundcube core
-      $newpwd = rcube_charset_convert($newpwd, $rc_charset, $charset);
-      $conpwd = rcube_charset_convert($conpwd, $rc_charset, $charset);
+            // check allowed characters according to the configured 'password_charset' option
+            // by converting the password entered by the user to this charset and back to UTF-8
+            $orig_pwd = $newpwd;
+            $chk_pwd = rcube_charset_convert($orig_pwd, $rc_charset, $charset);
+            $chk_pwd = rcube_charset_convert($chk_pwd, $charset, $rc_charset);
 
-      if ($chk_pwd != $orig_pwd) {
-        $rcmail->output->command('display_message', $this->gettext('passwordforbidden'), 'error');
-      }
-      // other passwords validity checks
-      else if ($conpwd != $newpwd) {
-        $rcmail->output->command('display_message', $this->gettext('passwordinconsistency'), 'error');
-      }
-      else if ($confirm && $rcmail->decrypt($_SESSION['password']) != $curpwd) {
-        $rcmail->output->command('display_message', $this->gettext('passwordincorrect'), 'error');
-      }
-      else if ($required_length && strlen($newpwd) < $required_length) {
-        $rcmail->output->command('display_message', $this->gettext(
-	  array('name' => 'passwordshort', 'vars' => array('length' => $required_length))), 'error');
-      }
-      else if ($check_strength && (!preg_match("/[0-9]/", $newpwd) || !preg_match("/[^A-Za-z0-9]/", $newpwd))) {
-        $rcmail->output->command('display_message', $this->gettext('passwordweak'), 'error');
-      }
-      // try to save the password
-      else if (!($res = $this->_save($curpwd,$newpwd))) {
-        $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
-        $_SESSION['password'] = $rcmail->encrypt($newpwd);
-      }
-      else
-        $rcmail->output->command('display_message', $res, 'error');
-    }
+            // WARNING: Default password_charset is ISO-8859-1, so conversion will
+            // change national characters. This may disable possibility of using
+            // the same password in other MUA's.
+            // We're doing this for consistence with Roundcube core
+            $newpwd = rcube_charset_convert($newpwd, $rc_charset, $charset);
+            $conpwd = rcube_charset_convert($conpwd, $rc_charset, $charset);
+
+            if ($chk_pwd != $orig_pwd) {
+                $rcmail->output->command('display_message', $this->gettext('passwordforbidden'), 'error');
+            }
+            // other passwords validity checks
+            else if ($conpwd != $newpwd) {
+                $rcmail->output->command('display_message', $this->gettext('passwordinconsistency'), 'error');
+            }
+            else if ($confirm && $rcmail->decrypt($_SESSION['password']) != $curpwd) {
+                $rcmail->output->command('display_message', $this->gettext('passwordincorrect'), 'error');
+            }
+            else if ($required_length && strlen($newpwd) < $required_length) {
+                $rcmail->output->command('display_message', $this->gettext(
+	                array('name' => 'passwordshort', 'vars' => array('length' => $required_length))), 'error');
+            }
+            else if ($check_strength && (!preg_match("/[0-9]/", $newpwd) || !preg_match("/[^A-Za-z0-9]/", $newpwd))) {
+                $rcmail->output->command('display_message', $this->gettext('passwordweak'), 'error');
+            }
+            // try to save the password
+            else if (!($res = $this->_save($curpwd,$newpwd))) {
+                $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
+                $_SESSION['password'] = $rcmail->encrypt($newpwd);
+            }
+            else {
+                $rcmail->output->command('display_message', $res, 'error');
+            }
+        }
 
-    rcmail_overwrite_action('plugin.password');
-    $rcmail->output->send('plugin');
-  }
+        rcmail_overwrite_action('plugin.password');
+        $rcmail->output->send('plugin');
+    }
 
-  function password_form()
-  {
-    $rcmail = rcmail::get_instance();
-    $this->load_config();
+    function password_form()
+    {
+        $rcmail = rcmail::get_instance();
+        $this->load_config();
 
-    // add some labels to client
-    $rcmail->output->add_label(
-      'password.nopassword',
-      'password.nocurpassword',
-      'password.passwordinconsistency'
-    );
+        // add some labels to client
+        $rcmail->output->add_label(
+            'password.nopassword',
+            'password.nocurpassword',
+            'password.passwordinconsistency'
+        );
 
-    $rcmail->output->set_env('product_name', $rcmail->config->get('product_name'));
+        $rcmail->output->set_env('product_name', $rcmail->config->get('product_name'));
 
-    $table = new html_table(array('cols' => 2));
+        $table = new html_table(array('cols' => 2));
 
-    if ($rcmail->config->get('password_confirm_current')) {
-      // show current password selection
-      $field_id = 'curpasswd';
-      $input_curpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id,
-        'size' => 20, 'autocomplete' => 'off'));
+        if ($rcmail->config->get('password_confirm_current')) {
+            // show current password selection
+            $field_id = 'curpasswd';
+            $input_curpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id,
+                'size' => 20, 'autocomplete' => 'off'));
   
-      $table->add('title', html::label($field_id, Q($this->gettext('curpasswd'))));
-      $table->add(null, $input_curpasswd->show());
-    }
+            $table->add('title', html::label($field_id, Q($this->gettext('curpasswd'))));
+            $table->add(null, $input_curpasswd->show());
+        }
 
-    // show new password selection
-    $field_id = 'newpasswd';
-    $input_newpasswd = new html_passwordfield(array('name' => '_newpasswd', 'id' => $field_id,
-      'size' => 20, 'autocomplete' => 'off'));
+        // show new password selection
+        $field_id = 'newpasswd';
+        $input_newpasswd = new html_passwordfield(array('name' => '_newpasswd', 'id' => $field_id,
+            'size' => 20, 'autocomplete' => 'off'));
 
-    $table->add('title', html::label($field_id, Q($this->gettext('newpasswd'))));
-    $table->add(null, $input_newpasswd->show());
+        $table->add('title', html::label($field_id, Q($this->gettext('newpasswd'))));
+        $table->add(null, $input_newpasswd->show());
 
-    // show confirm password selection
-    $field_id = 'confpasswd';
-    $input_confpasswd = new html_passwordfield(array('name' => '_confpasswd', 'id' => $field_id,
-      'size' => 20, 'autocomplete' => 'off'));
+        // show confirm password selection
+        $field_id = 'confpasswd';
+        $input_confpasswd = new html_passwordfield(array('name' => '_confpasswd', 'id' => $field_id,
+            'size' => 20, 'autocomplete' => 'off'));
 
-    $table->add('title', html::label($field_id, Q($this->gettext('confpasswd'))));
-    $table->add(null, $input_confpasswd->show());
+        $table->add('title', html::label($field_id, Q($this->gettext('confpasswd'))));
+        $table->add(null, $input_confpasswd->show());
 
-    $out = html::div(array('class' => 'settingsbox', 'style' => 'margin:0'),
-      html::div(array('id' => 'prefs-title', 'class' => 'boxtitle'), $this->gettext('changepasswd')) .
-      html::div(array('class' => 'boxcontent'), $table->show() .
-        html::p(null,
-          $rcmail->output->button(array(
-            'command' => 'plugin.password-save',
-            'type' => 'input',
-            'class' => 'button mainaction',
-            'label' => 'save'
-        )))
-      )
-    );
+        $out = html::div(array('class' => 'settingsbox', 'style' => 'margin:0'),
+            html::div(array('id' => 'prefs-title', 'class' => 'boxtitle'), $this->gettext('changepasswd')) .
+            html::div(array('class' => 'boxcontent'), $table->show() .
+            html::p(null,
+                $rcmail->output->button(array(
+                    'command' => 'plugin.password-save',
+                    'type' => 'input',
+                    'class' => 'button mainaction',
+                    'label' => 'save'
+            )))));
 
-    $rcmail->output->add_gui_object('passform', 'password-form');
+        $rcmail->output->add_gui_object('passform', 'password-form');
 
-    return $rcmail->output->form_tag(array(
-      'id' => 'password-form',
-      'name' => 'password-form',
-      'method' => 'post',
-      'action' => './?_task=settings&_action=plugin.password-save',
-      ), $out);
-  }
+        return $rcmail->output->form_tag(array(
+            'id' => 'password-form',
+            'name' => 'password-form',
+            'method' => 'post',
+            'action' => './?_task=settings&_action=plugin.password-save',
+        ), $out);
+    }
 
-  private function _save($curpass, $passwd)
-  {
-    $config = rcmail::get_instance()->config;
-    $driver = $this->home.'/drivers/'.$config->get('password_driver', 'sql').'.php';
+    private function _save($curpass, $passwd)
+    {
+        $config = rcmail::get_instance()->config;
+        $driver = $this->home.'/drivers/'.$config->get('password_driver', 'sql').'.php';
     
-    if (!is_readable($driver)) {
-      raise_error(array(
-        'code' => 600,
-        'type' => 'php',
-        'file' => __FILE__,
-        'message' => "Password plugin: Unable to open driver file $driver"
-        ), true, false);
-      return $this->gettext('internalerror');
-    }
+        if (!is_readable($driver)) {
+            raise_error(array(
+                'code' => 600,
+                'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Password plugin: Unable to open driver file $driver"
+            ), true, false);
+            return $this->gettext('internalerror');
+        }
     
-    include($driver);
+        include($driver);
+
+        if (!function_exists('password_save')) {
+            raise_error(array(
+                'code' => 600,
+                'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Password plugin: Broken driver: $driver"
+            ), true, false);
+            return $this->gettext('internalerror');
+        }
+
+        $result = password_save($curpass, $passwd);
 
-    if (!function_exists('password_save')) {
-      raise_error(array(
-        'code' => 600,
-        'type' => 'php',
-        'file' => __FILE__,
-        'message' => "Password plugin: Broken driver: $driver"
-        ), true, false);
-      return $this->gettext('internalerror');
+        switch ($result) {
+            case PASSWORD_SUCCESS:
+                return;
+            case PASSWORD_CRYPT_ERROR;
+                return $this->gettext('crypterror');
+            case PASSWORD_CONNECT_ERROR;
+                return $this->gettext('connecterror');
+            case PASSWORD_ERROR:
+            default:
+                return $this->gettext('internalerror');
+        }
     }
 
-    $result = password_save($curpass, $passwd);
+    static function username_local()
+    {
+        return password::user_login('local');
+    }
 
-    switch ($result) {
-      case PASSWORD_SUCCESS:
-        return;
-      case PASSWORD_CRYPT_ERROR;
-        return $this->gettext('crypterror');
-      case PASSWORD_CONNECT_ERROR;
-        return $this->gettext('connecterror');
-      case PASSWORD_ERROR:
-      default:
-        return $this->gettext('internalerror');
+    static function username_domain()
+    {
+        return password::user_login('domain');
     }
-  }
+    
+    static function user_login($part = null)
+    {
+        $user_info = explode('@', $_SESSION['username']);
+  
+        // at least we should always have the local part
+        if ($part == 'local') {
+            return $user_info[0];
+        }
+        else if ($part == 'domain') {
+            if (!empty($user_info[1])) {
+                return $user_info[1];
+            }
+            // if no domain was provided use the default if available
+            if ($domain = rcmail::get_instance()->config->get('mail_domain')) {
+                return $domain;
+            }
+            return '';
+        }
 
+        return $_SESSION['username'];
+    }                                          
 }
 
 ?>