[Phpgroupware-cvs] CVS: calendar/templates/idsociety header.inc.php,1.24,1.25

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/templates/idsociety
In directory subversions:/tmp/cvs-serv13160/templates/idsociety

Modified Files:
        header.inc.php 
Log Message:
Some more towards Ralf Beckers patches.

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/idsociety/header.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** header.inc.php      25 Aug 2002 04:07:21 -0000      1.24
--- header.inc.php      25 Aug 2002 12:33:57 -0000      1.25
***************
*** 78,89 ****
        {
                $remainder = 72;
!               $cal_id = get_var('cal_id',Array('GET','DEFAULT'),0);
!               $keywords = get_var('keywords',Array('POST','DEFAULT'),'');
!               $matrixtype = get_var('matrixtype',Array('POST','DEFAULT'),'');
                $participants = get_var('participants',Array('POST'));
                $var_list = Array(
                        'cal_id',
                        'keywords',
!                       'matrixtype'
                );
  
--- 78,97 ----
        {
                $remainder = 72;
!               $cal_id       = get_var('cal_id',Array('GET','DEFAULT'),0);
!               $keywords     = get_var('keywords',Array('POST','DEFAULT'),'');
!               $matrixtype   = 
get_var('matrixtype',Array('POST','DEFAULT'),'');
                $participants = get_var('participants',Array('POST'));
+               $date         = get_var('date',Array('GET','POST'));
+               $year         = $this->bo->year;
+               $month        = $this->bo-month;
+               $day          = $this->bo->day;
                $var_list = Array(
                        'cal_id',
                        'keywords',
!                       'matrixtype',
!                       'date',
!                       'year',
!                       'month',
!                       'day'
                );
  
***************
*** 93,111 ****
                        if($($var_list[$i]))
                        {
!                               $base_hidden_vars .= '    <input type="hidden" 
name="cal_id" value="'.$($var_list[$i]).'">'."\n";                       
                        }
                }
- //            if($cal_id != 0)
- //            {
- //                    $base_hidden_vars .= '    <input type="hidden" 
name="cal_id" value="'.$cal_id.'">'."\n";
- //            }
- //            if($keywords)
- //            {
- //                    $base_hidden_vars .= '    <input type="hidden" 
name="keywords" value="'.$keywords.'">'."\n";
- //            }
- //            if($matrixtype)
- //            {
- //                    $base_hidden_vars .= '    <input type="hidden" 
name="matrixtype" value="'.$matrixtype.'">'."\n";
- //            }
                $hidden_vars = '';
                if($participants)
--- 101,107 ----
                        if($($var_list[$i]))
                        {
!                               $base_hidden_vars .= '    <input type="hidden" 
name="'.$var_list[$i].'" value="'.$($var_list[$i]).'">'."\n";
                        }
                }
                $hidden_vars = '';
                if($participants)
***************
*** 130,133 ****
--- 126,151 ----
                $tpl->parse('header_column','head_col',True);
  
+               if(MENUACTION == 'calendar.uicalendar.planner')
+               {
+                       $remainder -= 28;
+                       print_debug('Sort By',$this->bo->sortby);
+ 
+                       $form_options = '<option 
value="user"'.($this->bo->sortby=='user'?' 
selected':'').'>'.lang('User').'</option>'."\n";
+                       $form_options .= '     <option 
value="category"'.((!isset($this->bo->sortby) || !$this->bo->sortby) || 
$this->bo->sortby=='category'?' 
selected':'').'>'.lang('Category').'</option>'."\n";
+               
+                       $var = Array(
+                               'form_width' => '28',
+                               'form_link'     => $this->page($referrer),
+                               'form_name'     => 'sortby',
+                               'title' => lang('Sort By'),
+                               'hidden_vars'   => $base_hidden_vars,
+                               'form_options'  => $form_options,
+                               'button_value'  => lang('Go!')
+                       );
+                       $tpl->set_var($var);
+                       
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+                       $tpl->parse('header_column','head_col',True);
+               }
+ 
                if($this->bo->check_perms(PHPGW_ACL_PRIVATE))
                {
***************
*** 228,231 ****
--- 246,257 ----
        {
                $hidden_vars .= '    <input type="hidden" name="filter" 
value="'.$this->bo->filter.'">'."\n";
+       }
+       if(isset($this->bo->sortby) && $this->bo->sortby)
+       {
+               $hidden_vars .= '    <input type="hidden" name="sortby" 
value="'.$this->bo->sortby.'">'."\n";
+       }
+       if(isset($this->bo->num_months) && $this->bo->num_months)
+       {
+               $hidden_vars .= '    <input type="hidden" name="num_months" 
value="'.$this->bo->num_months.'">'."\n";
        }
        $hidden_vars .= '    <input name="keywords"'.($keywords?' 
value="'.$keywords.'"':'').'>';