[Phpgroupware-cvs] calendar/inc class.holidaycalc.inc.php [Version-0_9_16-branch]

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    calendar
Branch:         Version-0_9_16-branch
Changes by:     Dave Hall <skwashd>     06/08/31 10:49:27

Modified files:
        inc            : class.holidaycalc.inc.php 

Log message:
        fix for http://www.frsirt.com/english/advisories/2006/3414

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.holidaycalc.inc.php?cvsroot=phpgroupware&only_with_tag=Version-0_9_16-branch&r1=1.5&r2=1.5.4.1

Patches:
Index: class.holidaycalc.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.holidaycalc.inc.php,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -b -r1.5 -r1.5.4.1
--- class.holidaycalc.inc.php   26 Aug 2001 12:32:28 -0000      1.5
+++ class.holidaycalc.inc.php   31 Aug 2006 10:49:27 -0000      1.5.4.1
@@ -11,9 +11,10 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: class.holidaycalc.inc.php,v 1.5 2001/08/26 12:32:28 skeeter Exp $ */
+  /* $Id: class.holidaycalc.inc.php,v 1.5.4.1 2006/08/31 10:49:27 skwashd Exp 
$ */
 
-       if 
(empty($GLOBALS['phpgw_info']['user']['preferences']['common']['country']))
+       if ( 
!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['country'])
+               || 
strlen($GLOBALS['phpgw_info']['user']['preferences']['common']['country']) <> 2 
)
        {
                $rule = 'US';
        }
@@ -25,10 +26,10 @@
        $calc_include = 
PHPGW_INCLUDE_ROOT.'/calendar/inc/class.holidaycalc_'.$rule.'.inc.php';
        if(@file_exists($calc_include))
        {
-               include($calc_include);
+               include_once($calc_include);
        }
        else
        {
-               
include(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.holidaycalc_US.inc.php');
+               
include_once(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.holidaycalc_US.inc.php');
        }
 ?>