[vhffs-dev] [831] Deleted <rss> part of the configuration, merged fields into <panel>, fixed public/rss/*.pl files

[subversion@xxxxxxxxx]

Revision: 831
Author:   gradator
Date:     2007-08-30 14:38:24 +0000 (Thu, 30 Aug 2007)

Log Message:
-----------
Deleted <rss> part of the configuration, merged fields into <panel>, fixed public/rss/*.pl files

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Conf.pm
    trunk/vhffs-backend/conf/vhffs.conf.dist.in
    trunk/vhffs-public/rss/lastgroups.pl
    trunk/vhffs-public/rss/lastusers.pl
    trunk/vhffs-tests/conf/vhffs.conf


Modified: trunk/vhffs-api/src/Vhffs/Conf.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 14:11:14 UTC (rev 830)
+++ trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 14:38:24 UTC (rev 831)
@@ -449,33 +449,7 @@
     return 0;
 }
 
-sub get_panel_rss_users
-{
-    if( $Config{"global"}{"panel"}{rss}{users} )
-    {
-        if( $Config{"global"}{"panel"}{rss}{users} eq "yes" )
-        {
-            return 1;
-        }
-    }
-    return 0;
-}
 
-
-sub get_panel_rss_groups
-{
-    if( $Config{"global"}{"panel"}{rss}{groups} )
-    {
-        if( $Config{"global"}{"panel"}{rss}{groups} eq "yes" )
-        {
-            return 1;
-        }
-    }
-    return 0;
-}
-
-
-
 sub get_panel_url
 {
 	if( $Config{"global"}{"panel"}{url} )

Modified: trunk/vhffs-backend/conf/vhffs.conf.dist.in
===================================================================
--- trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 14:11:14 UTC (rev 830)
+++ trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 14:38:24 UTC (rev 831)
@@ -13,7 +13,7 @@
 	host_name		=	My Hosting service
 
 	#This is the URL of the website of the hoster,
-	#if unset, no links will be added to hoster website
+	#if unset, no link will be added to hoster website
 	host_website		=	http://vhffs.org/
 
 	#The directory where you store ALL data
@@ -28,13 +28,13 @@
 	#The default language
 	default_language	=	en_US
 
-	#Mail sent to hosted people have From: vhffs_master
+	#Mails sent to hosted people have From: vhffs_master
 	vhffs_master 		=	VHFFS Admin <admin@localhost>
 
-	#Mail of moderator
+	#Mails sent to hosted people about moderations have From: vhffs_moderator
 	vhffs_moderator 	=	VHFFS Admin <moderator@localhost>
 
-	#Tag inserted in the subject of each sended mail
+	#Tag inserted in the subject of each sent mail
 	mailtag 		=	[VHFFS]
 
 	#Allow subscribing to the platform
@@ -43,6 +43,7 @@
 	#The mail where alert are sent
 	alert_mail		=	root@localhost
 
+	#Is the requests moderated or not
 	moderation		=	yes
 
 	#Whether to use vhffsfs or not. vhffsfs allows you to provide a
@@ -96,10 +97,8 @@
 		use_notation		=	yes
 
 		#Use RSS for users and groups ?
-		<rss>
-			users		=	yes
-			groups		=	yes
-		</rss>
+		rss_users		=	yes
+		rss_groups		=	yes
 	</panel>
 </global>
 

Modified: trunk/vhffs-public/rss/lastgroups.pl
===================================================================
--- trunk/vhffs-public/rss/lastgroups.pl	2007-08-30 14:11:14 UTC (rev 830)
+++ trunk/vhffs-public/rss/lastgroups.pl	2007-08-30 14:38:24 UTC (rev 831)
@@ -45,7 +45,7 @@
 $url = "" if( ! defined ( $url = $vhffs->get_config->get_panel_public_url ) );
 
 
-if( $vhffs->get_config->get_panel_rss_groups == 1 && $vhffs->get_config->get_panel_public == 1)
+if( $vhffs->get_config->get_panel->{'rss_groups'} eq 'yes' && $vhffs->get_config->get_panel_public == 1)
 {
 	my $groups = Vhffs::Group::get_last_groups( $vhffs );
 	
@@ -104,7 +104,7 @@
         use Locale::gettext;
         use HTML::Template;
         my $templatedir = $vhffs->get_config->get_templatedir;
-        my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+        my $template = new HTML::Template( filename => $templatedir."/public/simplemsg.tmpl" );
         my $message = gettext( "RSS infos are not published");
         $template->param( MESSAGE => $message );
         print "Content-Type: text/html; charset=utf-8\n\n" . $template->output;

Modified: trunk/vhffs-public/rss/lastusers.pl
===================================================================
--- trunk/vhffs-public/rss/lastusers.pl	2007-08-30 14:11:14 UTC (rev 830)
+++ trunk/vhffs-public/rss/lastusers.pl	2007-08-30 14:38:24 UTC (rev 831)
@@ -43,7 +43,7 @@
 my $url;
 $url = "" if( ! defined ( $url = $vhffs->get_config->get_panel_public_url ) );
 
-if( $vhffs->get_config->get_panel_rss_users == 1 && $vhffs->get_config->get_panel_public == 1 )
+if( $vhffs->get_config->get_panel->{'rss_users'} eq 'yes' && $vhffs->get_config->get_panel_public == 1 )
 {
 	my $users = Vhffs::User::get_last_users( $vhffs );
 
@@ -102,7 +102,7 @@
 		use Locale::gettext;
 		use HTML::Template;
 		my $templatedir = $vhffs->get_config->get_templatedir;
-        my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+        my $template = new HTML::Template( filename => $templatedir."/public/simplemsg.tmpl" );
         my $message = gettext( "RSS infos are not published");
         $template->param( MESSAGE => $message );
 		print "Content-Type: text/html; charset=utf-8\n\n" . $template->output;

Modified: trunk/vhffs-tests/conf/vhffs.conf
===================================================================
--- trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 14:11:14 UTC (rev 830)
+++ trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 14:38:24 UTC (rev 831)
@@ -69,13 +69,11 @@
 		#Notation is useful to handle aggressive users
 		#If a project is refused by moderation, the note os the user if decreased
 		#If a project or service is accepted, the note is increased
-		use_notation		= yes
+		use_notation		=	yes
 
 		#Use RSS for users and groups ?
-		<rss>
-			users		=	yes
-			groups		=	yes
-		</rss>
+		rss_users		=	yes
+		rss_groups		=	yes
 	</panel>
 </global>