From b5ac1fa2a33ae046fa785d9938dcd0d5274b7ce1 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Mon, 10 Jun 2024 21:09:15 -0700
Subject: Make sure to check users for being false

---
 src/SemanticScuttle/Model/User.php       | 27 +++++++++++++++++++++------
 src/SemanticScuttle/Service/AuthUser.php | 12 +++++++-----
 src/SemanticScuttle/Service/User.php     |  7 ++++++-
 3 files changed, 34 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/SemanticScuttle/Model/User.php b/src/SemanticScuttle/Model/User.php
index 3fbbaa0..96dddbf 100644
--- a/src/SemanticScuttle/Model/User.php
+++ b/src/SemanticScuttle/Model/User.php
@@ -83,7 +83,9 @@ class SemanticScuttle_Model_User
         if (!isset($this->privateKey)) {
             $us = SemanticScuttle_Service_Factory::get('User');
             $user = $us->getUser($this->id);
-            $this->privateKey = $user['privateKey'];
+            if ($user) {
+                $this->privateKey = $user['privateKey'];
+            }
         }
         //2023-12-20 add line to avoid 'Deprecated' warning
         if (is_null($this->privateKey)) return null;
@@ -106,7 +108,12 @@ class SemanticScuttle_Model_User
         if (!isset($this->name)) {
             $us = SemanticScuttle_Service_Factory::get('User');
             $user = $us->getUser($this->id);
-            $this->name = $user['name'];
+            if ($user) {
+                $this->name = $user['name'];
+            }
+            else {
+                $this->name = 'unknown';
+            }
         }
         return $this->name;
     }
@@ -122,7 +129,9 @@ class SemanticScuttle_Model_User
         if (!isset($this->email)) {
             $us = SemanticScuttle_Service_Factory::get('User');
             $user = $us->getUser($this->id);
-            $this->email = $user['email'];
+            if ($user) {
+                $this->email = $user['email'];
+            }
         }
         return $this->email;
     }
@@ -138,7 +147,9 @@ class SemanticScuttle_Model_User
         if(!isset($this->homepage)) {
             $us = SemanticScuttle_Service_Factory::get('User');
             $user = $us->getUser($this->id);
-            $this->homepage = $user['homepage'];
+            if ($user) {
+                $this->homepage = $user['homepage'];
+            }
         }
         return $this->homepage;
     }
@@ -154,7 +165,9 @@ class SemanticScuttle_Model_User
         if(!isset($this->content)) {
             $us = SemanticScuttle_Service_Factory::get('User');
             $user = $us->getUser($this->id);
-            $this->content = $user['uContent'];
+            if ($user) {
+                $this->content = $user['uContent'];
+            }
         }
         return $this->content;
     }
@@ -171,7 +184,9 @@ class SemanticScuttle_Model_User
         if(!isset($this->content)) {
             $us = SemanticScuttle_Service_Factory::get('User');
             $user = $us->getUser($this->id);
-            $this->datetime = $user['uDatetime'];
+            if ($user) {
+                $this->datetime = $user['uDatetime'];
+            }
         }
         return $this->datetime;
     }
diff --git a/src/SemanticScuttle/Service/AuthUser.php b/src/SemanticScuttle/Service/AuthUser.php
index 9447ee4..f0bc908 100644
--- a/src/SemanticScuttle/Service/AuthUser.php
+++ b/src/SemanticScuttle/Service/AuthUser.php
@@ -168,10 +168,12 @@ class SemanticScuttle_Service_AuthUser extends SemanticScuttle_Service_User
         //user must have changed password in external auth.
         //we need to update the local database.
         $user = $this->getUserByUsername($username);
-        $this->_updateuser(
-            $user['uId'], $this->getFieldName('password'),
-            $this->sanitisePassword($password)
-        );
+        if ($user) {
+            $this->_updateuser(
+                $user['uId'], $this->getFieldName('password'),
+                $this->sanitisePassword($password)
+            );
+        }
 
         return parent::login($username, $password, $remember);
     }
@@ -229,4 +231,4 @@ class SemanticScuttle_Service_AuthUser extends SemanticScuttle_Service_User
     }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php
index 917c7c9..675c4fb 100644
--- a/src/SemanticScuttle/Service/User.php
+++ b/src/SemanticScuttle/Service/User.php
@@ -395,7 +395,12 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
     {
         if (is_numeric($user)) {
             $user = $this->getUser($user);
-            $user = $user['username'];
+            if ($user) {
+                $user = $user['username'];
+            }
+            else {
+                $user = 'unknown';
+            }
         } else if (is_array($user)) {
             $user = $user['username'];
         }
-- 
cgit v1.2.3-54-g00ecf