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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/01/21 15:19:37

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

Log message:
        patch #5699

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1158&r2=1.1159
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.88&r2=1.89

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1158
retrieving revision 1.1159
diff -u -b -r1.1158 -r1.1159
--- distrib/ChangeLog   21 Jan 2007 15:18:13 -0000      1.1158
+++ distrib/ChangeLog   21 Jan 2007 15:19:36 -0000      1.1159
@@ -15,6 +15,7 @@
 =========
 
 2007/01/21
+5699: Multiuser: Fix wrong file path (user_commit_dir) in notification mail
 5695: Command "set": better error text if option does not exist
 5694: Fix small typo in buildinfo
 

Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- src/daemon/common/commonInteractive.ml      15 Jan 2007 18:26:27 -0000      
1.88
+++ src/daemon/common/commonInteractive.ml      21 Jan 2007 15:19:36 -0000      
1.89
@@ -331,7 +331,12 @@
     let incoming = incoming_dir (Unix2.is_directory (file_disk_name file)) () 
in
 
     let line4 = if !!url_in_mail = "" then "" else
-      Printf.sprintf "\r\n<%s/%s/%s>\r\n" !!url_in_mail incoming.shdir_dirname 
(Url.encode (file_best_name file))
+      Printf.sprintf "\r\n<%s/%s%s/%s>\r\n"
+        !!url_in_mail
+        incoming.shdir_dirname
+        (if (file_owner file).user_commit_dir = "" then ""
+         else Printf.sprintf "/%s" (file_owner file).user_commit_dir)
+        (Url.encode (file_best_name file))
     in
 
     let line5 = if !!auto_commit then "" else