ispman/lib/ISPMan UserMan.pm,1.62,1.63

Update of /cvsroot/ispman/ispman/lib/ISPMan
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16225/lib/ISPMan

Modified Files:
	UserMan.pm 
Log Message:
made cross-domain alias check configurable

Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- UserMan.pm	20 Nov 2006 15:47:54 -0000	1.62
+++ UserMan.pm	20 Nov 2006 16:03:39 -0000	1.63
@@ -342,17 +342,20 @@
             return ( 1, _("Mail address is not fully qualified") . ": " . $_ );
         }
 
-        # check for out-of-bounds addresses
-        if (/^[\w\.\-\+]*@([\w\.\-]+)$/) {
-            if ( !grep /^$1$/, @validDomains ) {
-                return (
-                    1,
-                    _(
-                        "Mail aliases to users from foreign domains are forbidden"
-                      )
-                      . ": "
-                      . $_
-                );
+        if ( lc( $self->getConf("allowCrossDomainAliases") eq "no" ) ) {
+
+            # check for out-of-bounds addresses
+            if (/^[\w\.\-\+]*@([\w\.\-]+)$/) {
+                if ( !grep /^$1$/, @validDomains ) {
+                    return (
+                        1,
+                        _(
+                            "Mail aliases to users from foreign domains are forbidden"
+                          )
+                          . ": "
+                          . $_
+                    );
+                }
             }
         }
 


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV