[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php, 1.71.2.33.2.17, 1.71.2.33.2.18 class.boicalendar.inc.php, 1.16.2.4.2.2, 1.16.2.4.2.3 class.uicalendar.inc.php, 1.66.2.55.2.21, 1.66.2.55.2.22

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.bocalendar.inc.php class.boicalendar.inc.php 
        class.uicalendar.inc.php 
Log Message:
Better use of ['phpgw_info']['menuaction'].

Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.33.2.17
retrieving revision 1.71.2.33.2.18
diff -C2 -d -r1.71.2.33.2.17 -r1.71.2.33.2.18
*** class.bocalendar.inc.php    7 Sep 2003 09:51:03 -0000       1.71.2.33.2.17
--- class.bocalendar.inc.php    29 Sep 2003 10:18:17 -0000      1.71.2.33.2.18
***************
*** 170,174 ****
                        $from = $regs[1];
                        if ((substr($_SERVER['PHP_SELF'],-8) == 'home.php' && 
substr($this->prefs['calendar']['defaultcalendar'],0,7) == 'planner'
!                                || $_GET['menuaction'] == 
'calendar.uicalendar.planner' &&
                                    $from  != 'calendar.uicalendar.planner' && 
!$this->save_owner)
                                 && 
intval($this->prefs['calendar']['planner_start_with_group']) > 0)
--- 170,174 ----
                        $from = $regs[1];
                        if ((substr($_SERVER['PHP_SELF'],-8) == 'home.php' && 
substr($this->prefs['calendar']['defaultcalendar'],0,7) == 'planner'
!                                || $GLOBALS['phpgw_info']['menuaction'] == 
'calendar.uicalendar.planner' &&
                                    $from  != 'calendar.uicalendar.planner' && 
!$this->save_owner)
                                 && 
intval($this->prefs['calendar']['planner_start_with_group']) > 0)
***************
*** 179,183 ****
                                $owner = 
'g_'.$this->prefs['calendar']['planner_start_with_group'];
                        }
!                       elseif ($_GET['menuaction'] != 
'calendar.uicalendar.planner' &&
                                $this->save_owner)
                        {
--- 179,183 ----
                                $owner = 
'g_'.$this->prefs['calendar']['planner_start_with_group'];
                        }
!                       elseif ($GLOBALS['phpgw_info']['menuaction'] != 
'calendar.uicalendar.planner' &&
                                $this->save_owner)
                        {

Index: class.boicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.boicalendar.inc.php,v
retrieving revision 1.16.2.4.2.2
retrieving revision 1.16.2.4.2.3
diff -C2 -d -r1.16.2.4.2.2 -r1.16.2.4.2.3
*** class.boicalendar.inc.php   27 Sep 2003 20:07:52 -0000      1.16.2.4.2.2
--- class.boicalendar.inc.php   29 Sep 2003 10:18:18 -0000      1.16.2.4.2.3
***************
*** 3209,3213 ****
                function export($params)
                {
!                       $event_id = 
($params['l_event_id']?$params['l_event_id']:$GLOBALS['HTTP_GET_VARS']['cal_id']);
                        $this->chunk_split = $params['chunk_split'];
                        $method = 
($params['method']?$params['method']:"publish");
--- 3209,3213 ----
                function export($params)
                {
!                       $event_id = 
get_var('cal_id',Array('GET','DEFAULT'),$params['l_event_id']);
                        $this->chunk_split = $params['chunk_split'];
                        $method = 
($params['method']?$params['method']:"publish");

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.55.2.21
retrieving revision 1.66.2.55.2.22
diff -C2 -d -r1.66.2.55.2.21 -r1.66.2.55.2.22
*** class.uicalendar.inc.php    7 Sep 2003 09:51:03 -0000       1.66.2.55.2.21
--- class.uicalendar.inc.php    29 Sep 2003 10:18:18 -0000      1.66.2.55.2.22
***************
*** 123,130 ****
                        {
                                // save return-fkt for add, view, ...
!                               list(,,$fkt) = explode('.',$_GET['menuaction']);
                                if ($fkt == 'day' || $fkt == 'week' || $fkt == 
'month' || $fkt == 'year' || $fkt == 'planner')
                                {
!                                       $this->bo->return_to = 
$_GET['menuaction'].
                                                
sprintf('&date=%04d%02d%02d',$this->bo->year,$this->bo->month,$this->bo->day);
                                }
--- 123,130 ----
                        {
                                // save return-fkt for add, view, ...
!                               list(,,$fkt) = 
explode('.',$GLOBALS['phpgw_info']['menuaction']);
                                if ($fkt == 'day' || $fkt == 'week' || $fkt == 
'month' || $fkt == 'year' || $fkt == 'planner')
                                {
!                                       $this->bo->return_to = 
$GLOBALS['phpgw_info']['menuaction'].
                                                
sprintf('&date=%04d%02d%02d',$this->bo->year,$this->bo->month,$this->bo->day);
                                }
***************
*** 2337,2341 ****
                function footer()
                {
!                       $menuaction = $_GET['menuaction'];
                        list(,,$method) = explode('.',$menuaction);
                
--- 2337,2341 ----
                function footer()
                {
!                       $menuaction = $GLOBALS['phpgw_info']['menuaction'];
                        list(,,$method) = explode('.',$menuaction);