diff options
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Widget/Cdav.php | 3 | ||||
| -rw-r--r-- | include/connections.php | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 93979baf3..cbb614429 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -714,7 +714,7 @@ class Libzot { $dirmode = get_config('system', 'directory_mode'); - if ((($arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE)) && ($arr['site']['url'] != z_root())) + if (((isset($arr['site']['directory_mode']) && $arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE)) && ($arr['site']['url'] != z_root())) $arr['searchable'] = false; $hidden = (1 - intval($arr['searchable'])); diff --git a/Zotlabs/Widget/Cdav.php b/Zotlabs/Widget/Cdav.php index 3a86f0d25..f5c3c3799 100644 --- a/Zotlabs/Widget/Cdav.php +++ b/Zotlabs/Widget/Cdav.php @@ -69,7 +69,6 @@ class Cdav { $editable = (($sabrecal['share-access'] == 2) ? 'false' : 'true'); // false/true must be string since we're passing it to javascript $sharees = []; - $share_displayname = []; foreach($invites as $invite) { if(strpos($invite->href, 'mailto:') !== false) { @@ -114,7 +113,7 @@ class Cdav { if(!$access || $access === 'read-write') { $writable_calendars[] = [ - 'displayname' => ((!$access) ? $sabrecal['{DAV:}displayname'] : $share_displayname[0]), + 'displayname' => $sabrecal['{DAV:}displayname'], 'id' => $sabrecal['id'] ]; } diff --git a/include/connections.php b/include/connections.php index dcfcc3985..d861bc1b3 100644 --- a/include/connections.php +++ b/include/connections.php @@ -384,7 +384,7 @@ function contact_remove($channel_id, $abook_id) { dbesc($abook['abook_xchan']) ); - if (strpos($xchan['xchan_addr'],'guest:') === 0 && strpos($abook['abook_xchan'],'.')){ + if ($xchan && strpos($xchan['xchan_addr'],'guest:') === 0 && strpos($abook['abook_xchan'],'.')){ $atoken_guid = substr($abook['abook_xchan'],strrpos($abook['abook_xchan'],'.') + 1); if ($atoken_guid) { atoken_delete_and_sync($channel_id,$atoken_guid); |