Merge pull request #7950 from JKingsnorth/CRM-18196

[civicrm-core.git] / CRM / Extension / Browser.php

diff --git a/CRM/Extension/Browser.php b/CRM/Extension/Browser.php
index c8f335403037ebc164e874e3f0e9920be6b36cb7..3a58366433b32bde57dcbd3ff8518900e30f80d7 100644 (file)
--- a/CRM/Extension/Browser.php
+++ b/CRM/Extension/Browser.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -30,14 +30,16 @@
  * system.
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
- * $Id$
- *
+ * @copyright CiviCRM LLC (c) 2004-2016
  */
 class CRM_Extension_Browser {
 
   /**
    * An URL for public extensions repository.
+   *
+   * Note: This default is now handled through setting/*.php.
+   *
+   * @deprecated
    */
   const DEFAULT_EXTENSIONS_REPOSITORY = 'https://civicrm.org/extdir/ver={ver}|cms={uf}';
 
@@ -51,6 +53,9 @@ class CRM_Extension_Browser {
    */
   const CACHE_JSON_FILE = 'extensions.json';
 
+  // timeout for when the connection or the server is slow
+  const CHECK_TIMEOUT = 5;
+
   /**
    * @param string $repoUrl
    *   URL of the remote repository.
@@ -165,7 +170,6 @@ class CRM_Extension_Browser {
       return $exts[$key];
     }
     else {
-      // throw new CRM_Extension_Exception("Unknown remote extension: $key");
       return NULL;
     }
   }
@@ -229,7 +233,7 @@ class CRM_Extension_Browser {
    */
   private function grabRemoteJson() {
 
-    ini_set('default_socket_timeout', CRM_Utils_VersionCheck::CHECK_TIMEOUT);
+    ini_set('default_socket_timeout', self::CHECK_TIMEOUT);
     set_error_handler(array('CRM_Extension_Browser', 'downloadError'));
 
     if (!ini_get('allow_url_fopen')) {