[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.24,1.71.2.25

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.bocalendar.inc.php 
Log Message:
need to set group on entering planer via home.php too


Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.24
retrieving revision 1.71.2.25
diff -C2 -r1.71.2.24 -r1.71.2.25
*** class.bocalendar.inc.php    5 Nov 2002 11:18:59 -0000       1.71.2.24
--- class.bocalendar.inc.php    6 Nov 2002 16:29:57 -0000       1.71.2.25
***************
*** 166,174 ****
                        $owner = 
(isset($GLOBALS['HTTP_GET_VARS']['owner'])?$GLOBALS['HTTP_GET_VARS']['owner']:$owner);
                        $owner = ($owner=='' && 
isset($GLOBALS['HTTP_POST_VARS']['owner'])?$GLOBALS['HTTP_POST_VARS']['owner']:$owner);
! 
                        
ereg('menuaction=([a-zA-Z.]+)',$GLOBALS['HTTP_REFERER'],$regs);
                        $from = $regs[1];
!                       if ($GLOBALS['HTTP_GET_VARS']['menuaction'] == 
'calendar.uicalendar.planner'
!                                && $from  != 'calendar.uicalendar.planner' && 
!$this->save_owner
                                 && 
intval($this->prefs['calendar']['planner_start_with_group']) > 0)
                        {
--- 166,175 ----
                        $owner = 
(isset($GLOBALS['HTTP_GET_VARS']['owner'])?$GLOBALS['HTTP_GET_VARS']['owner']:$owner);
                        $owner = ($owner=='' && 
isset($GLOBALS['HTTP_POST_VARS']['owner'])?$GLOBALS['HTTP_POST_VARS']['owner']:$owner);
!                       
                        
ereg('menuaction=([a-zA-Z.]+)',$GLOBALS['HTTP_REFERER'],$regs);
                        $from = $regs[1];
!                       if ((substr($GLOBALS['PHP_SELF'],-8) == 'home.php' && 
substr($this->prefs['calendar']['defaultcalendar'],0,7) == 'planner'
!                                || $GLOBALS['HTTP_GET_VARS']['menuaction'] == 
'calendar.uicalendar.planner' &&
!                                   $from  != 'calendar.uicalendar.planner' && 
!$this->save_owner)
                                 && 
intval($this->prefs['calendar']['planner_start_with_group']) > 0)
                        {
***************
*** 183,187 ****
                                // leaving planner with an unchanged user/owner 
==> setting owner back to save_owner
                                //
!                               $owner = intval($this->save_owner);
                                unset($this->save_owner);
                        }
--- 184,188 ----
                                // leaving planner with an unchanged user/owner 
==> setting owner back to save_owner
                                //
!                               $owner = 
intval(isset($GLOBALS['HTTP_GET_VARS']['owner']) ? 
$GLOBALS['HTTP_GET_VARS']['owner'] : $this->save_owner);
                                unset($this->save_owner);
                        }
***************
*** 192,196 ****
                                unset($this->save_owner);
                        }
! 
                        if(isset($owner) && $owner!='' && substr($owner,0,2) == 
'g_')
                        {
--- 193,197 ----
                                unset($this->save_owner);
                        }
!                       
                        if(isset($owner) && $owner!='' && substr($owner,0,2) == 
'g_')
                        {