[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.16,1.71.2.17 class.uicalendar.inc.php,1.66.2.25,1.66.2.26 class.uipreferences.inc.php,1.2.2.5,1.2.2.6

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.bocalendar.inc.php class.uicalendar.inc.php 
        class.uipreferences.inc.php 
Log Message:
corrected scr's patch for a default-group in planner

Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.16
retrieving revision 1.71.2.17
diff -C2 -r1.71.2.16 -r1.71.2.17
*** class.bocalendar.inc.php    21 Sep 2002 21:50:13 -0000      1.71.2.16
--- class.bocalendar.inc.php    23 Sep 2002 23:01:31 -0000      1.71.2.17
***************
*** 168,179 ****
                        $owner = ($owner=='' && 
isset($GLOBALS['HTTP_POST_VARS']['owner'])?$GLOBALS['HTTP_POST_VARS']['owner']:$owner);
  
!                       if ((!isset($owner) || $owner == '')
!                                && $GLOBALS['HTTP_GET_VARS']['menuaction'] == 
'calendar.uicalendar.planner'
                                 && $GLOBALS['HTTP_POST_VARS']['from'] != 
'calendar.uicalendar.planner'
                                 && 
$this->prefs['calendar']['planner_start_with_group'] != '-1')
                        {
!                               $owner = 
$this->prefs['calendar']['planner_start_with_group'];
                        }
- 
                        if(isset($owner) && $owner!='' && substr($owner,0,2) == 
'g_')
                        {
--- 168,188 ----
                        $owner = ($owner=='' && 
isset($GLOBALS['HTTP_POST_VARS']['owner'])?$GLOBALS['HTTP_POST_VARS']['owner']:$owner);
  
!                       if ($GLOBALS['HTTP_GET_VARS']['menuaction'] == 
'calendar.uicalendar.planner'
                                 && $GLOBALS['HTTP_POST_VARS']['from'] != 
'calendar.uicalendar.planner'
                                 && 
$this->prefs['calendar']['planner_start_with_group'] != '-1')
                        {
!                               $this->save_owner = $this->owner;
!                               $owner = 
'g_'.$this->prefs['calendar']['planner_start_with_group'];
!                       }
!                       elseif ($GLOBALS['HTTP_GET_VARS']['menuaction'] != 
'calendar.uicalendar.planner' &&
!                               $this->save_owner)
!                       {
!                               $owner = intval($this->save_owner);
!                               unset($this->save_owner);
!                       }
!                       else
!                       {
!                               if ($owner) unset($this->save_owner);
                        }
                        if(isset($owner) && $owner!='' && substr($owner,0,2) == 
'g_')
                        {
***************
*** 222,230 ****
                        if(!isset($this->sortby))
                        {
!                               $default_calender = 
$this->prefs['calendar']['defaultcalendar'];
!                               if ($default_calender == 'planner_cat' || 
$default_calender == 'planner_user')
!                               {
!                                       $this->sortby = ($default_calender == 
'planner_cat' ? 'category' : 'user');
!                               }
                        }
  
--- 231,235 ----
                        if(!isset($this->sortby))
                        {
!                          $this->sortby = 
$this->prefs['calendar']['defaultcalendar'] == 'planner_user' ? 'user' : 
'category';
                        }
  
***************
*** 448,451 ****
--- 453,457 ----
                        $this->sortby = $data['sortby'];
                        $this->owner  = intval($data['owner']);
+                       $this->save_owner = intval($data['save_owner']);
                        $this->year   = intval($data['year']);
                        $this->month  = intval($data['month']);

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.25
retrieving revision 1.66.2.26
diff -C2 -r1.66.2.25 -r1.66.2.26
*** class.uicalendar.inc.php    21 Sep 2002 21:50:13 -0000      1.66.2.25
--- class.uicalendar.inc.php    23 Sep 2002 23:01:31 -0000      1.66.2.26
***************
*** 1318,1322 ****
                                        }
                                        $intervals_per_day = 
$this->bo->prefs[\'calendar\'][\'planner_intervals_per_day\'];
! 
                                        // set title for table and rows of 
planner view
                                        //
--- 1318,1323 ----
                                        }
                                        $intervals_per_day = 
$this->bo->prefs[\'calendar\'][\'planner_intervals_per_day\'];
!                                       $this->save_sessiondata();      // need 
to save $this->bo->save_owner
!       
                                        // set title for table and rows of 
planner view
                                        //
***************
*** 1325,1332 ****
                                                $title = lang(\'Category\');
                                        }
!                                       elseif ($this->bo->sortby == \'user\')
                                        {
                                                $title = lang(\'User\');
- 
                                                $o = $this->bo->owner;
                                                $type = 
$GLOBALS[\'phpgw\']->accounts->get_type($o);
--- 1326,1332 ----
                                                $title = lang(\'Category\');
                                        }
!                                       else
                                        {
                                                $title = lang(\'User\');
                                                $o = $this->bo->owner;
                                                $type = 
$GLOBALS[\'phpgw\']->accounts->get_type($o);
***************
*** 2180,2183 ****
--- 2180,2184 ----
                                'cat_id'     => $this->bo->cat_id,
                                'owner'      => $this->bo->owner,
+                               'save_owner' => $this->bo->save_owner,
                                'year'       => $this->bo->year,
                                'month'      => $this->bo->month,

Index: class.uipreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uipreferences.inc.php,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -C2 -r1.2.2.5 -r1.2.2.6
*** class.uipreferences.inc.php 21 Sep 2002 21:50:14 -0000      1.2.2.5
--- class.uipreferences.inc.php 23 Sep 2002 23:01:31 -0000      1.2.2.6
***************
*** 117,124 ****
                        $user = $GLOBALS['phpgw_info']['user']['account_id'];
                        $groups = 
$GLOBALS['phpgw']->accounts->membership($user);
!                       $str =  '<option 
value="-1"'.(intval($this->bo->prefs['calendar']['planner_start_with__group'])==-1?'
 selected':'').'>none</option>'."\n";
                        while (list($key,$group) = each($groups))
                        {
!                               $str .= '<option 
value="'.$key.'"'.(intval($this->bo->prefs['calendar']['planner_start_with_group'])==$key?'
 
selected':'').'>'.$GLOBALS['phpgw']->common->grab_owner_name($group['account_id']).'</option>'."\n";
                        }
                        $this->display_item(lang('Preselected group for 
entering the planner'),'<select 
name="prefs[planner_start_with_group]">'."\n".$str.'</select>'."\n");
--- 117,124 ----
                        $user = $GLOBALS['phpgw_info']['user']['account_id'];
                        $groups = 
$GLOBALS['phpgw']->accounts->membership($user);
!                       $str =  '<option 
value="-1"'.(intval($this->bo->prefs['calendar']['planner_start_with_group'])==-1?'
 selected':'').'>none</option>'."\n";
                        while (list($key,$group) = each($groups))
                        {
!                               $str .= '<option 
value="'.$group['account_id'].'"'.(intval($this->bo->prefs['calendar']['planner_start_with_group'])==$group['account_id']?'
 
selected':'').'>'.$GLOBALS['phpgw']->common->grab_owner_name($group['account_id']).'</option>'."\n";
                        }
                        $this->display_item(lang('Preselected group for 
entering the planner'),'<select 
name="prefs[planner_start_with_group]">'."\n".$str.'</select>'."\n");