[vhffs-dev] [svn] commit: r237 - in /trunk: Makefile vhffs-api/src/Vhffs/Robots/User.pm vhffs-api/src/Vhffs/User.pm vhffs-panel/lost_ack.pl vhffs-panel/user/prefs_save.pl

[vhffs-dev@xxxxxxxxx]

Author: gradator
Date: Sun Oct 22 21:58:07 2006
New Revision: 237

Log:
Fixes a namespace conflict, send_mail function is exported in Functions.pm and another send_mail function was declared in User.pm causing $user->send_mail to run the wrong fonction, the function in User.pm has been renamed to send_mail_user to prevent any conflit (it seems hard to remove the export in Functions.pm since it is used everywhere without specifying the complete path to the function)


Modified:
    trunk/Makefile
    trunk/vhffs-api/src/Vhffs/Robots/User.pm
    trunk/vhffs-api/src/Vhffs/User.pm
    trunk/vhffs-panel/lost_ack.pl
    trunk/vhffs-panel/user/prefs_save.pl

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Oct 22 21:58:07 2006
@@ -23,7 +23,7 @@
 install: install-api install-panel install-listengine install-tools install-intl install-conf install-backend install-doc install-bots install-shell link-api
 
 install-debian: debian-deps install-api install-panel install-listengine install-tools install-intl install-conf install-backend install-doc install-bots install-shell
-	ln -s "$(DESTDIR)/usr/share/vhffs/api" "/usr/lib/perl5/Vhffs"
+	if [ ! -L "/usr/lib/perl5/Vhffs" ]; then ln -s "$(DESTDIR)/usr/share/vhffs/api" "/usr/lib/perl5/Vhffs" ; fi
 
 check: test-deps
 

Modified: trunk/vhffs-api/src/Vhffs/Robots/User.pm
==============================================================================
--- trunk/vhffs-api/src/Vhffs/Robots/User.pm (original)
+++ trunk/vhffs-api/src/Vhffs/Robots/User.pm Sun Oct 22 21:58:07 2006
@@ -146,7 +146,7 @@
 		# Send a mail with plain password inside
 		my $subject = "Welcome on VHFFS";
 		my $content = sprintf("Hello %s %s, Welcome on VHFFS\n\nHere are your login information :\nUser: %s\nPassword: %s\n\nVHFFS Administrators\n", $user->get_firstname, $user->get_lastname, $user->get_username, $plainpassword );
-		$user->send_mail( $subject, $content );
+		$user->send_mail_user( $subject, $content );
 
 		if( $user->commit < 0 )
 		{

Modified: trunk/vhffs-api/src/Vhffs/User.pm
==============================================================================
--- trunk/vhffs-api/src/Vhffs/User.pm (original)
+++ trunk/vhffs-api/src/Vhffs/User.pm Sun Oct 22 21:58:07 2006
@@ -427,7 +427,7 @@
 }
 
 
-sub send_mail
+sub send_mail_user
 {
 	use Vhffs::Functions;
 	my ( $user, $subject, $content ) = @_;

Modified: trunk/vhffs-panel/lost_ack.pl
==============================================================================
--- trunk/vhffs-panel/lost_ack.pl (original)
+++ trunk/vhffs-panel/lost_ack.pl Sun Oct 22 21:58:07 2006
@@ -62,7 +62,7 @@
     # Send a mail with plain password inside
     my $subject = "Password changed";
     my $content = sprintf("Hello %s %s,\n\nYou asked for a new password, here are your new login information:\nUser: %s\nPassword: %s\n\nVHFFS Administrators\n", $user->get_firstname, $user->get_lastname, $user->get_username, $plainpassword );
-    $user->send_mail( $subject, $content );
+    $user->send_mail_user( $subject, $content );
     
     $template = new HTML::Template( filename => $templatedir."/main/lost_ok.tmpl" );
     

Modified: trunk/vhffs-panel/user/prefs_save.pl
==============================================================================
--- trunk/vhffs-panel/user/prefs_save.pl (original)
+++ trunk/vhffs-panel/user/prefs_save.pl Sun Oct 22 21:58:07 2006
@@ -119,7 +119,7 @@
 		$user->set_mail( $mail );
 		my $subject = gettext("Mailbox modified");
 		my $content = sprintf( gettext("Hello %s %s,\n\nYou changed your email, here are your new personal information :\n\nUser: %s\nMail: %s\n\nVHFFS administrators\n"), $user->get_firstname, $user->get_lastname, $user->get_username, $user->get_mail);
-		$user->send_mail( $subject, $content );
+		$user->send_mail_user( $subject, $content );
 	}
 
 	if( $user->commit < 0 )