From 48f3be29bffbf3eccff641a004a66cdf70f50f9e Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Tue, 3 Feb 2009 21:02:04 +0000
Subject: [PATCH] CHANGELOG.TXT: - updated with latest changes

functions.inc.php
- whitespace fixes


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@561 a1433add-5e2c-0410-b055-b7f2511e0802
---
 CHANGELOG.TXT     |  5 +++--
 functions.inc.php | 36 ++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 43b4e7d1..fe67fb27 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -15,13 +15,14 @@ Only in SVN trunk
 -----------------
 
 
-Version 2.3 - 2009/01/30 - SVN r557
+Version 2.3 - 2009/02/03 - SVN r561
 -----------------------------------
   - vacation.pl: make it strip/discover addresses better, slightly better logging, stop it 
     requiring a messageid
   - added ADDITIONS/delete-mailq-by-domain.pl (by Jose Nilton)
   - added ADDITIONS/quota_usage.pl (by Jose Nilton) - produces report of quota usage
-  - some small bugfixes
+  - added support for courier authlib authentication flavors ($CONF['authlib_default_flavor'])
+  - some small bugfixes and language updates
 
 
 Version 2.3 Beta - 2009/01/15 - SVN r527
diff --git a/functions.inc.php b/functions.inc.php
index cdd3278c..b67fc296 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -256,7 +256,7 @@ function check_domain ($domain)
             flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!");
         }
     }
-    
+
     return true;
 }
 
@@ -1162,23 +1162,23 @@ function pacrypt ($pw, $pw_db="")
     }
     
     if ($CONF['encrypt'] == 'authlib') {
-    	$flavor = $CONF['authlib_default_flavor'];
-    	$salt = '  ';
-    	if(ereg('^{.*}', $pw_db)) {
-    		// we have a flavor in the db -> use it instead of default flavor
-    		$result = split('{|}', $pw_db, 3);
-    		$flavor = $result[1];  
-    		$salt = substr($result[2], 0, 2);  		
-    	}
-    	    	
-      	if(stripos($flavor, 'md5raw') === 0) {
-         	$password = '{' . $flavor . '}' . md5($pw);
-      	} else if(stripos($flavor, 'md5') === 0) {
-      		$password = '{' . $flavor . '}' . base64_encode(md5($pw, TRUE));
-      	} else if(stripos($flavor, 'crypt') === 0) {
-      		$password = '{' . $flavor . '}' . crypt($pw, $salt);
-      	}
-   	}
+       $flavor = $CONF['authlib_default_flavor'];
+       $salt = '  ';
+       if(ereg('^{.*}', $pw_db)) {
+          // we have a flavor in the db -> use it instead of default flavor
+          $result = split('{|}', $pw_db, 3);
+          $flavor = $result[1];  
+          $salt = substr($result[2], 0, 2);
+       }
+
+       if(stripos($flavor, 'md5raw') === 0) {
+          $password = '{' . $flavor . '}' . md5($pw);
+       } else if(stripos($flavor, 'md5') === 0) {
+          $password = '{' . $flavor . '}' . base64_encode(md5($pw, TRUE));
+       } else if(stripos($flavor, 'crypt') === 0) {
+          $password = '{' . $flavor . '}' . crypt($pw, $salt);
+       }
+    }
     
     
     $password = escape_string ($password);