diff --git a/db_details.php3 b/db_details.php3 index a7fe8f7ed..76caf78e1 100755 --- a/db_details.php3 +++ b/db_details.php3 @@ -179,35 +179,35 @@ else if (PMA_MYSQL_INT_VERSION >= 32300) { $bgcolor = ($i++ % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo; echo "\n"; ?> - - + + - +     - + - + - + - + - + - + @@ -250,7 +250,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32300) { $unit = ''; } ?> - + = 32300) { } ?> - +    - +    @@ -276,7 +276,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32300) { } // end if } else { ?> - + - - + + - +    - + - + - + - + - + - + - + diff --git a/db_printview.php3 b/db_printview.php3 index ed8f98e1b..d09247601 100755 --- a/db_printview.php3 +++ b/db_printview.php3 @@ -112,8 +112,8 @@ else if (PMA_MYSQL_INT_VERSION >= 32300) { $bgcolor = ($i++ % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo; echo "\n"; ?> - - + +     = 32300) { $unit = ''; } ?> - + = 32300) { } ?> - +    - +   = 32300) { } // end if } else { ?> - + - - + +   - +   diff --git a/db_stats.php3 b/db_stats.php3 index 2f13e12c9..c136be3b6 100644 --- a/db_stats.php3 +++ b/db_stats.php3 @@ -254,15 +254,15 @@ if ($num_dbs > 0) { list($idx_size, $idx_unit) = PMA_formatByteDown($dbs_array[$db_name][2], 3, 1); list($tot_size, $tot_unit) = PMA_formatByteDown($dbs_array[$db_name][3], 3, 1); - echo ' ' . "\n"; - echo ' ' . "\n"; + echo ' ' . "\n"; + echo ' ' . "\n"; echo '   ' . "\n"; echo ' ' . "\n"; - echo '  ' . htmlentities($db_name) . ' ' . "\n"; - echo '  ' . $dbs_array[$db_name][0] . ' ' . "\n"; - echo '  ' . $data_size . ' ' . $data_unit . ' ' . "\n"; - echo '  ' . $idx_size . ' ' . $idx_unit . ' ' . "\n"; - echo '  ' . $tot_size . ' ' . $tot_unit . ' ' . "\n"; + echo '  ' . htmlentities($db_name) . ' ' . "\n"; + echo '  ' . $dbs_array[$db_name][0] . ' ' . "\n"; + echo '  ' . $data_size . ' ' . $data_unit . ' ' . "\n"; + echo '  ' . $idx_size . ' ' . $idx_unit . ' ' . "\n"; + echo '  ' . $tot_size . ' ' . $tot_unit . ' ' . "\n"; echo ' ' . "\n"; $i++; diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3 index 34589cb86..3d7370bb0 100644 --- a/libraries/display_tbl.lib.php3 +++ b/libraries/display_tbl.lib.php3 @@ -47,7 +47,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ * * @access private * - * @see PMA_displayTable() + * @see PMA_displayTable() */ function PMA_setDisplayMode(&$the_disp_mode, &$the_total) { @@ -186,7 +186,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ * * @access private * - * @see PMA_displayTable() + * @see PMA_displayTable() */ function PMA_displayTableNavigation($pos_next, $pos_prev, $encoded_query) { @@ -376,7 +376,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ * * @access private * - * @see PMA_displayTable() + * @see PMA_displayTable() */ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $encoded_query = '') { @@ -593,7 +593,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ * * @access private * - * @see PMA_displayTable() + * @see PMA_displayTable() */ function PMA_displayTableBody(&$dt_result, &$is_display) { @@ -628,7 +628,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ $bgcolor = ($foo % 2) ? $GLOBALS['cfgBgcolorOne'] : $GLOBALS['cfgBgcolorTwo']; ?> - + - + @@ -740,7 +740,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ if (!empty($del_url)) { echo "\n"; ?> - + > @@ -757,11 +757,11 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ if ($primary->numeric == 1) { if (!isset($row[$primary->name]) || (function_exists('is_null') && is_null($row[$primary->name]))) { - echo ' NULL' . "\n"; + echo ' NULL' . "\n"; } else if ($row[$i] != '') { - echo ' ' . $row[$primary->name] . '' . "\n"; + echo ' ' . $row[$primary->name] . '' . "\n"; } else { - echo '  ' . "\n"; + echo '  ' . "\n"; } } else if ($GLOBALS['cfgShowBlob'] == FALSE && eregi('BLOB', $primary->type)) { // loic1 : mysql_fetch_fields returns BLOB in place of TEXT @@ -770,26 +770,26 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ // fields. $field_flags = mysql_field_flags($dt_result, $i); if (eregi('BINARY', $field_flags)) { - echo ' [BLOB]' . "\n"; + echo ' [BLOB]' . "\n"; } else { if (!isset($row[$primary->name]) || (function_exists('is_null') && is_null($row[$primary->name]))) { - echo ' NULL' . "\n"; + echo ' 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']) . '...'; } // loic1: displays / $row[$primary->name] = ereg_replace("((\015\012)|(\015)|(\012))+", '
', htmlspecialchars($row[$primary->name])); - echo ' ' . $row[$primary->name] . '' . "\n"; + echo ' ' . $row[$primary->name] . '' . "\n"; } else { - echo '  ' . "\n"; + echo '  ' . "\n"; } } } else { if (!isset($row[$primary->name]) || (function_exists('is_null') && is_null($row[$primary->name]))) { - echo ' NULL' . "\n"; + echo ' NULL' . "\n"; } else if ($row[$primary->name] != '') { // loic1: Cut text/blob fields even if $cfgShowBlob is true if (eregi('BLOB', $primary->type)) { @@ -810,9 +810,9 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ else { $row[$primary->name] = ereg_replace("((\015\012)|(\015)|(\012))+", '
', htmlspecialchars($row[$primary->name])); } - echo ' ' . $row[$primary->name] . '' . "\n"; + echo ' ' . $row[$primary->name] . '' . "\n"; } else { - echo '  ' . "\n"; + echo '  ' . "\n"; } } } // end for (2) @@ -821,7 +821,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ if ($GLOBALS['cfgModifyDeleteAtRight']) { if (!empty($edit_url)) { ?> - + @@ -830,7 +830,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ if (!empty($del_url)) { echo "\n"; ?> - + > @@ -876,8 +876,9 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ * * @access private * - * @see PMA_showMessage(), PMA_setDisplayMode(), PMA_displayTableNavigation(), - * PMA_displayTableHeaders(), PMA_displayTableBody() + * @see PMA_showMessage(), PMA_setDisplayMode(), + * PMA_displayTableNavigation(), PMA_displayTableHeaders(), + * PMA_displayTableBody() */ function PMA_displayTable(&$dt_result, &$the_disp_mode) { @@ -974,5 +975,5 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ } } // end of the 'PMA_displayTable()' function -} $__PMA_DISPLAY_TBL_LIB__ +} // $__PMA_DISPLAY_TBL_LIB__ ?> diff --git a/libraries/functions.js b/libraries/functions.js index 2be56be64..48f9c85fb 100644 --- a/libraries/functions.js +++ b/libraries/functions.js @@ -293,3 +293,27 @@ function checkTransmitDump(theForm, theAction) return true; } // end of the 'checkTransmitDump()' function + + +/** + * Displays an confirmation box beforme to submit a "DROP/DELETE/ALTER" query. + * This function is called while clicking links + * + * @param object the link + * @param object the sql query to submit + * + * @return boolean whether pointer is set or not + */ +function setPointer(theRow, thePointerColor) +{ + if (typeof(theRow.style) == 'undefined' || typeof(theRow.cells) == 'undefined') { + return false; + } + + var row_cells_cnt = theRow.cells.length; + for (var c = 0; c < row_cells_cnt; c++) { + theRow.cells[c].bgColor = thePointerColor; + } + + return true; +} // end of the 'setPointer()' function diff --git a/tbl_change.php3 b/tbl_change.php3 index 75a01e1f9..6c53dc95f 100755 --- a/tbl_change.php3 +++ b/tbl_change.php3 @@ -159,8 +159,8 @@ for ($i = 0; $i < $fields_cnt; $i++) { $bgcolor = ($i % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo; ?> - - + + - > + > ' . $strBinary . '' . "\n"; + echo ' ' . $strBinary . '' . "\n"; } else if (strstr($row_table_def['True_Type'], 'enum') || strstr($row_table_def['True_Type'], 'set')) { - echo ' --' . "\n"; + echo ' --' . "\n"; } else { ?> - + 32000) { - echo ' ' . $strTextAreaLength . '' . "\n"; + echo ' ' . $strTextAreaLength . '' . "\n"; } } else if (strstr($row_table_def['True_Type'], 'enum')) { @@ -284,7 +284,7 @@ for ($i = 0; $i < $fields_cnt; $i++) { $enum_cnt = count($enum); $seenchecked = 0; ?> - + - + @@ -427,7 +427,7 @@ for ($i = 0; $i < $fields_cnt; $i++) { } echo "\n"; ?> - + @@ -443,7 +443,7 @@ for ($i = 0; $i < $fields_cnt; $i++) { } echo "\n"; ?> - + diff --git a/tbl_indexes.php3 b/tbl_indexes.php3 index 3f45053fd..576f96f09 100644 --- a/tbl_indexes.php3 +++ b/tbl_indexes.php3 @@ -336,10 +336,11 @@ else if (!defined('PMA_IDX_INCLUDED') } else { $sub_part = ''; } + $bgcolor = (($row_no % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo); echo "\n"; ?> - - + + - + /> diff --git a/tbl_printview.php3 b/tbl_printview.php3 index ce85a39d7..09f496afd 100755 --- a/tbl_printview.php3 +++ b/tbl_printview.php3 @@ -171,13 +171,13 @@ while ($row = mysql_fetch_array($result)) { } echo "\n"; ?> - -   - > - -   -   -   + +   + > + +   +   +   - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + 0) { + $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); echo "\n"; ?> - -  ø - + +  ø + 0 && $mergetable == FALSE) { + $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); echo "\n"; ?> - -  ø - + +  ø + - -  Autoindex - + +  Autoindex + diff --git a/tbl_properties.inc.php3 b/tbl_properties.inc.php3 index e97bd6c7c..580ddbab1 100755 --- a/tbl_properties.inc.php3 +++ b/tbl_properties.inc.php3 @@ -57,8 +57,8 @@ for ($i = 0 ; $i < $num_fields; $i++) { } $bgcolor = ($i % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo; ?> - - + + " /> - + - + " /> - + - + " /> - + /> - + /> - + /> = 32323) { echo "\n"; ?> - + /> - - + + -    - > - -   -   -   - +    + > + +   +   +   + - + 1) { @@ -325,16 +325,16 @@ while ($row = mysql_fetch_array($fields_rs)) { echo "\n"; ?> - + - + - + @@ -342,7 +342,7 @@ while ($row = mysql_fetch_array($fields_rs)) { if (PMA_MYSQL_INT_VERSION >= 32323) { echo "\n"; ?> - + @@ -482,44 +482,44 @@ if ($cfgShowStats) { - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + 0) { + $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); echo "\n"; ?> - -  ø - + +  ø + 0 && $mergetable == FALSE) { + $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); echo "\n"; ?> - -  ø - + +  ø + - -  Autoindex - + +  Autoindex + diff --git a/user_details.php3 b/user_details.php3 index acba67a1a..68fcc9137 100644 --- a/user_details.php3 +++ b/user_details.php3 @@ -123,13 +123,13 @@ function PMA_tableGrants(&$host_db_result, $dbcheck = FALSE) { . '&goto=user_details.php3'; } ?> - + - > + bgcolor=""> @@ -138,7 +138,7 @@ function PMA_tableGrants(&$host_db_result, $dbcheck = FALSE) { if ($grantopt) { echo "\n"; ?> - > + bgcolor=""> @@ -148,7 +148,7 @@ function PMA_tableGrants(&$host_db_result, $dbcheck = FALSE) { if ($priv) { echo "\n"; ?> - + @@ -156,30 +156,30 @@ function PMA_tableGrants(&$host_db_result, $dbcheck = FALSE) { } else { echo "\n"; ?> -   +   - - ' . $GLOBALS['strAny'] . ''; ?> + + ' . $GLOBALS['strAny'] . ''; ?> - ' . $GLOBALS['strAll'] . '' : $db; ?> - ' . $GLOBALS['strAll'] . '' : $table; ?> - ' . $GLOBALS['strNoPrivileges'] . ''; ?> + ' . $GLOBALS['strAll'] . '' : $db; ?> + ' . $GLOBALS['strAll'] . '' : $table; ?> + ' . $GLOBALS['strNoPrivileges'] . ''; ?> - + - + - + - + @@ -854,30 +854,30 @@ function PMA_tableUsers($host = FALSE, $user = FALSE) } echo "\n"; ?> - + - + - + - + ' . $row['User'] . '' : '' . $GLOBALS['strAny'] . '') . "\n"; ?> - + ' . $GLOBALS['strNo'] . '') . "\n"; ?> - +