better variable names;
minor code formating;
This commit is contained in:
@@ -272,19 +272,19 @@ if (! $cfg['ShowFunctionFields']) {
|
||||
echo $strShow . ' : <a href="tbl_change.php' . PMA_generate_common_url($this_url_params) . '">' . $strFunction . '</a>' . "\n";
|
||||
}
|
||||
|
||||
foreach ($rows as $vrowcount => $vrow) {
|
||||
foreach ($rows as $row_id => $vrow) {
|
||||
if ($vrow === false) {
|
||||
unset($vrow);
|
||||
}
|
||||
|
||||
$jsvkey = $vrowcount;
|
||||
$browse_foreigners_uri = '&pk=' . $vrowcount;
|
||||
$jsvkey = $row_id;
|
||||
$browse_foreigners_uri = '&pk=' . $row_id;
|
||||
$vkey = '[multi_edit][' . $jsvkey . ']';
|
||||
|
||||
$vresult = (isset($result) && is_array($result) && isset($result[$vrowcount]) ? $result[$vrowcount] : $result);
|
||||
if ($insert_mode && $vrowcount > 0) {
|
||||
echo '<input type="checkbox" checked="checked" name="insert_ignore_' . $vrowcount . '" id="insert_ignore_check_' . $vrowcount . '" />';
|
||||
echo '<label for="insert_ignore_check_' . $vrowcount . '">' . $strIgnore . '</label><br />' . "\n";
|
||||
$vresult = (isset($result) && is_array($result) && isset($result[$row_id]) ? $result[$row_id] : $result);
|
||||
if ($insert_mode && $row_id > 0) {
|
||||
echo '<input type="checkbox" checked="checked" name="insert_ignore_' . $row_id . '" id="insert_ignore_check_' . $row_id . '" />';
|
||||
echo '<label for="insert_ignore_check_' . $row_id . '">' . $strIgnore . '</label><br />' . "\n";
|
||||
}
|
||||
?>
|
||||
<table>
|
||||
@@ -352,15 +352,11 @@ foreach ($rows as $vrowcount => $vrow) {
|
||||
}
|
||||
|
||||
if ($table_field['Type'] == 'datetime'
|
||||
&& (!isset($table_field['Default']))
|
||||
&& (!is_null($table_field['Default']))) {
|
||||
&& ! isset($table_field['Default'])
|
||||
&& ! is_null($table_field['Default'])) {
|
||||
// INSERT case
|
||||
if ($insert_mode) {
|
||||
if (isset($vrow)) {
|
||||
$vrow[$field] = date('Y-m-d H:i:s', time());
|
||||
} else {
|
||||
$vrow = array($field => date('Y-m-d H:i:s', time()));
|
||||
}
|
||||
}
|
||||
// UPDATE case with an empty and not NULL value under PHP4
|
||||
elseif (empty($vrow[$field]) && is_null($vrow[$field])) {
|
||||
@@ -421,7 +417,7 @@ foreach ($rows as $vrowcount => $vrow) {
|
||||
$real_null_value = FALSE;
|
||||
if (isset($vrow)) {
|
||||
if (! isset($vrow[$field])
|
||||
|| (function_exists('is_null') && is_null($vrow[$field]))) {
|
||||
|| is_null($vrow[$field])) {
|
||||
$real_null_value = TRUE;
|
||||
$vrow[$field] = '';
|
||||
$special_chars = '';
|
||||
|
Reference in New Issue
Block a user