Changeset 4165 in subversion

Timestamp:

Nov 2, 2010 3:09:57 AM (3 years ago)

Author:

alec

Message:

• hMail driver: Add possibility to connect to remote host (patch from Roland Liebl)

Location:

trunk/plugins/password

Files:

• README (modified) (10 diffs)
• config.inc.php.dist (modified) (1 diff)
• drivers/hmail.php (modified) (2 diffs)
• package.xml (modified) (3 diffs)

trunk/plugins/password/README

@@ -61 +61 @@
 
  You can specify which database to connect by 'password_db_dsn' option and
- what SQL query to execute by 'password_query'. See main.inc.php file for
+ what SQL query to execute by 'password_query'. See main.inc.php.dist file for
  more info.
 
@@ -166 +166 @@
 
  You can specify which host to connect to via 'password_pop_host' and
- what port via 'password_pop_port'. See config.inc.php file for more info.
+ what port via 'password_pop_port'. See config.inc.php.dist file for more info.
 
 
@@ -172 +172 @@
  ----------------
 
- See config.inc.php file. Requires PEAR::Net_LDAP2 package.
+ See config.inc.php.dist file. Requires PEAR::Net_LDAP2 package.
 
 
@@ -178 +178 @@
  --------------------------------------------
 
- You can specify which host to connect to via 'password_directadmin_host' 
- and what port via 'password_direactadmin_port'. See config.inc.php file 
+ You can specify which host to connect to via 'password_directadmin_host'
+ and what port via 'password_direactadmin_port'. See config.inc.php.dist file
  for more info.
 
@@ -187 +187 @@
 
  You can specify parameters for HTTP connection to cPanel's admin
- interface. See config.inc.php file for more info.
+ interface. See config.inc.php.dist file for more info.
 
 
@@ -194 +194 @@
 
  You can specify which host and port to connect to via 'password_ximss_host' 
- and 'password_ximss_port'. See config.inc.php file for more info.
+ and 'password_ximss_port'. See config.inc.php.dist file for more info.
 
 
@@ -208 +208 @@
  ------------------------
 
- Requires PHP COM (Windows only).
+ Requires PHP COM (Windows only). For access to hMail server on remote host
+ you'll need to define 'hmailserver_remote_dcom' and 'hmailserver_server'.
+ See config.inc.php.dist file for more info.
 
 
@@ -222 +224 @@
 
  Driver that adds functionality to change the systems user password via 
- the 'chpasswd' command. See config.inc.php file.
+ the 'chpasswd' command. See config.inc.php.dist file.
 
  Attached wrapper script (chpass-wrapper.py) restricts password changes
@@ -246 +248 @@
  -----------------------------------
 
- Driver for XMail (www.xmailserver.org). See config.inc.php file for configuration description.
+ Driver for XMail (www.xmailserver.org). See config.inc.php.dist file
+ for configuration description.
 
 
@@ -257 +260 @@
  PASSWORD_CRYPT_ERROR, PASSWORD_ERROR when driver was unable to change password.
  See existing drivers in drivers/ directory for examples.
+

trunk/plugins/password/config.inc.php.dist

@@ -257 +257 @@
 $rcmail_config['xmail_port'] = 6017;
 
+
+// hMail Driver options
+// -----------------------
+// Remote hMailServer configuration
+// true:  HMailserver is on a remote box (php.ini: com.allow_dcom = true)
+// false: Hmailserver is on same box as PHP
+$rcmail_config['hmailserver_remote_dcom'] = false;
+// Windows credentials
+$rcmail_config['hmailserver_server'] = array(
+    'Server' => 'localhost', // hostname or ip address
+    'Username' => 'administrator', // windows username
+    'Password' => 'password' // windows user password
+);
+

trunk/plugins/password/drivers/hmail.php

@@ -4 +4 @@
  * hMailserver password driver
  *
- * @version 1.1
+ * @version 1.2 - 31.10.2010
  * @author Roland 'rosali' Liebl <myroundcube@mail4us.net>
  *
@@ -17 +17 @@
 
     try {
-        $obApp = new COM('hMailServer.Application');
+      $remote = $rcmail->config->get('hmailserver_remote_dcom', false);
+      if ($remote)
+        $obApp = new COM("hMailServer.Application", $rcmail->config->get('hmailserver_server'));
+      else
+        $obApp = new COM("hMailServer.Application");
     }
     catch (Exception $e) {
-        write_log('errors', "Plugin password (hmail driver):" .  $e->getMessage() . ". This problem is often caused by DCOM permissions not being set.");
+        write_log('errors', "Plugin password (hmail driver):" .  $e->getMessage()
+            . ". This problem is often caused by DCOM permissions not being set.");
         return PASSWORD_ERROR;
     }

trunk/plugins/password/package.xml

@@ -16 +16 @@
                 <active>yes</active>
         </lead>
-        <date>2010-10-07</date>
+        <date>2010-11-02</date>
         <time>09:00:00</time>
         <version>
-                <release>2.0</release>
+                <release>2.1</release>
                 <api>1.6</api>
         </version>
@@ -28 +28 @@
         <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
         <notes>
-- Fixed SQL Injection in SQL driver when using %p or %o variables in query (#1487034)
+- hMail driver: Add possibility to connect to remote host
     </notes>
         <contents>
@@ -201 +201 @@
             </notes>
         </release>
+        <release>
+                <date>2010-10-07</date>
+                <time>09:00:00</time>
+                <version>
+                        <release>2.0</release>
+                        <api>1.6</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>
+- Fixed SQL Injection in SQL driver when using %p or %o variables in query (#1487034)
+            </notes>
+        </release>
     </changelog>
 </package>