[Phpgroupware-cvs] CVS: bookkeeping statistics.php,1.7,1.8

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/bookkeeping
In directory subversions:/tmp/cvs-serv17633/bookkeeping

Modified Files:
        statistics.php 
Log Message:
Started on bringing this module up to date with coding stds.

Index: statistics.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookkeeping/statistics.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** statistics.php      22 Mar 2001 16:43:33 -0000      1.7
--- statistics.php      22 Aug 2002 03:09:22 -0000      1.8
***************
*** 11,33 ****
    \**************************************************************************/
  
  // ------------------------------ HTTP_POST_VARS 
------------------------------
!   $submit=$HTTP_POST_VARS['submit'];
!   $res=$HTTP_POST_VARS['res'];
!   $from_year=$HTTP_POST_VARS['from_year'];
!   $from_month=$HTTP_POST_VARS['from_month'];
!   $from_week=$HTTP_POST_VARS['from_week'];
!   $from_day=$HTTP_POST_VARS['from_day'];
!   $till_year=$HTTP_POST_VARS['till_year'];
!   $till_month=$HTTP_POST_VARS['till_month'];
!   $till_week=$HTTP_POST_VARS['till_week'];
!   $till_day=$HTTP_POST_VARS['till_day'];
!   $category_id=$HTTP_POST_VARS['category_id'];
  // ------------------------------  ------------------------------
-   $phpgw_info["flags"]["currentapp"]='bookkeeping';
-   include('../header.inc.php');
-   include('inc/bookkeeping_header.inc.php');
  
!   $phpgw->template->set_file(array( "statistics" => "statistics.tpl"));
!   $phpgw->template->set_block("statistics", "results", "results_t");
  
  // ------------------------------  ------------------------------
--- 11,38 ----
    \**************************************************************************/
  
+       $GLOBALS['phpgw_info']['flags']['currentapp']='bookkeeping';
+       include('../header.inc.php');
+       include('inc/bookkeeping_header.inc.php');
+ 
  // ------------------------------ HTTP_POST_VARS 
------------------------------
!       $submit=get_var('submit',Array('POST'));
!       $res=get_var('res',Array('POST'));
!       $from_year=get_var('from_year',Array('POST'));
!       $from_month=get_var('from_month',Array('POST'));
!       $from_week=get_var('from_week',Array('POST'));
!       $from_day=get_var('from_day',Array('POST'));
!       $till_year=get_var('till_year',Array('POST'));
!       $till_month=get_var('till_month',Array('POST'));
!       $till_week=get_var('till_week',Array('POST'));
!       $till_day=get_var('till_day',Array('POST'));
!       $category_id=get_var('category_id',Array('POST'));
  // ------------------------------  ------------------------------
  
!       $GLOBALS['phpgw']->template->set_file(
!               Array(
!                       'statistics' => 'statistics.tpl'
!               )
!       );
!       
$GLOBALS['phpgw']->template->set_block('statistics','results','results_t');
  
  // ------------------------------  ------------------------------
***************
*** 35,90 ****
  
  // ------------------------------  ------------------------------
!   $lang_switch=lang("switch to");
!   if($selected==""){
!     $selected="expenses";
!   }
! 
!   if($selected=='expenses')
!   {
!     $lang_selected=lang('expense');
!     $lang_switch.=': <a 
href="'.$phpgw->link("/bookkeeping/statistics.php","selected=income").'">'.lang("income").'</a>';
!     $income_expense='E';
!   }else{
!     $lang_selected=lang('income');
!     $lang_switch.=': <a 
href="'.$phpgw->link("/bookkeeping/statistics.php","selected=expenses").'">'.lang("expenses").'</a>';
!     $income_expense='I';
!   }
  
  // ------------------------------ $resolution ------------------------------
!   if($res=='')
!   {
!     $resolution='month';
!   }
!   else
!   {
!     $resolution=$res;
!   }
!   $hidden_vars.='<input type="hidden" name="res" value="'.$resolution.'">';
! 
!   $phpgw->template->set_var('lang_resolution',lang('resolution'));
!   if($resolution=='month')
!   {
!     $selectbox_resolution='<select name="res"><option value="month" 
selected>'.lang('month').
!                                              '<option value="day7">'.lang('7 
days').
!                                              '<option value="day1">'.lang('1 
day').'</select>';
!   }
!   if($resolution=='day7')
!   { 
!     $selectbox_resolution='<select name="res"><option 
value="month">'.lang('month').
!                                              '<option value="day7" 
selected>'.lang('7 days').
!                                              '<option value="day1">'.lang('1 
day').'</select>';
!   }
!   if($resolution=='day1')
!   {
!     $selectbox_resolution='<select name="res"><option 
value="month">'.lang('month').
!                                              '<option value="day7">'.lang('7 
days').
!                                              '<option value="day1" 
selected>'.lang('1 day').'</select>';
!   }
!   $submit_resolution='<input type="submit" value="'.lang('submit').'">';
  // ------------------------------  ------------------------------
!   $lang_from=lang("from");
!   $lang_till=lang("till");
    $now=getdate();
!   $week=ceil($now["yday"]/7);
  // ------------------------------  ------------------------------
    if($submit=='')
--- 40,91 ----
  
  // ------------------------------  ------------------------------
!       $lang_switch=lang('switch to');
!       if($selected=='')
!       {
!               $selected='expenses';
!       }
! 
!       if($selected=='expenses')
!       {
!               $lang_selected=lang('expense');
!               $lang_switch.=': <a 
href="'.$GLOBALS['phpgw']->link('/bookkeeping/statistics.php','selected=income').'">'.lang('income').'</a>';
!               $income_expense='E';
!       }
!       else
!       {
!               $lang_selected=lang('income');
!               $lang_switch.=': <a 
href="'.$GLOBALS['phpgw']->link('/bookkeeping/statistics.php','selected=expenses').'">'.lang('expenses').'</a>';
!               $income_expense='I';
!       }
  
  // ------------------------------ $resolution ------------------------------
!       if($res=='')
!       {
!               $resolution='month';
!       }
!       else
!       {
!               $resolution=$res;
!       }
!       $hidden_vars.='<input type="hidden" name="res" 
value="'.$resolution.'">';
! 
!       
$GLOBALS['phpgw']->template->set_var('lang_resolution',lang('resolution'));
!       $resolution_array = Array(
!               'month' => lang('month'),
!               'day7'  => lang('7 days'),
!               'day1'  => lang('1 day')
!       );
!       $selectbox_resolution = '<select name="res">'."\n";
!       while(list($key,$text) = each($resolution_array))
!       {
!               $selectbox_resolution .= ' <option 
value="'.$key.'"'.($resolution==$key?' selected':'').'>'.$text."\n";
!       }
!       $selectbox_resolution .= '</select>'."\n";
!       $submit_resolution='<input type="submit" value="'.lang('submit').'">';
  // ------------------------------  ------------------------------
!   $lang_from=lang('from');
!   $lang_till=lang('till');
    $now=getdate();
!   $week=ceil($now['yday']/7);
  // ------------------------------  ------------------------------
    if($submit=='')