mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-17 12:10:45 +02:00
Code Issues Releases Wiki Activity

Attempt to fix issue processwire/processwire-issues#973 plus add support for partial string matching operators %= and ^= in dates

Browse Source
This commit is contained in:
Ryan Cramer
2019-10-15 09:48:46 -04:00
parent 42e87fef74
commit 3be2c31d41
1 changed files with 72 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
wire/modules/Fieldtype/FieldtypeDatetime.module
View File

@@ -120,6 +120,7 @@ class FieldtypeDatetime extends FieldtypeText {
*
*/
public function getInputfield(Page $page, Field $field) {
/** @var InputfieldDatetime $inputfield */
$inputfield = $this->modules->get('InputfieldDatetime');
$inputfield->class = $this->className();
return $inputfield;
@@ -142,15 +143,27 @@ class FieldtypeDatetime extends FieldtypeText {
* Sanitize a value assumed to be either a timestamp or in strtotime() compatible format
*
* @param string|int|\DateTime
* @return int
* @return int|string Returns unix timestamp integer or blank string if empty or invalid value
*
*/
protected function _sanitizeValue($value) {
if(empty($value)) return '';
if($value instanceof \DateTime) return $value->getTimestamp();
if(empty($value)) {
// empty value
$value = '';
} else if(is_int($value)) {
// value okay as-is
} else if($value instanceof \DateTime) {
// instance of DateTime
$value = $value->getTimestamp();
} else if(ctype_digit(ltrim("$value", '-'))) {
// already a timestamp
if(ctype_digit(ltrim($value, '-'))) return (int) $value;
return strtotime($value);
$value = (int) $value;
} else {
// convert date string to time
$value = strtotime($value);
if($value === false) $value = '';
}
return $value;
}
/**
@@ -183,23 +196,68 @@ class FieldtypeDatetime extends FieldtypeText {
* @param string $operator
* @param int|string $value
* @return DatabaseQuerySelect
* @throws WireException if given invalid operator
*
*/
public function getMatchQuery($query, $table, $subfield, $operator, $value) {
$value = (int) $this->_sanitizeValue($value);
if($value) $value = date('Y-m-d H:i:s', $value);
else $value = '';
$database = $this->wire('database');
if($database->isOperator($operator)) {
$intValue = $this->_sanitizeValue($value);
$table = $database->escapeTable($table);
$subfield = $database->escapeCol($subfield);
$subfield = $subfield ? $database->escapeCol($subfield) : 'data';
if(is_string($value) && in_array($operator, array('%=', '^='))) {
// partial date string match
if(!ctype_digit($value)) {
$value = str_replace(array('/', '.'), '-', trim($value));
}
if(!ctype_digit(str_replace(array('-', ' '), '', $value))) {
throw new WireException("Invalid partial date string '$value' (numbers, hyphens and space only)");
}
$value = $database->escapeStr($value);
$query->where("$table.{$subfield}{$operator}'$value'");
$value = $operator === '^=' ? "$value%" : "%$value%";
$query->where("$table.$subfield LIKE '$value'");
} else if(!$database->isOperator($operator)) {
// invalid operator
throw new WireException("$this invalid date operator: $operator");
} else if(is_int($intValue)) {
// matching a populated value that successfully converted to unix timestamp
$dateString = date('Y-m-d H:i:s', $intValue);
if($dateString !== false) {
$dateString = $database->escapeStr($dateString);
$query->where("$table.$subfield$operator'$dateString'");
}
} else {
// matching an empty value
$minDT = $database->escapeStr(date('Y-m-d H:i:s', 0));
if(in_array($operator, array('!=', '>', '>='))) {
// match NOT empty (!=0, >0)
$query->where("$table.$subfield>='$minDT'");
} else if(in_array($operator, array('=', '<', '<='))) {
// match empty (=0, <0, <=0): match null or value below unix timestamp range
// this includes 0000-00-00 when present and used by MySQL version
$query->where("$table.$subfield IS NULL OR $table.$subfield<'$minDT'");
} else {
// unsupported operator
throw new WireException("$this operator cannot be used here: $operator");
}
}
return $query;
}
public function ___getSelectorInfo(Field $field, array $data = array()) {
$a = parent::___getSelectorInfo($field, $data);
$a['operators'][] = '%=';
$a['operators'][] = '^=';
return $a;
}
/**
* Return database schema used by this field
*