public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Fix to really only poll GalleryModules.com once. This also only creates one local copy of the ini file to be scanned.

Browse Source
This commit is contained in:
dmolavi 2012-02-04 11:00:09 -05:00
parent b2eafa02a2
commit 1bb03303cc
2 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
3.0/modules/moduleupdates/controllers/admin_moduleupdates.php
View File

@ -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";
@ -171,6 +186,8 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
Cache::instance()->set("moduleupdates_cache_updates", serialize($cache_updates), array("ModuleUpdates"), null);
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'];
@ -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);
$file = 1;
}
$this_gm_repo = str_replace(".","",substr_replace(gallery::VERSION,"",strpos(gallery::VERSION," ")));
if(file_exists('gm.ini')) {
$file = 1;
}
if ($file != null) {
$gm_array = parse_ini_file('gm.ini',true);
unlink('gm.ini');
$server = '(GH)';
}
}
catch (Exception $e) {
echo $e;
}
}
break;
}

42
3.1/modules/moduleupdates/controllers/admin_moduleupdates.php
View File

@ -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";
@ -171,6 +186,8 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
Cache::instance()->set("moduleupdates_cache_updates", serialize($cache_updates), array("ModuleUpdates"), null);
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'];
@ -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);
$file = 1;
}
$this_gm_repo = str_replace(".","",substr_replace(gallery::VERSION,"",strpos(gallery::VERSION," ")));
if(file_exists('gm.ini')) {
$file = 1;
}
if ($file != null) {
$gm_array = parse_ini_file('gm.ini',true);
unlink('gm.ini');
$server = '(GH)';
}
}
catch (Exception $e) {
echo $e;
}
}
break;
}