holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix not working download of holidays from egroupware.org, caused by not working redirect with old network class, now replaced with standard php http wrapper and use egw_framework::proxy_context() for optional proxy server

Browse Source
This commit is contained in:
Ralf Becker 2016-02-01 11:08:39 +00:00
parent 215baf7497
commit cd9b6b77fe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.boholiday.inc.php
View File

@ -264,7 +264,6 @@
/* get the file that contains the calendar events for your locale */
/* "http://www.egroupware.org/cal/holidays.US.csv"; */
$network =& CreateObject('phpgwapi.network');
if(isset($GLOBALS['egw_info']['server']['holidays_url_path']) && $GLOBALS['egw_info']['server']['holidays_url_path'] != 'localhost')
{
$load_from = $GLOBALS['egw_info']['server']['holidays_url_path'];
@ -284,11 +283,12 @@
// echo 'Loading from: '.$load_from.'/holidays.'.strtoupper($locale).'.csv'."<br>\n";
if($GLOBALS['egw_info']['server']['holidays_url_path'] == 'localhost')
{
$lines = @file(EGW_SERVER_ROOT.'/calendar/egroupware.org/holidays.'.strtoupper($locale).'.csv');
$lines = file(EGW_SERVER_ROOT.'/calendar/egroupware.org/holidays.'.strtoupper($locale).'.csv');
}
else
{
$lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale).'.csv');
$lines = file($url=$load_from.'/holidays.'.strtoupper($locale).'.csv', 0, egw_framework::proxy_context());
//error_log(__METHOD__."('$locale', $year) file('$url')=".array2string($lines));
}
if (!$lines)
{