Reverting to use http: instead of https: for now

mattpass · mattpass · commit d5e6fb041f8a · 2014-04-26T16:14:27.000+01:00
file_get_contents won't get https: data for now
Need to look at resolving this
diff --git a/index.php b/index.php
@@ -10,7 +10,7 @@
 $updateMsg = '';
 // Check for updates
 if ($ICEcoder["checkUpdates"]) {
-	$icv_url = "https://icecoder.net/latest-version?thisVersion=".$ICEcoder["versionNo"];
+	$icv_url = "http://icecoder.net/latest-version?thisVersion=".$ICEcoder["versionNo"];
 	if (ini_get('allow_url_fopen')) {
 		$icvInfo = explode("\n",file_get_contents($icv_url,false,$context));
 	} elseif (function_exists('curl_init')) {
diff --git a/lib/plugins-manager.php b/lib/plugins-manager.php
@@ -3,7 +3,7 @@
 include("settings.php");
 
 // Set the plugin data source
-$pluginsDataSrc = "https://icecoder.net/plugin-data?format=JSON";
+$pluginsDataSrc = "http://icecoder.net/plugin-data?format=JSON";
 
 // Now get our plugin data and put into a PHP array
 if (ini_get('allow_url_fopen')) {
diff --git a/lib/updater.php b/lib/updater.php
@@ -48,7 +48,7 @@ function copyOldVersion() {
 			}
 		}
 	}
-	$icv_url = "https://icecoder.net/latest-version.txt";
+	$icv_url = "http://icecoder.net/latest-version.txt";
 	echo 'Detecting current version of ICEcoder...<br>';
 	if (ini_get('allow_url_fopen')) {
 		$icvInfo = file_get_contents($icv_url,false,$context);
@@ -71,7 +71,7 @@ function openZipNew($icvInfo) {
 	$source = 'ICEcoder v'.$icvInfo;
 	$target = '../';
 
-	$remoteFile = 'https://icecoder.net/ICEcoder-v'.(str_replace(" beta", "-beta",$icvInfo)).'.zip';
+	$remoteFile = 'http://icecoder.net/ICEcoder-v'.(str_replace(" beta", "-beta",$icvInfo)).'.zip';
     	$file = "../tmp/new-version.zip";
 	if (ini_get('allow_url_fopen')) {
 		$fileData = file_get_contents($remoteFile,false,$context);
diff --git a/test/index.php b/test/index.php
@@ -225,7 +225,7 @@ function runTests() {
 			o.p = ICEcoder.openFiles[1];
 			t++;
 		},1);
-		result = ICEcoder.getRemoteFile('https://icecoder.net/latest-version');
+		result = ICEcoder.getRemoteFile('http://icecoder.net/latest-version');
 	},
 
 	moveGoToLine: function() {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ function copyOldVersion() {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`
`51`		`- $icv_url = "https://icecoder.net/latest-version.txt";`
	`51`	`+ $icv_url = "http://icecoder.net/latest-version.txt";`
`52`	`52`	`echo 'Detecting current version of ICEcoder...<br>';`
`53`	`53`	`if (ini_get('allow_url_fopen')) {`
`54`	`54`	`$icvInfo = file_get_contents($icv_url,false,$context);`
`@@ -71,7 +71,7 @@ function openZipNew($icvInfo) {`
`71`	`71`	`$source = 'ICEcoder v'.$icvInfo;`
`72`	`72`	`$target = '../';`
`73`	`73`
`74`		`- $remoteFile = 'https://icecoder.net/ICEcoder-v'.(str_replace(" beta", "-beta",$icvInfo)).'.zip';`
	`74`	`+ $remoteFile = 'http://icecoder.net/ICEcoder-v'.(str_replace(" beta", "-beta",$icvInfo)).'.zip';`
`75`	`75`	`$file = "../tmp/new-version.zip";`
`76`	`76`	`if (ini_get('allow_url_fopen')) {`
`77`	`77`	`$fileData = file_get_contents($remoteFile,false,$context);`