|
@@ -1073,7 +1073,7 @@ class Database
|
|
|
public function list_search_time(&$result, $search, $prefix, $key, $config, $type = 'time')
|
|
|
{
|
|
|
$start = $end = true;
|
|
|
- $eq = false;
|
|
|
+ $eq = $eqs = false;
|
|
|
if (is_array($config)) {
|
|
|
$lang = $config['lang'];
|
|
|
$search_key = $config['key'];
|
|
@@ -1087,6 +1087,8 @@ class Database
|
|
|
$end = true;
|
|
|
} elseif ($temp[1] == 'eq') {
|
|
|
$eq = true;
|
|
|
+ } elseif ($temp[1] == 'eqs') {
|
|
|
+ $eqs = true;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1094,34 +1096,59 @@ class Database
|
|
|
$lang = $config;
|
|
|
}
|
|
|
|
|
|
- if ($eq) {
|
|
|
+ if ($eqs) {
|
|
|
+
|
|
|
$value['name'] = $prefix . 'option_' . $key;
|
|
|
+ Dever::setInput($value['name'], '', 'search_');
|
|
|
$value['lang'] = $lang;
|
|
|
if (isset($search[$value['name']])) {
|
|
|
$value['value'] = Dever::maketime($search[$value['name']]);
|
|
|
- Dever::setInput($value['name'], $value['value'], 'search_');
|
|
|
+ $start_value = $end_value = $value['value'];
|
|
|
+ if ($type == 'time' || $type == 'day' || $type == 'date') {
|
|
|
+ $start_value = Dever::maketime($search[$value['name']] . ' 00:00:00');
|
|
|
+ $end_value = Dever::maketime($search[$value['name']] . ' 23:59:59');
|
|
|
+ } elseif ($type == 'month') {
|
|
|
+ $start_value = Dever::maketime($search[$value['name']] . '-01 00:00:00');
|
|
|
+ $end_value = date('t', $start_value);
|
|
|
+ $end_value = Dever::maketime($search[$value['name']] . '-'.$end_value.' 23:59:59');
|
|
|
+ } elseif ($type == 'year') {
|
|
|
+ $start_value = Dever::maketime($search[$value['name']] . '-01-01 00:00:00');
|
|
|
+ $end_value = date('12-t', $start_value);
|
|
|
+ $end_value = Dever::maketime($search[$value['name']] . '-'.$end_value.' 23:59:59');
|
|
|
+ }
|
|
|
+
|
|
|
+ Dever::setInput($prefix . 'option_start_' . $key, $start_value, 'search_');
|
|
|
+ Dever::setInput($prefix . 'option_end_' . $key, $end_value, 'search_');
|
|
|
}
|
|
|
$result .= Html::$type($value, false);
|
|
|
- }
|
|
|
-
|
|
|
- if ($start) {
|
|
|
- $value['name'] = $prefix . 'option_start_' . $key;
|
|
|
- $value['lang'] = '>=' . $lang;
|
|
|
+ } elseif ($eq) {
|
|
|
+ $value['name'] = $prefix . 'option_' . $key;
|
|
|
+ $value['lang'] = $lang;
|
|
|
if (isset($search[$value['name']])) {
|
|
|
$value['value'] = Dever::maketime($search[$value['name']]);
|
|
|
Dever::setInput($value['name'], $value['value'], 'search_');
|
|
|
}
|
|
|
$result .= Html::$type($value, false);
|
|
|
- }
|
|
|
-
|
|
|
- if ($end) {
|
|
|
- $value['name'] = $prefix . 'option_end_' . $key;
|
|
|
- $value['lang'] = '<=' . $lang;
|
|
|
- if (isset($search[$value['name']])) {
|
|
|
- $value['value'] = Dever::maketime($search[$value['name']]);
|
|
|
- Dever::setInput($value['name'], $value['value'], 'search_');
|
|
|
+ } else {
|
|
|
+ if ($start) {
|
|
|
+ $value['name'] = $prefix . 'option_start_' . $key;
|
|
|
+ $value['lang'] = '>=' . $lang;
|
|
|
+ if (isset($search[$value['name']])) {
|
|
|
+ $value['value'] = Dever::maketime($search[$value['name']]);
|
|
|
+ Dever::setInput($value['name'], $value['value'], 'search_');
|
|
|
+ }
|
|
|
+ $result .= Html::$type($value, false);
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($end) {
|
|
|
+ $value['name'] = $prefix . 'option_end_' . $key;
|
|
|
+ $value['lang'] = '<=' . $lang;
|
|
|
+ if (isset($search[$value['name']])) {
|
|
|
+ $value['value'] = Dever::maketime($search[$value['name']]);
|
|
|
+ Dever::setInput($value['name'], $value['value'], 'search_');
|
|
|
+ }
|
|
|
+ $result .= Html::$type($value, false);
|
|
|
}
|
|
|
- $result .= Html::$type($value, false);
|
|
|
}
|
|
|
}
|
|
|
|