| [vhffs-dev] [799] Renaming Vhffs::Service::Httpd to Vhffs::Service::Web (part one) |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 799
Author: gradator
Date: 2007-08-29 23:10:28 +0000 (Wed, 29 Aug 2007)
Log Message:
-----------
Renaming Vhffs::Service::Httpd to Vhffs::Service::Web (part one)
Modified Paths:
--------------
trunk/vhffs-api/src/Vhffs/ObjectFactory.pm
trunk/vhffs-api/src/Vhffs/Panel/Web.pm
trunk/vhffs-api/src/Vhffs/Robots/Web.pm
trunk/vhffs-api/src/Vhffs/Services/Httpd.pm
trunk/vhffs-api/src/Vhffs/Services.pm
trunk/vhffs-api/src/examples/add_acl.pl
trunk/vhffs-api/src/examples/create_web.pl
trunk/vhffs-api/src/examples/delete_acl.pl
trunk/vhffs-api/src/examples/modify_acl.pl
trunk/vhffs-api/src/examples/perm_for_user.pl
trunk/vhffs-api/src/examples/show_dumper_cvs.pl
trunk/vhffs-api/src/examples/show_dumper_object.pl
trunk/vhffs-irc/modobot.pl
trunk/vhffs-panel/acl/view.pl
trunk/vhffs-panel/admin/broadcast_delete.pl
trunk/vhffs-panel/admin/broadcast_submit.pl
trunk/vhffs-panel/admin/moderation.pl
trunk/vhffs-panel/admin/moderation_submit.pl
trunk/vhffs-panel/admin/web/edit.pl
trunk/vhffs-panel/admin/web/edit_submit.pl
trunk/vhffs-panel/admin/web/show.pl
trunk/vhffs-panel/history.pl
trunk/vhffs-panel/user/delete.pl
trunk/vhffs-panel/web/delete.pl
trunk/vhffs-panel/web/prefs.pl
trunk/vhffs-panel/web/prefs_save.pl
trunk/vhffs-public/allwebsites.pl
trunk/vhffs-public/group.pl
trunk/vhffs-public/websearch.pl
trunk/vhffs-robots/src/create_web.pl
trunk/vhffs-robots/src/delete_group.pl
trunk/vhffs-robots/src/delete_web.pl
trunk/vhffs-robots/src/generate_webstats.pl
trunk/vhffs-robots/src/refused_web.pl
trunk/vhffs-tests/src/Services/Httpd.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 22:41:55 UTC (rev 798)
+++ trunk/vhffs-api/src/Vhffs/ObjectFactory.pm 2007-08-29 23:10:28 UTC (rev 799)
@@ -55,7 +55,7 @@
$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_USER] = 'Vhffs::User';
$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_GROUP] = 'Vhffs::Group';
-$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_HTTPD] = 'Vhffs::Services::Httpd';
+$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_HTTPD] = 'Vhffs::Services::Web';
$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_REPOSITORY] = 'Vhffs::Services::Repository';
$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_MYSQL] = 'Vhffs::Services::Mysql';
$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_PGSQL] = 'Vhffs::Services::Postgres';
Modified: trunk/vhffs-api/src/Vhffs/Panel/Web.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Web.pm 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-api/src/Vhffs/Panel/Web.pm 2007-08-29 23:10:28 UTC (rev 799)
@@ -43,7 +43,7 @@
use Vhffs::User;
use Vhffs::Main;
use Vhffs::Panel::Main;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Constants;
use Vhffs::Functions;
@@ -115,7 +115,7 @@
return undef if( !defined $user );
return undef if( !defined $group );
- my $web = Vhffs::Services::Httpd::create($main, $servername, $description, $user, $group);
+ my $web = Vhffs::Services::Web::create($main, $servername, $description, $user, $group);
return undef if( ! defined $web );
return undef if ( Vhffs::Acl::add_acl( $user , $web , Vhffs::Constants::ACL_DELETE , $main ) < 0 );
Modified: trunk/vhffs-api/src/Vhffs/Robots/Web.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Web.pm 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-api/src/Vhffs/Robots/Web.pm 2007-08-29 23:10:28 UTC (rev 799)
@@ -32,7 +32,7 @@
package Vhffs::Robots::Web;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Constants;
use Vhffs::Functions;
use Vhffs::Robots;
Modified: trunk/vhffs-api/src/Vhffs/Services/Httpd.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Httpd.pm 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-api/src/Vhffs/Services/Httpd.pm 2007-08-29 23:10:28 UTC (rev 799)
@@ -38,7 +38,7 @@
=head1 NAME
-Vhffs::Services::Httpd - Handle Web Area in VHFFS hosting platform.
+Vhffs::Services::Web - Handle Web Area in VHFFS hosting platform.
=head1 SYNOPSIS
@@ -48,7 +48,7 @@
=cut
-package Vhffs::Services::Httpd;
+package Vhffs::Services::Web;
use Vhffs::Functions;
use base qw(Vhffs::Object);
@@ -59,7 +59,7 @@
=head2 create
- my $httpd = Vhffs::Services::Httpd::create($main, $servername, $description, $user, $group);
+ my $httpd = Vhffs::Services::Web::create($main, $servername, $description, $user, $group);
die("Unable to create webarea $servername\n") unless(defined $httpd);
Creates a new webarea in database and returns the corresponding fully functional object.
@@ -184,7 +184,7 @@
while( $result = $sth->fetchrow_arrayref )
{
- push @{$objs}, _new Vhffs::Services::Httpd($vhffs, @{$result});
+ push @{$objs}, _new Vhffs::Services::Web($vhffs, @{$result});
}
return $objs;
}
@@ -221,7 +221,7 @@
while( $result = $sth->fetchrow_arrayref )
{
- push @{$objs}, _new Vhffs::Services::Httpd($vhffs, @{$result});
+ push @{$objs}, _new Vhffs::Services::Web($vhffs, @{$result});
}
return $objs;
}
@@ -256,7 +256,7 @@
while( $result = $sth->fetchrow_arrayref )
{
- push @{$objs}, _new Vhffs::Services::Httpd($vhffs, @{$result});
+ push @{$objs}, _new Vhffs::Services::Web($vhffs, @{$result});
}
return $objs;
}
@@ -285,7 +285,7 @@
while( $result = $sth->fetchrow_arrayref )
{
- push @{$objs}, _new Vhffs::Services::Httpd($vhffs, @{$result});
+ push @{$objs}, _new Vhffs::Services::Web($vhffs, @{$result});
}
return $objs;
}
@@ -305,7 +305,7 @@
=head2 get_by_servername
- my $httpd = Vhffs::Services::Httpd::get_by_servername($main, $servername);
+ my $httpd = Vhffs::Services::Web::get_by_servername($main, $servername);
die("Webarea $servername not found\n") unless(defined $httpd);
Fetches the webarea whose address is C<$servername>.
@@ -320,7 +320,7 @@
my @params;
return undef unless(@params = $dbh->selectrow_array($sql, undef, $servername));
- return _new Vhffs::Services::Httpd($main, @params);
+ return _new Vhffs::Services::Web($main, @params);
}
Modified: trunk/vhffs-api/src/Vhffs/Services.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services.pm 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-api/src/Vhffs/Services.pm 2007-08-29 23:10:28 UTC (rev 799)
@@ -33,7 +33,7 @@
use Vhffs::Services::Cvs;
use Vhffs::Services::DNS;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Services::Mail;
use Vhffs::Services::Mailing;
use Vhffs::Services::Mysql;
Modified: trunk/vhffs-api/src/examples/add_acl.pl
===================================================================
--- trunk/vhffs-api/src/examples/add_acl.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-api/src/examples/add_acl.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -6,7 +6,7 @@
use lib '%VHFFS_LIB_DIR%';
use Vhffs::User;
use Vhffs::Main;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
my $princ = init Vhffs::Main;
@@ -18,7 +18,7 @@
my $user = Vhffs::User::get_by_username($princ, $username);
die("User $username not found\n") unless(defined $user);
-my $httpd = Vhffs::Services::Httpd::get_by_servername($princ, $servername);
+my $httpd = Vhffs::Services::Web::get_by_servername($princ, $servername);
die("Webarea $servername not found\n") unless(defined $httpd);
Vhffs::Acl::add_acl( $user, $httpd, $level, $princ );
Modified: trunk/vhffs-api/src/examples/create_web.pl
===================================================================
--- trunk/vhffs-api/src/examples/create_web.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-api/src/examples/create_web.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -10,7 +10,7 @@
use Vhffs::Group;
use Vhffs::Main;
use Vhffs::Object;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
my $princ = init Vhffs::Main;
@@ -23,7 +23,7 @@
my $group = Vhffs::Group::get_by_groupname($princ, $groupname);
die("Group not found\n") unless(defined $group);
-my $httpd = Vhffs::Services::Httpd::create($princ, $servername, $description, $user, $group);
+my $httpd = Vhffs::Services::Web::create($princ, $servername, $description, $user, $group);
if( defined $httpd )
{
Modified: trunk/vhffs-api/src/examples/delete_acl.pl
===================================================================
--- trunk/vhffs-api/src/examples/delete_acl.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-api/src/examples/delete_acl.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -10,7 +10,7 @@
use Vhffs::Group;
use Vhffs::Main;
use Vhffs::Object;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
my $princ = init Vhffs::Main;
@@ -22,7 +22,7 @@
my $user = Vhffs::User::get_by_username($princ, $username);
die("User $username not found\n") unless(defined $user);
-my $httpd = Vhffs::Services::Httpd::get_by_servername($princ, $servername);
+my $httpd = Vhffs::Services::Web::get_by_servername($princ, $servername);
die("Webarea $servername not found\n") unless(defined $httpd);
die("Unable to delete ACL\n") unless(Vhffs::Acl::del_acl( $user , $httpd , $princ) > 0);
Modified: trunk/vhffs-api/src/examples/modify_acl.pl
===================================================================
--- trunk/vhffs-api/src/examples/modify_acl.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-api/src/examples/modify_acl.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -6,7 +6,7 @@
use lib '%VHFFS_LIB_DIR%';
use Vhffs::User;
use Vhffs::Main;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
my $princ = init Vhffs::Main;
@@ -18,7 +18,7 @@
my $user = Vhffs::User::get_by_username($princ, $username);
die("User $username not found\n") unless(defined $user);
-my $httpd = Vhffs::Services::Httpd::get_by_servername($princ, $servername);
+my $httpd = Vhffs::Services::Web::get_by_servername($princ, $servername);
die("Webarea $servername not found\n") unless(defined $httpd);
Vhffs::Acl::add_acl($user, $httpd , $level, $princ);
Modified: trunk/vhffs-api/src/examples/perm_for_user.pl
===================================================================
--- trunk/vhffs-api/src/examples/perm_for_user.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-api/src/examples/perm_for_user.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -7,7 +7,7 @@
use Vhffs::Main;
use Vhffs::Object;
use Vhffs::Services::Mysql;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
my $princ = init Vhffs::Main;
@@ -19,7 +19,7 @@
my $user = Vhffs::User::get_by_username($princ, $username);
die("User $username not found\n") unless(defined $user);
-my $httpd = Vhffs::Services::Httpd::get_by_servername($princ, $servername);
+my $httpd = Vhffs::Services::Web::get_by_servername($princ, $servername);
die("Webarea $servername not found\n") unless(defined $httpd);
print "Permission: ";
Modified: trunk/vhffs-api/src/examples/show_dumper_cvs.pl
===================================================================
--- trunk/vhffs-api/src/examples/show_dumper_cvs.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-api/src/examples/show_dumper_cvs.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -11,7 +11,7 @@
use Vhffs::Main;
use Vhffs::Object;
use Vhffs::Acl;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Panel::Group;
use Vhffs::Services::Cvs;
Modified: trunk/vhffs-api/src/examples/show_dumper_object.pl
===================================================================
--- trunk/vhffs-api/src/examples/show_dumper_object.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-api/src/examples/show_dumper_object.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -11,7 +11,7 @@
use Vhffs::Main;
use Vhffs::Object;
use Vhffs::Acl;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Panel::Group;
my $princ = init Vhffs::Main;
Modified: trunk/vhffs-irc/modobot.pl
===================================================================
--- trunk/vhffs-irc/modobot.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-irc/modobot.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -15,7 +15,7 @@
use Vhffs::User;
use Vhffs::Group;
use Vhffs::Main;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
use Vhffs::Constants;
use Vhffs::Note;
@@ -107,8 +107,8 @@
if( $vhffs->get_config->use_web == 1 )
{
#Treat Website to moderate
- use Vhffs::Services::Httpd;
- my $webs = Vhffs::Services::Httpd::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION);
+ use Vhffs::Services::Web;
+ my $webs = Vhffs::Services::Web::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION);
if( defined $webs )
{
@@ -499,7 +499,7 @@
{
my $name = shift;
my $web;
- if (! defined ($web = Vhffs::Services::Httpd::get_by_servername( $vhffs , $name)))
+ if (! defined ($web = Vhffs::Services::Web::get_by_servername( $vhffs , $name)))
{
irc_msg ("$name : No such website");
}
Modified: trunk/vhffs-panel/acl/view.pl
===================================================================
--- trunk/vhffs-panel/acl/view.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/acl/view.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -45,7 +45,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
use Vhffs::Constants;
my $panel = new Vhffs::Panel::Main();
Modified: trunk/vhffs-panel/admin/broadcast_delete.pl
===================================================================
--- trunk/vhffs-panel/admin/broadcast_delete.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/admin/broadcast_delete.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -45,7 +45,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
use Vhffs::Constants;
my $panel = new Vhffs::Panel::Main();
Modified: trunk/vhffs-panel/admin/broadcast_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/broadcast_submit.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/admin/broadcast_submit.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -45,7 +45,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
use Vhffs::Constants;
my $panel = new Vhffs::Panel::Main();
Modified: trunk/vhffs-panel/admin/moderation.pl
===================================================================
--- trunk/vhffs-panel/admin/moderation.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/admin/moderation.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -45,7 +45,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
use Vhffs::Constants;
use Vhffs::Note;
@@ -127,9 +127,9 @@
if( $vhffs->get_config->use_web == 1 )
{
#Treat Website to moderate
- use Vhffs::Services::Httpd;
+ use Vhffs::Services::Web;
$template->param( TEXT_WEB => gettext("Web Area awaiting validation") );
- my $webs = Vhffs::Services::Httpd::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION);
+ my $webs = Vhffs::Services::Web::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION);
my $web;
$output = "";
Modified: trunk/vhffs-panel/admin/moderation_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/moderation_submit.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/admin/moderation_submit.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -45,7 +45,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
use Vhffs::Constants;
use Vhffs::ObjectFactory;
Modified: trunk/vhffs-panel/admin/web/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/web/edit.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/admin/web/edit.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -79,7 +79,7 @@
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
-elsif( ! defined ( $object = Vhffs::Services::Httpd::get_by_servername( $vhffs , $webname ) ) )
+elsif( ! defined ( $object = Vhffs::Services::Web::get_by_servername( $vhffs , $webname ) ) )
{
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
Modified: trunk/vhffs-panel/admin/web/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/web/edit_submit.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/admin/web/edit_submit.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -79,7 +79,7 @@
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
-elsif( ! defined ( $object = Vhffs::Services::Httpd::get_by_servername( $vhffs , $servername ) ) )
+elsif( ! defined ( $object = Vhffs::Services::Web::get_by_servername( $vhffs , $servername ) ) )
{
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
Modified: trunk/vhffs-panel/admin/web/show.pl
===================================================================
--- trunk/vhffs-panel/admin/web/show.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/admin/web/show.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -79,7 +79,7 @@
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
-elsif( ! defined ( $object = Vhffs::Services::Httpd::get_by_servername( $vhffs , $webname ) ) )
+elsif( ! defined ( $object = Vhffs::Services::Web::get_by_servername( $vhffs , $webname ) ) )
{
$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
Modified: trunk/vhffs-panel/history.pl
===================================================================
--- trunk/vhffs-panel/history.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/history.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -44,7 +44,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
use Vhffs::Constants;
use Vhffs::Functions;
Modified: trunk/vhffs-panel/user/delete.pl
===================================================================
--- trunk/vhffs-panel/user/delete.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/user/delete.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -45,7 +45,7 @@
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
use Vhffs::Panel::Group;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
my $panel = new Vhffs::Panel::Main();
Modified: trunk/vhffs-panel/web/delete.pl
===================================================================
--- trunk/vhffs-panel/web/delete.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/web/delete.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -45,7 +45,7 @@
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
use Vhffs::Panel::Group;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
my $panel = new Vhffs::Panel::Main();
@@ -71,7 +71,7 @@
my $servername = $cgi->param("name");
-my $web = Vhffs::Services::Httpd::get_by_servername( $vhffs , $servername );
+my $web = Vhffs::Services::Web::get_by_servername( $vhffs , $servername );
if( ! defined( $web ) )
Modified: trunk/vhffs-panel/web/prefs.pl
===================================================================
--- trunk/vhffs-panel/web/prefs.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/web/prefs.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -44,7 +44,7 @@
use Vhffs::Main;
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
use Vhffs::Constants;
my $panel = new Vhffs::Panel::Main();
@@ -63,7 +63,7 @@
my $template;
my $templatedir = $vhffs->get_config->get_templatedir;
-my $web = Vhffs::Services::Httpd::get_by_servername( $vhffs , $servername );
+my $web = Vhffs::Services::Web::get_by_servername( $vhffs , $servername );
if( ! defined($web) )
{
Modified: trunk/vhffs-panel/web/prefs_save.pl
===================================================================
--- trunk/vhffs-panel/web/prefs_save.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-panel/web/prefs_save.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -45,7 +45,7 @@
use Vhffs::Panel::Main;
use Vhffs::Panel::Menu;
use Vhffs::Panel::Group;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Acl;
my $panel = new Vhffs::Panel::Main();
@@ -70,7 +70,7 @@
-my $web = Vhffs::Services::Httpd::get_by_servername( $vhffs , $servername );
+my $web = Vhffs::Services::Web::get_by_servername( $vhffs , $servername );
if( ! defined( $web ) )
{
Modified: trunk/vhffs-public/allwebsites.pl
===================================================================
--- trunk/vhffs-public/allwebsites.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-public/allwebsites.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -44,7 +44,7 @@
use Vhffs::Acl;
use Vhffs::Constants;
use Vhffs::Panel::Main;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
my $panel = new_light Vhffs::Panel::Main();
my $vhffs = $panel->{'vhffs'};
@@ -54,10 +54,10 @@
$panel->check_public();
my $template;
-my $letters = Vhffs::Services::Httpd::get_used_letters($vhffs);
+my $letters = Vhffs::Services::Web::get_used_letters($vhffs);
my $letter = ( defined $cgi->param('letter') ? $cgi->param('letter') : (defined $letters->[0] ? $letters->[0]->{letter} : undef) );
undef $letter if ( $letter eq 'all' );
-my $webs = Vhffs::Services::Httpd::getall_by_letter( $vhffs, $letter, Vhffs::Constants::ACTIVATED);
+my $webs = Vhffs::Services::Web::getall_by_letter( $vhffs, $letter, Vhffs::Constants::ACTIVATED);
my $output_final = "";
my $web;
my $maintemplate;
Modified: trunk/vhffs-public/group.pl
===================================================================
--- trunk/vhffs-public/group.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-public/group.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -117,10 +117,10 @@
if( $vhffs->get_config->use_web == 1 )
{
- use Vhffs::Services::Httpd;
+ use Vhffs::Services::Web;
$output = "";
- my $webs = Vhffs::Services::Httpd::getall_by_group( $vhffs , $group );
+ my $webs = Vhffs::Services::Web::getall_by_group( $vhffs , $group );
$template->param( WEBSITES_TITLE => gettext("Website for this group"));
if( defined $webs )
{
Modified: trunk/vhffs-public/websearch.pl
===================================================================
--- trunk/vhffs-public/websearch.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-public/websearch.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -44,7 +44,7 @@
use Vhffs::Acl;
use Vhffs::Constants;
use Vhffs::Panel::Main;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Functions;
my $panel = new_light Vhffs::Panel::Main();
@@ -64,7 +64,7 @@
my $hostname = $vhffs->get_config->get_host_name;
-my $webs = Vhffs::Services::Httpd::search( $vhffs , Vhffs::Constants::ACTIVATED , $name );
+my $webs = Vhffs::Services::Web::search( $vhffs , Vhffs::Constants::ACTIVATED , $name );
$maintemplate = new HTML::Template( filename => $templatedir."/public/allwebsites.tmpl" );
Modified: trunk/vhffs-robots/src/create_web.pl
===================================================================
--- trunk/vhffs-robots/src/create_web.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-robots/src/create_web.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -32,7 +32,7 @@
use lib '%VHFFS_LIB_DIR%';
use Vhffs::Robots::Web;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Robots;
use Vhffs::Main;
@@ -41,7 +41,7 @@
Vhffs::Robots::lock( $vhffs , "web" );
-my $webs = Vhffs::Services::Httpd::getall( $vhffs , Vhffs::Constants::WAITING_FOR_CREATION , undef, undef );
+my $webs = Vhffs::Services::Web::getall( $vhffs , Vhffs::Constants::WAITING_FOR_CREATION , undef, undef );
my $web;
foreach $web ( @{$webs} )
Modified: trunk/vhffs-robots/src/delete_group.pl
===================================================================
--- trunk/vhffs-robots/src/delete_group.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-robots/src/delete_group.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -37,7 +37,7 @@
use Vhffs::Constants;
use Vhffs::Services::Cvs;
use Vhffs::Services::DNS;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Services::Mailing;
use Vhffs::Services::Mail;
use Vhffs::Services::Mysql;
@@ -107,7 +107,7 @@
}
- $objects = Vhffs::Services::Httpd::getall( $vhffs , undef , undef , $group );
+ $objects = Vhffs::Services::Web::getall( $vhffs , undef , undef , $group );
$ok = 0 if( @$objects != 0 );
foreach $object ( @{$objects} )
{
Modified: trunk/vhffs-robots/src/delete_web.pl
===================================================================
--- trunk/vhffs-robots/src/delete_web.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-robots/src/delete_web.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -32,7 +32,7 @@
use lib '%VHFFS_LIB_DIR%';
use Vhffs::Robots;
use Vhffs::Robots::Web;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Main;
use Vhffs::Constants;
@@ -41,7 +41,7 @@
Vhffs::Robots::lock( $vhffs , "web" );
-my $webs = Vhffs::Services::Httpd::getall( $vhffs , Vhffs::Constants::TO_DELETE );
+my $webs = Vhffs::Services::Web::getall( $vhffs , Vhffs::Constants::TO_DELETE );
my $web;
Modified: trunk/vhffs-robots/src/generate_webstats.pl
===================================================================
--- trunk/vhffs-robots/src/generate_webstats.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-robots/src/generate_webstats.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -40,13 +40,13 @@
use Vhffs::Main;
use Vhffs::Conf;
use Vhffs::Functions;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Robots;
my $vhffs = init Vhffs::Main;
die "ERROR: Cannot init VHFFS !!!" if( ! defined $vhffs );
-my $webs = Vhffs::Services::Httpd::getall( $vhffs , Vhffs::Constants::ACTIVATED );
+my $webs = Vhffs::Services::Web::getall( $vhffs , Vhffs::Constants::ACTIVATED );
die "ERROR: Cannot fetch the list of websites\n" if( ! defined $webs );
my $webconf = Vhffs::Conf::get_web_config();
Modified: trunk/vhffs-robots/src/refused_web.pl
===================================================================
--- trunk/vhffs-robots/src/refused_web.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-robots/src/refused_web.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -37,7 +37,7 @@
use Vhffs::Main;
use Vhffs::User;
use Vhffs::Group;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Panel::User;
use Vhffs::Robots;
@@ -54,7 +54,7 @@
Vhffs::Robots::lock( $vhffs , "web" );
-$objects = Vhffs::Services::Httpd::getall( $vhffs , Vhffs::Constants::VALIDATION_REFUSED );
+$objects = Vhffs::Services::Web::getall( $vhffs , Vhffs::Constants::VALIDATION_REFUSED );
bindtextdomain("vhffs", $vhffs->get_config->get_intldir);
textdomain("vhffs");
Modified: trunk/vhffs-tests/src/Services/Httpd.pl
===================================================================
--- trunk/vhffs-tests/src/Services/Httpd.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-tests/src/Services/Httpd.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -3,7 +3,7 @@
use Vhffs::Tests::Utils;
use Vhffs::Constants;
use Vhffs::User;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Test::More 'no_plan';
my $main = init Vhffs::Tests::Main;
@@ -19,35 +19,35 @@
my $group2 = Vhffs::Group::create($main, 'webgroup2', $user1->get_uid, undef, 'Test group for web');
isa_ok($group2, 'Vhffs::Group', '$group1');
-my $web1 = Vhffs::Services::Httpd::create($main, 'testweb1.org', 'Test web 1', $user1, $group1);
-isa_ok($web1, 'Vhffs::Services::Httpd', '$web1');
+my $web1 = Vhffs::Services::Web::create($main, 'testweb1.org', 'Test web 1', $user1, $group1);
+isa_ok($web1, 'Vhffs::Services::Web', '$web1');
cmp_ok($web1->get_servername, 'eq', 'testweb1.org', 'servername is the one defined while creating object');
cmp_ok($web1->get_owner_uid, '==', $user1->get_uid, 'uid matches');
cmp_ok($web1->get_owner_gid, '==', $group1->get_gid, 'gid matches');
my ($max_oid) = $main->get_db_object->selectrow_array('SELECT MAX(object_id) FROM vhffs_object');
-ok(! defined(Vhffs::Services::Httpd::create($main, 'testweb1.org', 'Test web 1', $user1, $group1)), 'Unable to create 2 webareas with the same name');
+ok(! defined(Vhffs::Services::Web::create($main, 'testweb1.org', 'Test web 1', $user1, $group1)), 'Unable to create 2 webareas 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, 'Web service creation is a "all or nothing" process');
-my @webs = @{Vhffs::Services::Httpd::getall($main)};
+my @webs = @{Vhffs::Services::Web::getall($main)};
cmp_ok(scalar(@webs), '==', 1);
is_deeply($webs[0], $web1);
-cmp_ok(@{Vhffs::Services::Httpd::getall($main, Vhffs::Constants::ACTIVATED)}, '==', 0, 'No ACTIVATED webarea repo');
+cmp_ok(@{Vhffs::Services::Web::getall($main, Vhffs::Constants::ACTIVATED)}, '==', 0, 'No ACTIVATED webarea repo');
-@webs = @{Vhffs::Services::Httpd::getall_by_group($main, $group1)};
+@webs = @{Vhffs::Services::Web::getall_by_group($main, $group1)};
cmp_ok(scalar(@webs), '==', 1);
is_deeply($webs[0], $web1);
-cmp_ok(@{Vhffs::Services::Httpd::getall_by_group($main, $group2)}, '==', 0, 'No webarea repo for group2');
+cmp_ok(@{Vhffs::Services::Web::getall_by_group($main, $group2)}, '==', 0, 'No webarea repo for group2');
-@webs = @{Vhffs::Services::Httpd::getall_by_letter($main, 't')};
+@webs = @{Vhffs::Services::Web::getall_by_letter($main, 't')};
cmp_ok(scalar(@webs), '==', 1);
# Only first letter matters
-@webs = @{Vhffs::Services::Httpd::getall_by_letter($main, 'e')};
+@webs = @{Vhffs::Services::Web::getall_by_letter($main, 'e')};
cmp_ok(scalar(@webs), '==', 0);
Modified: trunk/vhffs-tests/src/Stats.pl
===================================================================
--- trunk/vhffs-tests/src/Stats.pl 2007-08-29 22:41:55 UTC (rev 798)
+++ trunk/vhffs-tests/src/Stats.pl 2007-08-29 23:10:28 UTC (rev 799)
@@ -7,7 +7,7 @@
use Vhffs::Stats;
use Vhffs::Constants;
-use Vhffs::Services::Httpd;
+use Vhffs::Services::Web;
use Vhffs::Services::Cvs;
use Vhffs::Services::DNS;
use Vhffs::Services::Mysql;
@@ -81,13 +81,13 @@
$group = Vhffs::Group::get_by_groupname($main, "testgroup0$i");
$user = Vhffs::User::get_by_username($main, "testuser0$i");
# Httpd servername must end with a 2-4 letters suffix
- $svc = Vhffs::Services::Httpd::create($main, "httpd0$i.test.com", '', $user, $group);
+ $svc = Vhffs::Services::Web::create($main, "httpd0$i.test.com", '', $user, $group);
}
$stats->refresh();
is($stats->get_web_in_moderation, 9, 'All httpd services waiting for moderation');
for(my $i = 1 ; $i < 10 ; ++$i) {
- $svc = Vhffs::Services::Httpd::get_by_servername($main, "httpd0$i.test.com");
+ $svc = Vhffs::Services::Web::get_by_servername($main, "httpd0$i.test.com");
$svc->set_status(Vhffs::Constants::WAITING_FOR_CREATION);
$svc->commit;
$stats->refresh();
@@ -96,7 +96,7 @@
}
for(my $i = 1 ; $i < 10 ; ++$i) {
- $svc = Vhffs::Services::Httpd::get_by_servername($main, "httpd0$i.test.com");
+ $svc = Vhffs::Services::Web::get_by_servername($main, "httpd0$i.test.com");
$svc->set_status(Vhffs::Constants::ACTIVATED);
$svc->commit;
$stats->refresh();