| [vhffs-dev] [717] All get_owner_xxx now refers to Vhffs::Object's methods. |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 717
Author: beuss
Date: 2007-07-12 13:37:55 +0000 (Thu, 12 Jul 2007)
Log Message:
-----------
All get_owner_xxx now refers to Vhffs::Object's methods.
Modified Paths:
--------------
trunk/vhffs-api/src/Vhffs/Group.pm
trunk/vhffs-api/src/Vhffs/Robots/Cvs.pm
trunk/vhffs-api/src/Vhffs/Robots/Group.pm
trunk/vhffs-api/src/Vhffs/Robots/Repository.pm
trunk/vhffs-api/src/Vhffs/Robots/Svn.pm
trunk/vhffs-api/src/Vhffs/Robots/Web.pm
trunk/vhffs-api/src/Vhffs/Services/Cvs.pm
trunk/vhffs-api/src/Vhffs/Services/DNS.pm
trunk/vhffs-api/src/Vhffs/Services/Httpd.pm
trunk/vhffs-api/src/Vhffs/Services/Mail.pm
trunk/vhffs-api/src/Vhffs/Services/Mailing.pm
trunk/vhffs-api/src/Vhffs/Services/Mysql.pm
trunk/vhffs-api/src/Vhffs/Services/Postgres.pm
trunk/vhffs-api/src/Vhffs/Services/Repository.pm
trunk/vhffs-api/src/Vhffs/Services/Svn.pm
trunk/vhffs-compat/4.0.sql.in
trunk/vhffs-irc/modobot.pl
trunk/vhffs-panel/admin/cvs/edit.pl
trunk/vhffs-panel/admin/cvs/show.pl
trunk/vhffs-panel/admin/mail/edit.pl
trunk/vhffs-panel/admin/mail/show.pl
trunk/vhffs-panel/admin/mysql/edit.pl
trunk/vhffs-panel/admin/mysql/show.pl
trunk/vhffs-panel/admin/pgsql/edit.pl
trunk/vhffs-panel/admin/pgsql/show.pl
trunk/vhffs-panel/admin/repository/edit.pl
trunk/vhffs-panel/admin/repository/show.pl
trunk/vhffs-panel/admin/web/edit.pl
trunk/vhffs-panel/admin/web/show.pl
trunk/vhffs-panel/group/prefs.pl
trunk/vhffs-panel/public/allwebsites.pl
trunk/vhffs-panel/public/websearch.pl
trunk/vhffs-robots/src/cvs_fixperms.pl
trunk/vhffs-robots/src/delete_users.pl
trunk/vhffs-robots/src/dump_mysql.pl
trunk/vhffs-robots/src/dump_pgsql.pl
trunk/vhffs-robots/src/listengine_publicarchives.pl
trunk/vhffs-tests/src/Services/Cvs.pl
trunk/vhffs-tests/src/Services/DNS.pl
trunk/vhffs-tests/src/Services/Httpd.pl
trunk/vhffs-tests/src/Services/Mail.pl
trunk/vhffs-tests/src/Services/Mailing.pl
trunk/vhffs-tests/src/Services/Mysql.pl
trunk/vhffs-tests/src/Services/Postgres.pl
trunk/vhffs-tests/src/Services/Repository.pl
trunk/vhffs-tests/src/Services/Svn.pl
Modified: trunk/vhffs-api/src/Vhffs/Group.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Group.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Group.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -422,21 +422,6 @@
}
}
-sub get_owneruid
-{
- my $self = shift;
- if( defined $self->{'owner_uid'} )
- {
- return $self->{'owner_uid'};
- }
- else
- {
- return undef;
- }
-
-}
-
-
sub get_last_groups
{
my $vhffs = shift;
Modified: trunk/vhffs-api/src/Vhffs/Robots/Cvs.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Cvs.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Robots/Cvs.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -89,7 +89,7 @@
$command = "/usr/bin/cvs -d $dir init";
system( $command );
- if( Vhffs::Functions::change_owner_recur( $dir , $cvs->get_owneruid , $cvs->get_ownergid ) < 0 )
+ if( Vhffs::Functions::change_owner_recur( $dir , $cvs->get_owner_uid , $cvs->get_owner_gid ) < 0 )
{
return -2;
}
Modified: trunk/vhffs-api/src/Vhffs/Robots/Group.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Group.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Robots/Group.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -47,14 +47,14 @@
# and is complete, no need to fetch it again
if( defined $group )
{
- my $user = Vhffs::User::get_by_uid( $main , $group->get_owneruid );
+ my $user = Vhffs::User::get_by_uid( $main , $group->get_owner_uid );
my $hash = Vhffs::Functions::hash_groupname( $group->get_groupname , $main );
$group->add_history("Ok, Robots will create the directory");
Vhffs::Functions::create_dir( $hash );
$group->add_history("Ok, Robots finish create the directory");
- if( defined $group->get_owneruid )
+ if( defined $group->get_owner_uid )
{
- chown( $group->get_owneruid , $group->get_gid , $hash );
+ chown( $group->get_owner_uid , $group->get_gid , $hash );
}
chmod( 0555 , $hash );
add_user( $user , $group , $main );
@@ -76,7 +76,7 @@
# If group is defined, it is complete
if( defined $group )
{
- my $user = Vhffs::User::get_by_uid( $main , $group->get_owneruid );
+ my $user = Vhffs::User::get_by_uid( $main , $group->get_owner_uid );
my $hash = Vhffs::Functions::hash_groupname( $group->get_groupname , $main );
if( -d $hash )
{
Modified: trunk/vhffs-api/src/Vhffs/Robots/Repository.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Repository.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Robots/Repository.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -71,7 +71,7 @@
system( $cmd );
# remove the link in group directory
- my $group = Vhffs::Group::get_by_gid( $vhffs , $repo->get_ownergid );
+ my $group = Vhffs::Group::get_by_gid( $vhffs , $repo->get_owner_gid );
Vhffs::Robots::unlink_to_group( $group, $repo->get_name.Vhffs::Constants::REPOSITORY_SUFFIX, $vhffs );
$repo->delete;
@@ -95,10 +95,10 @@
Vhffs::Functions::create_dir( $repodir ) if( ! -d $repodir );
return -2 if( ! -d $repodir );
- chown( $repo->get_owneruid , $repo->get_ownergid , $repodir );
+ chown( $repo->get_owner_uid , $repo->get_owner_gid , $repodir );
chmod( 02775 , $repodir );
- my $group = Vhffs::Group::get_by_gid( $vhffs , $repo->get_ownergid );
+ my $group = Vhffs::Group::get_by_gid( $vhffs , $repo->get_owner_gid );
if(Vhffs::Robots::link_to_group( $repodir, $group, $repo->get_name.Vhffs::Constants::REPOSITORY_SUFFIX, $vhffs ) < 0)
{
Modified: trunk/vhffs-api/src/Vhffs/Robots/Svn.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Svn.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Robots/Svn.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -103,7 +103,7 @@
$svn->add_history("Ok, robots find the empty directory and will create subversion repository");
system("svnadmin create --fs-type fsfs $dir");
Vhffs::Functions::chmod_recur( $dir , 0664 , 02775 );
- Vhffs::Functions::change_owner_recur( $dir , $svn->get_owneruid , $svn->get_ownergid );
+ Vhffs::Functions::change_owner_recur( $dir , $svn->get_owner_uid , $svn->get_owner_gid );
change_conf( $svn );
$svn->add_history("The Robots created the subversion repository");
} else {
Modified: trunk/vhffs-api/src/Vhffs/Robots/Web.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/Web.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Robots/Web.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -50,19 +50,19 @@
my $webdir = $main->get_config->get_datadir . "/" . Vhffs::Constants::WEBDIR . "/" . Vhffs::Functions::hash_webdir( $web->get_servername );
Vhffs::Functions::create_dir( $webdir );
-# chown( $web->get_owneruid , $web->get_ownergid , $webdir );
+# chown( $web->get_owner_uid , $web->get_owner_gid , $webdir );
Vhffs::Functions::create_dir( $webdir . "/htdocs");
- chown( $web->get_owneruid , $web->get_ownergid , $webdir . "/htdocs" );
+ chown( $web->get_owner_uid , $web->get_owner_gid , $webdir . "/htdocs" );
chmod( 02775 , $webdir . "/htdocs" );
Vhffs::Functions::create_dir( $webdir . "/php-include");
- chown( $web->get_owneruid , $web->get_ownergid , $webdir . "/php-include" );
+ chown( $web->get_owner_uid , $web->get_owner_gid , $webdir . "/php-include" );
chmod( 02775 , $webdir . "/php-include" );
Vhffs::Functions::create_dir( $webdir . "/tmp");
- chown( $web->get_owneruid , $web->get_ownergid , $webdir . "/tmp" );
+ chown( $web->get_owner_uid , $web->get_owner_gid , $webdir . "/tmp" );
chmod( 02775 , $webdir . "/tmp" );
- my $group = Vhffs::Group::get_by_gid( $main , $web->get_ownergid );
+ my $group = Vhffs::Group::get_by_gid( $main , $web->get_owner_gid );
if(Vhffs::Robots::link_to_group( $webdir,$group,$web->get_servername.Vhffs::Constants::WEB_SUFFIX,$main) < 0)
{
$web->add_history( "Can't link the webdirectory to the specified group");
Modified: trunk/vhffs-api/src/Vhffs/Services/Cvs.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Cvs.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Services/Cvs.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -188,18 +188,6 @@
$self->{'cvsroot'} = $value;
}
-sub get_owneruid
-{
- my( $self ) = @_;
- return $self->{'owner_uid'};
-}
-
-sub get_ownergid
-{
- my $self = shift;
- return $self->{'owner_gid'};
-}
-
sub get_title
{
my $self;
Modified: trunk/vhffs-api/src/Vhffs/Services/DNS.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/DNS.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Services/DNS.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -1052,20 +1052,6 @@
}
-sub get_ownergid
-{
- my $self = shift;
- return $self->{'owner_gid'};
-}
-
-
-
-sub get_owneruid
-{
- my $self = shift;
- return $self->{'owner_uid'};
-}
-
sub set_soa_expire
{
my $self = shift;
Modified: trunk/vhffs-api/src/Vhffs/Services/Httpd.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Httpd.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Services/Httpd.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -142,19 +142,6 @@
$self->{'group'} = $group;
}
-sub get_owneruid
-{
- my $self = shift;
- return $self->{'owner_uid'};
-}
-
-sub get_ownergid
-{
- my $self = shift;
- return $self->{'owner_gid'};
-}
-
-
sub get_title
{
my $self = shift;
Modified: trunk/vhffs-api/src/Vhffs/Services/Mail.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Mail.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Services/Mail.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -483,19 +483,6 @@
$self->{'group'} = $group;
}
-sub get_owneruid
-{
- my $self = shift;
- return $self->{'owner_uid'};
-}
-
-sub get_ownergid
-{
- my $self = shift;
- return $self->{'owner_gid'};
-}
-
-
=pod
=head2 get_by_mxdomain
Modified: trunk/vhffs-api/src/Vhffs/Services/Mailing.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Mailing.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Services/Mailing.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -553,18 +553,6 @@
return $self->{local_part} . "\@" . $self->{domain};
}
-sub get_ownergid
-{
- my $self = shift;
- return $self->{'owner_gid'};
-}
-
-sub get_owneruid
-{
- my $self = shift;
- return $self->{'owner_uid'};
-}
-
sub get_listname
{
my $self = shift;
Modified: trunk/vhffs-api/src/Vhffs/Services/Mysql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Mysql.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Services/Mysql.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -155,20 +155,6 @@
$self->SUPER::commit;
}
-sub get_ownergid
-{
- my $self = shift;
- return $self->{'owner_gid'};
-}
-
-
-sub get_owneruid
-{
- my $self = shift;
- return $self->{'owner_uid'};
-}
-
-
sub get_dbusername
{
my $self = shift;
Modified: trunk/vhffs-api/src/Vhffs/Services/Postgres.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Postgres.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Services/Postgres.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -169,18 +169,6 @@
$self->SUPER::commit;
}
-sub get_ownergid
-{
- my $self = shift;
- return $self->{'owner_gid'};
-}
-
-sub get_owneruid
-{
- my $self = shift;
- return $self->{'owner_uid'};
-}
-
sub get_dbusername
{
my $self = shift;
@@ -254,7 +242,6 @@
return undef unless(defined $self);
$self->{pgsql_id} = $pgsql_id;
- $self->{owner_gid} = $owner_gid;
$self->{dbname} = $dbname;
$self->{dbuser} = $dbuser;
$self->{dbpass} = $dbpass;
Modified: trunk/vhffs-api/src/Vhffs/Services/Repository.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Repository.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Services/Repository.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -267,18 +267,6 @@
$self->{'quota_used'} = $value;
}
-sub get_owneruid
-{
- my( $self ) = @_;
- return $self->{'owner_uid'};
-}
-
-sub get_ownergid
-{
- my $self = shift;
- return $self->{'owner_gid'};
-}
-
sub get_dir
{
my $self = shift;
Modified: trunk/vhffs-api/src/Vhffs/Services/Svn.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Svn.pm 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-api/src/Vhffs/Services/Svn.pm 2007-07-12 13:37:55 UTC (rev 717)
@@ -191,19 +191,6 @@
return $self->{'reponame'};
}
-
-sub get_owneruid
-{
- my( $self ) = @_;
- return $self->{'owner_uid'};
-}
-
-sub get_ownergid
-{
- my $self = shift;
- return $self->{'owner_gid'};
-}
-
sub get_title
{
my $self = shift;
Modified: trunk/vhffs-compat/4.0.sql.in
===================================================================
--- trunk/vhffs-compat/4.0.sql.in 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-compat/4.0.sql.in 2007-07-12 13:37:55 UTC (rev 717)
@@ -30,7 +30,6 @@
-- vhffs_object
ALTER TABLE vhffs_object ADD COLUMN owner_gid int4;
ALTER TABLE vhffs_object ALTER owner_uid SET NOT NULL;
-ALTER TABLE vhffs_object ALTER owner_gid SET NOT NULL;
ALTER TABLE vhffs_object ALTER date_creation SET NOT NULL;
-- TODO: merge vhffs_$service:owner_uid|owner_gid -> vhffs_object
@@ -44,21 +43,23 @@
-- didn't perform correct cleanup
UPDATE vhffs_object SET type=0;
-UPDATE vhffs_object SET type=10 WHERE object_id IN (SELECT object_id FROM vhffs_users);
-UPDATE vhffs_object SET type=11 WHERE object_id IN (SELECT object_id FROM vhffs_groups);
-UPDATE vhffs_object SET type=20 WHERE object_id IN (SELECT object_id FROM vhffs_httpd);
-UPDATE vhffs_object SET type=21 WHERE object_id IN (SELECT object_id FROM vhffs_repository);
-UPDATE vhffs_object SET type=30 WHERE object_id IN (SELECT object_id FROM vhffs_mysql);
-UPDATE vhffs_object SET type=31 WHERE object_id IN (SELECT object_id FROM vhffs_pgsql);
-UPDATE vhffs_object SET type=40 WHERE object_id IN (SELECT object_id FROM vhffs_cvs);
-UPDATE vhffs_object SET type=41 WHERE object_id IN (SELECT object_id FROM vhffs_svn);
-UPDATE vhffs_object SET type=50 WHERE object_id IN (SELECT object_id FROM vhffs_dns_global);
-UPDATE vhffs_object SET type=60 WHERE object_id IN (SELECT object_id FROM vhffs_mxdomain);
-UPDATE vhffs_object SET type=61 WHERE object_id IN (SELECT object_id FROM vhffs_ml);
+UPDATE vhffs_object SET type=10, owner_gid = u.gid FROM vhffs_users u WHERE vhffs_object.object_id = u.object_id;
+UPDATE vhffs_object SET type=11, owner_gid = g.gid FROM vhffs_groups g WHERE g.object_id = vhffs_object.object_id;
+UPDATE vhffs_object SET type=20, owner_gid = h.owner_gid FROM vhffs_httpd h WHERE h.object_id = vhffs_object.object_id;
+UPDATE vhffs_object SET type=21, owner_gid = r.owner_gid FROM vhffs_repository r WHERE r.object_id = vhffs_object.object_id;
+UPDATE vhffs_object SET type=30, owner_gid = m.owner_gid FROM vhffs_mysql m WHERE m.object_id = vhffs_object.object_id;
+UPDATE vhffs_object SET type=31, owner_gid = p.owner_gid FROM vhffs_pgsql p WHERE p.object_id = vhffs_object.object_id;
+UPDATE vhffs_object SET type=40, owner_gid = c.owner_gid FROM vhffs_cvs c WHERE c.object_id = vhffs_object.object_id;
+UPDATE vhffs_object SET type=41, owner_gid = s.owner_gid FROM vhffs_svn s WHERE s.object_id = vhffs_object.object_id;
+UPDATE vhffs_object SET type=50, owner_gid = d.owner_gid FROM vhffs_dns_global d WHERE d.object_id = vhffs_object.object_id;
+UPDATE vhffs_object SET type=60, owner_gid = m.owner_gid FROM vhffs_mxdomain m WHERE m.object_id = vhffs_object.object_id;
+UPDATE vhffs_object SET type=61, owner_gid = m.owner_gid FROM vhffs_ml m WHERE m.object_id = vhffs_object.object_id;
-- cleanup unused objects
-- DELETE FROM vhffs_object WHERE type=0;
+ALTER TABLE vhffs_object ALTER owner_gid SET NOT NULL;
+
-- merge vhffs_user_info to vhffs_users
ALTER TABLE vhffs_users ADD COLUMN date_creation timestamp;
ALTER TABLE vhffs_users ADD COLUMN firstname varchar(250);
Modified: trunk/vhffs-irc/modobot.pl
===================================================================
--- trunk/vhffs-irc/modobot.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-irc/modobot.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -502,7 +502,7 @@
}
else
{
- irc_msg ("$name => group ".Vhffs::Group::get_name_by_gid($vhffs,$web->get_ownergid));
+ irc_msg ("$name => group ".Vhffs::Group::get_name_by_gid($vhffs,$web->get_owner_gid));
}
}
@@ -517,7 +517,7 @@
}
else
{
- my $user = Vhffs::User::get_by_uid($vhffs, $group->get_owneruid);
+ my $user = Vhffs::User::get_by_uid($vhffs, $group->get_owner_uid);
if ( defined $user )
{
irc_msg ($groupname." owned by ". $user->get_username ." (". $user->get_firstname ." ". $user->get_lastname ." [". $user->get_mail ."] )");
Modified: trunk/vhffs-panel/admin/cvs/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/cvs/edit.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/admin/cvs/edit.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -115,8 +115,8 @@
$template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
$template->param( VALUE_CVSROOT => $object->get_cvsroot);
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_ownergid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owneruid ));
+ $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
+ $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
my $oid = $object->{'object_id'};
$template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
Modified: trunk/vhffs-panel/admin/cvs/show.pl
===================================================================
--- trunk/vhffs-panel/admin/cvs/show.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/admin/cvs/show.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -110,8 +110,8 @@
$template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
$template->param( VALUE_CVSROOT => $object->get_cvsroot);
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_ownergid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owneruid ));
+ $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
+ $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
$template->param( VALUE_STATUS => Vhffs::Functions::status_string_from_status_id ($object->get_status) );
my $oid = $object->{'object_id'};
Modified: trunk/vhffs-panel/admin/mail/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/edit.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/admin/mail/edit.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -106,8 +106,8 @@
$template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
$template->param( VALUE_DOMAIN => $object->get_domain );
$template->param( VALUE_CATCHALL => $object->get_catchall );
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_ownergid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owneruid ));
+ $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
+ $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
my $oid = $object->{'object_id'};
$template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
Modified: trunk/vhffs-panel/admin/mail/show.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/show.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/admin/mail/show.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -105,8 +105,8 @@
$template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
$template->param( VALUE_DOMAIN => $object->get_domain );
$template->param( VALUE_CATCHALL => $object->get_catchall );
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_ownergid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owneruid ));
+ $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
+ $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
$template->param( VALUE_STATUS => Vhffs::Functions::status_string_from_status_id ($object->get_status) );
my $oid = $object->{'object_id'};
Modified: trunk/vhffs-panel/admin/mysql/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/mysql/edit.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/admin/mysql/edit.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -107,8 +107,8 @@
$template->param( VALUE_DBNAME => $object->get_dbname );
$template->param( VALUE_DBUSER => $object->get_dbusername );
$template->param( VALUE_DBPASS => $object->get_dbpassword);
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_ownergid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owneruid ));
+ $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
+ $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
my $oid = $object->{'object_id'};
$template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
Modified: trunk/vhffs-panel/admin/mysql/show.pl
===================================================================
--- trunk/vhffs-panel/admin/mysql/show.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/admin/mysql/show.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -102,8 +102,8 @@
$template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
$template->param( VALUE_DBNAME => $object->get_dbname );
$template->param( VALUE_DBUSER => $object->get_dbusername );
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_ownergid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owneruid ));
+ $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
+ $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
$template->param( VALUE_STATUS => Vhffs::Functions::status_string_from_status_id ($object->get_status) );
my $oid = $object->{'object_id'};
Modified: trunk/vhffs-panel/admin/pgsql/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/edit.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/admin/pgsql/edit.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -106,8 +106,8 @@
$template->param( VALUE_DBNAME => $object->get_dbname );
$template->param( VALUE_DBUSER => $object->get_dbusername );
$template->param( VALUE_DBPASS => $object->get_dbpassword);
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_ownergid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owneruid ));
+ $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
+ $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
my $oid = $object->{'object_id'};
$template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
Modified: trunk/vhffs-panel/admin/pgsql/show.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/show.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/admin/pgsql/show.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -102,8 +102,8 @@
$template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
$template->param( VALUE_DBNAME => $object->get_dbname );
$template->param( VALUE_DBUSER => $object->get_dbusername );
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_ownergid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owneruid ));
+ $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
+ $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
$template->param( VALUE_STATUS => Vhffs::Functions::status_string_from_status_id ($object->get_status) );
my $oid = $object->{'object_id'};
Modified: trunk/vhffs-panel/admin/repository/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/repository/edit.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/admin/repository/edit.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -104,8 +104,8 @@
$template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
$template->param( VALUE_NAME => $object->get_name);
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_ownergid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owneruid ));
+ $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
+ $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
$template->param( VALUE_QUOTA => $object->get_quota);
$template->param( VALUE_QUOTAUSED => $object->get_quota_used);
Modified: trunk/vhffs-panel/admin/repository/show.pl
===================================================================
--- trunk/vhffs-panel/admin/repository/show.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/admin/repository/show.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -102,8 +102,8 @@
$template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
$template->param( VALUE_NAME => $object->get_name);
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_ownergid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owneruid ));
+ $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
+ $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
$template->param( VALUE_STATUS => Vhffs::Functions::status_string_from_status_id ($object->get_status) );
$template->param( VALUE_QUOTA => $object->get_quota);
$template->param( VALUE_QUOTAUSED => $object->get_quota_used);
Modified: trunk/vhffs-panel/admin/web/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/web/edit.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/admin/web/edit.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -102,8 +102,8 @@
$template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
$template->param( VALUE_SERVERNAME => $object->get_servername );
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_ownergid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owneruid ));
+ $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
+ $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
my $oid = $object->{'object_id'};
$template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
Modified: trunk/vhffs-panel/admin/web/show.pl
===================================================================
--- trunk/vhffs-panel/admin/web/show.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/admin/web/show.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -100,8 +100,8 @@
$template->param( VALUE_DESCRIPTION => CGI::escapeHTML( $object->get_description ) );
$template->param( VALUE_SERVERNAME => $object->get_servername );
- $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_ownergid ));
- $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owneruid ));
+ $template->param( VALUE_GROUP => Vhffs::Group::get_name_by_gid( $vhffs , $object->get_owner_gid ));
+ $template->param( VALUE_OWNER => Vhffs::User::get_name_by_uid( $vhffs , $object->get_owner_uid ));
my $oid = $object->{'object_id'};
$template->param( VALUE_HISTORY => "/history.pl?OID=$oid" );
Modified: trunk/vhffs-panel/group/prefs.pl
===================================================================
--- trunk/vhffs-panel/group/prefs.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/group/prefs.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -104,7 +104,7 @@
my $uid = $cgi->param( 'uid' );
if( ! defined($uid) || $uid !~ /^\d+$/ ) {
$panel->add_error( gettext('CGI error') );
- } elsif( $uid == $group->get_owneruid ) {
+ } elsif( $uid == $group->get_owner_uid ) {
$panel->add_error( gettext('You cannot remove the owner of the group') );
} elsif( $group->remove_user($uid) ) {
$panel->add_info( gettext('This user will be removed from this group as soon as possible') );
Modified: trunk/vhffs-panel/public/allwebsites.pl
===================================================================
--- trunk/vhffs-panel/public/allwebsites.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/public/allwebsites.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -85,7 +85,7 @@
$template->param( SERVERNAME => $web->get_servername );
$template->param( TEXT_GROUPNAME => gettext("Owned by"));
- $template->param( GROUPNAME => Vhffs::Group::get_name_by_gid( $vhffs , $web->get_ownergid ) );
+ $template->param( GROUPNAME => Vhffs::Group::get_name_by_gid( $vhffs , $web->get_owner_gid ) );
$template->param( DESCRIPTION => CGI::escapeHTML( $web->get_description ) );
Modified: trunk/vhffs-panel/public/websearch.pl
===================================================================
--- trunk/vhffs-panel/public/websearch.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-panel/public/websearch.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -83,7 +83,7 @@
$template = new HTML::Template( filename => $templatedir."/public/misc/web-part.tmpl" );
$template->param( SERVERNAME => $web->get_servername );
- $template->param( GROUPNAME => Vhffs::Group::get_name_by_gid( $vhffs , $web->get_ownergid ) );
+ $template->param( GROUPNAME => Vhffs::Group::get_name_by_gid( $vhffs , $web->get_owner_gid ) );
$template->param( DESCRIPTION => CGI::escapeHTML( $web->get_description ) );
Modified: trunk/vhffs-robots/src/cvs_fixperms.pl
===================================================================
--- trunk/vhffs-robots/src/cvs_fixperms.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-robots/src/cvs_fixperms.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -98,8 +98,8 @@
open( FILE , ">$passwd_file" ) or die( "cannot open $passwd_file" );
print FILE "anonymous::".$user->get_username;
close( FILE );
- chown $cvs->get_owneruid , $cvs->get_ownergid , $passwd_file;
- chown $cvs->get_owneruid , $cvs->get_ownergid , $readers_file;
+ chown $cvs->get_owner_uid , $cvs->get_owner_gid , $passwd_file;
+ chown $cvs->get_owner_uid , $cvs->get_owner_gid , $readers_file;
}
$cvs->set_status( Vhffs::Constants::ACTIVATED );
$cvs->commit;
Modified: trunk/vhffs-robots/src/delete_users.pl
===================================================================
--- trunk/vhffs-robots/src/delete_users.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-robots/src/delete_users.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -57,7 +57,7 @@
foreach $group ( @{$groups} )
{
Vhffs::Robots::vhffs_log( sprintf("Delete %s, remains group(s) : will delete %s " , $user->get_username , $group->get_groupname ) , $vhffs);
- if( $group->get_owneruid == $user->get_uid )
+ if( $group->get_owner_uid == $user->get_uid )
{
$ok = 0;
$group->set_status( Vhffs::Constants::TO_DELETE );
Modified: trunk/vhffs-robots/src/dump_mysql.pl
===================================================================
--- trunk/vhffs-robots/src/dump_mysql.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-robots/src/dump_mysql.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -61,7 +61,7 @@
foreach $obj ( @{$objs} )
{
- $groupname = Vhffs::Group::get_name_by_gid( $vhffs , $obj->get_ownergid );
+ $groupname = Vhffs::Group::get_name_by_gid( $vhffs , $obj->get_owner_gid );
my $dbname = $obj->get_dbname;
my $dir = Vhffs::Functions::hash_groupname( $groupname , $vhffs );
if( -d $dir )
@@ -73,7 +73,7 @@
#Change the chmod if the backup succeed
if( -f $file )
{
- chown( $obj->get_owneruid , $obj->get_ownergid , $file );
+ chown( $obj->get_owner_uid , $obj->get_owner_gid , $file );
chmod( 0660 , $file );
}
Modified: trunk/vhffs-robots/src/dump_pgsql.pl
===================================================================
--- trunk/vhffs-robots/src/dump_pgsql.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-robots/src/dump_pgsql.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -61,7 +61,7 @@
foreach $obj ( @{$objs} )
{
- $groupname = Vhffs::Group::get_name_by_gid( $vhffs , $obj->get_ownergid );
+ $groupname = Vhffs::Group::get_name_by_gid( $vhffs , $obj->get_owner_gid );
my $dbname = $obj->get_dbname;
my $dir = Vhffs::Functions::hash_groupname( $groupname , $vhffs );
if( -d $dir )
@@ -75,7 +75,7 @@
#Change the chmod if the backup succeed
if( -f $file )
{
- chown( $obj->get_owneruid , $obj->get_ownergid , $file );
+ chown( $obj->get_owner_uid , $obj->get_owner_gid , $file );
chmod( 0660 , $file );
}
}
Modified: trunk/vhffs-robots/src/listengine_publicarchives.pl
===================================================================
--- trunk/vhffs-robots/src/listengine_publicarchives.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-robots/src/listengine_publicarchives.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -42,7 +42,7 @@
my $lists = Vhffs::Services::Mailing::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_ownergid )." ".$list->get_oid." ".Vhffs::Functions::status_string_from_status_id( $list->get_status )."\n";
+# 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";
next if ( !defined $list->get_domain || !defined $list->get_localpart || $list->get_domain eq "" || $list->get_localpart eq "" );
Modified: trunk/vhffs-tests/src/Services/Cvs.pl
===================================================================
--- trunk/vhffs-tests/src/Services/Cvs.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-tests/src/Services/Cvs.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -22,8 +22,8 @@
my $cvs1 = Vhffs::Services::Cvs::create($main, 'cvs1', 'Test cvs repo 1', $user1, $group1);
isa_ok($cvs1, 'Vhffs::Services::Cvs', '$cvs1');
cmp_ok($cvs1->get_cvsroot, 'eq', 'cvs1', 'cvsroot is the one defined while creating object');
-cmp_ok($cvs1->get_owneruid, '==', $user1->get_uid, 'uid matches');
-cmp_ok($cvs1->get_ownergid, '==', $group1->get_gid, 'gid matches');
+cmp_ok($cvs1->get_owner_uid, '==', $user1->get_uid, 'uid matches');
+cmp_ok($cvs1->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::Cvs::create($main, 'cvs1', 'Test cvs repo 1', $user1, $group1)), 'Unable to create 2 repo with the same name');
Modified: trunk/vhffs-tests/src/Services/DNS.pl
===================================================================
--- trunk/vhffs-tests/src/Services/DNS.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-tests/src/Services/DNS.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -19,8 +19,8 @@
my $dns1 = Vhffs::Services::DNS::create($main, 'test.com', 'Test DNS domain 1', $user1, $group1);
isa_ok($dns1, 'Vhffs::Services::DNS', '$dns1');
-cmp_ok($dns1->get_owneruid, '==', $user1->get_uid, 'uid matches');
-cmp_ok($dns1->get_ownergid, '==', $group1->get_gid, 'gid matches');
+cmp_ok($dns1->get_owner_uid, '==', $user1->get_uid, 'uid matches');
+cmp_ok($dns1->get_owner_gid, '==', $group1->get_gid, 'gid matches');
cmp_ok($dns1->get_description, 'eq', 'Test DNS domain 1', 'description matches');
cmp_ok($dns1->get_domain, 'eq', 'test.com', 'Domainname matches');
Modified: trunk/vhffs-tests/src/Services/Httpd.pl
===================================================================
--- trunk/vhffs-tests/src/Services/Httpd.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-tests/src/Services/Httpd.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -22,8 +22,8 @@
my $web1 = Vhffs::Services::Httpd::create($main, 'testweb1.org', 'Test web 1', $user1, $group1);
isa_ok($web1, 'Vhffs::Services::Httpd', '$web1');
cmp_ok($web1->get_servername, 'eq', 'testweb1.org', 'servername is the one defined while creating object');
-cmp_ok($web1->get_owneruid, '==', $user1->get_uid, 'uid matches');
-cmp_ok($web1->get_ownergid, '==', $group1->get_gid, 'gid matches');
+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');
Modified: trunk/vhffs-tests/src/Services/Mail.pl
===================================================================
--- trunk/vhffs-tests/src/Services/Mail.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-tests/src/Services/Mail.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -18,8 +18,8 @@
my $mail1 = Vhffs::Services::Mail::create($main, 'test.com', 'Test mail domain 1', $user1, $group1);
isa_ok($mail1, 'Vhffs::Services::Mail', '$mail1');
-cmp_ok($mail1->get_owneruid, '==', $user1->get_uid, 'uid matches');
-cmp_ok($mail1->get_ownergid, '==', $group1->get_gid, 'gid matches');
+cmp_ok($mail1->get_owner_uid, '==', $user1->get_uid, 'uid matches');
+cmp_ok($mail1->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::Mail::create($main, 'test.com', 'Test mail domain 1', $user1, $group1)), 'Unable to create 2 mxdomains with the same name');
Modified: trunk/vhffs-tests/src/Services/Mailing.pl
===================================================================
--- trunk/vhffs-tests/src/Services/Mailing.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-tests/src/Services/Mailing.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -20,8 +20,8 @@
my $mail1 = Vhffs::Services::Mail::create($main, 'test.com', 'Test mail domain 1', $user1, $group1);
isa_ok($mail1, 'Vhffs::Services::Mail', '$mail1');
-cmp_ok($mail1->get_owneruid, '==', $user1->get_uid, 'uid matches');
-cmp_ok($mail1->get_ownergid, '==', $group1->get_gid, 'gid matches');
+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');
Modified: trunk/vhffs-tests/src/Services/Mysql.pl
===================================================================
--- trunk/vhffs-tests/src/Services/Mysql.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-tests/src/Services/Mysql.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -23,8 +23,8 @@
isa_ok($mysql1, 'Vhffs::Services::Mysql', '$mysql1');
cmp_ok($mysql1->get_dbname, 'eq', 'mysql1', 'dbname is the one defined while creating object');
cmp_ok($mysql1->get_dbusername, 'eq', 'mysqlu1', 'dbuser is the one defined while creating object');
-cmp_ok($mysql1->get_owneruid, '==', $user1->get_uid, 'uid matches');
-cmp_ok($mysql1->get_ownergid, '==', $group1->get_gid, 'gid matches');
+cmp_ok($mysql1->get_owner_uid, '==', $user1->get_uid, 'uid matches');
+cmp_ok($mysql1->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::Mysql::create($main, 'mysql1', 'mysqlu1', 'plop', 'Test mysql DB 1', $user1, $group1)),
Modified: trunk/vhffs-tests/src/Services/Postgres.pl
===================================================================
--- trunk/vhffs-tests/src/Services/Postgres.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-tests/src/Services/Postgres.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -23,8 +23,8 @@
isa_ok($postgres1, 'Vhffs::Services::Postgres', '$postgres1');
cmp_ok($postgres1->get_dbname, 'eq', 'postgres1', 'dbname is the one defined while creating object');
cmp_ok($postgres1->get_dbusername, 'eq', 'pgu1', 'dbuser is the one defined while creating object');
-cmp_ok($postgres1->get_owneruid, '==', $user1->get_uid, 'uid matches');
-cmp_ok($postgres1->get_ownergid, '==', $group1->get_gid, 'gid matches');
+cmp_ok($postgres1->get_owner_uid, '==', $user1->get_uid, 'uid matches');
+cmp_ok($postgres1->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::Postgres::create($main, 'postgres1', 'pgu1', 'plop', 'Test postgres DB 1', $user1, $group1)),
Modified: trunk/vhffs-tests/src/Services/Repository.pl
===================================================================
--- trunk/vhffs-tests/src/Services/Repository.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-tests/src/Services/Repository.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -22,8 +22,8 @@
my $repo1 = Vhffs::Services::Repository::create($main, 'repo1', 'Test repo 1', $user1, $group1);
isa_ok($repo1, 'Vhffs::Services::Repository', '$repo1');
cmp_ok($repo1->get_name, 'eq', 'repo1', 'name is the one defined while creating object');
-cmp_ok($repo1->get_owneruid, '==', $user1->get_uid, 'uid matches');
-cmp_ok($repo1->get_ownergid, '==', $group1->get_gid, 'gid matches');
+cmp_ok($repo1->get_owner_uid, '==', $user1->get_uid, 'uid matches');
+cmp_ok($repo1->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::Repository::create($main, 'repo1', 'Test repo 1', $user1, $group1)), 'Unable to create 2 repo with the same name');
Modified: trunk/vhffs-tests/src/Services/Svn.pl
===================================================================
--- trunk/vhffs-tests/src/Services/Svn.pl 2007-07-12 12:34:00 UTC (rev 716)
+++ trunk/vhffs-tests/src/Services/Svn.pl 2007-07-12 13:37:55 UTC (rev 717)
@@ -22,8 +22,8 @@
my $svn1 = Vhffs::Services::Svn::create($main, 'svn1', 'test svn repo 1', $user1, $group1);
isa_ok($svn1, 'Vhffs::Services::Svn', '$svn1');
cmp_ok($svn1->get_reponame, 'eq', 'svn1', 'svnroot is the one defined while creating object');
-cmp_ok($svn1->get_owneruid, '==', $user1->get_uid, 'uid matches');
-cmp_ok($svn1->get_ownergid, '==', $group1->get_gid, 'gid matches');
+cmp_ok($svn1->get_owner_uid, '==', $user1->get_uid, 'uid matches');
+cmp_ok($svn1->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::Svn::create($main, 'svn1', 'test svn repo 1', $user1, $group1)), 'Unable to create 2 repo with the same name');