mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 12:20:44 +02:00
Code Issues Releases Wiki Activity

Issue #4778 - Corrected calculation of date search period.

Browse Source
This commit is contained in:
Cameron
2023-02-27 09:48:35 -08:00
parent 73405f55cb
commit b57a431855
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
e107_handlers/admin_ui.php
View File

@@ -4535,15 +4535,38 @@ class e_admin_controller_ui extends e_admin_controller
case 'integer': case 'integer':
if($_fieldType === 'datestamp') // Past Month, Past Year etc. if($_fieldType === 'datestamp') // Past Month, Past Year etc.
{ {
$tmp = explode('__',$filterOptions);
$dateSearchType = $tmp[2];
if($filterValue > time()) if($filterValue > time())
{ {
if(E107_DEBUG_LEVEL == E107_DBG_SQLQUERIES)
{
e107::getMessage()->addDebug("[$dateSearchType] Between now and ".date(DATE_RFC822, $filterValue));
}
$searchQry[] = $this->fields[$filterField]['__tableField']. ' > ' .time(); $searchQry[] = $this->fields[$filterField]['__tableField']. ' > ' .time();
$searchQry[] = $this->fields[$filterField]['__tableField']. ' < ' . (int) $filterValue; $searchQry[] = $this->fields[$filterField]['__tableField']. ' < ' . (int) $filterValue;
} }
else else // THIS X, FUTURE
{ {
$endOpts = [
'today' => strtotime('+24 hours', $filterValue),
'thisweek' => strtotime('+1 week', $filterValue),
'thismonth' => strtotime('+1 month', $filterValue),
'thisyear' => strtotime('+1 year', $filterValue),
];
$end = isset($endOpts[$dateSearchType]) ? $endOpts[$dateSearchType] : time();
if(E107_DEBUG_LEVEL == E107_DBG_SQLQUERIES)
{
e107::getMessage()->addDebug("[$dateSearchType] Between ".date(DATE_RFC822, $filterValue)." and ".date(DATE_RFC822, $end));
}
$searchQry[] = $this->fields[$filterField]['__tableField']. ' > ' . (int) $filterValue; $searchQry[] = $this->fields[$filterField]['__tableField']. ' > ' . (int) $filterValue;
$searchQry[] = $this->fields[$filterField]['__tableField']. ' < ' .time(); $searchQry[] = $this->fields[$filterField]['__tableField']. ' < ' .$end;
} }
} }