[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/02/18 00:22:47

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonInteractive.ml 

Log message:
        patch #5753

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1185&r2=1.1186
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.90&r2=1.91

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1185
retrieving revision 1.1186
diff -u -b -r1.1185 -r1.1186
--- distrib/ChangeLog   18 Feb 2007 00:12:16 -0000      1.1185
+++ distrib/ChangeLog   18 Feb 2007 00:22:47 -0000      1.1186
@@ -15,6 +15,7 @@
 =========
 
 2007/02/18
+5753: Multiuser: New variable $USER_MAIL for file_completed_cmd
 5751: Improve startup log messages, remove unused code, optimize Date code
 5749: BT: recognize more BT client types (orbit)
 5748: KAD/OV: Limit searches for sources (bogeyman)

Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- src/daemon/common/commonInteractive.ml      6 Feb 2007 22:26:58 -0000       
1.90
+++ src/daemon/common/commonInteractive.ml      18 Feb 2007 00:22:47 -0000      
1.91
@@ -183,6 +183,10 @@
            ("ED2K_HASH", (file_print_ed2k_link filename (file_size file) 
info.G.file_md4));
            ("FILE_OWNER",(file_owner file).user_name);
            ("FILE_GROUP",user2_print_group (file_group file));
+           ("USER_MAIL", ( if (file_owner file).user_mail <> "" then
+                              (file_owner file).user_mail
+                            else
+                              if !!mail <> "" then !!mail else ""));
            ]
 
   with e ->