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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/07/01 12:59:24

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

Log message:
        patch #6060

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1294&r2=1.1295
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.98&r2=1.99

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1294
retrieving revision 1.1295
diff -u -b -r1.1294 -r1.1295
--- distrib/ChangeLog   1 Jul 2007 12:58:54 -0000       1.1294
+++ distrib/ChangeLog   1 Jul 2007 12:59:24 -0000       1.1295
@@ -15,6 +15,7 @@
 =========
 
 2007/07/01
+6060: Do not send mail notifications when smtp_server = ""
 6059: Multiuser: Avoid double group entries in user_groups
 6056: Log username, IP:port and old/new value when changing options
 

Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- src/daemon/common/commonInteractive.ml      1 Jul 2007 12:57:03 -0000       
1.98
+++ src/daemon/common/commonInteractive.ml      1 Jul 2007 12:59:24 -0000       
1.99
@@ -95,6 +95,7 @@
 let all_temp_queued = ref false
 
 let send_dirfull_warning dir full line1 =
+  if !!smtp_server <> "" && !!smtp_port <> 0 then begin
   let status = if full then "is full" else "has enough space again" in
   lprintf_nl "WARNING: Directory %s %s, %s" dir status line1;
   if (not (keep_console_output ())) then
@@ -124,6 +125,7 @@
           M.sendmail !!smtp_server !!smtp_port !!add_mail_brackets mail
        with _ -> ()
     end
+  end
 
 let file_commited_name incoming_dir file =
   (try Unix2.safe_mkdir incoming_dir with _ -> ());
@@ -328,7 +330,7 @@
 
 let mail_for_completed_file file =
   let usermail = (file_owner file).user_mail in
-  if !!mail <> "" || usermail <> "" then begin
+  if (!!mail <> "" || usermail <> "") && !!smtp_server <> "" && !!smtp_port <> 
0 then begin
     let module M = Mailer in
     let info = file_info file in
     let line1 = "mldonkey has completed the download of:\r\n\r\n" in