[Phpgroupware-cvs] CVS: calendar/inc class.boholiday.inc.php,1.10.2.2,1.10.2.2.2.1 class.uiholiday.inc.php,1.3.2.2.2.1,1.3.2.2.2.2

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv32690

Modified Files:
      Tag: Version-0_9_16-branch
        class.boholiday.inc.php class.uiholiday.inc.php 
Log Message:
some fixes to get it working with register globals off


Index: class.boholiday.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.boholiday.inc.php,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.2.2.1
diff -C2 -r1.10.2.2 -r1.10.2.2.2.1
*** class.boholiday.inc.php     27 Feb 2003 19:14:02 -0000      1.10.2.2
--- class.boholiday.inc.php     13 Jun 2003 09:15:33 -0000      1.10.2.2.2.1
***************
*** 49,54 ****
                        $this->so = CreateObject('calendar.soholiday');
  
-                       if(isset($GLOBALS['locale'])) { $this->locales[] = 
$GLOBALS['locale']; }
- 
                        if(isset($GLOBALS['start']))  { $this->start = 
intval($GLOBALS['start']); } else { $this->start = 0; }
  
--- 49,52 ----
***************
*** 59,65 ****
                        if(isset($GLOBALS['order']))  { $this->order = 
$GLOBALS['order'];      }
  
!                       if(isset($GLOBALS['id']))     { $this->id = 
$GLOBALS['id'];            }
!                       
!                       if(isset($GLOBALS['year']))   { $this->year = 
$GLOBALS['year'];        } else { $this->year = date('Y'); }
                        
                        if($this->debug)
--- 57,67 ----
                        if(isset($GLOBALS['order']))  { $this->order = 
$GLOBALS['order'];      }
  
!                       $this->id   = get_var('id',array('POST','GET'));
!                       $this->year = 
get_var('year',array('POST','GET'),date('Y'));
!                       $this->locale = get_var('locale',array('POST','GET'));
!                       if ($this->locale)
!                       {
!                               $this->locales[] = $this->locale;
!                       }
                        
                        if($this->debug)

Index: class.uiholiday.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uiholiday.inc.php,v
retrieving revision 1.3.2.2.2.1
retrieving revision 1.3.2.2.2.2
diff -C2 -r1.3.2.2.2.1 -r1.3.2.2.2.2
*** class.uiholiday.inc.php     19 Apr 2003 21:11:49 -0000      1.3.2.2.2.1
--- class.uiholiday.inc.php     13 Jun 2003 09:15:34 -0000      1.3.2.2.2.2
***************
*** 119,122 ****
--- 119,126 ----
                function edit_locale($locale='')
                {
+                       if ($locale === '')
+                       {
+                               $locale = $this->bo->locale;
+                       }
                        if ($locale)
                        {
***************
*** 129,133 ****
                                        'menuaction'    => 
'calendar.uiholiday.admin'
                                );
!                               Header('Location: ' . 
$GLOBALS['phpgw']->link($this->base_url,$link_params));
                        }
                        unset($GLOBALS['phpgw_info']['flags']['noheader']);
--- 133,137 ----
                                        'menuaction'    => 
'calendar.uiholiday.admin'
                                );
!                               
$GLOBALS['phpgw']->redirect_link($this->base_url,$link_params);
                        }
                        unset($GLOBALS['phpgw_info']['flags']['noheader']);
***************
*** 229,235 ****
                                $holiday = $this->bo->read_entry($this->bo->id);
                        }
!                       if ($GLOBALS['HTTP_GET_VARS']['locale'])
                        {
!                               $holiday['locale'] = 
$GLOBALS['HTTP_GET_VARS']['locale'];
                        }
                        unset($GLOBALS['phpgw_info']['flags']['noheader']);
--- 233,239 ----
                                $holiday = $this->bo->read_entry($this->bo->id);
                        }
!                       if ($this->locale)
                        {
!                               $holiday['locale'] = $this->locale;
                        }
                        unset($GLOBALS['phpgw_info']['flags']['noheader']);
***************
*** 446,450 ****
                        $holidays = $this->bo->get_holiday_list();
  
!                       if (isset($GLOBALS['HTTP_GET_VARS']['download']))
                        {
                                $locale = $this->bo->locales[0];
--- 450,454 ----
                        $holidays = $this->bo->get_holiday_list();
  
!                       if (isset($_GET['download']))
                        {
                                $locale = $this->bo->locales[0];