Kolab Groupware OBS

roundcubemail-1.1.tar.gz/INSTALL Changed

@@ -40,22 +40,26 @@
   or SQLite support in PHP
 * One of the above databases with permission to create tables
 * An SMTP server (recommended) or PHP configured for mail delivery
+* Composer installed either locally or globally
 
 
 INSTALLATION
 ============
 
 1. Decompress and put this folder somewhere inside your document root
-2. Make sure that the following directories (and the files within)
+2. Install dependencies using composer:
+   - get composer from https://getcomposer.org/download/
+   - rename the composer.json-dist file into composer.json
+   - run `php composer.phar install`
+3. Make sure that the following directories (and the files within)
    are writable by the webserver
    - /temp
    - /logs
-3. Create a new database and a database user for Roundcube (see DATABASE SETUP)
-4. Point your browser to http://url-to-roundcube/installer/
-5. Follow the instructions of the install script (or see MANUAL CONFIGURATION)
-6. After creating and testing the configuration, remove the installer directory
-7. Check Known Issues section of this file
-8. Done!
+4. Create a new database and a database user for Roundcube (see DATABASE SETUP)
+5. Point your browser to http://url-to-roundcube/installer/
+6. Follow the instructions of the install script (or see MANUAL CONFIGURATION)
+7. After creating and testing the configuration, remove the installer directory
+8. Check Known Issues section of this file
 
 
 CONFIGURATION HINTS

roundcubemail-1.1.tar.gz/bin/cleandb.sh Changed

roundcubemail-1.1.tar.gz/bin/decrypt.sh Changed

roundcubemail-1.1.tar.gz/bin/indexcontacts.sh Changed

roundcubemail-1.1.tar.gz/bin/moduserprefs.sh Changed

roundcubemail-1.1.tar.gz/composer.json-dist Changed

roundcubemail-1.1.tar.gz/installer/check.php Changed

@@ -25,6 +25,7 @@
     'Mcrypt'    => 'mcrypt',
     'Intl'      => 'intl',
     'Exif'      => 'exif',
+    'LDAP'      => 'ldap',
 );
 
 $required_libs = array(
@@ -32,11 +33,14 @@
     'Auth_SASL' => 'pear.php.net',
     'Net_SMTP'  => 'pear.php.net',
     'Net_IDNA2' => 'pear.php.net',
-    'Net_LDAP3' => 'git.kolab.org',
     'Mail_mime' => 'pear.php.net',
     'Mail_mimeDecode' => 'pear.php.net',
 );
 
+$optional_libs = array(
+    'Net_LDAP3' => 'git.kolab.org',
+);
+
 $ini_checks = array(
     'file_uploads'                  => 1,
     'session.auto_start'            => 0,
@@ -68,6 +72,7 @@
     'Intl'      => 'http://www.php.net/manual/en/book.intl.php',
     'Exif'      => 'http://www.php.net/manual/en/book.exif.php',
     'PDO'       => 'http://www.php.net/manual/en/book.pdo.php',
+    'LDAP'      => 'http://www.php.net/manual/en/book.ldap.php',
     'pdo_mysql'   => 'http://www.php.net/manual/en/ref.pdo-mysql.php',
     'pdo_pgsql'   => 'http://www.php.net/manual/en/ref.pdo-pgsql.php',
     'pdo_sqlite'  => 'http://www.php.net/manual/en/ref.pdo-sqlite.php',
@@ -77,7 +82,9 @@
     'PEAR'      => 'http://pear.php.net',
     'Net_SMTP'  => 'http://pear.php.net/package/Net_SMTP',
     'Mail_mime' => 'http://pear.php.net/package/Mail_mime',
+    'Mail_mimeDecode' => 'http://pear.php.net/package/Mail_mimeDecode',
     'Net_IDNA2' => 'http://pear.php.net/package/Net_IDNA2',
+    'Net_LDAP3' => 'http://git.kolab.org/pear/Net_LDAP3',
 );
 
 echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 3 : 2) . '" />';
@@ -164,7 +171,6 @@
 <?php
 
 foreach ($required_libs as $classname => $vendor) {
-    @include_once $file;
     if (class_exists($classname)) {
         $RCI->pass($classname);
     }
@@ -174,6 +180,15 @@
     echo "<br />";
 }
 
+foreach ($optional_libs as $classname => $vendor) {
+    if (class_exists($classname)) {
+        $RCI->pass($classname);
+    }
+    else {
+        $RCI->na($classname, "Recommended to install $classname from $vendor", $source_urls[$classname]);
+    }
+    echo "<br />";
+}
 
 ?>

roundcubemail-1.1.tar.gz/plugins/managesieve/Changelog Changed

roundcubemail-1.1.tar.gz/plugins/managesieve/managesieve.js Changed

roundcubemail-1.1.tar.gz/plugins/managesieve/managesieve.php Changed

@@ -51,7 +51,9 @@
         }
         else if ($this->rc->task == 'mail') {
             // register message hook
-            $this->add_hook('message_headers_output', array($this, 'mail_headers'));
+            if ($this->rc->action == 'show') {
+                $this->add_hook('message_headers_output', array($this, 'mail_headers'));
+            }
 
             // inject Create Filter popup stuff
             if (empty($this->rc->action) || $this->rc->action == 'show'
@@ -192,9 +194,10 @@
     function managesieve_actions()
     {
         // handle fetching email headers for the new filter form
-        if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GPC)) {
-            $mailbox = $this->rc->get_storage()->get_folder();
-            $message = new rcube_message($uid, $mailbox);
+        if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST)) {
+            $uids    = rcmail::get_uids();
+            $mailbox = key($uids);
+            $message = new rcube_message($uids[$mailbox][0], $mailbox);
             $headers = $this->parse_headers($message->headers);
 
             $this->rc->output->set_env('sieve_headers', $headers);

roundcubemail-1.1.tar.gz/plugins/password/drivers/chpasswd.php Changed

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * chpasswd Driver
+ * chpasswd driver
  *
  * Driver that adds functionality to change the systems user password via
  * the 'chpasswd' command.
@@ -10,6 +10,21 @@
  *
  * @version 2.0
  * @author Alex Cartwright <acartwright@mutinydesign.co.uk>
+ *
+ * Copyright (C) 2005-2013, The Roundcube Dev Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 class rcube_chpasswd_password

roundcubemail-1.1.tar.gz/plugins/password/drivers/cpanel.php Changed

roundcubemail-1.1.tar.gz/plugins/password/drivers/dbmail.php Changed

roundcubemail-1.1.tar.gz/plugins/password/drivers/directadmin.php Changed

roundcubemail-1.1.tar.gz/plugins/password/drivers/domainfactory.php Changed

@@ -10,80 +10,91 @@
  * @author Till Krüss <me@tillkruess.com>
  * @link http://tillkruess.com/projects/roundcube/
  *
+ * Copyright (C) 2005-2014, The Roundcube Dev Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 class rcube_domainfactory_password
 {
-	function save($curpass, $passwd)
-	{
-		$rcmail = rcmail::get_instance();
-
-		if (is_null($curpass)) {
-			$curpass = $rcmail->decrypt($_SESSION['password']);
-		}
-
-		if ($ch = curl_init()) {
-
-			// initial login
-			curl_setopt_array($ch, array(
-				CURLOPT_RETURNTRANSFER => true,
-				CURLOPT_URL => 'https://ssl.df.eu/chmail.php',
-				CURLOPT_POST => true,
-				CURLOPT_POSTFIELDS => http_build_query(array(
-					'login' => $rcmail->user->get_username(),
-					'pwd' => $curpass,
-					'action' => 'change'
-				))
-			));
-
-			if ($result = curl_exec($ch)) {
-				// login successful, get token!
-				$postfields = array(
-					'pwd1' => $passwd,
-					'pwd2' => $passwd,
-					'action[update]' => 'Speichern'
-				);
-
-				preg_match_all('~<input name="(.+?)" type="hidden" value="(.+?)">~i', $result, $fields);
-				foreach ($fields[1] as $field_key => $field_name) {
-					$postfields[$field_name] = $fields[2][$field_key];
-				}
-
-				// change password
-				$ch = curl_copy_handle($ch);
-				curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($postfields));
-				if ($result = curl_exec($ch)) {
+    function save($curpass, $passwd)
+    {
+        $rcmail = rcmail::get_instance();
 
-					// has the password been changed?
-					if (strpos($result, 'Einstellungen erfolgreich') !== false) {
-						return PASSWORD_SUCCESS;
-					}
+        if (is_null($curpass)) {
+            $curpass = $rcmail->decrypt($_SESSION['password']);
+        }
 
-					// show error message(s) if possible
-					if (strpos($result, '<div class="d-msg-text">') !== false) {
-						preg_match_all('#<div class="d-msg-text">(.*?)</div>#s', $result, $errors);
-						if (isset($errors[1])) {
-							$error_message = '';
-							foreach ( $errors[1] as $error ) {
-								$error_message .= trim(mb_convert_encoding( $error, 'UTF-8', 'ISO-8859-15' )).' ';
-							}
-							return array('code' => PASSWORD_ERROR, 'message' => $error_message);
-						}
-					}
+        if ($ch = curl_init()) {
+            // initial login
+            curl_setopt_array($ch, array(
+                CURLOPT_RETURNTRANSFER => true,
+                CURLOPT_URL        => 'https://ssl.df.eu/chmail.php',
+                CURLOPT_POST       => true,
+                CURLOPT_POSTFIELDS => http_build_query(array(
+                    'login'  => $rcmail->user->get_username(),
+                    'pwd'    => $curpass,
+                    'action' => 'change'
+                ))
+            ));
 
+            if ($result = curl_exec($ch)) {
+                // login successful, get token!
+                $postfields = array(
+                    'pwd1'           => $passwd,
+                    'pwd2'           => $passwd,
+                    'action[update]' => 'Speichern'
+                );
 
-				} else {
-					return PASSWORD_CONNECT_ERROR;
-				}
+                preg_match_all('~<input name="(.+?)" type="hidden" value="(.+?)">~i', $result, $fields);
+                foreach ($fields[1] as $field_key => $field_name) {
+                    $postfields[$field_name] = $fields[2][$field_key];
+                }
 
-			} else {
-				return PASSWORD_CONNECT_ERROR;
-			}
+                // change password
+                $ch = curl_copy_handle($ch);
+                curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($postfields));
+                if ($result = curl_exec($ch)) {
+                    // has the password been changed?
+                    if (strpos($result, 'Einstellungen erfolgreich') !== false) {
+                        return PASSWORD_SUCCESS;
+                    }
 
-		} else {
-			return PASSWORD_CONNECT_ERROR;
-		}
+                    // show error message(s) if possible
+                    if (strpos($result, '<div class="d-msg-text">') !== false) {
+                        preg_match_all('#<div class="d-msg-text">(.*?)</div>#s', $result, $errors);
+                        if (isset($errors[1])) {
+                            $error_message = '';
+                            foreach ($errors[1] as $error) {
+                                $error_message .= trim(mb_convert_encoding( $error, 'UTF-8', 'ISO-8859-15' )).' ';
+                            }
+                            return array('code' => PASSWORD_ERROR, 'message' => $error_message);
+                        }
+                    }
+                }
+                else {
+                    return PASSWORD_CONNECT_ERROR;
+                }
+            }
+            else {
+                return PASSWORD_CONNECT_ERROR;
+            }
+        }
+        else {
+            return PASSWORD_CONNECT_ERROR;
+        }
 
-		return PASSWORD_ERROR;
-	}
+        return PASSWORD_ERROR;
+    }
 }

roundcubemail-1.1.tar.gz/plugins/password/drivers/expect.php Changed

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * expect Driver
+ * expect driver
  *
  * Driver that adds functionality to change the systems user password via
  * the 'expect' command.
@@ -10,7 +10,7 @@
  *
  * @version 2.0
  * @author Andy Theuninck <gohanman@gmail.com)
- * 
+ *
  * Based on chpasswd roundcubemail password driver by
  * @author Alex Cartwright <acartwright@mutinydesign.co.uk)
  * and expect horde passwd driver by
@@ -21,8 +21,23 @@
  * password_expect_script => path to "password-expect" file
  * password_expect_params => arguments for the expect script
  *   see the password-expect file for details. This is probably
- *   a good starting default: 
+ *   a good starting default:
  *   -telent -host localhost -output /tmp/passwd.log -log /tmp/passwd.log
+ *
+ * Copyright (C) 2005-2014, The Roundcube Dev Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 class rcube_expect_password

roundcubemail-1.1.tar.gz/plugins/password/drivers/gearman.php Changed

roundcubemail-1.1.tar.gz/plugins/password/drivers/hmail.php Changed

roundcubemail-1.1.tar.gz/plugins/password/drivers/ldap.php Changed

@@ -12,6 +12,20 @@
  * method hashPassword based on code from the phpLDAPadmin development team (http://phpldapadmin.sourceforge.net/).
  * method randomSalt based on code from the phpLDAPadmin development team (http://phpldapadmin.sourceforge.net/).
  *
+ * Copyright (C) 2005-2014, The Roundcube Dev Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 class rcube_ldap_password
@@ -301,5 +315,4 @@
 
         return $str;
     }
-
 }

roundcubemail-1.1.tar.gz/plugins/password/drivers/ldap_simple.php Changed

roundcubemail-1.1.tar.gz/plugins/password/drivers/pam.php Changed

roundcubemail-1.1.tar.gz/plugins/password/drivers/plesk.php Changed

@@ -1,21 +1,33 @@
 <?php
+
 /**
  * Roundcube Password Driver for Plesk-RPC.
  *
  * This driver changes a E-Mail-Password via Plesk-RPC
  * Deps: PHP-Curl, SimpleXML
  *
- * @author        Cyrill von Wattenwyl <cyrill.vonwattenwyl@adfinis-sygroup.ch>
- * @copyright     Adfinis SyGroup AG, 2014
- * @license       GNU GPL v3
+ * @author     Cyrill von Wattenwyl <cyrill.vonwattenwyl@adfinis-sygroup.ch>
+ * @copyright  Adfinis SyGroup AG, 2014
  *
  * Config needed:
- * $config['password_plesk_host'] 	= '10.0.0.5';
- * $config['password_plesk_user'] 	= 'admin';
- * $config['password_plesk_pass'] 	= 'pass';
- * $config['password_plesk_rpc_port'] 	= 8443;
- * $config['password_plesk_rpc_path'] 	= enterprise/control/agent.php;
+ * $config['password_plesk_host']     = '10.0.0.5';
+ * $config['password_plesk_user']     = 'admin';
+ * $config['password_plesk_pass']     = 'pass';
+ * $config['password_plesk_rpc_port'] = 8443;
+ * $config['password_plesk_rpc_path'] = enterprise/control/agent.php;
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 /**
@@ -23,45 +35,44 @@
  *
  * See {ROUNDCUBE_ROOT}/plugins/password/README for API description
  *
- * @author        Cyrill von Wattenwyl <cyrill.vonwattenwyl@adfinis-sygroup.ch>
+ * @author Cyrill von Wattenwyl <cyrill.vonwattenwyl@adfinis-sygroup.ch>
  */
-class rcube_plesk_password {
-
-	/**
-	 * this method is called from roundcube to change the password
-	 *
-	 * roundcube allready validated the old password so we just need to change it at this point
-	 *
-	 * @author        Cyrill von Wattenwyl <cyrill.vonwattenwyl@adfinis-sygroup.ch>
-	 * @param         string $curpass current password
-	 * @param         string $newpass new password
-	 * @returns       PASSWORD_SUCCESS|PASSWORD_ERROR
-	 */
-	function save($currpass, $newpass) {
-
-		// get config
-		$rcmail	= rcmail::get_instance();
-		$host	= $rcmail->config->get('password_plesk_host');
-		$user	= $rcmail->config->get('password_plesk_user');
-		$pass	= $rcmail->config->get('password_plesk_pass');
-		$port	= $rcmail->config->get('password_plesk_rpc_port');
-		$path	= $rcmail->config->get('password_plesk_rpc_path');
-
-		// create plesk-object
-		$plesk	= new plesk_rpc;
-		$plesk->init($host, $port, $path, $user, $pass);
-
-		// try to change password and return the status
-		$result = $plesk->change_mailbox_password($_SESSION['username'], $newpass);
-		//$plesk->destroy();
-
-		if ($result) {
-			return PASSWORD_SUCCESS;
-		}
-
-		return PASSWORD_ERROR;
-	}
-
+class rcube_plesk_password
+{
+    /**
+     * this method is called from roundcube to change the password
+     *
+     * roundcube allready validated the old password so we just need to change it at this point
+     *
+     * @author Cyrill von Wattenwyl <cyrill.vonwattenwyl@adfinis-sygroup.ch>
+     * @param string $curpass Current password
+     * @param string $newpass New password
+     * @returns int PASSWORD_SUCCESS|PASSWORD_ERROR
+     */
+    function save($currpass, $newpass)\
+    {
+        // get config
+        $rcmail = rcmail::get_instance();
+        $host   = $rcmail->config->get('password_plesk_host');
+        $user   = $rcmail->config->get('password_plesk_user');
+        $pass   = $rcmail->config->get('password_plesk_pass');
+        $port   = $rcmail->config->get('password_plesk_rpc_port');
+        $path   = $rcmail->config->get('password_plesk_rpc_path');
+
+        // create plesk-object
+        $plesk = new plesk_rpc;
+        $plesk->init($host, $port, $path, $user, $pass);
+
+        // try to change password and return the status
+        $result = $plesk->change_mailbox_password($_SESSION['username'], $newpass);
+        //$plesk->destroy();
+
+        if ($result) {
+            return PASSWORD_SUCCESS;
+        }
+
+        return PASSWORD_ERROR;
+    }
 }
 
 
@@ -73,162 +84,158 @@
  *
  * Documentation of Plesk RPC-API: http://download1.parallels.com/Plesk/PP11/11.0/Doc/en-US/online/plesk-api-rpc/
  *
- * @author        Cyrill von Wattenwyl <cyrill.vonwattenwyl@adfinis-sygroup.ch>
+ * @author Cyrill von Wattenwyl <cyrill.vonwattenwyl@adfinis-sygroup.ch>
  */
-class plesk_rpc {
-
-	/**
-	 * init plesk-rpc via curl
-	 *
-	 * @author        Cyrill von Wattenwyl <cyrill.vonwattenwyl@adfinis-sygroup.ch>
-	 * @param         string $host plesk host
-	 * @param         string $port plesk rpc port
-	 * @param         string $path plesk rpc path
-	 * @param         string $user plesk user
-	 * @param         string $user plesk password
-	 * @returns       void
-	 */
-	function init($host, $port, $path, $user, $pass) {
-		$headers    = array(
-			sprintf("HTTP_AUTH_LOGIN: %s", $user),
-			sprintf("HTTP_AUTH_PASSWD: %s", $pass),
-			"Content-Type: text/xml"
-		);
-		$url        = sprintf("https://%s:%s/%s", $host, $port, $path);
-		$this->curl = curl_init();
-		curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT , 5);
-		curl_setopt($this->curl, CURLOPT_SSL_VERIFYHOST , 0);
-		curl_setopt($this->curl, CURLOPT_SSL_VERIFYPEER , false);
-		curl_setopt($this->curl, CURLOPT_HTTPHEADER     , $headers);
-		curl_setopt($this->curl, CURLOPT_URL            , $url);
-	}
-
-
-	/**
-	 * send a request to the plesk
-	 *
-	 * @author        Cyrill von Wattenwyl <cyrill.vonwattenwyl@adfinis-sygroup.ch>
-	 * @param         string $packet XML-Packet to send to Plesk
-	 * @returns       bool request was successfull or not
-	 */
-	function send_request($packet) {
-		curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($this->curl, CURLOPT_POSTFIELDS, $packet);
-		$retval = curl_exec($this->curl);
-
-		return $retval;
-	}
-
-
-	/**
-	 * close curl
-	 *
-	 * @author        Cyrill von Wattenwyl <cyrill.vonwattenwyl@adfinis-sygroup.ch>
-	 * @returns       void
-	 */
-	function destroy(){
-		curl_close($this->curl);
-	}
-
-
-	/**
-	 * Creates an Initial SimpleXML-Object for Plesk-RPC
-	 *
-	 * @author        Cyrill von Wattenwyl <cyrill.vonwattenwyl@adfinis-sygroup.ch>
-	 * @returns       object SimpleXML object
-	 */
-	function get_request_obj(){
-		$request = new SimpleXMLElement("<packet></packet>");
-		$request->addAttribute("version", "1.6.3.0");
-
-		return $request;
-	}

roundcubemail-1.1.tar.gz/plugins/password/drivers/poppassd.php Changed

@@ -8,6 +8,20 @@
  * @version 2.0
  * @author Philip Weir
  *
+ * Copyright (C) 2005-2013, The Roundcube Dev Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 class rcube_poppassd_password
@@ -16,9 +30,9 @@
     {
         if (preg_match('/^\d\d\d\s+(\S.*)\s*$/', $line, $matches)) {
             return array('code' => $code, 'message' => $matches[1]);
-        } else {
-            return $code;
         }
+
+        return $code;
     }
 
     function save($curpass, $passwd)
@@ -40,14 +54,14 @@
             else {
                 $poppassd->writeLine("user ". $_SESSION['username']);
                 $result = $poppassd->readLine();
-                if(!preg_match('/^[23]\d\d/', $result) ) {
+                if (!preg_match('/^[23]\d\d/', $result) ) {
                     $poppassd->disconnect();
                     return $this->format_error_result(PASSWORD_CONNECT_ERROR, $result);
                 }
                 else {
                     $poppassd->writeLine("pass ". $curpass);
                     $result = $poppassd->readLine();
-                    if(!preg_match('/^[23]\d\d/', $result) ) {
+                    if (!preg_match('/^[23]\d\d/', $result) ) {
                         $poppassd->disconnect();
                         return $this->format_error_result(PASSWORD_ERROR, $result);
                     }
@@ -55,10 +69,11 @@
                         $poppassd->writeLine("newpass ". $passwd);
                         $result = $poppassd->readLine();
                         $poppassd->disconnect();
-                        if (!preg_match('/^2\d\d/', $result))
+                        if (!preg_match('/^2\d\d/', $result)) {
                             return $this->format_error_result(PASSWORD_ERROR, $result);
-                        else
-                            return PASSWORD_SUCCESS;
+                        }
+
+                        return PASSWORD_SUCCESS;
                     }
                 }
             }

roundcubemail-1.1.tar.gz/plugins/password/drivers/pw_usermod.php Changed

roundcubemail-1.1.tar.gz/plugins/password/drivers/sasl.php Changed

roundcubemail-1.1.tar.gz/plugins/password/drivers/smb.php Changed

roundcubemail-1.1.tar.gz/plugins/password/drivers/sql.php Changed

@@ -8,6 +8,20 @@
  * @version 2.0
  * @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
  *
+ * Copyright (C) 2005-2013, The Roundcube Dev Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 class rcube_sql_password
@@ -16,19 +30,13 @@
     {
         $rcmail = rcmail::get_instance();
 
-        if (!($sql = $rcmail->config->get('password_query')))
+        if (!($sql = $rcmail->config->get('password_query'))) {
             $sql = 'SELECT update_passwd(%c, %u)';
+        }
 
         if ($dsn = $rcmail->config->get('password_db_dsn')) {
-            // #1486067: enable new_link option
-            if (is_array($dsn) && empty($dsn['new_link']))
-                $dsn['new_link'] = true;
-            else if (!is_array($dsn) && !preg_match('/\?new_link=true/', $dsn))
-                $dsn .= '?new_link=true';
-
             $db = rcube_db::factory($dsn, '', false);
             $db->set_debug((bool)$rcmail->config->get('sql_debug'));
-            $db->db_connect('w');
         }
         else {
             $db = $rcmail->get_dbh();
@@ -42,16 +50,14 @@
         if (strpos($sql, '%c') !== FALSE) {
             $salt = '';
 
-            if (!($crypt_hash = $rcmail->config->get('password_crypt_hash')))
-            {
+            if (!($crypt_hash = $rcmail->config->get('password_crypt_hash'))) {
                 if (CRYPT_MD5)
                     $crypt_hash = 'md5';
                 else if (CRYPT_STD_DES)
                     $crypt_hash = 'des';
             }
 
-            switch ($crypt_hash)
-            {
+            switch ($crypt_hash) {
             case 'md5':
                 $len = 8;
                 $salt_hashindicator = '$1$';
@@ -128,8 +134,9 @@
                 return PASSWORD_ERROR;
             }
 
-            if (!($hash_algo = strtolower($rcmail->config->get('password_hash_algorithm'))))
+            if (!($hash_algo = strtolower($rcmail->config->get('password_hash_algorithm')))) {
                 $hash_algo = 'sha1';
+            }
 
             $hash_passwd = hash($hash_algo, $passwd);
             $hash_curpass = hash($hash_algo, $curpass);
@@ -185,9 +192,11 @@
 
         if (!$db->is_error()) {
             if (strtolower(substr(trim($sql),0,6)) == 'select') {
-                if ($db->fetch_array($res))
+                if ($db->fetch_array($res)) {
                     return PASSWORD_SUCCESS;
-            } else {
+                }
+            }
+            else {
                 // This is the good case: 1 row updated
                 if ($db->affected_rows($res) == 1)
                     return PASSWORD_SUCCESS;

roundcubemail-1.1.tar.gz/plugins/password/drivers/virtualmin.php Changed

roundcubemail-1.1.tar.gz/plugins/password/drivers/vpopmaild.php Changed

@@ -8,6 +8,20 @@
  * @version 2.0
  * @author Johannes Hessellund
  *
+ * Copyright (C) 2005-2013, The Roundcube Dev Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 class rcube_vpopmaild_password
@@ -22,7 +36,7 @@
             $rcmail->config->get('password_vpopmaild_port'), null))) {
             return PASSWORD_CONNECT_ERROR;
         }
-	
+
         $vpopmaild->setTimeout($rcmail->config->get('password_vpopmaild_timeout'),0);
 
         $result = $vpopmaild->readLine();
@@ -47,8 +61,9 @@
         $vpopmaild->writeLine("quit");
         $vpopmaild->disconnect();
 
-        if (!preg_match('/^\+OK/', $result))
+        if (!preg_match('/^\+OK/', $result)) {
             return PASSWORD_ERROR;
+        }
 
         return PASSWORD_SUCCESS;
     }

roundcubemail-1.1.tar.gz/plugins/password/drivers/ximss.php Changed

@@ -8,12 +8,26 @@
  *   password_ximss_host - Host name of Communigate server
  *   password_ximss_port - XIMSS port on Communigate server
  *
- *
  * References:
  *   http://www.communigate.com/WebGuide/XMLAPI.html
  *
  * @version 2.0
  * @author Erik Meitner <erik wanderings.us>
+ *
+ * Copyright (C) 2005-2013, The Roundcube Dev Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 class rcube_ximss_password
@@ -71,6 +85,5 @@
         } //foreach
 
         return PASSWORD_SUCCESS;
-
     }
 }

roundcubemail-1.1.tar.gz/plugins/password/drivers/xmail.php Changed

roundcubemail-1.1.tar.gz/program/include/rcmail.php Changed

roundcubemail-1.1.tar.gz/program/js/app.js Changed

roundcubemail-1.1.tar.gz/program/js/treelist.js Changed

roundcubemail-1.1.tar.gz/program/lib/Roundcube/rcube.php Changed

roundcubemail-1.1.tar.gz/program/lib/Roundcube/rcube_db.php Changed

roundcubemail-1.1.tar.gz/program/lib/Roundcube/rcube_imap.php Changed

roundcubemail-1.1.tar.gz/program/steps/mail/func.inc Changed

Changes of Revision 31