Merge branch 'develop' into hooks

Conflicts:
	op/op.Login.php

CHANGELOG

@@ -27,6 +27,7 @@
 - moving several documents/folders at a time (Bug #64)
 - set encoding of terms when adding document to full text index (Bug #66)
 - droped support for myisam database engine
+- add support for connecting to ldap servers without anonymous bind
 
 --------------------------------------------------------------------------------
                      Changes in version 4.2.2

conf/settings.xml.template

@@ -118,6 +118,8 @@
           host = "ldaps://ldap.host.com"
           port = "389"
           baseDN = ""
+          bindDN="" 
+          bindPw=""
         >
         </connector>
         <!-- ***** CONNECTOR Microsoft Active Directory  *****
@@ -135,6 +137,8 @@
           port = "389"
           baseDN = ""
           accountDomainName = "example.com"
+	  bindDN="" 
+	  bindPw=""
         >
         </connector>
       </connectors>

inc/inc.ClassEmail.php

@@ -49,7 +49,8 @@ class SeedDMS_Email extends SeedDMS_Notify {
 		$message = getMLText("email_header", array(), "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang);
 		$message .= "\r\n\r\n".getMLText("email_footer", array(), "", $lang);
 
-		mail($recipient->getEmail(), getMLText($subject, $params, "", $lang), $message, implode("\r\n", $headers));
+		$subject = "=?UTF-8?B?".base64_encode(getMLText($subject, $params, "", $lang))."?=";
+		mail($recipient->getEmail(), $subject, $message, implode("\r\n", $headers));
 
 		return true;
 	} /* }}} */
@@ -86,10 +87,11 @@ class SeedDMS_Email extends SeedDMS_Notify {
 		$headers   = array();
 		$headers[] = "MIME-Version: 1.0";
 		$headers[] = "Content-type: text/plain; charset=utf-8";
-		$headers[] = "From: ". $settings->_smtpSendFrom();
+		$headers[] = "From: ". $settings->_smtpSendFrom;
-		$headers[] = "Reply-To: ". $settings->_smtpSendFrom();
+		$headers[] = "Reply-To: ". $settings->_smtpSendFrom;
 
-		return (mail($recipient->getEmail(), $this->replaceMarker($subject), $this->replaceMarker($message), implode("\r\n", $header)) ? 0 : -1);
+		$subject = "=?UTF-8?B?".base64_encode($this->replaceMarker($subject))."?=";
+		return (mail($recipient->getEmail(), $subject, $this->replaceMarker($message), implode("\r\n", $header)) ? 0 : -1);
 	} /* }}} */
 }
 ?>

inc/inc.ClassSettings.php

@@ -186,6 +186,8 @@ class Settings { /* {{{ */
 	var $_ldapHost = ""; // URIs are supported, e.g.: ldaps://ldap.host.com
 	var $_ldapPort = 389; // Optional.
 	var $_ldapBaseDN = "";
+	var $_ldapBindDN = "";
+	var $_ldapBindPw = "";
 	var $_ldapAccountDomainName = "";
 	var $_ldapType = 1; // 0 = ldap; 1 = AD
 	var $_converters = array(); // list of commands used to convert files to text for Indexer
@@ -383,6 +385,8 @@ class Settings { /* {{{ */
 				$this->_ldapHost = strVal($connectorNode["host"]);
 				$this->_ldapPort = intVal($connectorNode["port"]);
 				$this->_ldapBaseDN = strVal($connectorNode["baseDN"]);
+				$this->_ldapBindDN = strVal($connectorNode["bindDN"]);
+				$this->_ldapBindPw = strVal($connectorNode["bindPw"]);
 				$this->_ldapType = 0;
 			}
 			else if ($params['enable'] && ($typeConn == "AD"))
@@ -390,6 +394,8 @@ class Settings { /* {{{ */
 				$this->_ldapHost = strVal($connectorNode["host"]);
 				$this->_ldapPort = intVal($connectorNode["port"]);
 				$this->_ldapBaseDN = strVal($connectorNode["baseDN"]);
+				$this->_ldapBindDN = strVal($connectorNode["bindDN"]);
+				$this->_ldapBindPw = strVal($connectorNode["bindPw"]);
 				$this->_ldapType = 1;
 				$this->_ldapAccountDomainName = strVal($connectorNode["accountDomainName"]);
 			}

install/install.php

@@ -33,8 +33,8 @@ if (!file_exists("create_tables-innodb.sql")) {
   echo "Can't install SeedDMS, 'create_tables-innodb.sql' missing";
   exit;
 }
-if (!file_exists("create_tables.sql")) {
+if (!file_exists("create_tables-sqlite3.sql")) {
-  echo "Can't install SeedDMS, 'create_tables.sql' missing";
+  echo "Can't install SeedDMS, 'create_tables-sqlite3.sql' missing";
   exit;
 }
 if (!file_exists("settings.xml.template_install")) {

install/settings.xml.template_install

@@ -121,6 +121,8 @@
           host = "ldaps://ldap.host.com"
           port = "389"
           baseDN = ""
+          bindDN="" 
+          bindPw=""
         >
         </connector>
         <!-- ***** CONNECTOR Microsoft Active Directory  *****
@@ -138,6 +140,8 @@
           port = "389"
           baseDN = ""
           accountDomainName = "example.com"
+	  bindDN="" 
+	  bindPw=""
         >
         </connector>
       </connectors>

install/update-4.0.0/update.txt

@@ -1,9 +1,9 @@
 LetoDMS is now SeedDMS
 ======================
 
-I had to change of LetoDMS and took SeedDMS. It is a smooth continuation
+I had to change the name of LetoDMS and took SeedDMS. It is a smooth
-of LetoDMS. This initial version of SeedDMS will be able to update all
+continuation of LetoDMS. This initial version of SeedDMS will be able
-former versions of LetoDMS back to 3.0.0.
+to update all former versions of LetoDMS back to 3.0.0.
 
 Run object check after upgrade
 ==============================

op/op.Login.php

@@ -114,7 +114,11 @@ if (is_bool($user)) {
 			ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
 
 			// try an anonymous bind first. If it succeeds, get the DN for the user.
+			if (isset($settings->_ldapBindDN)) {
+				$bind = @ldap_bind($ds, $settings->_ldapBindDN, $settings->_ldapBindPw);
+			} else {
 				$bind = @ldap_bind($ds);
+			}
 			$dn = false;
 					
 			/* new code by doudoux - TO BE TESTED */