From a1bb150b2ec5a21b8b0e3dd22831b9861f075198 Mon Sep 17 00:00:00 2001 From: Alan Jack Pippin Date: Wed, 29 Mar 2006 14:20:30 -0700 Subject: [PATCH] Removed call to broken strtotime() php method & wrote my own. --- inc/class.eq.inc.php | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php index aa60481..d9a58fa 100644 --- a/inc/class.eq.inc.php +++ b/inc/class.eq.inc.php @@ -23,6 +23,8 @@ class eq var $default_ppi_num_months; var $default_ppi_num_years; var $default_att_num_months; + var $current_year; + var $current_month; var $public_functions = array ( @@ -64,6 +66,12 @@ class eq $GLOBALS['phpgw_info']['flags']['app_header'] = 'Elders Quorum Tools'; $GLOBALS['phpgw']->common->phpgw_header(); + + $this->current_month = `date '+%m'`; + $this->current_month = $this->current_month-0; // Make it numeric + $this->current_year = `date '+%Y'`; + $this->current_year = $this->current_year-0; // Make it numeric + echo parse_navbar(); $this->display_app_header(); } @@ -128,7 +136,7 @@ class eq $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.ht_view')); $this->t->set_var('title','Hometeaching'); - + $sql = "SELECT * FROM eq_district where valid=1 ORDER BY district ASC"; $this->db->query($sql,__LINE__,__FILE__); $i=0; @@ -230,10 +238,14 @@ class eq // in the past $num_months for this Family $header_row="Families"; for($m=$num_months; $m >= 0; $m--) { - if(`date '+%d'` == 31) { $d = 1; } else { $d = 0; } - $month = date('m/Y', strtotime('-'.$m.' month -'.$d.' day')); - $month_start = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_start .= "-01"; - $month_end = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_end .= "-31"; + $month = $this->current_month - $m; + $year = $this->current_year; + if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; } + if($month < 10) { $month = "0"."$month"; } + $month_start = "$year"."-"."$month"."-"."01"; + $month_end = "$year"."-"."$month"."-"."31"; + $month = "$month"."/"."$year"; + //print "m: $m month: $month year: $year month_start: $month_start month_end: $month_end
"; // Add this to the query to filter on only visits made by this companionship: // " AND companionship=" . $unique_companionships[$j]['companionship']. $sql = "SELECT * FROM eq_visit WHERE date >= '$month_start' AND date <= '$month_end' ". @@ -978,10 +990,13 @@ class eq $header_row .= "$year"; } else { - if(`date '+%d'` == 31) { $d = 1; } else { $d = 0; } - $month = date('m/Y', strtotime('-'.$m.' month -'.$d.' day')); - $month_start = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_start .= "-01"; - $month_end = date('Y-m', strtotime('-'.$m.' month -'.$d.' day')); $month_end .= "-31"; + $month = $this->current_month - $m; + $year = $this->current_year; + if($month <= 0) { $remainder = $month; $month = 12 + $remainder; $year=$year-1; } + if($month < 10) { $month = "0"."$month"; } + $month_start = "$year"."-"."$month"."-"."01"; + $month_end = "$year"."-"."$month"."-"."31"; + $month = "$month"."/"."$year"; $sql = "SELECT * FROM eq_ppi WHERE date >= '$month_start' AND date <= '$month_end' ". "AND elder=" . $elder_id . " AND aaronic=" . $aaronic_id . " AND eqpresppi=0"; $this->db2->query($sql,__LINE__,__FILE__); -- 2.34.1