X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fmail.php;h=0fb36a465a926e6a67bf977072e0f815778ec362;hb=13decf40861100a16df9a8858b15e9733b5e6ce7;hp=4788ccb91725fc9480148622e8e0d5c30dd0b942;hpb=130ba2888643992943780962dd4efcca3c595735;p=quix0rs-gnu-social.git

diff --git a/lib/mail.php b/lib/mail.php
index 4788ccb917..0fb36a465a 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -191,7 +191,7 @@ function mail_broadcast_notice_sms($notice) {
 
 	$user->free();
 	unset($user);
-	
+
 	return true;
 }
 
@@ -232,24 +232,47 @@ function mail_confirm_sms($code, $nickname, $address) {
 	mail_send($recipients, $headers, $body);
 }
 
+
+function mail_notify_nudge($from, $to) {
+
+	$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'));
+
+	return mail_to_user($to, $subject, $body);
+}
+
+
+
 function mail_notify_message($message, $from=NULL, $to=NULL) {
 
 	if (is_null($from)) {
-		$from = User::staticGet($message->from_profile);
+		$from = User::staticGet('id', $message->from_profile);
 	}
-	
+
 	if (is_null($to)) {
-		$to = User::staticGet($message->to_profile);
+		$to = User::staticGet('id', $message->to_profile);
 	}
 
-	if (!$to->email || !$to->emailnotifymsg) {
+	if (is_null($to->email) || !$to->emailnotifymsg) {
 		return true;
 	}
-	
+
 	$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".
@@ -257,13 +280,34 @@ function mail_notify_message($message, $from=NULL, $to=NULL) {
 					  "You can reply to their message here:\n\n".
 					  "%4\$s\n\n".
 					  "Don't reply to this email; it won't get to them.\n\n".
-					  "With kind regards,\n",
+					  "With kind regards,\n".
 					  "%5\$s\n"),
 					$from_profile->getBestName(),
 					$from->nickname,
 					$message->content,
 					common_local_url('newmessage', array('to' => $from->id)),
 					common_config('site', 'name'));
-	
+
 	return mail_to_user($to, $subject, $body);
 }
+
+function mail_notify_fave($other, $user, $notice) {
+
+	$profile = $user->getProfile();
+	$bestname = $profile->getBestName();
+	$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" .
+					  "%3\$s\n\n" .
+					  "You can see the list of %1\$s's favorites here:\n\n" .
+					  "%4\$s\n\n" .
+					  "Faithfully yours,\n" .
+					  "%5\$s\n"),
+					$bestname,
+					common_exact_date($notice->created),
+					common_local_url('shownotice', array('notice' => $notice->id)),
+					common_local_url('showfavorites', array('nickname' => $user->nickname)),
+					common_config('site', 'name'));
+
+	mail_to_user($other, $subject, $body);
+}