SF.net SVN: postfixadmin:[561] trunk

[<chr...@us...>]

Revision: 561
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=561&view=rev
Author:   christian_boltz
Date:     2009-02-03 21:02:04 +0000 (Tue, 03 Feb 2009)

Log Message:
-----------
CHANGELOG.TXT:
- updated with latest changes

functions.inc.php
- whitespace fixes

Modified Paths:
--------------
    trunk/CHANGELOG.TXT
    trunk/functions.inc.php

Modified: trunk/CHANGELOG.TXT
===================================================================
--- trunk/CHANGELOG.TXT	2009-02-03 17:50:13 UTC (rev 560)
+++ trunk/CHANGELOG.TXT	2009-02-03 21:02:04 UTC (rev 561)
@@ -15,13 +15,14 @@
 -----------------
 
 
-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

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2009-02-03 17:50:13 UTC (rev 560)
+++ trunk/functions.inc.php	2009-02-03 21:02:04 UTC (rev 561)
@@ -256,7 +256,7 @@
             flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!");
         }
     }
-    
+
     return true;
 }
 
@@ -1162,23 +1162,23 @@
     }
     
     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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.