Profile block base style

[quix0rs-gnu-social.git] / actions / subscribe.php

diff --git a/actions/subscribe.php b/actions/subscribe.php
index fe683828a7623911d3046af8a6b0797f471ecd93..a032cf71769278b83da547d6766531306bc3ac33 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -20,11 +20,12 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class SubscribeAction extends Action {
+
        function handle($args) {
                parent::handle($args);
 
                if (!common_logged_in()) {
-                       common_user_error(_t('Not logged in.'));
+                       common_user_error(_('Not logged in.'));
                        return;
                }
 
@@ -34,70 +35,44 @@ class SubscribeAction extends Action {
                        common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
                        return;
                }
-               
-               $other_nickname = $this->arg('subscribeto');
 
-               $other = User::staticGet('nickname', $other_nickname);
+               # CSRF protection
 
-               if (!$other) {
-                       common_user_error(_t('No such user.'));
-                       return;
-               }
+               $token = $this->trimmed('token');
 
-               if ($user->isSubscribed($other)) {
-                       common_user_error(_t('Already subscribed!.'));
+               if (!$token || $token != common_session_token()) {
+                       $this->client_error(_('There was a problem with your session token. Try again, please.'));
                        return;
                }
 
-               $sub = new Subscription();
-               $sub->subscriber = $user->id;
-               $sub->subscribed = $other->id;
+               $other_id = $this->arg('subscribeto');
 
-               $sub->created = DB_DataObject_Cast::dateTime(); # current time
+        $other = User::staticGet('id', $other_id);
 
-               if (!$sub->insert()) {
-                       common_server_error(_t('Couldn\'t create subscription.'));
+        if (!$other) {
+                       $this->client_error(_('Not a local user.'));
                        return;
-               }
+        }
 
-               $this->notify($other, $user);
+               $result = subs_subscribe_to($user, $other);
 
-               common_redirect(common_local_url('subscriptions', array('nickname' =>
-                                                                                                                               $user->nickname)));
-       }
-       
-       function notify($listenee, $listener) {
-               # XXX: add other notifications (Jabber, SMS) here
-               # XXX: queue this and handle it offline
-               $this->notify_email($listenee, $listener);
-       }
-       
-       function notify_email($listenee, $listener) {
-               if ($listenee->email) {
-                       global $config;
-                       $profile = $listenee->getProfile();
-                       $other = $listener->getProfile();
-                       $name = $profile->getBestName();
-                       $other_name = $other->getBestName();
-                       $recipients = $listenee->email;
-                       $headers['From'] = mail_notify_from();
-                       $headers['To'] = $name . ' <' . $listenee->email . '>';
-                       $headers['Subject'] = $other_name . _t(' is now listening to your notices on ') . $config['site']['name'];
-
-                       $body = 
-                         ($other->fullname) ? 
-                         ($other->fullname . ' (' . $other->nickname . ')') : $other->nickname;
-
-                       $body .= _t(' is now listening to your notices on ') . $config['site']['name'] . '.';
-                       $body .= "\n\n";
-                       $body .= "\t".$other->profileurl;
-                       $body .= "\n\n";
-                       $body .= _t('Faithfully yours, ');
-                       $body .= "\n";
-                       $body .= $config['site']['name'];
-                       $body .= "\n";
-
-                       mail_send($recipients, $headers, $body);
+               if($result != true) {
+                       common_user_error($result);
+                       return;
                }
+
+               if ($this->boolean('ajax')) {
+                       common_start_html('text/xml');
+                       common_element_start('head');
+                       common_element('title', null, _('Subscribed'));
+                       common_element_end('head');
+                       common_element_start('body');
+                       common_unsubscribe_form($other->getProfile());
+                       common_element_end('body');
+                       common_element_end('html');
+               } else {
+                   common_redirect(common_local_url('subscriptions', array('nickname' =>
+                                                                                                                               $user->nickname)));
+        }
        }
-}
\ No newline at end of file
+}