Fixed issue #6848: Unable to use administration if PECL http extensio…

…n is installed on the server
LimeSurvey · Nov 15, 2012 · 3ce8ed2 · 3ce8ed2
1 parent a118d04
commit 3ce8ed2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/application/controllers/admin/update.php b/application/controllers/admin/update.php
@@ -27,7 +27,7 @@ class update extends Survey_Common_Action
     function index($sSubAction = null)
     {
         $this->_RunUpdaterUpdate();
-        Yii::import('application.libraries.admin.http.httpRequest');
+        Yii::import('application.libraries.admin.http.httpRequestIt');
 
         $clang = $this->getController()->lang;
         $iCurrentBuildnumber = Yii::app()->getConfig("buildnumber");
@@ -59,8 +59,8 @@ function index($sSubAction = null)
 
     private function _getChangedFiles($buildnumber, $updaterversion, $updatekey)
     {
-        Yii::import('application.libraries.admin.http.httpRequest');
-        $http = new httpRequest;
+        Yii::import('application.libraries.admin.http.httpRequestIt');
+        $http = new httpRequestIt;
         $httperror = $this->_requestChangedFiles($http, $buildnumber, $updaterversion, $updatekey);
 
         if ($httperror != '') {
@@ -71,8 +71,8 @@ private function _getChangedFiles($buildnumber, $updaterversion, $updatekey)
 
     private function _getChangelog($buildnumber, $updaterversion, $updatekey)
     {
-        Yii::import('application.libraries.admin.http.httpRequest');
-        $http = new httpRequest;
+        Yii::import('application.libraries.admin.http.httpRequestIt');
+        $http = new httpRequestIt;
         $httperror = $this->_requestChangelog($http, $buildnumber, $updaterversion, $updatekey);
 
         if ($httperror != '') {
@@ -81,7 +81,7 @@ private function _getChangelog($buildnumber, $updaterversion, $updatekey)
         return $this->_readChangelog($http);
     }
 
-    private function _readChangelog(httpRequest $http)
+    private function _readChangelog(httpRequestIt $http)
     {
         $szLines = '';
         $szResponse = '';
@@ -96,7 +96,7 @@ private function _readChangelog(httpRequest $http)
         }
     }
 
-    private function _requestChangelog(httpRequest $http, $buildnumber, $updaterversion, $updatekey)
+    private function _requestChangelog(httpRequestIt $http, $buildnumber, $updaterversion, $updatekey)
     {
         $http->timeout = 0;
         $http->data_timeout = 0;
@@ -108,7 +108,7 @@ private function _requestChangelog(httpRequest $http, $buildnumber, $updatervers
         return $http->SendRequest($arguments);
     }
 
-    private function _requestChangedFiles(httpRequest $http, $buildnumber, $updaterversion, $updatekey)
+    private function _requestChangedFiles(httpRequestIt $http, $buildnumber, $updaterversion, $updatekey)
     {
         $http->timeout = 0;
         $http->data_timeout = 0;
@@ -327,8 +327,8 @@ function step4()
         // Create DB and file backups now
 
         $downloaderror=false;
-        Yii::import('application.libraries.admin.http.httpRequest');
-        $http=new httpRequest;
+        Yii::import('application.libraries.admin.http.httpRequestIt');
+        $http=new httpRequestIt;
 
         // Allow redirects
         $http->follow_redirect=1;
@@ -433,8 +433,8 @@ private function _RunUpdaterUpdate()
         $buildnumber = Yii::app()->getConfig("buildnumber");
         $tempdir = Yii::app()->getConfig("tempdir");
 
-        Yii::import('application.libraries.admin.http.httpRequest');
-        $oHTTPRequest=new httpRequest;
+        Yii::import('application.libraries.admin.http.httpRequestIt');
+        $oHTTPRequest=new httpRequestIt;
 
         /* Connection timeout */
         $oHTTPRequest->timeout=0;
@@ -485,8 +485,8 @@ private function _RunUpdaterUpdate()
         // Create DB and file backups now
 
         $downloaderror=false;
-        Yii::import('application.libraries.admin.http.httpRequest');
-        $oHTTPRequest=new httpRequest;
+        Yii::import('application.libraries.admin.http.httpRequestIt');
+        $oHTTPRequest=new httpRequestIt;
 
         // Allow redirects
         $oHTTPRequest->follow_redirect=1;

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -4460,8 +4460,8 @@ function removeBOM($str=""){
 function getUpdateInfo()
 {
     //require_once($homedir."/classes/http/http.php");
-    Yii::import('application.libraries.admin.http.httpRequest');
-    $http=new httpRequest;
+    Yii::import('application.libraries.admin.http.httpRequestIt');
+    $http=new httpRequestIt;
 
     $http->timeout=0;
     $http->data_timeout=0;

diff --git a/...tion/libraries/admin/http/httpRequest.php → ...on/libraries/admin/http/httpRequestIt.php b/...tion/libraries/admin/http/httpRequest.php → ...on/libraries/admin/http/httpRequestIt.php
@@ -6,7 +6,7 @@
  *
  */
 
-class httpRequest
+class httpRequestIt
 {
     var $host_name="";
     var $host_port=0;