diff --git a/Documentation.html b/Documentation.html index 33c08603b5..5071b1c85d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -5,8 +5,8 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - - + + phpMyAdmin 4.0.0-dev - Documentation diff --git a/db_operations.php b/db_operations.php index 080686735f..98506d0736 100644 --- a/db_operations.php +++ b/db_operations.php @@ -558,7 +558,7 @@ echo __('Remove database'); if ($GLOBALS['cfg']['AjaxEnable']) { echo ' class="ajax" '; } - echo 'method="post" action="./db_operations.php">' + echo 'method="post" action="db_operations.php">' . PMA_generate_common_hidden_inputs($db, $table) . '
' . "\n" . ' '; diff --git a/db_structure.php b/db_structure.php index ed6ef18182..8c6806ee66 100644 --- a/db_structure.php +++ b/db_structure.php @@ -644,7 +644,7 @@ echo '

'; echo ''; echo PMA_getIcon('b_print.png', __('Print view'), true) . ''; -echo ''; +echo ''; echo PMA_getIcon('b_tblanalyse.png', __('Data Dictionary'), true) . ''; echo '

'; diff --git a/index.php b/index.php index 574f96fd49..62169b763f 100644 --- a/index.php +++ b/index.php @@ -78,8 +78,8 @@ require './libraries/header_http.inc.php'; lang="" dir=""> - - + + phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo htmlspecialchars($HTTP_HOST); ?> diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 0c3d8a61dc..5e74f48a93 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -198,7 +198,7 @@ if (top != self) { '; if ($GLOBALS['cfg']['ReplaceHelpImg']) { echo PMA_getImage('b_help.png', __('phpMyAdmin documentation')); diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index df7e56e5f4..1a27480e13 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -115,7 +115,7 @@ function Swekey_auth_error() if (count($_SESSION['SWEKEY']['VALID_SWEKEYS']) == 0) return sprintf(__('File %s does not contain any key id'), $GLOBALS['cfg']['Server']['auth_swekey_config']); - include_once "./libraries/auth/swekey/swekey.php"; + include_once "libraries/auth/swekey/swekey.php"; Swekey_SetCheckServer($_SESSION['SWEKEY']['CONF_SERVER_CHECK']); Swekey_SetRndTokenServer($_SESSION['SWEKEY']['CONF_SERVER_RNDTOKEN']); diff --git a/libraries/build_html_for_db.lib.php b/libraries/build_html_for_db.lib.php index a6836c8c5a..d59ffb9bda 100644 --- a/libraries/build_html_for_db.lib.php +++ b/libraries/build_html_for_db.lib.php @@ -146,7 +146,7 @@ function PMA_buildHtmlForDb($current, $is_superuser, $checkall, $url_query, $col $out .= '' . '' diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 145a5d22fb..aeb7d6532d 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -929,7 +929,7 @@ function PMA_removeBackquote($a_name) */ function PMA_whichCrlf() { - // The 'PMA_USR_OS' constant is defined in "./libraries/Config.class.php" + // The 'PMA_USR_OS' constant is defined in "libraries/Config.class.php" // Win case if (PMA_USR_OS == 'Win') { $the_crlf = "\r\n"; @@ -2500,7 +2500,7 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou . $frame . '">' . $caption2 . ''; } - echo "\n", '
', "\n"; + echo "\n", '', "\n"; echo PMA_generate_common_hidden_inputs($_url_params); echo PMA_pageselector( $max_count, diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 36df934cc8..92f71b0b2f 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -704,9 +704,9 @@ function PMA_linkURL($url) function PMA_includeJS($url) { if (strpos($url, '?') === false) { - return '' . "\n"; + return '' . "\n"; } else { - return '' . "\n"; + return '' . "\n"; } } diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index c99087435f..ad26071f76 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -35,8 +35,8 @@ if ($GLOBALS['text_dir'] == 'ltr') { - - + + <?php if (!empty($page_title)) { echo htmlspecialchars($page_title); diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index ad53ce9415..ff2c100f95 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -43,8 +43,8 @@ if ($text_dir == 'ltr') { <head> <meta charset="utf-8" /> -<link rel="icon" href="./favicon.ico" type="image/x-icon" /> -<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> +<link rel="icon" href="favicon.ico" type="image/x-icon" /> +<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" /> <title><?php echo __('SQL result'); ?> - phpMyAdmin <?php echo PMA_VERSION ?> - + @@ -613,7 +613,7 @@ class PMA_User_Schema PMA_DBI_select_db($db); - include "./libraries/schema/" . ucfirst($export_type) . "_Relation_Schema.class.php"; + include "libraries/schema/" . ucfirst($export_type) . "_Relation_Schema.class.php"; $obj_schema = eval("new PMA_" . ucfirst($export_type) . "_Relation_Schema();"); } diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index fb55c79b5c..ded404d1f0 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -387,11 +387,11 @@ function PMA_sqlQueryFormBookmark() echo '
' . "\n"; echo __('Variable'); if ($GLOBALS['cfg']['ReplaceHelpImg']) { - echo ' ' . PMA_getImage('b_help.png', __('Documentation')) . ''; } else { - echo ' (' . __('Documentation') . '): '; } echo '', ''); + $str = sprintf(__('The SQL validator could not be initialized. Please check if you have installed the necessary PHP extensions as described in the %sdocumentation%s.'), '', ''); } else { // create new class instance $srv = new PMA_SQLValidator(); diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 8fdce579db..9a20ce5406 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -549,7 +549,7 @@ for ($i = 0; $i < $num_fields; $i++) { } // end for ?> - + +