| [vhffs-dev] [806] Renaming Vhffs::Services::Mailing to Vhffs::Services::MailingList ( part one) |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 806
Author: gradator
Date: 2007-08-29 23:41:26 +0000 (Wed, 29 Aug 2007)
Log Message:
-----------
Renaming Vhffs::Services::Mailing to Vhffs::Services::MailingList (part one)
Modified Paths:
--------------
trunk/vhffs-api/src/Vhffs/ObjectFactory.pm
trunk/vhffs-api/src/Vhffs/Panel/Mailinglist.pm
trunk/vhffs-api/src/Vhffs/Services/Mail.pm
trunk/vhffs-api/src/Vhffs/Services/Mailing.pm
trunk/vhffs-api/src/Vhffs/Services.pm
trunk/vhffs-api/src/examples/create_list.pl
trunk/vhffs-api/src/examples/get_list.pl
trunk/vhffs-api/src/examples/show_members_from_list.pl
trunk/vhffs-irc/modobot.pl
trunk/vhffs-listengine/src/listengine.pl
trunk/vhffs-panel/admin/moderation.pl
trunk/vhffs-panel/mailinglist/add_sub.pl
trunk/vhffs-panel/mailinglist/change_right.pl
trunk/vhffs-panel/mailinglist/del_member.pl
trunk/vhffs-panel/mailinglist/delete.pl
trunk/vhffs-panel/mailinglist/prefs.pl
trunk/vhffs-panel/mailinglist/save_options.pl
trunk/vhffs-panel/mailinglist/save_sig.pl
trunk/vhffs-public/group.pl
trunk/vhffs-robots/src/create_ml.pl
trunk/vhffs-robots/src/delete_group.pl
trunk/vhffs-robots/src/delete_mail.pl
trunk/vhffs-robots/src/delete_ml.pl
trunk/vhffs-robots/src/listengine_publicarchives.pl
trunk/vhffs-robots/src/refused_ml.pl
trunk/vhffs-tests/src/Services/Mailing.pl
trunk/vhffs-tests/src/Stats.pl
Modified: trunk/vhffs-api/src/Vhffs/ObjectFactory.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/ObjectFactory.pm 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-api/src/Vhffs/ObjectFactory.pm 2007-08-29 23:41:26 UTC (rev 806)
@@ -63,7 +63,7 @@
$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_SVN] = 'Vhffs::Services::Svn';
$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_DNS] = 'Vhffs::Services::DNS';
$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_MAIL] = 'Vhffs::Services::Mail';
-$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_ML] = 'Vhffs::Services::Mailing';
+$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_ML] = 'Vhffs::Services::MailingList';
=head2 fetch_object
Modified: trunk/vhffs-api/src/Vhffs/Panel/Mailinglist.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mailinglist.pm 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mailinglist.pm 2007-08-29 23:41:26 UTC (rev 806)
@@ -43,7 +43,7 @@
use Vhffs::User;
use Vhffs::Main;
use Vhffs::Panel::Main;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
sub search
{
@@ -126,7 +126,7 @@
return undef unless( defined $user );
return undef unless( defined $group );
- my $list = Vhffs::Services::Mailing::create( $main , $lpart , $domain, $user->get_mail, $description, $user, $group );
+ my $list = Vhffs::Services::MailingList::create( $main , $lpart , $domain, $user->get_mail, $description, $user, $group );
return undef unless( defined $list );
return undef if ( Vhffs::Acl::add_acl( $user , $list , Vhffs::Constants::ACL_DELETE , $main ) < 0 );
Modified: trunk/vhffs-api/src/Vhffs/Services/Mail.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Mail.pm 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-api/src/Vhffs/Services/Mail.pm 2007-08-29 23:41:26 UTC (rev 806)
@@ -250,7 +250,7 @@
return -1 unless(defined($name) && defined($remote) && $name =~ /^[a-z0-9\_\-\.]+$/ && Vhffs::Functions::valid_mail( $remote ) );
return -2 if( ( defined ( $self->{'forward'}{$name} ) ) || ( defined( $self->{'boxes'}{$name} ) ) ||
- Vhffs::Services::Mailing::address_exists($self->get_main, $name, $self->{domain}) );
+ Vhffs::Services::MailingList::address_exists($self->get_main, $name, $self->{domain}) );
my $sql = 'INSERT INTO vhffs_forward(domain, local_part, remote_name, password) VALUES(?, ?, ?, \'x\')';
my $dbh = $self->{db};
@@ -283,7 +283,7 @@
return -1 unless(defined($password) && defined($name) && $name =~ /^[a-z0-9\_\-\.]+$/ && $password =~ /^[a-zA-Z0-9\_\-]+$/);
return -2 if( ( defined ( $self->{'boxes'}{$name} ) ) || ( defined( $self->{'forward'}{$name} ) )
- || Vhffs::Services::Mailing::address_exists($self->get_main, $name, $self->{domain}) );
+ || Vhffs::Services::MailingList::address_exists($self->get_main, $name, $self->{domain}) );
$password = crypt_pwd( $password );
my $domainhash = Vhffs::Functions::hash_mxdomain($self->{domain});
@@ -624,7 +624,7 @@
if(Vhffs::Services::Mail::address_exists($vhffs, $local_part, $domain));
Return true if a box or a forward C<$local_part>@C<$domain> already exists.
-It does B<not> check for mailing lists (use Vhffs::Services::Mailing::address_exists).
+It does B<not> check for mailing lists (use Vhffs::Services::MailingList::address_exists).
=cut
Modified: trunk/vhffs-api/src/Vhffs/Services/Mailing.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Mailing.pm 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-api/src/Vhffs/Services/Mailing.pm 2007-08-29 23:41:26 UTC (rev 806)
@@ -37,7 +37,7 @@
=head1 NAME
-Vhffs::Services::Mailing - Handle mailing lists in VHFFS.
+Vhffs::Services::MailingList - Handle mailing lists in VHFFS.
=head1 SYNOPSIS
@@ -47,7 +47,7 @@
=cut
-package Vhffs::Services::Mailing;
+package Vhffs::Services::MailingList;
use base qw(Vhffs::Object);
use strict;
@@ -57,7 +57,7 @@
=head2 create
- my $ml = Vhffs::Services::Mailing::create($local, $domain, $admin, $description, $user, $group);
+ my $ml = Vhffs::Services::MailingList::create($local, $domain, $admin, $description, $user, $group);
die('Unable to create list') unless defined $ml;
Creates a new mailing list in database and returns the corresponding fully functional object.
@@ -112,7 +112,7 @@
=head2 get_by_mladdress
- my $ml = Vhffs::Services::Mailing::get_by_mladdress($main, $local_part, $domain);
+ my $ml = Vhffs::Services::MailingList::get_by_mladdress($main, $local_part, $domain);
die("Mailing list $localpart\@$domain not found\n") unless(defined $ml);
Fetches the mailing list $local_part@$domain.
@@ -129,7 +129,7 @@
my @params = $sth->fetchrow_array;
push @params, fetch_subs($dbh, $params[0]);
- return _new Vhffs::Services::Mailing($main, @params);
+ return _new Vhffs::Services::MailingList($main, @params);
}
=head2 fetch_subs
@@ -164,7 +164,7 @@
reply_to, sub_ctrl, post_ctrl, signature FROM vhffs_ml
WHERE object_id = ?};
$obj = $class->SUPER::_fill_object($obj, $sql);
- if($obj->isa('Vhffs::Services::Mailing')) {
+ if($obj->isa('Vhffs::Services::MailingList')) {
$obj->{subs} = fetch_subs($obj->get_db_object, $obj->{ml_id});
}
return $obj;
Modified: trunk/vhffs-api/src/Vhffs/Services.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services.pm 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-api/src/Vhffs/Services.pm 2007-08-29 23:41:26 UTC (rev 806)
@@ -35,7 +35,7 @@
use Vhffs::Services::DNS;
use Vhffs::Services::Web;
use Vhffs::Services::Mail;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Services::Mysql;
use Vhffs::Services::Pgsql;
use Vhffs::Services::Repository;
Modified: trunk/vhffs-api/src/examples/create_list.pl
===================================================================
--- trunk/vhffs-api/src/examples/create_list.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-api/src/examples/create_list.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -11,7 +11,7 @@
use Vhffs::Main;
use Vhffs::Object;
use Vhffs::Services::Mail;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
my $princ = init Vhffs::Main;
@@ -24,7 +24,7 @@
my $group = Vhffs::Group::get_by_groupname($princ, $groupname);
die("Group not found\n") unless(defined $group);
-my $mail = Vhffs::Services::Mailing::create($princ, $local, $domain, $admin, $description, $user, $group);
+my $mail = Vhffs::Services::MailingList::create($princ, $local, $domain, $admin, $description, $user, $group);
if( defined $mail )
{
Modified: trunk/vhffs-api/src/examples/get_list.pl
===================================================================
--- trunk/vhffs-api/src/examples/get_list.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-api/src/examples/get_list.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -6,7 +6,7 @@
use lib '%VHFFS_LIB_DIR%';
use Data::Dumper;
use Vhffs::Main;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
my $princ = init Vhffs::Main;
@@ -17,7 +17,7 @@
my ($local, $domain) = split(/@/, $address);
die("$address is not a valid email address\n") unless(defined $local && defined $domain);
-my $ml = Vhffs::Services::Mailing::get_by_mladdress($princ, $local, $domain);
+my $ml = Vhffs::Services::MailingList::get_by_mladdress($princ, $local, $domain);
die("Mailing list $address not found\n") unless(defined $ml);
print Dumper $ml;
Modified: trunk/vhffs-api/src/examples/show_members_from_list.pl
===================================================================
--- trunk/vhffs-api/src/examples/show_members_from_list.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-api/src/examples/show_members_from_list.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -6,7 +6,7 @@
use Data::Dumper;
use lib '%VHFFS_LIB_DIR%';
use Vhffs::Main;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
my $princ = init Vhffs::Main;
@@ -17,7 +17,7 @@
my ($local, $domain) = split(/@/, $address);
die("$address is not a valid email address\n") unless(defined $local && defined $domain);
-my $ml = Vhffs::Services::Mailing::get_by_mladdress($princ, $local, $domain);
+my $ml = Vhffs::Services::MailingList::get_by_mladdress($princ, $local, $domain);
die("Mailing list $address not found\n") unless(defined $ml);
my $subs = $ml->get_members;
Modified: trunk/vhffs-irc/modobot.pl
===================================================================
--- trunk/vhffs-irc/modobot.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-irc/modobot.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -194,7 +194,7 @@
{
#Treat Mailing lists to moderate
use Vhffs::Panel::Mailinglist;
- my $mls = Vhffs::Services::Mailing::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION );
+ my $mls = Vhffs::Services::MailingList::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION );
if( defined $mls )
{
Modified: trunk/vhffs-listengine/src/listengine.pl
===================================================================
--- trunk/vhffs-listengine/src/listengine.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-listengine/src/listengine.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -39,7 +39,7 @@
use Mail::Internet;
use lib '%VHFFS_LIB_DIR%';
use Vhffs::Main;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Listengine::Intl;
# open (MYFILE, '>/tmp/grunt');
@@ -793,7 +793,7 @@
my $temp;
my $members = $list->get_members;
- $lang = Vhffs::Services::Mailing::get_language_for_sub( $vhffs , $from );
+ $lang = Vhffs::Services::MailingList::get_language_for_sub( $vhffs , $from );
#If the user specified a lang, we change it to get internationalized messages
if( defined $lang )
{
@@ -825,7 +825,7 @@
elsif( ( $lang ) = $subject =~ /^lang\s([a-zA-Z\_\-]+)$/ )
{
#Try to change the language for this subscriber on whole listengine subsystem
- unless( Vhffs::Services::Mailing::set_language_for_sub( $vhffs , $from , $lang ) )
+ unless( Vhffs::Services::MailingList::set_language_for_sub( $vhffs , $from , $lang ) )
{
$email = Mail::Internet->new( [ <> ],
Body => Vhffs::Listengine::Intl::lang_change_error( $from , $lang )
@@ -1080,7 +1080,7 @@
my $mail = shift;
my ( $from ) = ( $mail->get('From') =~ /(([\+\.a-zA-Z_\-0-9^\s]+)@([\.a-zA-Z_\-0-9^\s]+)\.(\w+))/);
- my $lang = Vhffs::Services::Mailing::get_language_for_sub( $vhffs , $from );
+ my $lang = Vhffs::Services::MailingList::get_language_for_sub( $vhffs , $from );
if( defined $lang )
{
#Change current locale to user preferences if defined
@@ -1123,7 +1123,7 @@
get_lang( $mail );
#Build the list object from VHFFS
-my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs , $lpart , $domain );
+my $list = Vhffs::Services::MailingList::get_by_mladdress( $vhffs , $lpart , $domain );
exit( 0 ) if(!defined $list);
Modified: trunk/vhffs-panel/admin/moderation.pl
===================================================================
--- trunk/vhffs-panel/admin/moderation.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-panel/admin/moderation.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -259,7 +259,7 @@
#Treat Mail domains to moderate
use Vhffs::Panel::Mailinglist;
$template->param( TEXT_MAILING => gettext("List awaiting validation") );
- my $mls = Vhffs::Services::Mailing::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION );
+ my $mls = Vhffs::Services::MailingList::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION );
$output = "";
if( defined $mls )
Modified: trunk/vhffs-panel/mailinglist/add_sub.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/add_sub.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-panel/mailinglist/add_sub.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -45,7 +45,7 @@
use Vhffs::Functions;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Acl;
use Vhffs::Constants;
@@ -69,7 +69,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs , $lpart , $domain , $user , $group );
+my $list = Vhffs::Services::MailingList::get_by_mladdress( $vhffs , $lpart , $domain , $user , $group );
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
Modified: trunk/vhffs-panel/mailinglist/change_right.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/change_right.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-panel/mailinglist/change_right.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -46,7 +46,7 @@
use Vhffs::Functions;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Acl;
use Vhffs::Constants;
my $panel = new Vhffs::Panel::Main();
@@ -72,7 +72,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs, $lpart, $domain );
+my $list = Vhffs::Services::MailingList::get_by_mladdress( $vhffs, $lpart, $domain );
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
Modified: trunk/vhffs-panel/mailinglist/del_member.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/del_member.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-panel/mailinglist/del_member.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -45,7 +45,7 @@
use Vhffs::Functions;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Acl;
use Vhffs::Constants;
my $panel = new Vhffs::Panel::Main();
@@ -70,7 +70,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs, $lpart, $domain );
+my $list = Vhffs::Services::MailingList::get_by_mladdress( $vhffs, $lpart, $domain );
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
Modified: trunk/vhffs-panel/mailinglist/delete.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/delete.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-panel/mailinglist/delete.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -45,7 +45,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Acl;
use Vhffs::Constants;
my $panel = new Vhffs::Panel::Main();
@@ -69,7 +69,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs , $lpart , $domain );
+my $list = Vhffs::Services::MailingList::get_by_mladdress( $vhffs , $lpart , $domain );
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
Modified: trunk/vhffs-panel/mailinglist/prefs.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/prefs.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-panel/mailinglist/prefs.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -44,7 +44,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Acl;
use Vhffs::Constants;
my $panel = new Vhffs::Panel::Main();
@@ -74,7 +74,7 @@
}
-my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs , $lpart , $domain );
+my $list = Vhffs::Services::MailingList::get_by_mladdress( $vhffs , $lpart , $domain );
if( ! defined $list )
Modified: trunk/vhffs-panel/mailinglist/save_options.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/save_options.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-panel/mailinglist/save_options.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -44,7 +44,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Acl;
use Vhffs::Constants;
my $panel = new Vhffs::Panel::Main();
@@ -72,7 +72,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs , $lpart , $domain );
+my $list = Vhffs::Services::MailingList::get_by_mladdress( $vhffs , $lpart , $domain );
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
Modified: trunk/vhffs-panel/mailinglist/save_sig.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/save_sig.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-panel/mailinglist/save_sig.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -44,7 +44,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Acl;
use Vhffs::Constants;
my $panel = new Vhffs::Panel::Main();
@@ -68,7 +68,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs , $lpart , $domain );
+my $list = Vhffs::Services::MailingList::get_by_mladdress( $vhffs , $lpart , $domain );
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
Modified: trunk/vhffs-public/group.pl
===================================================================
--- trunk/vhffs-public/group.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-public/group.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -199,8 +199,8 @@
if( $vhffs->get_config->use_mailing == 1 )
{
- use Vhffs::Services::Mailing;
- $objs = Vhffs::Services::Mailing::getall_by_group( $vhffs , $group );
+ use Vhffs::Services::MailingList;
+ $objs = Vhffs::Services::MailingList::getall_by_group( $vhffs , $group );
$output = "";
$template->param( LISTS_TITLE => gettext("List(s) for this group") );
if( defined $objs )
Modified: trunk/vhffs-robots/src/create_ml.pl
===================================================================
--- trunk/vhffs-robots/src/create_ml.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-robots/src/create_ml.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -33,14 +33,14 @@
use Vhffs::Main;
use Vhffs::Robots;
use Vhffs::Constants;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
my $vhffs = init Vhffs::Main;
Vhffs::Robots::lock( $vhffs , "ml" );
-my $mls = Vhffs::Services::Mailing::getall( $vhffs , Vhffs::Constants::WAITING_FOR_CREATION );
+my $mls = Vhffs::Services::MailingList::getall( $vhffs , Vhffs::Constants::WAITING_FOR_CREATION );
my $ml;
Modified: trunk/vhffs-robots/src/delete_group.pl
===================================================================
--- trunk/vhffs-robots/src/delete_group.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-robots/src/delete_group.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -38,7 +38,7 @@
use Vhffs::Services::Cvs;
use Vhffs::Services::DNS;
use Vhffs::Services::Web;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Services::Mail;
use Vhffs::Services::Mysql;
use Vhffs::Services::Pgsql;
@@ -116,7 +116,7 @@
$object->commit;
}
- $objects = Vhffs::Services::Mailing::getall( $vhffs , undef , undef , $group );
+ $objects = Vhffs::Services::MailingList::getall( $vhffs , undef , undef , $group );
$ok = 0 if( @$objects != 0);
foreach $object ( @{$objects} )
{
Modified: trunk/vhffs-robots/src/delete_mail.pl
===================================================================
--- trunk/vhffs-robots/src/delete_mail.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-robots/src/delete_mail.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -33,7 +33,7 @@
use lib '%VHFFS_LIB_DIR%';
use Vhffs::Services::Mail;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Robots;
use Vhffs::Main;
@@ -49,7 +49,7 @@
my $list;
foreach $mail ( @{$mails} )
{
- my $lists = Vhffs::Services::Mailing::getall( $vhffs , undef , undef , undef , $mail->get_domain );
+ my $lists = Vhffs::Services::MailingList::getall( $vhffs , undef , undef , undef , $mail->get_domain );
if( @$lists != 0) {
Vhffs::Robots::vhffs_log( sprintf( "Cannot delete mail domain %s, remains lists" , $mail->get_domain ) , $vhffs);
foreach $list ( @{$lists} ) {
Modified: trunk/vhffs-robots/src/delete_ml.pl
===================================================================
--- trunk/vhffs-robots/src/delete_ml.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-robots/src/delete_ml.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -34,12 +34,12 @@
use Vhffs::Main;
use Vhffs::Constants;
use Vhffs::Robots;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
my $vhffs = init Vhffs::Main;
Vhffs::Robots::lock( $vhffs , "ml" );
-my $mls = Vhffs::Services::Mailing::getall( $vhffs , Vhffs::Constants::TO_DELETE );
+my $mls = Vhffs::Services::MailingList::getall( $vhffs , Vhffs::Constants::TO_DELETE );
my $ml;
foreach $ml ( @{$mls} )
Modified: trunk/vhffs-robots/src/listengine_publicarchives.pl
===================================================================
--- trunk/vhffs-robots/src/listengine_publicarchives.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-robots/src/listengine_publicarchives.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -6,7 +6,7 @@
use Vhffs::Main;
use Vhffs::Group;
use Vhffs::Functions;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Constants;
use Vhffs::Robots;
use HTML::Template;
@@ -42,7 +42,7 @@
Vhffs::Robots::lock( $vhffs , "listenginearchives" );
-my $lists = Vhffs::Services::Mailing::getall( $vhffs , Vhffs::Constants::ACTIVATED , undef );
+my $lists = Vhffs::Services::MailingList::getall( $vhffs , Vhffs::Constants::ACTIVATED , undef );
foreach my $list ( @{$lists} )
{
# print $list->get_domain." ".$list->get_localpart." ".Vhffs::Group::get_name_by_gid( $vhffs , $list->get_owner_gid )." ".$list->get_oid." ".Vhffs::Functions::status_string_from_status_id( $list->get_status )."\n";
Modified: trunk/vhffs-robots/src/refused_ml.pl
===================================================================
--- trunk/vhffs-robots/src/refused_ml.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-robots/src/refused_ml.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -38,7 +38,7 @@
use Vhffs::Robots;
use Vhffs::User;
use Vhffs::Group;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Vhffs::Panel::User;
@@ -54,7 +54,7 @@
Vhffs::Robots::lock( $vhffs , "ml" );
-$objects = Vhffs::Services::Mailing::getall( $vhffs , Vhffs::Constants::VALIDATION_REFUSED );
+$objects = Vhffs::Services::MailingList::getall( $vhffs , Vhffs::Constants::VALIDATION_REFUSED );
bindtextdomain("vhffs", $vhffs->get_config->get_intldir);
textdomain("vhffs");
Modified: trunk/vhffs-tests/src/Services/Mailing.pl
===================================================================
--- trunk/vhffs-tests/src/Services/Mailing.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-tests/src/Services/Mailing.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -4,7 +4,7 @@
use Vhffs::Constants;
use Vhffs::User;
use Vhffs::Services::Mail;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Test::More 'no_plan';
my $main = init Vhffs::Tests::Main;
@@ -23,20 +23,20 @@
cmp_ok($mail1->get_owner_uid, '==', $user1->get_uid, 'uid matches');
cmp_ok($mail1->get_owner_gid, '==', $group1->get_gid, 'gid matches');
-my $ml1 = Vhffs::Services::Mailing::create($main, 'list1', 'test.com', 'admin@xxxxxxxx', 'Test ml 1', $user1, $group1);
-isa_ok($ml1, 'Vhffs::Services::Mailing', '$ml1');
+my $ml1 = Vhffs::Services::MailingList::create($main, 'list1', 'test.com', 'admin@xxxxxxxx', 'Test ml 1', $user1, $group1);
+isa_ok($ml1, 'Vhffs::Services::MailingList', '$ml1');
cmp_ok($ml1->get_localpart, 'eq', 'list1', 'Local part matches');
cmp_ok($ml1->get_domain, 'eq', 'test.com', 'Mail domain matches');
my ($max_oid) = $main->get_db_object->selectrow_array('SELECT MAX(object_id) FROM vhffs_object');
-ok(! defined(Vhffs::Services::Mailing::create($main, 'list1', 'test.com', 'admin@xxxxxxxx', 'Test ml 1', $user1, $group1)), 'Unable to create 2 lists with the same name');
+ok(! defined(Vhffs::Services::MailingList::create($main, 'list1', 'test.com', 'admin@xxxxxxxx', 'Test ml 1', $user1, $group1)), 'Unable to create 2 lists with the same name');
my ($new_max_oid) = $main->get_db_object->selectrow_array('SELECT MAX(object_id) FROM vhffs_object');
cmp_ok($new_max_oid, '==', $max_oid, 'Mailing list service creation is a "all or nothing" process');
$ml1->add_sub('toto@xxxxxxxx', Vhffs::Constants::ML_RIGHT_SUB);
cmp_ok(keys(%{$ml1->{subs}}), '==', 1, 'One subscriber registered');
-my $tmpml = Vhffs::Services::Mailing::get_by_mladdress($main, 'list1', 'test.com');
+my $tmpml = Vhffs::Services::MailingList::get_by_mladdress($main, 'list1', 'test.com');
my $subs = $tmpml->{subs};
cmp_ok(keys(%$subs), '==', 1, 'One subscriber registered (fetched)');
ok(defined $subs->{'toto@xxxxxxxx'}, 'Subscriber key is email address');
Modified: trunk/vhffs-tests/src/Stats.pl
===================================================================
--- trunk/vhffs-tests/src/Stats.pl 2007-08-29 23:32:47 UTC (rev 805)
+++ trunk/vhffs-tests/src/Stats.pl 2007-08-29 23:41:26 UTC (rev 806)
@@ -14,7 +14,7 @@
use Vhffs::Services::Pgsql;
use Vhffs::Services::Svn;
use Vhffs::Services::Mail;
-use Vhffs::Services::Mailing;
+use Vhffs::Services::MailingList;
use Test::More 'no_plan';
@@ -301,14 +301,14 @@
for(my $i = 1 ; $i < 10 ; ++$i) {
$group = Vhffs::Group::get_by_groupname($main, "testgroup0$i");
$user = Vhffs::User::get_by_username($main, "testuser0$i");
- $svc = Vhffs::Services::Mailing::create($main, "ml", "mail0$i.test.com", undef, "Test list #$i", $user, $group);
+ $svc = Vhffs::Services::MailingList::create($main, "ml", "mail0$i.test.com", undef, "Test list #$i", $user, $group);
}
$stats->refresh();
is($stats->get_lists_in_moderation, 9, 'All Mailing Lists services waiting for moderation');
for(my $i = 1 ; $i < 10 ; ++$i) {
- $svc = Vhffs::Services::Mailing::get_by_mladdress($main, "ml", "mail0$i.test.com");
+ $svc = Vhffs::Services::MailingList::get_by_mladdress($main, "ml", "mail0$i.test.com");
$svc->set_status(Vhffs::Constants::WAITING_FOR_CREATION);
$svc->commit;
$stats->refresh();
@@ -317,7 +317,7 @@
}
for(my $i = 1 ; $i < 10 ; ++$i) {
- $svc = Vhffs::Services::Mailing::get_by_mladdress($main, "ml", "mail0$i.test.com");
+ $svc = Vhffs::Services::MailingList::get_by_mladdress($main, "ml", "mail0$i.test.com");
$svc->set_status(Vhffs::Constants::ACTIVATED);
$svc->commit;
$stats->refresh();
@@ -327,7 +327,7 @@
# Subscribers test
for(my $i = 1 ; $i < 10 ; ++$i) {
- $svc = Vhffs::Services::Mailing::get_by_mladdress($main, "ml", "mail0$i.test.com");
+ $svc = Vhffs::Services::MailingList::get_by_mladdress($main, "ml", "mail0$i.test.com");
for(my $j = 0 ; $j < 10 ; ++$j) {
$svc->add_sub("sub0$j\@test.com", Vhffs::Constants::USER_NORMAL);
}