>
numeric == 1) {
if (!isset($row[$primary->name])
|| (function_exists('is_null') && is_null($row[$primary->name]))) {
- $verticaldisplay['data'][$foo][$i] = ' | NULL | ' . "\n";
+ $vertical_display['data'][$foo][$i] = ' NULL | ' . "\n";
} else if ($row[$i] != '') {
- $verticaldisplay['data'][$foo][$i] = ' ' . $row[$primary->name] . ' | ' . "\n";
+ $vertical_display['data'][$foo][$i] = ' ' . $row[$primary->name] . ' | ' . "\n";
} else {
- $verticaldisplay['data'][$foo][$i] = ' | ' . "\n";
+ $vertical_display['data'][$foo][$i] = ' | ' . "\n";
}
} else if ($GLOBALS['cfgShowBlob'] == FALSE && eregi('BLOB', $primary->type)) {
// loic1 : mysql_fetch_fields returns BLOB in place of TEXT
@@ -874,11 +877,11 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
// fields.
$field_flags = mysql_field_flags($dt_result, $i);
if (eregi('BINARY', $field_flags)) {
- $verticaldisplay['data'][$foo][$i] = ' [BLOB] | ' . "\n";
+ $vertical_display['data'][$foo][$i] = ' [BLOB] | ' . "\n";
} else {
if (!isset($row[$primary->name])
|| (function_exists('is_null') && is_null($row[$primary->name]))) {
- $verticaldisplay['data'][$foo][$i] = ' NULL | ' . "\n";
+ $vertical_display['data'][$foo][$i] = ' NULL | ' . "\n";
} else if ($row[$primary->name] != '') {
if (strlen($row[$primary->name]) > $GLOBALS['cfgLimitChars'] && ($dontlimitchars != 1)) {
$row[$primary->name] = substr($row[$primary->name], 0, $GLOBALS['cfgLimitChars']) . '...';
@@ -888,15 +891,15 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
$row[$primary->name] = htmlspecialchars($row[$primary->name]);
$row[$primary->name] = str_replace("\011", ' ', str_replace(' ', ' ', $row[$primary->name]));
$row[$primary->name] = ereg_replace("((\015\012)|(\015)|(\012))", '
', $row[$primary->name]);
- $verticaldisplay['data'][$foo][$i] = ' ' . $row[$primary->name] . ' | ' . "\n";
+ $vertical_display['data'][$foo][$i] = ' ' . $row[$primary->name] . ' | ' . "\n";
} else {
- $verticaldisplay['data'][$foo][$i] = ' | ' . "\n";
+ $vertical_display['data'][$foo][$i] = ' | ' . "\n";
}
}
} else {
if (!isset($row[$primary->name])
|| (function_exists('is_null') && is_null($row[$primary->name]))) {
- $verticaldisplay['data'][$foo][$i] = ' NULL | ' . "\n";
+ $vertical_display['data'][$foo][$i] = ' NULL | ' . "\n";
} else if ($row[$primary->name] != '') {
// loic1: Cut text/blob fields even if $cfgShowBlob is true
if (eregi('BLOB', $primary->type)) {
@@ -920,21 +923,21 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
$row[$primary->name] = str_replace("\011", ' ', str_replace(' ', ' ', $row[$primary->name]));
$row[$primary->name] = ereg_replace("((\015\012)|(\015)|(\012))", '
', $row[$primary->name]);
}
- $verticaldisplay['data'][$foo][$i] = ' ' . $row[$primary->name] . ' | ' . "\n";
+ $vertical_display['data'][$foo][$i] = ' ' . $row[$primary->name] . ' | ' . "\n";
} else {
- $verticaldisplay['data'][$foo][$i] = ' | ' . "\n";
+ $vertical_display['data'][$foo][$i] = ' | ' . "\n";
}
}
// lem9: output stored cell
if ($disp_direction == 'horizontal') {
- echo $verticaldisplay['data'][$foo][$i];
+ echo $vertical_display['data'][$foo][$i];
}
- if (isset($verticaldisplay['rowdata'][$i][$foo])) {
- $verticaldisplay['rowdata'][$i][$foo] .= $verticaldisplay['data'][$foo][$i];
+ if (isset($vertical_display['rowdata'][$i][$foo])) {
+ $vertical_display['rowdata'][$i][$foo] .= $vertical_display['data'][$foo][$i];
} else {
- $verticaldisplay['rowdata'][$i][$foo] = $verticaldisplay['data'][$foo][$i];
+ $vertical_display['rowdata'][$i][$foo] = $vertical_display['data'][$foo][$i];
}
} // end for (2)
@@ -970,25 +973,25 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
// 4. Gather links of del_urls and edit_urls in an array for later
// output
- if (!isset($verticaldisplay['edit'][$foo])) {
- $verticaldisplay['edit'][$foo] = '';
- $verticaldisplay['delete'][$foo] = '';
+ if (!isset($vertical_display['edit'][$foo])) {
+ $vertical_display['edit'][$foo] = '';
+ $vertical_display['delete'][$foo] = '';
}
- $verticaldisplay['edit'][$foo] .= ' ' . "\n";
- $verticaldisplay['edit'][$foo] .= ' ' . "\n";
- $verticaldisplay['edit'][$foo] .= ' ' . $edit_str . '' . "\n";
- $verticaldisplay['edit'][$foo] .= ' | ' . "\n";
+ $vertical_display['edit'][$foo] .= ' ' . "\n"
+ . ' ' . "\n"
+ . ' ' . $edit_str . '' . "\n"
+ . ' | ' . "\n";
- $verticaldisplay['delete'][$foo] .= ' ' . "\n";
- $verticaldisplay['delete'][$foo] .= ' ' . "\n"
+ . ' ' . "\n";
- $verticaldisplay['delete'][$foo] .= ' | ' . "\n";
+ $vertical_display['delete'][$foo] .= '>' . "\n"
+ . ' ' . $del_str . '' . "\n"
+ . ' ' . "\n";
- echo "\n";
+ echo (($disp_direction == 'horizontal') ? "\n" : '');
$foo++;
} // end while
@@ -996,6 +999,115 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
} // end of the 'PMA_displayTableBody()' function
+ /**
+ * Do display the result table with the vertical direction mode
+ *
+ * @return boolean always true
+ *
+ * @global array the information to display
+ * @global integer the number of row to display between two table headers
+ *
+ * @access private
+ *
+ * @see PMA_displayTable()
+ */
+ function PMA_displayVerticalTable()
+ {
+ global $vertical_display, $repeat_cells;
+
+ reset($vertical_display);
+
+ // Displays "edit" link at top if required
+ if ($GLOBALS['cfgModifyDeleteAtLeft'] && is_array($vertical_display['edit'])) {
+ echo '' . "\n";
+ echo ' | | ' . "\n";
+ reset($vertical_display['edit']);
+ $foo_counter = 0;
+ while (list($key, $val) = each($vertical_display['edit'])) {
+ if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
+ echo ' | ' . "\n";
+ }
+
+ echo $val;
+ $foo_counter++;
+ } // end while
+ echo '
' . "\n";
+ } // end if
+
+ // Displays "delete" link at top if required
+ if ($GLOBALS['cfgModifyDeleteAtLeft'] && is_array($vertical_display['delete'])) {
+ echo '' . "\n";
+ echo '| | ' . "\n";
+ reset($vertical_display['delete']);
+ $foo_counter = 0;
+ while (list($key, $val) = each($vertical_display['delete'])) {
+ if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
+ echo ' | ' . "\n";
+ }
+
+ echo $val;
+ $foo_counter++;
+ } // end while
+ echo '
' . "\n";
+ } // end if
+
+ // Displays data
+ reset($vertical_display['desc']);
+ while (list($key, $val) = each($vertical_display['desc'])) {
+ echo '' . "\n";
+ echo $val;
+
+ $foo_counter = 0;
+ while (list($subkey, $subval) = each($vertical_display['rowdata'][$key])) {
+ if (($foo_counter != 0) && ($repeat_cells != 0) and !($foo_counter % $repeat_cells)) {
+ echo $val;
+ }
+
+ echo $subval;
+ $foo_counter++;
+ } // end while
+
+ echo '
' . "\n";
+ } // end while
+
+ // Displays "edit" link at bottom if required
+ if ($GLOBALS['cfgModifyDeleteAtRight'] && is_array($vertical_display['edit'])) {
+ echo '' . "\n";
+ echo ' | | ' . "\n";
+ reset($vertical_display['edit']);
+ $foo_counter = 0;
+ while (list($key, $val) = each($vertical_display['edit'])) {
+ if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
+ echo ' | ' . "\n";
+ }
+
+ echo $val;
+ $foo_counter++;
+ } // end while
+ echo '
' . "\n";
+ } // end if
+
+ // Displays "delete" link at bottom if required
+ if ($GLOBALS['cfgModifyDeleteAtRight'] && is_array($vertical_display['delete'])) {
+ echo '' . "\n";
+ echo '| | ' . "\n";
+ reset($vertical_display['delete']);
+ $foo_counter = 0;
+ while (list($key, $val) = each($vertical_display['delete'])) {
+ if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
+ echo ' | ' . "\n";
+ }
+
+ echo $val;
+ $foo_counter++;
+ } // end while
+ echo '
' . "\n";
+ }
+
+ return TRUE;
+ } // end of the 'PMA_displayVerticalTable' function
+
+
/**
* Displays a table of results returned by a sql query.
* This function is called by the "sql.php3" script.
@@ -1035,7 +1147,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
global $lang, $server, $db, $table;
global $goto;
global $sql_query, $num_rows, $unlim_num_rows, $pos, $fields_meta, $fields_cnt;
- global $verticaldisplay, $disp_direction, $repeat_cells;
+ global $vertical_display, $disp_direction, $repeat_cells;
global $dontlimitchars;
// 1. ----- Prepares the work -----
@@ -1103,117 +1215,22 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
}
// 3. ----- Displays the results table -----
- // lem9: horizontal output?
- if ($disp_direction == 'horizontal') {
- ?>
+ ?>
-
-
-
- ' . "\n";
- echo ' | | ' . "\n";
- reset($verticaldisplay['edit']);
- $foo_counter = 0;
- while (list($key, $val) = each($verticaldisplay['edit'])) {
- if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
- echo ' | ' . "\n";
- }
-
- echo $val;
- $foo_counter++;
- } // end while
- echo '' . "\n";
- } // end if
-
- if ($GLOBALS['cfgModifyDeleteAtLeft'] && is_array($verticaldisplay['delete'])) {
- echo '' . "\n";
- echo '| | ' . "\n";
- reset($verticaldisplay['delete']);
- $foo_counter = 0;
- while (list($key, $val) = each($verticaldisplay['delete'])) {
- if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
- echo ' | ' . "\n";
- }
-
- echo $val;
- $foo_counter++;
- } // end while
- echo '
' . "\n";
- } // end if
-
- reset($verticaldisplay['desc']);
- while (list($key, $val) = each($verticaldisplay['desc'])) {
- echo '' . "\n";
- echo $val;
-
- $foo_counter = 0;
- while (list($subkey, $subval) = each($verticaldisplay['rowdata'][$key])) {
- if (($foo_counter != 0) && ($repeat_cells != 0) and !($foo_counter % $repeat_cells)) {
- echo $val;
- }
-
- echo $subval;
- $foo_counter++;
- } // end while
-
- echo '
' . "\n";
- } // end while
-
- if ($GLOBALS['cfgModifyDeleteAtRight'] && is_array($verticaldisplay['edit'])) {
- echo '' . "\n";
- echo ' | | ' . "\n";
- reset($verticaldisplay['edit']);
- $foo_counter = 0;
- while (list($key, $val) = each($verticaldisplay['edit'])) {
- if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
- echo ' | ' . "\n";
- }
-
- echo $val;
- $foo_counter++;
- } // end while
- echo '
' . "\n";
- } // end if
-
- if ($GLOBALS['cfgModifyDeleteAtRight'] && is_array($verticaldisplay['delete'])) {
- echo '' . "\n";
- echo '| | ' . "\n";
- reset($verticaldisplay['delete']);
- $foo_counter = 0;
- while (list($key, $val) = each($verticaldisplay['delete'])) {
- if (($foo_counter != 0) && ($repeat_cells != 0) && !($foo_counter % $repeat_cells)) {
- echo ' | ' . "\n";
- }
-
- echo $val;
- $foo_counter++;
- } // end while
- echo '
' . "\n";
- }
- ?>
-
-
-