Add in sha passwd crypt for ldap (requires mhash to configure and use) ...

Concept by Matt Pavlovich <mpav@algx.net>

admin/inc/hook_config.inc.php

@@ -101,4 +101,32 @@
 		}
 		return $out;
 	}
+
+	function passwdhashes($config)
+	{
+		$hashes = array(
+			'des' => 'des',
+			'md5' => 'md5'
+		);
+		if(@function_exists('mhash'))
+		{
+			$hashes += array('sha' => 'sha');
+		}
+
+		while(list($key, $value) = each($hashes))
+		{
+			if($config['ldap_encryption_type'] == $value)
+			{
+				$selected = ' selected';
+			}
+			else
+			{
+				$selected = '';
+			}
+			$descr = strtoupper($value);
+
+			$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+		}
+		return $out;
+	}
 ?>

admin/templates/default/config.tpl

@@ -144,8 +144,7 @@
     <td>{lang_LDAP_encryption_type}:</td>
     <td>
      <select name="newsettings[ldap_encryption_type]">
-      <option value="DES"{selected_ldap_encryption_type_DES}>DES</option>
+{hook_passwdhashes}
-      <option value="MD5"{selected_ldap_encryption_type_MD5}>MD5</option>
      </select>
     </td>
    </tr>

phpgwapi/inc/class.common.inc.php

@@ -1156,6 +1156,15 @@
 
 			return $ldappassword;
 		}
+
+		function sha_cryptpasswd($userpass)
+		{
+			$hash = base64_encode(mhash(MHASH_SHA1, $userpass));
+			$ldappassword = sprintf('%s%s', '{SHA}', $hash);
+
+			return $ldappassword;
+		}
+
 		/*!
 		@function encrypt_password
 		@abstract encrypt password
@@ -1174,6 +1183,19 @@
 				$salt       = $this->randomstring(8);
 				$e_password = $this->md5_cryptpasswd($password, $salt);
 			}
+			if($GLOBALS['phpgw_info']['server']['ldap_encryption_type'] == 'SHA')
+			{
+				if(@function_exists('mhash'))
+				{
+					$e_password = $this->sha_cryptpasswd($password);
+				}
+				else
+				{
+					/* this should error instead... */
+					$salt       = $this->randomstring(8);
+					$e_password = $this->md5_cryptpasswd($password, $salt);
+				}
+			}
 			return $e_password;
 		}