R54887 - /trunk/calendar/inc/class.boholiday.inc.php

Old eGW-svn
1

Author: ralfbecker
New Revision: 54887

URL: http://svn.stylite.de/viewvc/egroupware?rev=54887&view=rev
Log:
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

Modified:
trunk/calendar/inc/class.boholiday.inc.php

Modified: trunk/calendar/inc/class.boholiday.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/inc/class.boholiday.inc.php?rev=54887&r1=54886&r2=54887&view=diff

— trunk/calendar/inc/class.boholiday.inc.php (original)
+++ trunk/calendar/inc/class.boholiday.inc.php Mon Feb 1 12:08:39 2016
@@ -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’."
\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)
  		{

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs