X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fmail.php;h=a7cbab8589665daa7343ce171d892e66d5947037;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=b6ce1fe22cf6e53567f761820e5b46edecb7d7e7;hpb=fa2d50f481cda7b430c627cee04a81b8b2703bd7;p=quix0rs-gnu-social.git

diff --git a/lib/mail.php b/lib/mail.php
index b6ce1fe22c..a7cbab8589 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -39,6 +39,9 @@ function mail_backend() {
 
 function mail_send($recipients, $headers, $body) {
 	$backend = mail_backend();
+    if (!isset($headers['Content-Type'])) {
+        $headers['Content-Type'] = 'text/plain; charset=UTF-8';
+    }
 	assert($backend); # throws an error if it's bad
 	$sent = $backend->send($recipients, $headers, $body);
 	if (PEAR::isError($sent)) {
@@ -81,31 +84,17 @@ function mail_to_user(&$user, $subject, $body, $address=NULL) {
 }
 
 # For confirming a Jabber address
-# XXX: change to use mail_to_user() above
 
-function mail_confirm_address($code, $nickname, $address) {
-	$recipients = $address;
-	$headers['From'] = mail_notify_from();
-	$headers['To'] = $nickname . ' <' . $address . '>';
-	$headers['Subject'] = _('Email address confirmation');
+function mail_confirm_address($user, $code, $nickname, $address) {
 
-	$body = "Hey, $nickname.";
-	$body .= "\n\n";
-	$body .= 'Someone just entered this email address on ' . common_config('site', 'name') . '.';
-	$body .= "\n\n";
-	$body .= 'If it was you, and you want to confirm your entry, use the URL below:';
-	$body .= "\n\n";
-	$body .= "\t".common_local_url('confirmaddress',
-								   array('code' => $code));
-	$body .= "\n\n";
-	$body .= 'If not, just ignore this message.';
-	$body .= "\n\n";
-	$body .= 'Thanks for your time, ';
-	$body .= "\n";
-	$body .= common_config('site', 'name');
-	$body .= "\n";
+	$subject = _('Email address confirmation');
 
-	mail_send($recipients, $headers, $body);
+    $body = sprintf(_("Hey, %s.\n\nSomeone just entered this email address on %s.\n\n" .
+        "If it was you, and you want to confirm your entry, use the URL below:\n\n\t%s\n\n" .
+        "If not, just ignore this message.\n\nThanks for your time, \n%s\n")
+        , $nickname, common_config('site', 'name')
+        , common_local_url('confirmaddress', array('code' => $code)), common_config('site', 'name'));
+     return mail_to_user($user, $subject, $body, $address);
 }
 
 function mail_subscribe_notify($listenee, $listener) {
@@ -115,6 +104,8 @@ function mail_subscribe_notify($listenee, $listener) {
 
 function mail_subscribe_notify_profile($listenee, $other) {
 	if ($listenee->email && $listenee->emailnotifysub) {
+        // use the recipients localization
+        common_init_locale($listenee->language);
 		$profile = $listenee->getProfile();
 		$name = $profile->getBestName();
 		$long_name = ($other->fullname) ? ($other->fullname . ' (' . $other->nickname . ')') : $other->nickname;
@@ -130,6 +121,9 @@ function mail_subscribe_notify_profile($listenee, $other) {
 						 common_config('site', 'name'),
 						 $other->profileurl,
 						 common_config('site', 'name'));
+
+        // reset localization
+        common_init_locale();
 		mail_send($recipients, $headers, $body);
 	}
 }
@@ -157,7 +151,7 @@ function mail_new_incoming_notify($user) {
 }
 
 function mail_new_incoming_address() {
-	$prefix = common_good_rand(8);
+	$prefix = common_confirmation_code(64);
 	$suffix = mail_domain();
 	return $prefix . '@' . $suffix;
 }
@@ -173,7 +167,8 @@ function mail_broadcast_notice_sms($notice) {
 				 'ON user.id = subscription.subscriber ' .
 				 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
 				 'AND user.smsemail IS NOT NULL ' .
-				 'AND user.smsnotify = 1');
+				 'AND user.smsnotify = 1 ' .
+                 'AND subscription.sms = 1 ');
 
 	while ($user->fetch()) {
 		common_log(LOG_INFO,
@@ -191,7 +186,7 @@ function mail_broadcast_notice_sms($notice) {
 
 	$user->free();
 	unset($user);
-	
+
 	return true;
 }
 
@@ -232,12 +227,32 @@ function mail_confirm_sms($code, $nickname, $address) {
 	mail_send($recipients, $headers, $body);
 }
 
+function mail_notify_nudge($from, $to) {
+    common_init_locale($to->language);
+	$subject = sprintf(_('You\'ve been nudged by %s'), $from->nickname);
+
+	$from_profile = $from->getProfile();
+
+	$body = sprintf(_("%1\$s (%2\$s) is wondering what you are up to these days and is inviting you to post some news.\n\n".
+					  "So let's hear from you :)\n\n".
+					  "%3\$s\n\n".
+					  "Don't reply to this email; it won't get to them.\n\n".
+					  "With kind regards,\n".
+					  "%4\$s\n"),
+					$from_profile->getBestName(),
+					$from->nickname,
+					common_local_url('all', array('nickname' => $to->nickname)),
+					common_config('site', 'name'));
+    common_init_locale();
+	return mail_to_user($to, $subject, $body);
+}
+
 function mail_notify_message($message, $from=NULL, $to=NULL) {
 
 	if (is_null($from)) {
 		$from = User::staticGet('id', $message->from_profile);
 	}
-	
+
 	if (is_null($to)) {
 		$to = User::staticGet('id', $message->to_profile);
 	}
@@ -245,11 +260,12 @@ function mail_notify_message($message, $from=NULL, $to=NULL) {
 	if (is_null($to->email) || !$to->emailnotifymsg) {
 		return true;
 	}
-	
+
+    common_init_locale($to->language);
 	$subject = sprintf(_('New private message from %s'), $from->nickname);
 
 	$from_profile = $from->getProfile();
-	
+
 	$body = sprintf(_("%1\$s (%2\$s) sent you a private message:\n\n".
 					  "------------------------------------------------------\n".
 					  "%3\$s\n".
@@ -264,13 +280,16 @@ function mail_notify_message($message, $from=NULL, $to=NULL) {
 					$message->content,
 					common_local_url('newmessage', array('to' => $from->id)),
 					common_config('site', 'name'));
-	
+
+    common_init_locale();
 	return mail_to_user($to, $subject, $body);
 }
 
 function mail_notify_fave($other, $user, $notice) {
+
 	$profile = $user->getProfile();
 	$bestname = $profile->getBestName();
+    common_init_locale($other->language);
 	$subject = sprintf(_('%s added your notice as a favorite'), $bestname);
 	$body = sprintf(_("%1\$s just added your notice from %2\$s as one of their favorites.\n\n" .
 					  "In case you forgot, you can see the text of your notice here:\n\n" .
@@ -284,7 +303,7 @@ function mail_notify_fave($other, $user, $notice) {
 					common_local_url('shownotice', array('notice' => $notice->id)),
 					common_local_url('showfavorites', array('nickname' => $user->nickname)),
 					common_config('site', 'name'));
-	
+
+    common_init_locale();
 	mail_to_user($other, $subject, $body);
 }
-  
\ No newline at end of file