X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ffavor.php;h=dd61899e4b3b3a29b7624e37d9d491e3cc2012f4;hb=b3ed4e5e20523673d4005415e8d9f26bf0748659;hp=f192321f909444c083c3c4820c362e49f87afde3;hpb=a8a36677748b304faf20742598b90f3d9634f393;p=quix0rs-gnu-social.git

diff --git a/actions/favor.php b/actions/favor.php
index f192321f90..dd61899e4b 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -19,7 +19,7 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once($INSTALLDIR.'/lib/mail.php');
+require_once(INSTALLDIR.'/lib/mail.php');
 
 class FavorAction extends Action {
 
@@ -62,39 +62,32 @@ class FavorAction extends Action {
 		}
 
 		$this->notify($fave, $notice, $user);
-
-		common_redirect(common_local_url('showfavorites',
-										 array('nickname' => $user->nickname)));
+		$user->blowFavesCache();
+		
+		if ($this->boolean('ajax')) {
+			common_start_html('text/xml');
+			common_element_start('head');
+			common_element('title', _('Disfavor'));
+			common_element_end('head');
+			common_element_start('body');
+			common_disfavor_form($notice);
+			common_element_end('body');
+			common_element_end('html');
+		} else {
+			common_redirect(common_local_url('showfavorites',
+											 array('nickname' => $user->nickname)));
+		}
 	}
 
 	function notify($fave, $notice, $user) {
 	    $other = User::staticGet('id', $notice->profile_id);
-		if ($other) {
+		if ($other && $other->id != $user->id) {
 			if ($other->email && $other->emailnotifyfav) {
-				$this->notify_mail($other, $user, $notice);
+				mail_notify_fave($other, $user, $notice);
 			}
 			# XXX: notify by IM
 			# XXX: notify by SMS
 		}
 	}
 
-	function notify_mail($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);
-	}
 }
\ No newline at end of file