mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-14 18:08:21 +01:00
an other small fix, now the auto-loading from localhost works too
This commit is contained in:
parent
83adb9e7ad
commit
eb002e91c3
@ -224,12 +224,10 @@
|
|||||||
{
|
{
|
||||||
if($this->so->holiday_total($locale) == 0)
|
if($this->so->holiday_total($locale) == 0)
|
||||||
{
|
{
|
||||||
global $HTTP_HOST, $SERVER_PORT;
|
|
||||||
|
|
||||||
@set_time_limit(0);
|
@set_time_limit(0);
|
||||||
|
|
||||||
/* get the file that contains the calendar events for your locale */
|
/* get the file that contains the calendar events for your locale */
|
||||||
/* "http://www.egroupware.org/cal/holidays.US"; */
|
/* "http://www.egroupware.org/cal/holidays.US.csv"; */
|
||||||
$network = CreateObject('phpgwapi.network');
|
$network = CreateObject('phpgwapi.network');
|
||||||
if(isset($GLOBALS['phpgw_info']['server']['holidays_url_path']) && $GLOBALS['phpgw_info']['server']['holidays_url_path'] != 'localhost')
|
if(isset($GLOBALS['phpgw_info']['server']['holidays_url_path']) && $GLOBALS['phpgw_info']['server']['holidays_url_path'] != 'localhost')
|
||||||
{
|
{
|
||||||
@ -257,8 +255,8 @@
|
|||||||
}
|
}
|
||||||
$load_from = $server_host.'/calendar/egroupware.org';
|
$load_from = $server_host.'/calendar/egroupware.org';
|
||||||
}
|
}
|
||||||
// echo 'Loading from: '.$load_from.'/holidays.'.strtoupper($locale)."<br>\n";
|
// echo 'Loading from: '.$load_from.'/holidays.'.strtoupper($locale).'.csv'."<br>\n";
|
||||||
$lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale).'csv');
|
$lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale).'.csv');
|
||||||
if (!$lines)
|
if (!$lines)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user