Browse Source

Fixes several notices

tags/2020.09
Michael 1 month ago
parent
commit
84a9a5b174
3 changed files with 11 additions and 8 deletions
  1. +5
    -5
      mod/events.php
  2. +1
    -1
      src/Model/Contact.php
  3. +5
    -2
      src/Model/Mail.php

+ 5
- 5
mod/events.php View File

@@ -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)) {


+ 1
- 1
src/Model/Contact.php View File

@@ -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();
}



+ 5
- 2
src/Model/Mail.php View File

@@ -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;
}



Loading…
Cancel
Save