[vhffs-dev] [885] use TYPE_WEB instead TYPE_HTTPD

[subversion@xxxxxxxxxxxxx]

Revision: 885
Author:   gradator
Date:     2007-09-09 04:20:19 +0000 (Sun, 09 Sep 2007)

Log Message:
-----------
use TYPE_WEB instead TYPE_HTTPD

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Constants.pm
    trunk/vhffs-api/src/Vhffs/Functions.pm
    trunk/vhffs-api/src/Vhffs/Group.pm
    trunk/vhffs-api/src/Vhffs/ObjectFactory.pm
    trunk/vhffs-api/src/Vhffs/Services/Web.pm


Modified: trunk/vhffs-api/src/Vhffs/Constants.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Constants.pm	2007-09-09 03:13:03 UTC (rev 884)
+++ trunk/vhffs-api/src/Vhffs/Constants.pm	2007-09-09 04:20:19 UTC (rev 885)
@@ -64,7 +64,7 @@
 # Objects' types
     TYPE_USER => 10,
     TYPE_GROUP => 11,
-    TYPE_HTTPD => 20,
+    TYPE_WEB => 20,
     TYPE_REPOSITORY => 21,
     TYPE_MYSQL => 30,
     TYPE_PGSQL => 31,

Modified: trunk/vhffs-api/src/Vhffs/Functions.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Functions.pm	2007-09-09 03:13:03 UTC (rev 884)
+++ trunk/vhffs-api/src/Vhffs/Functions.pm	2007-09-09 04:20:19 UTC (rev 885)
@@ -71,7 +71,7 @@
 my @TYPES_STRINGS;
 $TYPES_STRINGS[Vhffs::Constants::TYPE_USER] = 'User';
 $TYPES_STRINGS[Vhffs::Constants::TYPE_GROUP] = 'Group';
-$TYPES_STRINGS[Vhffs::Constants::TYPE_HTTPD] = 'Webarea';
+$TYPES_STRINGS[Vhffs::Constants::TYPE_WEB] = 'Webarea';
 $TYPES_STRINGS[Vhffs::Constants::TYPE_REPOSITORY] = 'Download Repository';
 $TYPES_STRINGS[Vhffs::Constants::TYPE_MYSQL] = 'MySQL DB';
 $TYPES_STRINGS[Vhffs::Constants::TYPE_PGSQL] = 'PgSQL DB';

Modified: trunk/vhffs-api/src/Vhffs/Group.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Group.pm	2007-09-09 03:13:03 UTC (rev 884)
+++ trunk/vhffs-api/src/Vhffs/Group.pm	2007-09-09 04:20:19 UTC (rev 885)
@@ -180,7 +180,7 @@
 	if( $config->get_service_availability('web') == 1 ) {
 		$query ='SELECT COUNT(*) FROM vhffs_object WHERE type = ? AND owner_gid=?';
 	    $request = $self->{'db'}->prepare( $query );
-	    $request->execute( Vhffs::Constants::TYPE_HTTPD, $self->get_gid );
+	    $request->execute( Vhffs::Constants::TYPE_WEB, $self->get_gid );
         ($rows) = $request->fetchrow();
 		return 0 if( $rows != 0 );
 	}

Modified: trunk/vhffs-api/src/Vhffs/ObjectFactory.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/ObjectFactory.pm	2007-09-09 03:13:03 UTC (rev 884)
+++ trunk/vhffs-api/src/Vhffs/ObjectFactory.pm	2007-09-09 04:20:19 UTC (rev 885)
@@ -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::Web';
+$OBJECTS_BY_TYPE[Vhffs::Constants::TYPE_WEB] = '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::Pgsql';

Modified: trunk/vhffs-api/src/Vhffs/Services/Web.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Web.pm	2007-09-09 03:13:03 UTC (rev 884)
+++ trunk/vhffs-api/src/Vhffs/Services/Web.pm	2007-09-09 04:20:19 UTC (rev 885)
@@ -79,7 +79,7 @@
     $dbh->begin_work;
 
     eval {
-        my $parent =  Vhffs::Object::create($main, $user->get_uid, $group->get_gid, $description, undef, Vhffs::Constants::TYPE_HTTPD);
+        my $parent =  Vhffs::Object::create($main, $user->get_uid, $group->get_gid, $description, undef, Vhffs::Constants::TYPE_WEB);
     
         die('Unable to create parent object') unless(defined($parent));
 
@@ -345,7 +345,7 @@
 sub _new {
     my ($class, $main, $httpd_id, $servername, $owner_uid, $owner_gid, $oid, $date_creation, $description, $state) = @_;
 
-    my $self = $class->SUPER::_new($main, $oid, $owner_uid, $owner_gid, $date_creation, $description, $state, Vhffs::Constants::TYPE_HTTPD);
+    my $self = $class->SUPER::_new($main, $oid, $owner_uid, $owner_gid, $date_creation, $description, $state, Vhffs::Constants::TYPE_WEB);
     return undef unless(defined($self));
 
     $self->{http_id} = $httpd_id;