[vhffs-dev] [svn] commit: r66 - in trunk/vhffs-panel: admin/mailing/list.pl mailinglist/prefs.pl mailinglist/submit.pl

[vhffs-dev@xxxxxxxxx]

Author: soda
Date: Wed Jul 27 01:15:59 2005
New Revision: 66

Log:
Fix changes to list mailings


Modified:
    trunk/vhffs-panel/admin/mailing/list.pl
    trunk/vhffs-panel/mailinglist/prefs.pl
    trunk/vhffs-panel/mailinglist/submit.pl

Modified: trunk/vhffs-panel/admin/mailing/list.pl
==============================================================================
--- trunk/vhffs-panel/admin/mailing/list.pl (original)
+++ trunk/vhffs-panel/admin/mailing/list.pl Wed Jul 27 01:15:59 2005
@@ -57,7 +57,7 @@
 
 
 
-    my $lists = Vhffs::Services::Mailing::getall_by_state( $vhffs , undef , $name );
+    my $lists = Vhffs::Services::Mailing::getall( $vhffs , undef , $name );
 
     if( defined $lists )
     {

Modified: trunk/vhffs-panel/mailinglist/prefs.pl
==============================================================================
--- trunk/vhffs-panel/mailinglist/prefs.pl (original)
+++ trunk/vhffs-panel/mailinglist/prefs.pl Wed Jul 27 01:15:59 2005
@@ -47,7 +47,7 @@
 	$template->param( MESSAGE => $message );
 
 }
-elsif( $list->get_status != Vhffs::Constants::ACTIVATED )
+elsif( ( $list->get_status != Vhffs::Constants::ACTIVATED ) && ( $user->is_admin != 1 ) )
 {
 	
 	$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );

Modified: trunk/vhffs-panel/mailinglist/submit.pl
==============================================================================
--- trunk/vhffs-panel/mailinglist/submit.pl (original)
+++ trunk/vhffs-panel/mailinglist/submit.pl Wed Jul 27 01:15:59 2005
@@ -52,14 +52,12 @@
     $default_domain = undef;
 }
 
-
 $valid = 1 if( $default_domain eq $domain );
 
 foreach( sort ( keys %{$domains} ) )
 {
     $valid = 1 if( $_ eq $domain );
 }
-
 
 
 if( ( ! defined $description ) || ( ! defined $domain ) || ( ! defined $lpart ) )