diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php index 2833a9422..6d572a5b1 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php @@ -187,7 +187,7 @@ trait CardDAV if (!$oClient) { return $aContactsPaths; } - $sNextPath = $oClient->__UrlPath__; + $sNextPath = $oClient->urlPath; } if ($sPath != $sNextPath) { @@ -219,7 +219,7 @@ trait CardDAV if (!$oClient) { return $aContactsPaths; } - $sCurrentUserPrincipal = $oClient->__UrlPath__; + $sCurrentUserPrincipal = $oClient->urlPath; } $aResponse = $this->detectionPropFind($oClient, $sCurrentUserPrincipal); @@ -243,7 +243,7 @@ trait CardDAV if (!$oClient) { return $aContactsPaths; } - $sAddressbookHomeSet = $oClient->__UrlPath__; + $sAddressbookHomeSet = $oClient->urlPath; } $aResponse = $this->detectionPropFind($oClient, $sAddressbookHomeSet); @@ -287,7 +287,7 @@ trait CardDAV } } if ($bGood) { - $oClient->__UrlPath__ = $sPath; + $oClient->urlPath = $sPath; } } @@ -332,7 +332,7 @@ trait CardDAV $oClient = new DAVClient($aSettings); $oClient->setVerifyPeer(false); - $oClient->__UrlPath__ = $aUrl['path']; + $oClient->urlPath = $aUrl['path']; $this->logWrite('DavClient: User: '.$aSettings['userName'].', Url: '.$sUrl, \LOG_INFO, 'DAV'); @@ -361,7 +361,7 @@ trait CardDAV $oClient = $this->getDavClientFromUrl($sUrl, $sUser, $sPassword, $sProxy); - $sPath = $oClient->__UrlPath__; + $sPath = $oClient->urlPath; $bGood = true; if ('' === $sPath || '/' === $sPath || !$this->checkContactsPath($oClient, $sPath)) { diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php index 2c26073fd..c072478c1 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php @@ -135,7 +135,7 @@ class PdoAddressBook return false; } - $sPath = $oClient->__UrlPath__; + $sPath = $oClient->urlPath; $time = \microtime(true); $aRemoteSyncData = $this->prepareDavSyncData($oClient, $sPath); diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php b/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php index 528f8015a..5578e3241 100644 --- a/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php +++ b/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php @@ -10,7 +10,7 @@ namespace SnappyMail\DAV; class Client { -// public $__UrlPath__; + public $urlPath; const NS_DAV = 'urn:DAV',