Merged message -> email fixes from stable

diff --git a/message/lib.php b/message/lib.php
index 5e9ff991190c0ef22d9bc3078c4d7ccb234d52e3..dd94482721a59cf0540dc577bb974abf10e70b66 100644 (file)
--- a/message/lib.php
+++ b/message/lib.php
@@ -991,12 +991,11 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
         return false;
     }
 
-
 /// Check to see if anything else needs to be done with it
 
     $preference = (object)get_user_preferences(NULL, NULL, $userto->id);
 
-    if (!isset($preference->message_emailmessages) or $preference->message_emailmessages) {  // Receiver wants mail forwarding
+    if (!isset($preference->message_emailmessages) || $preference->message_emailmessages) {  // Receiver wants mail forwarding
         if (!isset($preference->message_emailtimenosee)) {
             $preference->message_emailtimenosee = 10;
         }
@@ -1024,6 +1023,9 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
                 $userto->email = $preference->message_emailaddress;   // Use custom messaging address
             }
             email_to_user($userto, $userfrom, $messagesubject, $messagetext, $messagehtml);
+            debugging('Mail was sent', DEBUG_NORMAL);
+            echo "mail was sent"; 
+            sleep(3);
         }
     }
 

diff --git a/message/send.php b/message/send.php
index 0e2bd28e30ca6a1851540737c2cbaa8cc57f53fd..afe3fb2147ce887ec7d01943289edaa1cbbc1500 100644 (file)
--- a/message/send.php
+++ b/message/send.php
@@ -58,14 +58,6 @@
         }
     }
 
-/// Make sure the receiving user has preferences
-    if (!isset($userpreferences['message_showmessagewindow'])) {  // User has not used messaging before
-        set_user_preference('message_showmessagewindow', 1, $user->id);
-        set_user_preference('message_emailmessages', 1, $user->id);
-        set_user_preference('message_emailtimenosee', 10, $user->id);
-        set_user_preference('message_emailaddress', $user->email, $user->id);
-    }
-
 
     if ($message!='' and confirm_sesskey()) {   /// Current user has just sent a message