Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes

[quix0rs-gnu-social.git] / classes / User.php

diff --git a/classes/User.php b/classes/User.php
index 40e1a1b6443a2503371e1e81c680ea73d26cce58..c9c61d3aed40606267eb5e6268b624b91e39a1c4 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -190,7 +190,7 @@ class User extends Managed_DataObject
         return Sms_carrier::getKV('id', $this->carrier);
     }
 
-    function hasBlocked($other)
+    function hasBlocked(Profile $other)
     {
         return $this->getProfile()->hasBlocked($other);
     }
@@ -343,7 +343,8 @@ class User extends Managed_DataObject
                 $invite->convert($user);
             }
 
-            if (!empty($email) && !$user->email) {
+            if (!empty($email) && empty($user->email)) {
+                // The actual email will be sent further down, after the database COMMIT
 
                 $confirm = new Confirm_address();
                 $confirm->code = common_confirmation_code(128);
@@ -353,7 +354,7 @@ class User extends Managed_DataObject
 
                 $result = $confirm->insert();
 
-                if (!$result) {
+                if ($result===false) {
                     common_log_db_error($confirm, 'INSERT', __FILE__);
                     $profile->query('ROLLBACK');
                     // TRANS: Email confirmation data could not be inserted for some reason.
@@ -381,11 +382,11 @@ class User extends Managed_DataObject
 
             $profile->query('COMMIT');
 
-            if (!empty($email) && !empty($user->email)) {
+            if (!empty($email) && empty($user->email)) {
                 try {
-                    mail_confirm_address($user, $confirm->code, $profile->nickname, $email);
+                    $confirm->sendConfirmation();
                 } catch (EmailException $e) {
-                    common_log(LOG_ERR, "Could not send user registration email for user id=={$user->id}: {$e->getMessage()}");
+                    common_log(LOG_ERR, "Could not send user registration email for user id=={$profile->getID()}: {$e->getMessage()}");
                     if (!$accept_email_fail) {
                         throw $e;
                     }
@@ -407,7 +408,7 @@ class User extends Managed_DataObject
                                               // TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
                                               sprintf(_('Welcome to %1$s, @%2$s!'),
                                                       common_config('site', 'name'),
-                                                      $user->nickname),
+                                                      $profile->getNickname()),
                                               'system');
                 }
             }
@@ -415,7 +416,7 @@ class User extends Managed_DataObject
             Event::handle('EndUserRegister', array($profile));
         }
 
-        if (!$user instanceof User) {
+        if (!$user instanceof User || empty($user->id)) {
             throw new ServerException('User could not be registered. Probably an event hook that failed.');
         }
 
@@ -433,13 +434,14 @@ class User extends Managed_DataObject
         if ($invites->find()) {
             while ($invites->fetch()) {
                 try {
-                    $other = Profile::getKV('id', $invites->user_id);
-                    if (!($other instanceof Profile)) {    // remove when getKV throws exceptions
-                        continue;
-                    }
+                    $other = Profile::getByID($invites->user_id);
                     Subscription::start($other, $this->getProfile());
+                } catch (NoResultException $e) {
+                    // profile did not exist
+                } catch (AlreadyFulfilledException $e) {
+                    // already subscribed to this profile
                 } catch (Exception $e) {
-                    continue;
+                    common_log(LOG_ERR, 'On-invitation-completion subscription failed when subscribing '._ve($invites->user_id).' to '.$this->getProfile()->getID().': '._ve($e->getMessage()));
                 }
             }
         }
@@ -701,15 +703,18 @@ class User extends Managed_DataObject
 
     function repeatedByMe($offset=0, $limit=20, $since_id=null, $max_id=null)
     {
-        $stream = new RepeatedByMeNoticeStream($this);
+        // FIXME: Use another way to get Profile::current() since we
+        // want to avoid confusion between session user and queue processing.
+        $stream = new RepeatedByMeNoticeStream($this->getProfile(), Profile::current());
         return $stream->getNotices($offset, $limit, $since_id, $max_id);
     }
 
 
     function repeatsOfMe($offset=0, $limit=20, $since_id=null, $max_id=null)
     {
-        $stream = new RepeatsOfMeNoticeStream($this);
-
+        // FIXME: Use another way to get Profile::current() since we
+        // want to avoid confusion between session user and queue processing.
+        $stream = new RepeatsOfMeNoticeStream($this->getProfile(), Profile::current());
         return $stream->getNotices($offset, $limit, $since_id, $max_id);
     }
 
@@ -873,6 +878,8 @@ class User extends Managed_DataObject
 
     static function recoverPassword($nore)
     {
+        require_once(INSTALLDIR . '/lib/mail.php');
+
         // $confirm_email will be used as a fallback if our user doesn't have a confirmed email
         $confirm_email = null;