|
|
@@ -1598,6 +1598,20 @@ class Database
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /*
|
|
|
+ if ($result) {
|
|
|
+ $thead = $this->list_thead();
|
|
|
+ if ($thead) {
|
|
|
+ $k = $k + 1;
|
|
|
+ $result[$k] = '<tr>';
|
|
|
+ foreach ($thead as $k => $v) {
|
|
|
+ $result[$k] .= $v;
|
|
|
+ }
|
|
|
+ $result[$k] .= '</tr>';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ */
|
|
|
+
|
|
|
return $result;
|
|
|
}
|
|
|
|
|
|
@@ -2062,27 +2076,25 @@ class Database
|
|
|
}
|
|
|
}
|
|
|
if (strpos($k, '_c_') !== false) {
|
|
|
- if ($v) {
|
|
|
- $temp = explode('_c_', $k);
|
|
|
- $k = str_replace('update_', $prefix . '_', $temp[0]);
|
|
|
- if (!isset($c[$k])) {
|
|
|
- $c[$k] = array();
|
|
|
- }
|
|
|
- if (strpos($temp[1], '_i_') !== false) {
|
|
|
- $temp = explode('_i_', $temp[1]);
|
|
|
-
|
|
|
- if (!isset($c[$k][$temp[1]])) {
|
|
|
- $c[$k][$temp[1]] = 0;
|
|
|
- } else {
|
|
|
- $c[$k][$temp[1]]++;
|
|
|
- }
|
|
|
-
|
|
|
- $num = $c[$k][$temp[1]];
|
|
|
+ $temp = explode('_c_', $k);
|
|
|
+ $k = str_replace('update_', $prefix . '_', $temp[0]);
|
|
|
+ if (!isset($c[$k])) {
|
|
|
+ $c[$k] = array();
|
|
|
+ }
|
|
|
+ if (strpos($temp[1], '_i_') !== false) {
|
|
|
+ $temp = explode('_i_', $temp[1]);
|
|
|
|
|
|
- $update[$i][$k][$num][$temp[1]] = $v;
|
|
|
+ if (!isset($c[$k][$temp[1]])) {
|
|
|
+ $c[$k][$temp[1]] = 0;
|
|
|
} else {
|
|
|
- //$update[$i][$k][$c][$temp[1]] = $v;
|
|
|
+ $c[$k][$temp[1]]++;
|
|
|
}
|
|
|
+
|
|
|
+ $num = $c[$k][$temp[1]];
|
|
|
+
|
|
|
+ $update[$i][$k][$num][$temp[1]] = $v;
|
|
|
+ } else {
|
|
|
+ //$update[$i][$k][$c][$temp[1]] = $v;
|
|
|
}
|
|
|
} elseif (strpos($k, '__') !== false) {
|
|
|
$temp1 = explode('__', $k);
|
rabin