add timestamp to avatar filenames to prevent overlap

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

diff --git a/actions/subscribe.php b/actions/subscribe.php
index ea3038236c45303dab990a62166c7013ea42607a..522c315935a1ca46e184e82a3c8171b64c5768d7 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -1,18 +1,18 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -22,48 +22,40 @@ 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.'));
                        return;
                }
-               
+
                $other_nickname = $this->arg('subscribeto');
 
                $other = User::staticGet('nickname', $other_nickname);
-               
+
                if (!$other) {
                        common_user_error(_t('No such user.'));
                        return;
                }
-               
+
                $user = common_current_user();
 
                if ($user->isSubscribed($other)) {
                        common_user_error(_t('Already subscribed!.'));
                        return;
                }
-               
+
                $sub = new Subscription();
                $sub->subscriber = $user->id;
                $sub->subscribed = $other->id;
-               
+
                $sub->created = DB_DataObject_Cast::dateTime(); # current time
 
-               $val = $sub->validate();
-               
-               if ($val !== TRUE) {
-                       # XXX: give some error notice
-                       common_server_error(_t('Subscription did not validate.'));
-                       return;
-               }
-               
                if (!$sub->insert()) {
                        common_server_error(_t('Couldn\'t create subscription.'));
                        return;
                }
-               
-               common_redirect(common_local_url('all', array('nickname' =>
-                                                                                                         $user->nickname)));
+
+               common_redirect(common_local_url('subscriptions', array('nickname' =>
+                                                                                                                               $user->nickname)));
        }
 }
\ No newline at end of file