Fix to really only poll GalleryModules.com once. This also only creates one local copy of the ini file to be scanned.
This commit is contained in:
parent
b2eafa02a2
commit
1bb03303cc
@ -93,6 +93,21 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
|
||||
$update_count = 0;
|
||||
|
||||
if($refreshCache == true){
|
||||
// Only poll GalleryModules.com once for the ini file.
|
||||
$fp = fopen('gm.ini', 'w');
|
||||
if(function_exists("curl_init")) {
|
||||
$cp = curl_init("http://www.gallerymodules.com/gallerymodules.ini");
|
||||
curl_setopt($cp, CURLOPT_FILE, $fp);
|
||||
|
||||
$buffer = curl_exec($cp);
|
||||
|
||||
curl_close($cp);
|
||||
fclose($fp);
|
||||
} else {
|
||||
fwrite($fp,file_get_contents("http://www.gallerymodules.com/gallerymodules.ini"));
|
||||
fclose($fp);
|
||||
}
|
||||
|
||||
foreach (module::available() as $this_module_name => $module_info) {
|
||||
|
||||
$font_color_local = "black";
|
||||
@ -172,6 +187,8 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
|
||||
log::success("moduleupdates", t("Completed checking remote GitHub for modules updates."));
|
||||
}
|
||||
|
||||
unlink('gm.ini');
|
||||
|
||||
$view->content->vars = $cache;
|
||||
$view->content->update_time = $cache_updates['date'];
|
||||
$view->content->csrf = access::csrf_token();
|
||||
@ -305,37 +322,20 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
|
||||
}
|
||||
break;
|
||||
case "GH":
|
||||
//Check GalleryModules.com
|
||||
if ($file == null) {
|
||||
//Parse ini file from GalleryModules.com
|
||||
try {
|
||||
$fp = fopen('gm.ini', 'w');
|
||||
if(function_exists("curl_init")) {
|
||||
$cp = curl_init("http://www.gallerymodules.com/gallerymodules.ini");
|
||||
curl_setopt($cp, CURLOPT_FILE, $fp);
|
||||
|
||||
$buffer = curl_exec($cp);
|
||||
|
||||
curl_close($cp);
|
||||
$file = 1;
|
||||
fclose($fp);
|
||||
} else {
|
||||
fwrite($fp,file_get_contents("http://www.gallerymodules.com/gallerymodules.ini"));
|
||||
fclose($fp);
|
||||
$this_gm_repo = str_replace(".","",substr_replace(gallery::VERSION,"",strpos(gallery::VERSION," ")));
|
||||
if(file_exists('gm.ini')) {
|
||||
$file = 1;
|
||||
}
|
||||
|
||||
$this_gm_repo = str_replace(".","",substr_replace(gallery::VERSION,"",strpos(gallery::VERSION," ")));
|
||||
|
||||
if ($file != null) {
|
||||
$gm_array = parse_ini_file('gm.ini',true);
|
||||
unlink('gm.ini');
|
||||
$server = '(GH)';
|
||||
}
|
||||
}
|
||||
catch (Exception $e) {
|
||||
echo $e;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -93,6 +93,21 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
|
||||
$update_count = 0;
|
||||
|
||||
if($refreshCache == true){
|
||||
// Only poll GalleryModules.com once for the ini file.
|
||||
$fp = fopen('gm.ini', 'w');
|
||||
if(function_exists("curl_init")) {
|
||||
$cp = curl_init("http://www.gallerymodules.com/gallerymodules.ini");
|
||||
curl_setopt($cp, CURLOPT_FILE, $fp);
|
||||
|
||||
$buffer = curl_exec($cp);
|
||||
|
||||
curl_close($cp);
|
||||
fclose($fp);
|
||||
} else {
|
||||
fwrite($fp,file_get_contents("http://www.gallerymodules.com/gallerymodules.ini"));
|
||||
fclose($fp);
|
||||
}
|
||||
|
||||
foreach (module::available() as $this_module_name => $module_info) {
|
||||
|
||||
$font_color_local = "black";
|
||||
@ -172,6 +187,8 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
|
||||
log::success("moduleupdates", t("Completed checking remote GitHub for modules updates."));
|
||||
}
|
||||
|
||||
unlink('gm.ini');
|
||||
|
||||
$view->content->vars = $cache;
|
||||
$view->content->update_time = $cache_updates['date'];
|
||||
$view->content->csrf = access::csrf_token();
|
||||
@ -305,37 +322,20 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
|
||||
}
|
||||
break;
|
||||
case "GH":
|
||||
//Check GalleryModules.com
|
||||
if ($file == null) {
|
||||
//Parse ini file from GalleryModules.com
|
||||
try {
|
||||
$fp = fopen('gm.ini', 'w');
|
||||
if(function_exists("curl_init")) {
|
||||
$cp = curl_init("http://www.gallerymodules.com/gallerymodules.ini");
|
||||
curl_setopt($cp, CURLOPT_FILE, $fp);
|
||||
|
||||
$buffer = curl_exec($cp);
|
||||
|
||||
curl_close($cp);
|
||||
$file = 1;
|
||||
fclose($fp);
|
||||
} else {
|
||||
fwrite($fp,file_get_contents("http://www.gallerymodules.com/gallerymodules.ini"));
|
||||
fclose($fp);
|
||||
$this_gm_repo = str_replace(".","",substr_replace(gallery::VERSION,"",strpos(gallery::VERSION," ")));
|
||||
if(file_exists('gm.ini')) {
|
||||
$file = 1;
|
||||
}
|
||||
|
||||
$this_gm_repo = str_replace(".","",substr_replace(gallery::VERSION,"",strpos(gallery::VERSION," ")));
|
||||
|
||||
if ($file != null) {
|
||||
$gm_array = parse_ini_file('gm.ini',true);
|
||||
unlink('gm.ini');
|
||||
$server = '(GH)';
|
||||
}
|
||||
}
|
||||
catch (Exception $e) {
|
||||
echo $e;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user