diff --git a/composer.json b/composer.json index b30882f..58c46b3 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,8 @@ "monolog/monolog": "~1.15", "ptcinc/solr-php-client": "^1.0", "symfony/process": "^3.2 || ^4", - "tractorcow/silverstripe-proxy-db": "~0.1" + "tractorcow/silverstripe-proxy-db": "~0.1", + "ext-curl": "*" }, "require-dev": { "silverstripe/cms": "^4.0", diff --git a/src/Search/Services/SearchableService.php b/src/Search/Services/SearchableService.php index a621a75..421d06f 100644 --- a/src/Search/Services/SearchableService.php +++ b/src/Search/Services/SearchableService.php @@ -151,12 +151,12 @@ class SearchableService // Anonymous member canView() for indexing if (!$this->classSkipsCanViewCheck($objClass)) { $value = Member::actAs(null, function () use ($obj) { - return $obj->canView(); + return (bool) $obj->canView(); }); } } else { // Current member canView() check for retrieving search results - $value = $obj->canView(); + $value = (bool) $obj->canView(); } } $this->extend('updateIsSearchable', $obj, $indexing, $value); diff --git a/src/Utils/WebDAV.php b/src/Utils/WebDAV.php index a3a51ad..1243261 100644 --- a/src/Utils/WebDAV.php +++ b/src/Utils/WebDAV.php @@ -22,10 +22,14 @@ class WebDAV } $ch = self::curl_init($url, 'PROPFIND'); - - $res = curl_exec($ch); + + curl_exec($ch); $code = curl_getinfo($ch, CURLINFO_HTTP_CODE); + $err = curl_error($ch); + + curl_close($ch); + if ($code == 404) { return false; } @@ -33,8 +37,6 @@ class WebDAV return true; } - $err = curl_error($ch); - user_error("Got error from webdav server - " . $err, E_USER_ERROR); } @@ -42,8 +44,9 @@ class WebDAV { $ch = self::curl_init(rtrim($url, '/') . '/', 'MKCOL'); - $res = curl_exec($ch); + curl_exec($ch); $code = curl_getinfo($ch, CURLINFO_HTTP_CODE); + curl_close($ch); return $code == 201; } @@ -58,10 +61,12 @@ class WebDAV curl_setopt($ch, CURLOPT_INFILE, $handle); - $res = curl_exec($ch); + curl_exec($ch); fclose($handle); + $code = curl_getinfo($ch, CURLINFO_HTTP_CODE); + curl_close($ch); - return curl_getinfo($ch, CURLINFO_HTTP_CODE); + return $code; } public static function upload_from_string($string, $url)