|
@@ -2297,6 +2297,7 @@ class Database
|
|
|
if ($exist) {
|
|
|
foreach ($exist as $k => $v) {
|
|
|
if ($v) {
|
|
|
+ $v = ltrim(rtrim($v));
|
|
|
unset($search[$k]);
|
|
|
$k = str_replace('search_exist_', '', $k);
|
|
|
if ($v == 'yes') {
|
|
@@ -2333,6 +2334,7 @@ class Database
|
|
|
$in_state = false;
|
|
|
foreach ($in as $k => $v) {
|
|
|
if ($v) {
|
|
|
+ $v = ltrim(rtrim($v));
|
|
|
unset($search[$k]);
|
|
|
$k = str_replace('search_in_', '', $k);
|
|
|
$param['option'][$k] = array('yes', 'in');
|
|
@@ -2352,6 +2354,7 @@ class Database
|
|
|
$fulltext_state = false;
|
|
|
foreach ($fulltext as $k => $v) {
|
|
|
if ($v) {
|
|
|
+ $v = ltrim(rtrim($v));
|
|
|
unset($search[$k]);
|
|
|
$k = str_replace('search_fulltext_', '', $k);
|
|
|
$param['option_' . $k] = $v;
|
|
@@ -2405,6 +2408,7 @@ class Database
|
|
|
if ($exp) {
|
|
|
$k = $search['search_exp_col'];
|
|
|
$v = $search['search_exp_value'];
|
|
|
+ $v = ltrim(rtrim($v));
|
|
|
$param['option_' . $k] = $v;
|
|
|
$param['search_type'] = $search['search_exp_type'];
|
|
|
|
|
@@ -2414,6 +2418,7 @@ class Database
|
|
|
$order = Dever::preInput('search_order_');
|
|
|
if ($order) {
|
|
|
foreach ($order as $k => $v) {
|
|
|
+ $v = ltrim(rtrim($v));
|
|
|
$k = str_replace('search_order_', '', $k);
|
|
|
$param['order'][0][$k] = $v;
|
|
|
unset($search[$k]);
|
|
@@ -2421,6 +2426,10 @@ class Database
|
|
|
}
|
|
|
foreach ($search as $k => $v) {
|
|
|
if ($v) {
|
|
|
+ if (is_string($v)) {
|
|
|
+ $v = ltrim(rtrim($v));
|
|
|
+ }
|
|
|
+
|
|
|
if (strpos($k, '-') !== false) {
|
|
|
$k = str_replace('search_option_', '', $k);
|
|
|
$temp = explode('-', $k);
|
|
@@ -3711,7 +3720,7 @@ class Database
|
|
|
if (isset($config['manage']['tab'])) {
|
|
|
$param['prefix'] = $prefix;
|
|
|
$param['tab_config'] = $config['manage']['tab'];
|
|
|
- if (isset($config['manage']['tab'])) {
|
|
|
+ if (isset($config['manage']['lang'])) {
|
|
|
$param['lang'] = $config['manage']['lang'];
|
|
|
}
|
|
|
}
|
|
@@ -3741,11 +3750,14 @@ class Database
|
|
|
if ($this->id && $hk === 'id') {
|
|
|
$hv['update'] = 'hidden';
|
|
|
}
|
|
|
- if (isset($hv['update']) && $hv['update']) {
|
|
|
+ if (isset($hv['update']) && $hv['update'] && !isset($hv['tab'])) {
|
|
|
$n = $hv['name'];
|
|
|
unset($hv['name']);
|
|
|
$s = '';
|
|
|
$hv['ext'] = $param['name'] . '_c_-1_i_' . $hk;
|
|
|
+ if ($hv['update'] == 'linkage') {
|
|
|
+ $hv['update_width'] = '30%';
|
|
|
+ }
|
|
|
$this->update_html($hv, $hk, $hk, array(), $s, '', 'up');
|
|
|
if ($hv['update'] == 'hidden') {
|
|
|
$table_header .= '<td style="display:none;">'.$n.'</td>';
|
|
@@ -3773,10 +3785,13 @@ class Database
|
|
|
if ($this->id && $hk === 'id') {
|
|
|
$hv['update'] = 'hidden';
|
|
|
}
|
|
|
- if (isset($hv['update']) && $hv['update']) {
|
|
|
+ if (isset($hv['update']) && $hv['update'] && !isset($hv['tab'])) {
|
|
|
unset($hv['name']);
|
|
|
$s = '';
|
|
|
$hv['ext'] = $param['name'] . '_c_' . $bk . '_i_' . $hk;
|
|
|
+ if ($hv['update'] == 'linkage') {
|
|
|
+ $hv['update_width'] = '30%';
|
|
|
+ }
|
|
|
$this->update_html($hv, $hk, $hk, $bv, $s);
|
|
|
if ($hv['update'] == 'hidden') {
|
|
|
$table_body .= '<td style="display:none;">'.$s.'</td>';
|