Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 16:37:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #1409

Browse source
This commit is contained in:
the-djmaze 2024-01-29 11:22:19 +01:00
parent 3a37aad25f
commit 0a6ac6613c
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
View file

@ -187,7 +187,7 @@ trait CardDAV
if (!$oClient) { if (!$oClient) {
return $aContactsPaths; return $aContactsPaths;
} }
$sNextPath = $oClient->__UrlPath__; $sNextPath = $oClient->urlPath;
} }
if ($sPath != $sNextPath) { if ($sPath != $sNextPath) {
@ -219,7 +219,7 @@ trait CardDAV
if (!$oClient) { if (!$oClient) {
return $aContactsPaths; return $aContactsPaths;
} }
$sCurrentUserPrincipal = $oClient->__UrlPath__; $sCurrentUserPrincipal = $oClient->urlPath;
} }
$aResponse = $this->detectionPropFind($oClient, $sCurrentUserPrincipal); $aResponse = $this->detectionPropFind($oClient, $sCurrentUserPrincipal);
@ -243,7 +243,7 @@ trait CardDAV
if (!$oClient) { if (!$oClient) {
return $aContactsPaths; return $aContactsPaths;
} }
$sAddressbookHomeSet = $oClient->__UrlPath__; $sAddressbookHomeSet = $oClient->urlPath;
} }
$aResponse = $this->detectionPropFind($oClient, $sAddressbookHomeSet); $aResponse = $this->detectionPropFind($oClient, $sAddressbookHomeSet);
@ -287,7 +287,7 @@ trait CardDAV
} }
} }
if ($bGood) { if ($bGood) {
$oClient->__UrlPath__ = $sPath; $oClient->urlPath = $sPath;
} }
} }
@ -332,7 +332,7 @@ trait CardDAV
$oClient = new DAVClient($aSettings); $oClient = new DAVClient($aSettings);
$oClient->setVerifyPeer(false); $oClient->setVerifyPeer(false);
$oClient->__UrlPath__ = $aUrl['path']; $oClient->urlPath = $aUrl['path'];
$this->logWrite('DavClient: User: '.$aSettings['userName'].', Url: '.$sUrl, \LOG_INFO, 'DAV'); $this->logWrite('DavClient: User: '.$aSettings['userName'].', Url: '.$sUrl, \LOG_INFO, 'DAV');
@ -361,7 +361,7 @@ trait CardDAV
$oClient = $this->getDavClientFromUrl($sUrl, $sUser, $sPassword, $sProxy); $oClient = $this->getDavClientFromUrl($sUrl, $sUser, $sPassword, $sProxy);
$sPath = $oClient->__UrlPath__; $sPath = $oClient->urlPath;
$bGood = true; $bGood = true;
if ('' === $sPath || '/' === $sPath || !$this->checkContactsPath($oClient, $sPath)) { if ('' === $sPath || '/' === $sPath || !$this->checkContactsPath($oClient, $sPath)) {

2
snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
View file

@ -135,7 +135,7 @@ class PdoAddressBook
return false; return false;
} }
$sPath = $oClient->__UrlPath__; $sPath = $oClient->urlPath;
$time = \microtime(true); $time = \microtime(true);
$aRemoteSyncData = $this->prepareDavSyncData($oClient, $sPath); $aRemoteSyncData = $this->prepareDavSyncData($oClient, $sPath);

2
snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php
View file

@ -10,7 +10,7 @@ namespace SnappyMail\DAV;
class Client class Client
{ {
// public $__UrlPath__; public $urlPath;
const const
NS_DAV = 'urn:DAV', NS_DAV = 'urn:DAV',