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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/09/01 07:36:49

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

Log message:
        patch #6629

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1384&r2=1.1385
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.105&r2=1.106

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1384
retrieving revision 1.1385
diff -u -b -r1.1384 -r1.1385
--- distrib/ChangeLog   1 Sep 2008 07:21:50 -0000       1.1384
+++ distrib/ChangeLog   1 Sep 2008 07:36:49 -0000       1.1385
@@ -15,6 +15,7 @@
 =========
 
 2008/09/01
+6629: Mail: Move hostname from subject to body (eydaimon)
 Updated Mozilla protocol handler to version 2.5
 - original source from http://www.informatik.uni-oldenburg.de/~dyna/mldonkey
 6628: IP discover: Use http://whatismyip.org, old URL is not working anymore

Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- src/daemon/common/commonInteractive.ml      2 May 2008 14:56:51 -0000       
1.105
+++ src/daemon/common/commonInteractive.ml      1 Sep 2008 07:36:49 -0000       
1.106
@@ -343,9 +343,9 @@
     in
 
     let subject = if !!filename_in_subject then
-        Printf.sprintf "address@hidden file received - %s" (Unix.gethostname 
()) (file_best_name file)
+        Printf.sprintf "mldonkey - %s complete" (file_best_name file)
       else
-        Printf.sprintf "address@hidden, file received" (Unix.gethostname ())
+        Printf.sprintf "mldonkey - download complete"
     in
 
 (* TODO: This information can be wrong *)
@@ -365,7 +365,11 @@
     in
 
     let line6 =
-      Printf.sprintf "\r\nUser/Group: %s:%s\r\n" (file_owner file).user_name 
(user2_print_group (file_group file))
+      Printf.sprintf "\r\nUser/Group: %s:%s" (file_owner file).user_name 
(user2_print_group (file_group file))
+    in
+
+    let line7 =
+      Printf.sprintf "\r\nHost: %s\r\n" (Unix.gethostname ())
     in
       
     let send_mail address admin =
@@ -373,7 +377,7 @@
         M.mail_to = address;
         M.mail_from = address;
         M.mail_subject = subject;
-        M.mail_body = line1 ^ line2 ^ line3 ^ line4 ^ line5 ^ (if admin then 
line6 else "");
+        M.mail_body = line1 ^ line2 ^ line3 ^ line4 ^ line5 ^ (if admin then 
line6 else "") ^ line7;
       } in
         M.sendmail !!smtp_server !!smtp_port !!add_mail_brackets mail
     in