[vhffs-dev] [svn] commit: r276 - in /trunk: vhffs-api/src/Vhffs/Services/Mail.pm vhffs-panel/mail/prefs.pl vhffs-panel/mail/save_catchall.pl

[vhffs-dev@xxxxxxxxx]

Author: gradator
Date: Wed Nov  1 15:40:13 2006
New Revision: 276

Log:
Allow the user to remove the catchall


Modified:
    trunk/vhffs-api/src/Vhffs/Services/Mail.pm
    trunk/vhffs-panel/mail/prefs.pl
    trunk/vhffs-panel/mail/save_catchall.pl

Modified: trunk/vhffs-api/src/Vhffs/Services/Mail.pm
==============================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Mail.pm (original)
+++ trunk/vhffs-api/src/Vhffs/Services/Mail.pm Wed Nov  1 15:40:13 2006
@@ -578,7 +578,7 @@
 {
 	my( $self , $value ) = @_;
 	use Vhffs::Functions;
-	if( Vhffs::Functions::valid_mail( $value ) == 1 )
+	if( $value eq "" || Vhffs::Functions::valid_mail( $value ) == 1 )
 	{
 		$self->{'catchall'} = $value;
 		return 1;

Modified: trunk/vhffs-panel/mail/prefs.pl
==============================================================================
--- trunk/vhffs-panel/mail/prefs.pl (original)
+++ trunk/vhffs-panel/mail/prefs.pl Wed Nov  1 15:40:13 2006
@@ -97,7 +97,7 @@
 	$template->param( TEXT_TITLE => gettext("Mail Administration for domain ") );
 	$template->param( VALUE_DOMAIN => $mail->get_domain );
 	
-	$template->param( SUBTITLE_CATCHALL => gettext("Catchall adress") );
+	$template->param( SUBTITLE_CATCHALL => gettext("Catchall address") );
 	$template->param( VALUE_CATCHALL => $mail->get_catchall );
 	$template->param( TEXT_CATCHALL_EXPLAIN => gettext("Enter a mail address to catch all email for this domain") );
 	$template->param( TEXT_CATCHALL => gettext("Catchall mail") );

Modified: trunk/vhffs-panel/mail/save_catchall.pl
==============================================================================
--- trunk/vhffs-panel/mail/save_catchall.pl (original)
+++ trunk/vhffs-panel/mail/save_catchall.pl Wed Nov  1 15:40:13 2006
@@ -96,7 +96,7 @@
 	}
 	else
 	{
-		$template->param( MESSAGE => gettext("Catchall address successfully added") );
+		$template->param( MESSAGE => gettext("Catchall address successfully changed") );
 	}
 }