Changeset 4726 in subversion

Timestamp:

May 3, 2011 4:42:27 PM (2 years ago)

Author:

netbit

Message:

• Improvements to DirectAdmin? password driver
• Update pt-BR language

Location:

trunk

Files:

• plugins/password/README (modified) (1 diff)
• plugins/password/config.inc.php.dist (modified) (1 diff)
• plugins/password/drivers/directadmin.php (modified) (8 diffs)
• roundcubemail/program/localization/pt_BR/messages.inc (modified) (1 diff)

trunk/plugins/password/README

@@ -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.dist file
- for more info.
+ You can specify which host to connect to via 'password_directadmin_host' (don't 
+ forget to use tcp:// or ssl://) and what port via 'password_direactadmin_port'.
+ The password enforcement with plenty customization can be done directly by 
+ DirectAdmin, please see http://www.directadmin.com/features.php?id=910
+ See config.inc.php.dist file for more info.
 
 

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

@@ -213 +213 @@
 // --------------------------
 // The host which changes the password
-// Use 'ssl://serverip' instead of 'tcp://serverip' when running DirectAdmin over SSL.
+// Use 'ssl://host' instead of 'tcp://host' when running DirectAdmin over SSL.
+// The host can contain the following macros that will be expanded as follows:
+//     %h is replaced with the imap host (from the session info)
+//     %d is replaced with the domain part of the username (if the username is an email)
 $rcmail_config['password_directadmin_host'] = 'tcp://localhost';
 

trunk/plugins/password/drivers/directadmin.php

@@ -6 +6 @@
  * Driver to change passwords via DirectAdmin Control Panel
  *
- * @version 1.0
+ * @version 1.2
  * @author Victor Benincasa <vbenincasa@gmail.com>
  *
@@ -22 +22 @@
     $da_host    = $rcmail->config->get('password_directadmin_host');
     $da_port    = $rcmail->config->get('password_directadmin_port');
+
+    if(strpos($da_user, '@') === false) return array('code' => PASSWORD_ERROR, 'message' => 'Change the SYSTEM user password through control panel!');
+
+    $da_host = str_replace('%h', $_SESSION['imap_host'], $da_host);
+    $da_host = str_replace('%d', $rcmail->user->get_username('domain'), $da_host);
 
     $Socket->connect($da_host,$da_port); 
@@ -35 +40 @@
     $response = $Socket->fetch_parsed_body();
 
-        //console("DA error response: $response[text] [$da_user]");
-
-    if($Socket->result_status_code <> 200)
-        return PASSWORD_CONNECT_ERROR;
-    elseif($response['error'] == 1){ //Error description: $response[text] 
-        return PASSWORD_ERROR;
-    }else 
+    //DEBUG
+    //console("Password Plugin: [USER: $da_user] [HOST: $da_host] - Response: [SOCKET: ".$Socket->result_status_code."] [DA ERROR: ".strip_tags($response['error'])."] [TEXT: ".$response[text]."]");
+
+    if($Socket->result_status_code != 200)
+        return array('code' => PASSWORD_CONNECT_ERROR, 'message' => $Socket->error[0]);
+    elseif($response['error'] == 1)
+        return array('code' => PASSWORD_ERROR, 'message' => strip_tags($response['text']));
+    else 
         return PASSWORD_SUCCESS;
 
@@ -58 +64 @@
  * @author Phi1 'l0rdphi1' Stier <l0rdphi1@liquenox.net>
  * @package HTTPSocket
- * @version 2.6
+ * @version 2.7 (Updated by Victor Benincasa <vbenincasa@gmail.com>)
  */
 class HTTPSocket {
 
-    var $version = '2.6';
+    var $version = '2.7';
     
     /* all vars are private except $error, $query_cache, and $doFollowLocationHeader */
@@ -317 +323 @@
 
         }
-
-        list($this->result_header, $this->result_body) = explode("\r\n\r\n", $this->result, 2);
+        
+        list($this->result_header,$this->result_body) = preg_split("/\r\n\r\n/",$this->result,2);
 
         if ($this->bind_host)
@@ -379 +385 @@
             if ($asArray)
             {
-                return explode("\n", $this->fetch_body());
+                return preg_split("/\n/",$this->fetch_body());
             }
 
@@ -439 +445 @@
     function fetch_header( $header = '' )
     {
-        $array_headers = explode("\r\n", $this->result_header);
-
+        $array_headers = preg_split("/\r\n/",$this->result_header);
+        
         $array_return = array( 0 => $array_headers[0] );
         unset($array_headers[0]);
@@ -446 +452 @@
         foreach ( $array_headers as $pair )
         {
-            list($key,$value) = explode(": ", $pair, 2);
+            list($key,$value) = preg_split("/: /",$pair,2);
             $array_return[strtolower($key)] = $value;
         }

trunk/roundcubemail/program/localization/pt_BR/messages.inc

@@ -39 +39 @@
 $messages['loading'] = 'Carregando...';
 $messages['uploading'] = 'Enviando anexo...';
+$messages['uploadingmany'] = 'Enviando anexos...';
 $messages['loadingdata'] = 'Carregando informações...';
 $messages['checkingmail'] = 'Verificando se há novas mensagens...';