From 84a9a5b174865b9f4b1281371458e713a67d17c4 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 19 Sep 2020 03:16:26 +0000
Subject: [PATCH] Fixes several notices

---
 mod/events.php        | 10 +++++-----
 src/Model/Contact.php |  2 +-
 src/Model/Mail.php    |  7 +++++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mod/events.php b/mod/events.php
index d82fbd818e..695432e2a4 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -474,16 +474,16 @@ function events_content(App $a)
 		$t_orig = $orig_event['summary']  ?? '';
 		$d_orig = $orig_event['desc']     ?? '';
 		$l_orig = $orig_event['location'] ?? '';
-		$eid = !empty($orig_event) ? $orig_event['id']  : 0;
-		$cid = !empty($orig_event) ? $orig_event['cid'] : 0;
-		$uri = !empty($orig_event) ? $orig_event['uri'] : '';
+		$eid = $orig_event['id'] ?? 0;
+		$cid = $orig_event['cid'] ?? 0;
+		$uri = $orig_event['uri'] ?? '';
 
 		if ($cid || $mode === 'edit') {
 			$share_disabled = 'disabled="disabled"';
 		}
 
-		$sdt = !empty($orig_event) ? $orig_event['start']  : 'now';
-		$fdt = !empty($orig_event) ? $orig_event['finish'] : 'now';
+		$sdt = $orig_event['start'] ?? 'now';
+		$fdt = $orig_event['finish'] ?? 'now';
 
 		$tz = date_default_timezone_get();
 		if (!empty($orig_event)) {
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 97c281e1a1..3d3583b6bf 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1909,7 +1909,7 @@ class Contact
 			$ret['pubkey'] = $new_pubkey;
 		}
 
-		if (($ret['addr'] != $contact['addr']) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) {
+		if ((!empty($ret['addr']) && ($ret['addr'] != $contact['addr'])) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) {
 			$ret['uri-date'] = DateTimeFormat::utcNow();
 		}
 
diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 67d5d1ddca..12b4985526 100644
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -129,9 +129,12 @@ class Mail
 		}
 
 		$me = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
-		$contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
+		if (!DBA::isResult($me)) {
+			return -2;
+		}
 
-		if (!(count($me) && (count($contact)))) {
+		$contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
+		if (!DBA::isResult($contact)) {
 			return -2;
 		}