[vhffs-dev] [svn] commit: r185 - in /trunk: ./ vhffs-api/src/Vhffs/ vhffs-api/src/Vhffs/Services/ vhffs-backend/conf/ vhffs-listengine/src/ vhffs-panel/mailinglist/ vhffs-panel/templates/admin/misc/ vhffs-panel/templates/mail/ vhffs-panel/templates/mailinglist/ vhffs-panel/templates/menu/

[vhffs-dev@xxxxxxxxx]

Author: soda
Date: Tue Apr 18 23:23:21 2006
New Revision: 185

Log:
Fix somes bugs :
#0000160 : mailing-list : ajouter le nombre d'utilisateurs inscrits
#0000163 : la description n'apparait pas ...
#0000156 : mails dans panel pour mailing list
#0000172 : Mauvaise configuration des balises labels sur /mail/prefs.pl?name= 
#0000175 : liens de la mod<E9>ration
#0000170 : Probl<E8>mes avec les listes de diffusion
#0000161 : Divers bugs dans listengine.pl
#0000162 : modification de la description de la webarea ...
#0000169 : Unable to change the "reply-to" setting of the mailing-list engine


Modified:
    trunk/Relases.notes
    trunk/vhffs-api/src/Vhffs/Conf.pm
    trunk/vhffs-api/src/Vhffs/Services/Mailing.pm
    trunk/vhffs-backend/conf/vhffs.conf
    trunk/vhffs-listengine/src/listengine.pl
    trunk/vhffs-panel/mailinglist/prefs.pl
    trunk/vhffs-panel/templates/admin/misc/moderation_part.tmpl
    trunk/vhffs-panel/templates/mail/prefs.tmpl
    trunk/vhffs-panel/templates/mailinglist/prefs.tmpl
    trunk/vhffs-panel/templates/menu/main.tmpl

Modified: trunk/Relases.notes
==============================================================================
--- trunk/Relases.notes (original)
+++ trunk/Relases.notes Tue Apr 18 23:23:21 2006
@@ -3,6 +3,8 @@
  * New installer. You don't have to use vhffs-install.sh script
    use now make install. To get help on this installer, please
    type make help
+ * The domain for listengine is now in the configfile vhffs.conf
+   See vhffs-backend/conf/vhffs.conf, at section <listengine>
 
 
 ***************************************************************

Modified: trunk/vhffs-api/src/Vhffs/Conf.pm
==============================================================================
--- trunk/vhffs-api/src/Vhffs/Conf.pm (original)
+++ trunk/vhffs-api/src/Vhffs/Conf.pm Tue Apr 18 23:23:21 2006
@@ -662,6 +662,18 @@
 }
 
 
+sub get_listengine_domain
+{
+	if( defined $Config{"services"}{"listengine"}{"domain"} )
+	{
+		return $Config{"services"}{"listengine"}{"domain"};
+	}
+	else
+	{
+		return "host.tld";
+	}
+}
+
 sub get_listengine_listmaster
 {
 	if( defined $Config{"services"}{"listengine"}{"listmaster"} )

Modified: trunk/vhffs-api/src/Vhffs/Services/Mailing.pm
==============================================================================
--- trunk/vhffs-api/src/Vhffs/Services/Mailing.pm (original)
+++ trunk/vhffs-api/src/Vhffs/Services/Mailing.pm Tue Apr 18 23:23:21 2006
@@ -214,6 +214,9 @@
     my $right = shift;
 
     return -1 if( Vhffs::Functions::valid_mail( $subscriber ) != 1 );
+    return -2 if( $subscriber =~ /.*<.*/ );
+    return -2 if( $subscriber =~ /.*>.*/ );
+    return -2 if( $subscriber =~ /.*\s.*/ );
     return -1 if( ! ( $right =~ /^[\d]+$/ ) );
 
     my $query = "SELECT * FROM vhffs_ml_subscribers WHERE ml_id='".$self->{ml_id}."' AND member='".$subscriber."'";
@@ -524,7 +527,7 @@
 sub set_replyto
 {
     my( $self , $value ) = @_;
-    return -1 if( Vhffs::Functions::valid_mail( $value ) != 1 );
+	return -2 if( ( $value != 0 ) && ( $value != 1 ) );
     $self->{'reply_to'} = $value;
     return 1;
 }

Modified: trunk/vhffs-backend/conf/vhffs.conf
==============================================================================
--- trunk/vhffs-backend/conf/vhffs.conf (original)
+++ trunk/vhffs-backend/conf/vhffs.conf Tue Apr 18 23:23:21 2006
@@ -267,6 +267,9 @@
 
 	#Configuration for listengine
 	<listengine>
+		#The domain is used when listengine bounces mails to SMTP server
+		#Listengine will send HELO domain to the SMTP sever
+		domain		=	"myhost.tld"
 		#Where we store listengine data
 		datadir		=	"/data/listengine"
 		#Email of listmaster

Modified: trunk/vhffs-listengine/src/listengine.pl
==============================================================================
--- trunk/vhffs-listengine/src/listengine.pl (original)
+++ trunk/vhffs-listengine/src/listengine.pl Tue Apr 18 23:23:21 2006
@@ -27,7 +27,6 @@
 ###########################
 my $MAIL_UID = 8;
 my $MAIL_GID = 8;
-my $DOMAIN	 = "tuxfamily.org";
 ###########################
 
 #Huho, if the program stop heres, you have some problems with your MTA configuration
@@ -42,8 +41,9 @@
 my $domain = shift;
 my $vhffs = init Vhffs::Main;
 
-my $LISTMASTER = $vhffs->get_config->get_listengine_listmaster;
-my $ADMIN = $vhffs->get_config->get_listengine_listmaster;
+my $DOMAIN		= $vhffs->get_config->get_listengine_domain;
+my $LISTMASTER	= $vhffs->get_config->get_listengine_listmaster;
+my $ADMIN		= $vhffs->get_config->get_listengine_listmaster;
 my $SMTP_SERVER = $vhffs->get_config->get_listengine_smtp;
 
 #Be carefule, listengine will create /data/listengine/archives for archives

Modified: trunk/vhffs-panel/mailinglist/prefs.pl
==============================================================================
--- trunk/vhffs-panel/mailinglist/prefs.pl (original)
+++ trunk/vhffs-panel/mailinglist/prefs.pl Tue Apr 18 23:23:21 2006
@@ -33,8 +33,10 @@
 my $name = $cgi->param("name");
 my $template;
 my $subtemplate;
+my $templatedir = $vhffs->get_config->get_templatedir;
 
-my $templatedir = $vhffs->get_config->get_templatedir;
+my $num_members;
+$num_members = 0;
 
 #defined name in CGI overwrite lpart and domain cgi
 if( defined $name )
@@ -149,8 +151,10 @@
 			$subtemplate->param( SELECTED_RIGHT_SUB_WAITING_FOR_REPLY  => "selected" ) if( $subs->{$_}{perm} == Vhffs::Constants::ML_RIGHT_SUB_WAITING_FOR_REPLY );
 	
 			$output .= $subtemplate->output;	
+			$num_members++;
 		}
 		$template->param( LIST_MEMBERS => $output );
+		$template->param( HOWMANY_MEMBERS => $num_members );
 	}
 	else
 	{

Modified: trunk/vhffs-panel/templates/admin/misc/moderation_part.tmpl
==============================================================================
--- trunk/vhffs-panel/templates/admin/misc/moderation_part.tmpl (original)
+++ trunk/vhffs-panel/templates/admin/misc/moderation_part.tmpl Tue Apr 18 23:23:21 2006
@@ -4,14 +4,14 @@
 	</td>
 	<td>
 	
-		<a href="user/edit.pl?NAME=<TMPL_VAR NAME="OWNER">"> 
+		<a href="user/show.pl?NAME=<TMPL_VAR NAME="OWNER">"> 
 		<TMPL_VAR NAME="OWNER">
 		</a>
 		(<TMPL_VAR NAME="NOTE">)
 
 	</td>
 	<td>
-		<a href="group/edit.pl?NAME=<TMPL_VAR NAME="GROUP">"> 
+		<a href="group/show.pl?NAME=<TMPL_VAR NAME="GROUP">"> 
 		<TMPL_VAR NAME="GROUP">
 		</a>
 	</td>

Modified: trunk/vhffs-panel/templates/mail/prefs.tmpl
==============================================================================
--- trunk/vhffs-panel/templates/mail/prefs.tmpl (original)
+++ trunk/vhffs-panel/templates/mail/prefs.tmpl Tue Apr 18 23:23:21 2006
@@ -28,16 +28,16 @@
 
 <form method="post" action="add_account.pl">
 	<p>
-		<label for="LOCALPART">
+		<label for="LOCALPART" id="LabelLocalpart">
 			<tmpl_var name="TEXT_ACCOUNT_LOCALPART">:
 		</label>
 			<input type="text" name="LOCALPART" id="LOCALPART" /> at <tmpl_var name="VALUE_DOMAIN">
 	</p>
 	<p>
-		<label for="CATCHALL">
+		<label for="CATCHALL" id="LabelCatchAll">
 			<tmpl_var name="TEXT_ACCOUNT_PASSWORD">:
 		</label>
-		<input type="text" name="PASSWORD" id="" />
+		<input type="text" name="PASSWORD" id="MailPassword" />
 	</p>
 	<p class="button" id="buttonModify">
 		<input type="hidden" name="NAME" value="<tmpl_var name="VALUE_DOMAIN">" />				

Modified: trunk/vhffs-panel/templates/mailinglist/prefs.tmpl
==============================================================================
--- trunk/vhffs-panel/templates/mailinglist/prefs.tmpl (original)
+++ trunk/vhffs-panel/templates/mailinglist/prefs.tmpl Tue Apr 18 23:23:21 2006
@@ -53,7 +53,7 @@
 </form>
 
 <h2><tmpl_var name="TITLE_MEMBERS"></h2>
-<h3><tmpl_var name="TITLE_LIST_MEMBERS"></h3>
+<h3><tmpl_var name="TITLE_LIST_MEMBERS"> (<tmpl_var name="HOWMANY_MEMBERS">)</h3>
 
 <table>
 	<tmpl_var name="LIST_MEMBERS">

Modified: trunk/vhffs-panel/templates/menu/main.tmpl
==============================================================================
--- trunk/vhffs-panel/templates/menu/main.tmpl (original)
+++ trunk/vhffs-panel/templates/menu/main.tmpl Tue Apr 18 23:23:21 2006
@@ -4,7 +4,7 @@
 
 <div id="menu">
 <a class="logomenu" href="/panel.pl">
-<img src="/themes/<tmpl_var name="THEME">/images/logo.png"/>
+<img src="/themes/<tmpl_var name="THEME">/images/logo.png" alt="logo"/>
 </a>
 <tmpl_var name="USER_MENU">
 <tmpl_var name="ADMIN_MENU">