Added: Plugin: Contacts suggestion from ldap

Added: Custom favicon setting
+ Small fixes

Author: RainLoop

build/plugin.xml

@@ -78,6 +78,16 @@
 			<param name="plugin-name" value="hmailserver-change-password"/>
 		</antcall>
 	</target>
+	<target name="ldap-change-password">
+		<antcall target="_build_plugin_">
+			<param name="plugin-name" value="ldap-change-password"/>
+		</antcall>
+	</target>
+	<target name="ldap-contacts-suggestions">
+		<antcall target="_build_plugin_">
+			<param name="plugin-name" value="ldap-contacts-suggestions"/>
+		</antcall>
+	</target>
 	<target name="snowfall-on-login-screen">
 		<antcall target="_build_plugin_">
 			<param name="plugin-name" value="snowfall-on-login-screen"/>

dev/Settings/Admin/Branding.js

@@ -30,6 +30,9 @@
 		this.loadingDesc = ko.observable(Settings.settingsGet('LoadingDescription'));
 		this.loadingDesc.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
 
+		this.faviconUrl = ko.observable(Settings.settingsGet('FaviconUrl'));
+		this.faviconUrl.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
+
 		this.loginLogo = ko.observable(Settings.settingsGet('LoginLogo') || '');
 		this.loginLogo.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
 
@@ -88,7 +91,8 @@
 
 			var
 				f1 = Utils.settingsSaveHelperSimpleFunction(self.title.trigger, self),
-				f2 = Utils.settingsSaveHelperSimpleFunction(self.loadingDesc.trigger, self)
+				f2 = Utils.settingsSaveHelperSimpleFunction(self.loadingDesc.trigger, self),
+				f3 = Utils.settingsSaveHelperSimpleFunction(self.faviconUrl.trigger, self)
 			;
 
 			self.title.subscribe(function (sValue) {
@@ -103,6 +107,12 @@
 				});
 			});
 
+			self.faviconUrl.subscribe(function (sValue) {
+				Remote.saveAdminConfig(f3, {
+					'FaviconUrl': Utils.trim(sValue)
+				});
+			});
+
 		}, 50);
 	};
 

package.json

@@ -2,7 +2,7 @@
   "name": "RainLoop",
   "title": "RainLoop Webmail",
   "version": "1.9.2",
-  "release": "357",
+  "release": "361",
   "description": "Simple, modern & fast web-based email client",
   "homepage": "http://rainloop.net",
   "main": "gulpfile.js",
@@ -40,7 +40,7 @@
     "plugins"
   ],
   "readmeFilename": "README.md",
-  "ownCloudPackageVersion": "4.6",
+  "ownCloudPackageVersion": "4.7",
   "engines": {
     "node": ">= 0.10.0"
   },
@@ -49,7 +49,7 @@
     "rimraf": "*",
     "jshint-summary": "*",
     "webpack": "*",
-    "gulp": "*",
+    "gulp": "~3.9.0",
     "gulp-util": "*",
     "gulp-uglify": "*",
     "gulp-rimraf": "*",

plugins/ldap-change-password/ChangePasswordLdapDriver.php

@@ -7,6 +7,11 @@ class ChangePasswordLdapDriver implements \RainLoop\Providers\ChangePassword\Cha
 	 */
 	private $sHostName = '127.0.0.1';
 
+	/**
+	 * @var int
+	 */
+	private $iHostPort = 389;
+
 	/**
 	 * @var string
 	 */
@@ -34,15 +39,17 @@ class ChangePasswordLdapDriver implements \RainLoop\Providers\ChangePassword\Cha
 
 	/**
 	 * @param string $sHostName
+	 * @param int $iHostPort
 	 * @param string $sUserDnFormat
 	 * @param string $sPasswordField
 	 * @param string $sPasswordEncType
 	 *
 	 * @return \ChangePasswordLdapDriver
 	 */
-	public function SetConfig($sHostName, $sUserDnFormat, $sPasswordField, $sPasswordEncType)
+	public function SetConfig($sHostName, $iHostPort, $sUserDnFormat, $sPasswordField, $sPasswordEncType)
 	{
 		$this->sHostName = $sHostName;
+		$this->iHostPort = $iHostPort;
 		$this->sUserDnFormat = $sUserDnFormat;
 		$this->sPasswordField = $sPasswordField;
 		$this->sPasswordEncType = $sPasswordEncType;
@@ -114,7 +121,7 @@ public function ChangePassword(\RainLoop\Account $oAccount, $sPrevPassword, $sNe
 				'{imap:port}' => $oAccount->DomainIncPort()
 			));
 
-			$oCon = @\ldap_connect($this->sHostName);
+			$oCon = @\ldap_connect($this->sHostName, $this->iHostPort);
 			if ($oCon)
 			{
 				@\ldap_set_option($oCon, LDAP_OPT_PROTOCOL_VERSION, 3);
@@ -133,22 +140,31 @@ public function ChangePassword(\RainLoop\Account $oAccount, $sPrevPassword, $sNe
 					return false;
 				}
 			}
+			else
+			{
+				return false;
+			}
 
+			$sSshaSalt = '';
+			$sShaPrefix = '{SHA}';
 			$sEncodedNewPassword = $sNewPassword;
 			switch (\strtolower($this->sPasswordEncType))
 			{
+				case 'ssha':
+					$sSshaSalt = $this->getSalt(4);
+					$sShaPrefix = '{SSHA}';
 				case 'sha':
 					switch (true)
 					{
 						default:
 						case \function_exists('sha1'):
-							$sEncodedNewPassword = '{SHA}'.\base64_encode(\pack('H*', \sha1($sNewPassword)));
+							$sEncodedNewPassword = $sShaPrefix.\base64_encode(\sha1($sNewPassword.$sSshaSalt, true).$sSshaSalt);
 							break;
 						case \function_exists('hash'):
-							$sEncodedNewPassword = '{SHA}'.\base64_encode(\hash('sha1', $sNewPassword, true));
+							$sEncodedNewPassword = $sShaPrefix.\base64_encode(\hash('sha1', $sNewPassword, true).$sSshaSalt);
 							break;
 						case \function_exists('mhash') && defined('MHASH_SHA1'):
-							$sEncodedNewPassword = '{SHA}'.\base64_encode(\mhash(MHASH_SHA1, $sNewPassword));
+							$sEncodedNewPassword = $sShaPrefix.\base64_encode(\mhash(MHASH_SHA1, $sNewPassword).$sSshaSalt);
 							break;
 					}
 					break;

plugins/ldap-change-password/VERSION

@@ -1 +1 @@
-1.0
+1.1

plugins/ldap-change-password/index.php

@@ -31,18 +31,19 @@ public function MainFabrica($sName, &$oProvider)
 			case 'change-password':
 
 				$sHostName = \trim($this->Config()->Get('plugin', 'hostname', ''));
+				$iHostPort = (int) $this->Config()->Get('plugin', 'port', 389);
 				$sUserDnFormat = \trim($this->Config()->Get('plugin', 'user_dn_format', ''));
 				$sPasswordField = \trim($this->Config()->Get('plugin', 'password_field', ''));
 				$sPasswordEncType = \trim($this->Config()->Get('plugin', 'password_enc_type', ''));
 
-				if (!empty($sHostName) && !empty($sUserDnFormat) && !empty($sPasswordField) && !empty($sPasswordEncType))
+				if (!empty($sHostName) && 0 < $iHostPort && !empty($sUserDnFormat) && !empty($sPasswordField) && !empty($sPasswordEncType))
 				{
 					include_once __DIR__.'/ChangePasswordLdapDriver.php';
 
 					$oProvider = new \ChangePasswordLdapDriver();
 
 					$oProvider
-						->SetConfig($sHostName, $sUserDnFormat, $sPasswordField, $sPasswordEncType)
+						->SetConfig($sHostName, $iHostPort, $sUserDnFormat, $sPasswordField, $sPasswordEncType)
 						->SetAllowedEmails(\strtolower(\trim($this->Config()->Get('plugin', 'allowed_emails', ''))))
 						->SetLogger($this->Manager()->Actions()->Logger())
 					;
@@ -59,14 +60,17 @@ public function configMapping()
 		return array(
 			\RainLoop\Plugins\Property::NewInstance('hostname')->SetLabel('LDAP hostname')
 				->SetDefaultValue('127.0.0.1'),
+			\RainLoop\Plugins\Property::NewInstance('port')->SetLabel('LDAP port')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::INT)
+				->SetDefaultValue(389),
 			\RainLoop\Plugins\Property::NewInstance('user_dn_format')->SetLabel('User DN format')
 				->SetDescription('LDAP user dn format. Supported tokens: {email}, {login}, {domain}, {domain:dc}, {imap:login}, {imap:host}, {imap:port}')
 				->SetDefaultValue('uid={imap:login},ou=Users,{domain:dc}'),
 			\RainLoop\Plugins\Property::NewInstance('password_field')->SetLabel('Password field')
 				->SetDefaultValue('userPassword'),
 			\RainLoop\Plugins\Property::NewInstance('password_enc_type')->SetLabel('Encryption type')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION)
-				->SetDefaultValue(array('SHA', 'MD5', 'Crypt', 'Clear')),
+				->SetDefaultValue(array('SHA', 'SSHA', 'MD5', 'Crypt', 'Clear')),
 			\RainLoop\Plugins\Property::NewInstance('allowed_emails')->SetLabel('Allowed emails')
 				->SetDescription('Allowed emails, space as delimiter, wildcard supported. Example: user1@domain1.net user2@domain1.net *@domain2.net')
 				->SetDefaultValue('*')

plugins/ldap-contacts-suggestions/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.