diff --git a/browse_foreigners.php b/browse_foreigners.php index ed04583dc..db9947d90 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -242,20 +242,20 @@ if (is_array($foreignData['disp_row'])) { ' : '') + echo ($key_ordered_current_equals_data ? '' : '') .'' - .htmlspecialchars($key_ordered_current_key) . '' . ($key_ordered_current_equals_data ? '' : ''); + .htmlspecialchars($key_ordered_current_key) . '' . ($key_ordered_current_equals_data ? '' : ''); ?> ' : '') + echo ($key_ordered_current_equals_data ? '' : '') . '' - . $key_ordered_current_val . '' . ($key_ordered_current_equals_data ? '' : ''); + . $key_ordered_current_val . '' . ($key_ordered_current_equals_data ? '' : ''); ?> ' : '') + echo ($val_ordered_current_equals_data ? '' : '') . '' - . $val_ordered_current_val . '' . ($val_ordered_current_equals_data ? '' : ''); + . $val_ordered_current_val . '' . ($val_ordered_current_equals_data ? '' : ''); ?> ' : '') . '' . htmlspecialchars($val_ordered_current_key) - . '' . ($val_ordered_current_equals_data ? '' : ''); + . '' . ($val_ordered_current_equals_data ? '' : ''); ?> ]" /> - : + : /> @@ -366,7 +366,7 @@ for ($y = 0; $y <= $row; $y++) { - : + : /> @@ -435,7 +435,7 @@ for ($y = 0; $y <= $row; $y++) { - : + : /> @@ -447,7 +447,7 @@ for ($y = 0; $y <= $row; $y++) { - : + : /> @@ -518,9 +518,9 @@ for ($x = 0; $x < $col; $x++) { } ?> - : + : /> -   : +   : />
@@ -549,9 +549,9 @@ for ($x = 0; $x < $col; $x++) { } ?> - : + : /> -   : +   : />
diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index c3a4c8838..aeb5cee88 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -40,7 +40,7 @@ if ($events) { $sqlDrop = 'DROP EVENT ' . PMA_backquote($event['EVENT_NAME']); echo sprintf(' - %s + %s %s %s %s diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php index 0e68483f1..eab4a7b4c 100644 --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -68,7 +68,7 @@ if ($routines) { $sqlDropProc = 'DROP FUNCTION ' . PMA_backquote($routine['SPECIFIC_NAME']); } echo sprintf(' - %s + %s %s %s %s diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php index 48ae1bb56..2b4e9520e 100644 --- a/libraries/display_create_database.lib.php +++ b/libraries/display_create_database.lib.php @@ -17,8 +17,8 @@ require_once './libraries/check_user_privileges.lib.php'; if ($is_create_db_priv) { // The user is allowed to create a db ?> -
- ' . $strCreateNewDatabase . ' ' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?>
+ + ' . $strCreateNewDatabase . ' ' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?>
@@ -32,7 +32,7 @@ if ($is_create_db_priv) { } else { ?> -
+
' . ($cfg['ErrorIconic'] ? '' : '') diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index c955db4c3..04e03960f 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -54,13 +54,13 @@ if ($text_dir == 'ltr') {

- :
- :
- :
- : phpMyAdmin  / MySQL 
- : ; + :
+ :
+ :
+ : phpMyAdmin  / MySQL 
+ : ;
- : + :

diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 0bb3c09c9..9b31b91b9 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -90,11 +90,11 @@ function PMA_getRelationsParam($verbose = false) */ function PMA_printRelationsParamDiagnostic($cfgRelation) { - $messages['error'] = '' . $GLOBALS['strNotOK'] - . ' [ ' + $messages['error'] = '' . $GLOBALS['strNotOK'] + . ' [ ' . $GLOBALS['strDocu'] . ' ]'; - $messages['ok'] = '' . $GLOBALS['strOK'] . ''; + $messages['ok'] = '' . $GLOBALS['strOK'] . ''; $messages['enabled'] = '' . $GLOBALS['strEnabled'] . ''; $messages['disabled'] = '' . $GLOBALS['strDisabled'] . ''; diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index c5d921162..4db374c3d 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -81,7 +81,7 @@ function PMA_select_server($not_only_options, $ommit_fieldset) if ($list) { echo '
  • '; if ($selected && !$ommit_fieldset) { - echo '' . htmlspecialchars($label) . ''; + echo '' . htmlspecialchars($label) . ''; } else { echo '".$d_prev." ".$t_prev."][cur: ".$d_cur." ".$t_cur."][next: ".$d_next." ".$t_next."]
    "; + //DEBUG echo "[prev: ".$d_prev." ".$t_prev."][cur: ".$d_cur." ".$t_cur."][next: ".$d_next." ".$t_next."]
    "; if ($t_cur == 'alpha') { $t_suffix = '_identifier'; @@ -1002,7 +1002,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { // loop #1 for each token: select_expr, table_ref for SELECT for ($i = 0; $i < $size; $i++) { -//DEBUG echo "Loop1 " . $arr[$i]['data'] . " (" . $arr[$i]['type'] . ")
    "; +//DEBUG echo "Loop1 " . $arr[$i]['data'] . " (" . $arr[$i]['type'] . ")
    "; // High speed seek for locating the end of the current query if ($seek_queryend == TRUE) { @@ -1451,7 +1451,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $unsorted_query = $arr['raw']; // in case there is no ORDER BY for ($i = 0; $i < $size; $i++) { -//DEBUG echo "Loop2 " . $arr[$i]['data'] . " (" . $arr[$i]['type'] . ")
    "; +//DEBUG echo "Loop2 " . $arr[$i]['data'] . " (" . $arr[$i]['type'] . ")
    "; // need_confirm // @@ -1739,7 +1739,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $seen_default = FALSE; for ($i = 0; $i < $size; $i++) { - // DEBUG echo "Loop 3 " . $arr[$i]['data'] . " " . $arr[$i]['type'] . "
    "; + // DEBUG echo "Loop 3 " . $arr[$i]['data'] . " " . $arr[$i]['type'] . "
    "; if ($arr[$i]['type'] == 'alpha_reservedWord') { $upper_data = strtoupper($arr[$i]['data']); @@ -2123,7 +2123,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $in_priv_list = FALSE; for ($i = $start_token; $i < $arraysize; $i++) { -// DEBUG echo "Loop format " . $arr[$i]['data'] . " " . $arr[$i]['type'] . "
    "; +// DEBUG echo "Loop format " . $arr[$i]['data'] . " " . $arr[$i]['type'] . "
    "; $before = ''; $after = ''; $indent = 0; diff --git a/libraries/tbl_triggers.lib.php b/libraries/tbl_triggers.lib.php index 659cc2c40..14f290653 100644 --- a/libraries/tbl_triggers.lib.php +++ b/libraries/tbl_triggers.lib.php @@ -32,7 +32,7 @@ if ($triggers) { $drop_and_create = $trigger['drop'] . $delimiter . "\n" . $trigger['create'] . "\n"; echo sprintf(' - %s + %s %s %s %s diff --git a/main.php b/main.php index c56c02037..cb4300a0c 100644 --- a/main.php +++ b/main.php @@ -173,10 +173,10 @@ if ($server > 0) { echo '
  • '; echo ' ' . $strMySQLCharset . ': ' - . ' ' + . ' ' . ' ' . $mysql_charsets_descriptions[$mysql_charset_map[strtolower($charset)]] . "\n" . ' (' . $mysql_charset_map[strtolower($charset)] . ')' . "\n" - . ' ' . "\n" + . ' ' . "\n" . '
    • ' . "\n"; echo ' '; echo ' '; diff --git a/pdf_pages.php b/pdf_pages.php index 2db0c72c4..7457aca59 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -524,7 +524,7 @@ function resetDrag() { - ' . $strDisplayPDF . ''; ?>: 
    + ' . $strDisplayPDF . ''; ?>: 



    diff --git a/pdf_schema.php b/pdf_schema.php index 0d716a70f..b9c3e72a9 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -227,7 +227,7 @@ class PMA_PDF extends TCPDF { require_once './libraries/header.inc.php'; - echo '

    PDF - ' . $GLOBALS['strError'] . '

    ' . "\n"; + echo '

    PDF - ' . $GLOBALS['strError'] . '

    ' . "\n"; if (!empty($error_message)) { $error_message = htmlspecialchars($error_message); } diff --git a/pmd_general.php b/pmd_general.php index 35524e808..479284ea2 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -311,12 +311,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - + - + @@ -377,7 +377,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
    FOREIGN KEYFOREIGN KEY
    on delete - + + diff --git a/user_password.php b/user_password.php index b144f542a..51c0fb6f0 100644 --- a/user_password.php +++ b/user_password.php @@ -110,7 +110,7 @@ if (isset($_REQUEST['nopass'])) { PMA_showMessage($strUpdateProfileMessage, $sql_query, 'success'); ?> - +
    diff --git a/tbl_change.php b/tbl_change.php index 10cadaeb8..bf3e363ea 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -964,7 +964,7 @@ if (!isset($after_insert)) { ?> -        +       
    -  .  +  . 
    '. $strShowTables . ': ' . $tbl_list . '' . "\n"; + echo ''. $strShowTables . ': ' . $tbl_list . '' . "\n"; echo '
    ' . "\n"; } // end if diff --git a/tbl_relation.php b/tbl_relation.php index 18256d96a..32fb38dd6 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -375,7 +375,7 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { ?>
    -