X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FExtension%2FBrowser.php;h=fa46980699b0e8346c18fc3e393e5168743f10e7;hb=ccaae7e57d54ce580fafd43e13ad7c2bdeeb9996;hp=70eaba90b627507b15387f45b6976c45bf8c61da;hpb=2f5ff37192635986fc82a3b46970121cf6688836;p=civicrm-core.git
diff --git a/CRM/Extension/Browser.php b/CRM/Extension/Browser.php
index 70eaba90b6..fa46980699 100644
--- a/CRM/Extension/Browser.php
+++ b/CRM/Extension/Browser.php
@@ -1,9 +1,9 @@
getRepositoryUrl());
}
+ /**
+ * @return string
+ */
public function getRepositoryUrl() {
return $this->repoUrl;
}
@@ -132,6 +135,8 @@ class CRM_Extension_Browser {
/**
* Get a description of a particular extension
*
+ * @param $key
+ *
* @return CRM_Extension_Info|NULL
*/
public function getExtension($key) {
@@ -145,6 +150,10 @@ class CRM_Extension_Browser {
}
}
+ /**
+ * @return array
+ * @throws CRM_Extension_Exception_ParseException
+ */
private function _discoverRemote() {
$tsPath = $this->getTsPath();
$timestamp = FALSE;
@@ -181,6 +190,9 @@ class CRM_Extension_Browser {
return $this->_remotesDiscovered;
}
+ /**
+ * @return array
+ */
private function grabCachedKeyList() {
$result = array();
$cachedPath = $this->cacheDir . DIRECTORY_SEPARATOR;
@@ -217,29 +229,29 @@ class CRM_Extension_Browser {
return array();
}
+ $exts = array();
list ($status, $extdir) = CRM_Utils_HttpClient::singleton()->get($this->getRepositoryUrl() . $this->indexPath);
if ($extdir === FALSE || $status !== CRM_Utils_HttpClient::STATUS_OK) {
CRM_Core_Session::setStatus(ts('The CiviCRM public extensions directory at %1 could not be contacted - please check your webserver can make external HTTP requests or contact CiviCRM team on CiviCRM forum.
', array(1 => $this->getRepositoryUrl())), ts('Connection Error'), 'error');
- }
-
- $lines = explode("\n", $extdir);
-
- foreach ($lines as $ln) {
- if (preg_match("@\