Merge remote-tracking branch 'origin/master'

phpmyadmin · Mar 19, 2012 · 4fd8e15 · 4fd8e15
2 parents 506497a + 86410ae
commit 4fd8e15
Show file tree

Hide file tree

Showing 217 changed files with 2,026 additions and 1,715 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
 + Patch #3497179 Contest-5: Add user: Allow create DB w/same name + grant u_%
 + Patch #3498201 Contest-6: Export all privileges
 + Patch #3502814 for rfe #3187077 Change password buttons should match
++ rfe #3488640 Expand table-group in non-light navigation frame if only one
 
 3.5.0.0 (not yet released)
 + rfe #2021981 [interface] Add support for mass prefix change.

diff --git a/Documentation.html b/Documentation.html
diff --git a/browse_foreigners.php b/browse_foreigners.php
@@ -9,19 +9,19 @@
 /**
  * Gets a core script and starts output buffering work
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 PMA_checkParameters(array('db', 'table', 'field'));
 
-require_once './libraries/ob.lib.php';
+require_once 'libraries/ob.lib.php';
 PMA_outBufferPre();
 
-require_once './libraries/header_http.inc.php';
+require_once 'libraries/header_http.inc.php';
 
 /**
  * Displays the frame
  */
-require_once './libraries/transformations.lib.php'; // Transformations
+require_once 'libraries/transformations.lib.php'; // Transformations
 $cfgRelation = PMA_getRelationsParam();
 $foreigners  = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : false);
 
@@ -72,21 +72,17 @@
     }
 }
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-    xml:lang="<?php echo $available_languages[$lang][1]; ?>"
-    lang="<?php echo $available_languages[$lang][1]; ?>"
-    dir="<?php echo $text_dir; ?>">
+<!DOCTYPE HTML>
+<html lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>">
 
 <head>
     <title>phpMyAdmin</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta charset="utf-8" />
     <link rel="stylesheet" type="text/css"
         href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=right&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
 <?php
 // includes everything asked for by libraries/common.inc.php
-require_once './libraries/header_scripts.inc.php';
+require_once 'libraries/header_scripts.inc.php';
 ?>
     <script type="text/javascript">
     //<![CDATA[

diff --git a/changelog.php b/changelog.php
@@ -9,7 +9,7 @@
 /**
  * Gets core libraries and defines some variables
  */
-require './libraries/common.inc.php';
+require 'libraries/common.inc.php';
 
 $filename = CHANGELOG_FILE;
 
@@ -99,16 +99,14 @@
 );
 
 header('Content-type: text/html; charset=utf-8');
-echo '<?xml version="1.0" encoding="utf-8"?'.'>';
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+<!DOCTYPE HTML>
+<html lang="en" dir="ltr">
 <head>
-<link rel="icon" href="./favicon.ico" type="image/x-icon" />
-<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
-<title>phpMyAdmin - ChangeLog</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <link rel="icon" href="favicon.ico" type="image/x-icon" />
+    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
+    <title>phpMyAdmin - ChangeLog</title>
+    <meta charset="utf-8" />
 </head>
 <body>
 <h1>phpMyAdmin - ChangeLog</h1>
@@ -117,5 +115,11 @@
 echo preg_replace(array_keys($replaces), $replaces, $changelog);
 echo '</pre>';
 ?>
+<script type="text/javascript">
+var links = document.getElementsByTagName("a");
+for(var i = 0; i < links.length; i++) {
+    links[i].target = "_blank";
+}
+</script>
 </body>
 </html>
diff --git a/chk_rel.php b/chk_rel.php
@@ -8,8 +8,8 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/header.inc.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/header.inc.php';
 
 
 /**
@@ -21,5 +21,5 @@
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_create.php b/db_create.php
@@ -8,15 +8,15 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 $GLOBALS['js_include'][] = 'functions.js';
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 
-require_once './libraries/mysql_charsets.lib.php';
+require_once 'libraries/mysql_charsets.lib.php';
 if (!PMA_DRIZZLE) {
-    include_once './libraries/replication.inc.php';
+    include_once 'libraries/replication.inc.php';
 }
-require './libraries/build_html_for_db.lib.php';
+require 'libraries/build_html_for_db.lib.php';
 
 /**
  * Sets globals from $_POST
@@ -67,8 +67,8 @@
         PMA_ajaxResponse($message, false);
     }
 
-    include_once './libraries/header.inc.php';
-    include_once './main.php';
+    include_once 'libraries/header.inc.php';
+    include_once 'main.php';
 } else {
     $message = PMA_Message::success(__('Database %1$s has been created.'));
     $message->addParam($new_db);
@@ -138,7 +138,7 @@
         PMA_ajaxResponse($message, true, $extra_data);
     }
 
-    include_once './libraries/header.inc.php';
-    include_once './' . $cfg['DefaultTabDatabase'];
+    include_once 'libraries/header.inc.php';
+    include_once '' . $cfg['DefaultTabDatabase'];
 }
 ?>
diff --git a/db_datadict.php b/db_datadict.php
@@ -8,11 +8,11 @@
 /**
  * Gets the variables sent or posted to this script, then displays headers
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 if (! isset($selected_tbl)) {
-    include './libraries/db_common.inc.php';
-    include './libraries/db_info.inc.php';
+    include 'libraries/db_common.inc.php';
+    include 'libraries/db_info.inc.php';
 }
 
 
@@ -21,7 +21,7 @@
  */
 $cfgRelation  = PMA_getRelationsParam();
 
-require_once './libraries/transformations.lib.php';
+require_once 'libraries/transformations.lib.php';
 
 
 /**
@@ -228,7 +228,7 @@
         }
         ?>
     </td>
-    <td<?php echo $type_nowrap; ?> xml:lang="en" dir="ltr"><?php echo $type; ?></td>
+    <td<?php echo $type_nowrap; ?> lang="en" dir="ltr"><?php echo $type; ?></td>
 <?php /*    <td<?php echo $type_nowrap; ?>><?php echo $attribute; ?></td>*/ ?>
     <td><?php echo (($row['Null'] == 'NO') ? __('No') : __('Yes')); ?></td>
     <td nowrap="nowrap"><?php if (isset($row['Default'])) { echo $row['Default']; } ?></td>
@@ -271,5 +271,5 @@
  */
 PMA_printButton();
 
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_events.php b/db_events.php
@@ -9,8 +9,8 @@
 /**
  * Include required files
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/common.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/common.lib.php';
 
 /**
  * Include JavaScript libraries
@@ -25,12 +25,12 @@
 /**
  * Include all other files
  */
-require_once './libraries/rte/rte_events.lib.php';
+require_once 'libraries/rte/rte_events.lib.php';
 
 /**
  * Do the magic
  */
 $_PMA_RTE = 'EVN';
-require_once './libraries/rte/rte_main.inc.php';
+require_once 'libraries/rte/rte_main.inc.php';
 
 ?>
diff --git a/db_export.php b/db_export.php
@@ -9,16 +9,16 @@
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'export.js';
 
 // $sub_part is also used in db_info.inc.php to see if we are coming from
 // db_export.php, in which case we don't obey $cfg['MaxTableList']
 $sub_part  = '_export';
-require_once './libraries/db_common.inc.php';
+require_once 'libraries/db_common.inc.php';
 $url_query .= '&amp;goto=db_export.php';
-require_once './libraries/db_info.inc.php';
+require_once 'libraries/db_info.inc.php';
 
 /**
  * Displays the form
@@ -28,7 +28,7 @@
 // exit if no tables in db found
 if ($num_tables < 1) {
     PMA_Message::error(__('No tables found in database.'))->display();
-    include './libraries/footer.inc.php';
+    include 'libraries/footer.inc.php';
     exit;
 } // end if
 
@@ -77,10 +77,10 @@
 $multi_values .= '</select></div>';
 
 $export_type = 'database';
-require_once './libraries/display_export.lib.php';
+require_once 'libraries/display_export.lib.php';
 
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
diff --git a/db_import.php b/db_import.php
@@ -8,22 +8,22 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
+require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'import.js';
 
 /**
  * Gets tables informations and displays top links
  */
-require './libraries/db_common.inc.php';
-require './libraries/db_info.inc.php';
+require 'libraries/db_common.inc.php';
+require 'libraries/db_info.inc.php';
 
 $import_type = 'database';
-require './libraries/display_import.lib.php';
+require 'libraries/display_import.lib.php';
 
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>
 
diff --git a/db_operations.php b/db_operations.php
@@ -15,8 +15,8 @@
 /**
  * requirements
  */
-require_once './libraries/common.inc.php';
-require_once './libraries/mysql_charsets.lib.php';
+require_once 'libraries/common.inc.php';
+require_once 'libraries/mysql_charsets.lib.php';
 
 // add a javascript file for jQuery functions to handle Ajax actions
 // also add jQueryUI
@@ -129,7 +129,7 @@
         $views = array();
 
         // remove all foreign key constraints, otherwise we can get errors
-        include_once './libraries/export/sql.php';
+        include_once 'libraries/export/sql.php';
         foreach ($tables_full as $each_table => $tmp) {
             $sql_constraints = '';
             $sql_drop_foreign_keys = '';
@@ -289,7 +289,7 @@
             /**
              * cleanup pmadb stuff for this db
              */
-            include_once './libraries/relation_cleanup.lib.php';
+            include_once 'libraries/relation_cleanup.lib.php';
             PMA_relationsCleanupDatabase($db);
 
             // if someday the RENAME DATABASE reappears, do not DROP
@@ -355,12 +355,12 @@
  * because there is no table in the database ($is_info is true)
  */
 if (empty($is_info)) {
-    include './libraries/db_common.inc.php';
+    include 'libraries/db_common.inc.php';
     $url_query .= '&amp;goto=db_operations.php';
 
     // Gets the database structure
     $sub_part = '_structure';
-    include './libraries/db_info.inc.php';
+    include 'libraries/db_info.inc.php';
     echo "\n";
 
     if (isset($message)) {
@@ -403,7 +403,7 @@
     }
     ?>
     <div class="operations_half_width">
-    <?php include './libraries/display_create_table.lib.php'; ?>
+    <?php include 'libraries/display_create_table.lib.php'; ?>
     </div>
     <?php
     /**
@@ -558,7 +558,7 @@
     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)
        . '<fieldset>' . "\n"
        . '    <legend>';
@@ -618,5 +618,5 @@
 /**
  * Displays the footer
  */
-require './libraries/footer.inc.php';
+require 'libraries/footer.inc.php';
 ?>