Changeset 6487
- Timestamp:
- 08/27/08 12:14:50 (3 months ago)
- Files:
-
- freepbx/trunk/amp_conf/htdocs/admin/cdr/call-comp.php (modified) (1 diff)
- freepbx/trunk/amp_conf/htdocs/admin/cdr/call-daily-load.php (modified) (1 diff)
- freepbx/trunk/amp_conf/htdocs/admin/cdr/call-last-month.php (modified) (1 diff)
- freepbx/trunk/amp_conf/htdocs/admin/cdr/call-log.php (modified) (1 diff)
- freepbx/trunk/freepbx.pot (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
freepbx/trunk/amp_conf/htdocs/admin/cdr/call-comp.php
r5360 r6487 171 171 if (isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) $date_clause.=" AND calldate < date'$fromstatsmonth_sday-$fromstatsday_sday'+ INTERVAL '1 DAY' AND calldate >= date'$fromstatsmonth_sday-$fromstatsday_sday' - INTERVAL '$days_compare DAY'"; 172 172 }else{ 173 if (isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) $date_clause.=" AND calldate < ADDDATE('$fromstatsmonth_sday-$fromstatsday_sday',INTERVAL 1 DAY) AND calldate >= SUBDATE('$fromstatsmonth_sday-$fromstatsday_sday',INTERVAL $days_compare DAY)"; 173 if (isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) 174 { //check for invalid start date 175 $daysinamonth = date("t",strtotime($fromstatsmonth_sday."-01")); 176 if ($fromstatsday_sday > $daysinamonth) $fromstatsday_sday = $daysinamonth; 177 $date_clause.=" AND calldate < ADDDATE('$fromstatsmonth_sday-$fromstatsday_sday',INTERVAL 1 DAY) AND calldate >= SUBDATE('$fromstatsmonth_sday-$fromstatsday_sday',INTERVAL $days_compare DAY)"; 178 } 174 179 } 175 180 freepbx/trunk/amp_conf/htdocs/admin/cdr/call-daily-load.php
r5360 r6487 163 163 if (isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) $date_clause.=" AND calldate < date'$fromstatsmonth_sday-$fromstatsday_sday'+ INTERVAL '1 DAY' AND calldate >= date'$fromstatsmonth_sday-$fromstatsday_sday'"; 164 164 }else{ 165 if (isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) $date_clause.=" AND calldate < ADDDATE('$fromstatsmonth_sday-$fromstatsday_sday',INTERVAL 1 DAY) AND calldate >= '$fromstatsmonth_sday-$fromstatsday_sday'"; 165 if (isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) 166 { // check for ivalid start date 167 $daysinamonth = date("t",strtotime($fromstatsmonth_sday."-01")); 168 if ($fromstatsday_sday > $daysinamonth) $fromstatsday_sday = $daysinamonth; 169 $date_clause.=" AND calldate < ADDDATE('$fromstatsmonth_sday-$fromstatsday_sday',INTERVAL 1 DAY) AND calldate >= '$fromstatsmonth_sday-$fromstatsday_sday'"; 170 } 166 171 } 167 172 freepbx/trunk/amp_conf/htdocs/admin/cdr/call-last-month.php
r5360 r6487 164 164 if (isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) $date_clause.=" AND calldate < date'$fromstatsmonth_sday-$fromstatsday_sday'+ INTERVAL '1 DAY' AND calldate >= date'$fromstatsmonth_sday-$fromstatsday_sday' - INTERVAL '$days_compare DAY'"; 165 165 }else{ 166 if (isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) $date_clause.=" AND calldate < ADDDATE('$fromstatsmonth_sday-$fromstatsday_sday',INTERVAL 1 DAY) AND calldate >= SUBDATE('$fromstatsmonth_sday-$fromstatsday_sday',INTERVAL $days_compare DAY)"; 166 if (isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) 167 { //check for invalid start date 168 $daysinamonth = date("t",strtotime($fromstatsmonth_sday."-01")); 169 if ($fromstatsday_sday > $daysinamonth) $fromstatsday_sday = $daysinamonth; 170 $date_clause.=" AND calldate < ADDDATE('$fromstatsmonth_sday-$fromstatsday_sday',INTERVAL 1 DAY) AND calldate >= SUBDATE('$fromstatsmonth_sday-$fromstatsday_sday',INTERVAL $days_compare DAY)"; 171 } 167 172 } 168 173 freepbx/trunk/amp_conf/htdocs/admin/cdr/call-log.php
r5360 r6487 212 212 $UNIX_TIMESTAMP = "UNIX_TIMESTAMP"; 213 213 } 214 215 214 if (isset($Period) && $Period=="Month"){ 216 215 if ($frommonth && isset($fromstatsmonth)) $date_clause.=" AND $UNIX_TIMESTAMP(calldate) >= $UNIX_TIMESTAMP('$fromstatsmonth-01')"; 217 if ($tomonth && isset($tostatsmonth)) $date_clause.=" AND $UNIX_TIMESTAMP(calldate) <= $UNIX_TIMESTAMP('$tostatsmonth-31 23:59:59')"; 216 if ($tomonth && isset($tostatsmonth)) 217 { 218 $daysinamonth = date("t",strtotime($tostatsmonth."-01")); 219 $date_clause.=" AND $UNIX_TIMESTAMP(calldate) <= $UNIX_TIMESTAMP('$tostatsmonth-$daysinamonth 23:59:59')"; 220 } 218 221 }else{ 219 if ((isset($fromday) && $fromday) && isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) $date_clause.=" AND $UNIX_TIMESTAMP(calldate) >= $UNIX_TIMESTAMP('$fromstatsmonth_sday-$fromstatsday_sday')"; 220 if ((isset($today) && $today) && isset($tostatsday_sday) && isset($tostatsmonth_sday)) $date_clause.=" AND $UNIX_TIMESTAMP(calldate) <= $UNIX_TIMESTAMP('$tostatsmonth_sday-".sprintf("%02d",intval($tostatsday_sday)/*+1*/)." 23:59:59')"; 222 if ((isset($fromday) && $fromday) && isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) 223 { // check for invalid start date 224 $daysinamonth = date("t",strtotime($fromstatsmonth_sday."-01")); 225 if ($fromstatsday_sday > $daysinamonth) $fromstatsday_sday = $daysinamonth; 226 $date_clause.=" AND $UNIX_TIMESTAMP(calldate) >= $UNIX_TIMESTAMP('$fromstatsmonth_sday-$fromstatsday_sday')"; 227 } 228 if ((isset($today) && $today) && isset($tostatsday_sday) && isset($tostatsmonth_sday)) 229 { //check for invalid end date 230 $daysinamonth = date("t",strtotime($tostatsmonth_sday."-01")); 231 if ($tostatsday_sday > $daysinamonth) $tostatsday_sday = $daysinamonth; 232 $date_clause.=" AND $UNIX_TIMESTAMP(calldate) <= $UNIX_TIMESTAMP('$tostatsmonth_sday-".sprintf("%02d",intval($tostatsday_sday)/*+1*/)." 23:59:59')"; 233 } 221 234 } 222 235 //echo "<br>$date_clause<br>"; freepbx/trunk/freepbx.pot
r6482 r6487 9 9 "Project-Id-Version: PACKAGE VERSION\n" 10 10 "Report-Msgid-Bugs-To: \n" 11 "POT-Creation-Date: 2008-08-2 6 19:39+0200\n"11 "POT-Creation-Date: 2008-08-27 19:56+0200\n" 12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
