You need PHP 5.2.0 or newer, with session support
(see
- FAQ 1.31)
- , the Standard PHP Library (SPL) extension and JSON support.
+ FAQ 1.31)
+ , the Standard PHP Library (SPL) extension and JSON support.
-
To support uploading of ZIP files, you need the PHP zip extension.
+
To support uploading of ZIP files, you need the PHP zip extension.
For proper support of multibyte strings (eg. UTF-8, which is
currently the default), you should install the mbstring and ctype
extensions.
@@ -778,7 +778,7 @@
Configuration
Please see the install section on "Using authentication modes"
for more information.
-
+
$cfg['Servers'][$i]['auth_http_realm'] string
@@ -1244,10 +1244,10 @@
Configuration
$cfg['Servers'][$i]['AllowNoPassword']
boolean
-
Whether to allow logins without a password. The default
- value of false for this parameter prevents unintended access
- to a MySQL server with was left with an empty password for root or
- on which an anonymous (blank) user is defined.
+
Whether to allow logins without a password. The default
+ value of false for this parameter prevents unintended access
+ to a MySQL server with was left with an empty password for root or
+ on which an anonymous (blank) user is defined.
This is needed for native MS Excel export, see
FAQ
- 6.23 and to work around limitations of
- open_basedir for uploaded
+ 6.23 and to work around limitations of
+ open_basedir for uploaded
files, see FAQ
1.11.
- If the directory where phpMyAdmin is installed is subject to an
- open_basedir restriction, you need to create a
+ If the directory where phpMyAdmin is installed is subject to an
+ open_basedir restriction, you need to create a
temporary directory in some directory accessible by the web
server. However for security reasons, this directory should be outside
the tree published by webserver. If you cannot avoid having this
@@ -3106,7 +3106,7 @@
Note: if the backend url looks like http://host/~user/phpmyadmin,
- the tilde (~) must be url encoded as %7E in the ProxyPassReverse* lines.
- This is not specific to phpmyadmin, it's just the behavior of Apache.
-
+ the tilde (~) must be url encoded as %7E in the ProxyPassReverse* lines.
+ This is not specific to phpmyadmin, it's just the behavior of Apache.
+
For general information about BLOB streaming on MySQL, visit blobstreaming.org. You need the following components:
@@ -4309,11 +4309,11 @@
Here are details about configuration and operation:
-
In config.inc.php your host should be defined with a FQDN (fully qualified domain name) instead of "localhost".
+
In config.inc.php your host should be defined with a FQDN (fully qualified domain name) instead of "localhost".
Ensure that your target table is under the PBXT storage engine and has a LONGBLOB column (which must be nullable if you want to remove the BLOB reference from it).
-
When you insert or update a row in this table, put a checkmark on the "Upload to BLOB repository" optional choice; otherwise, the upload will be done directly in your LONGBLOB column instead of the repository.
-
Finally when you browse your table, you'll see in your column a link to stream your data, for example "View image". A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time.
-
+
When you insert or update a row in this table, put a checkmark on the "Upload to BLOB repository" optional choice; otherwise, the upload will be done directly in your LONGBLOB column instead of the repository.
+
Finally when you browse your table, you'll see in your column a link to stream your data, for example "View image". A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time.
';
}
@@ -113,10 +113,10 @@
* explode
* count
* strlen
- * @param string the table name
- * @param string restrict the search to this field
- * @param string the string to search
- * @param integer type of search (1 -> 1 word at least, 2 -> all words,
+ * @param string the table name
+ * @param string restrict the search to this field
+ * @param string the string to search
+ * @param integer type of search (1 -> 1 word at least, 2 -> all words,
* 3 -> exact string, 4 -> regexp)
*
* @return array 3 SQL querys (for count, display and delete results)
@@ -262,7 +262,7 @@ function PMA_getSearchSqls($table, $field, $search_str, $search_option)
/**
* If we are in an Ajax request, we need to exit after displaying all the HTML
*/
-if($GLOBALS['is_ajax_request'] == true) {
+if ($GLOBALS['is_ajax_request'] == true) {
exit;
}
else {
diff --git a/db_structure.php b/db_structure.php
index 6a2391e28769..160e9da8dfa8 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -62,17 +62,17 @@
// 1. No tables
if ($num_tables == 0) {
- echo '
' . __('No tables found in database') . '
' . "\n";
+ echo '
' . __('No tables found in database') . '
' . "\n";
- if (empty($db_is_information_schema)) {
- require './libraries/display_create_table.lib.php';
- } // end if (Create Table dialog)
+ if (empty($db_is_information_schema)) {
+ require './libraries/display_create_table.lib.php';
+ } // end if (Create Table dialog)
- /**
- * Displays the footer
- */
- require_once './libraries/footer.inc.php';
- exit;
+ /**
+ * Displays the footer
+ */
+ require_once './libraries/footer.inc.php';
+ exit;
}
// else
@@ -183,7 +183,7 @@
}
//$display_rows = ' - ';
break;
- // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM
+ // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM
// Both are aliases for MERGE
case 'MRG_MyISAM' :
case 'MRG_MYISAM' :
@@ -384,7 +384,7 @@
$sum_row_count_pre = '~';
$show_superscript = PMA_showHint(PMA_sanitize(sprintf(__('This view has at least this number of rows. Please refer to %sdocumentation%s.'), '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', '[/a]')));
}
- } elseif($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) {
+ } elseif ($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) {
// InnoDB table: we did not get an accurate row count
$row_count_pre = '~';
$sum_row_count_pre = '~';
diff --git a/db_tracking.php b/db_tracking.php
index 38a231d4e0a3..df1106e83b1c 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -16,7 +16,7 @@
/**
* If we are not in an Ajax request, then do the common work and show the links etc.
*/
-if($GLOBALS['is_ajax_request'] != true) {
+if ($GLOBALS['is_ajax_request'] != true) {
require './libraries/db_common.inc.php';
}
$url_query .= '&goto=tbl_tracking.php&back=db_tracking.php';
@@ -34,7 +34,7 @@
* If in an Ajax request, generate the success message and use
* {@link PMA_ajaxResponse()} to send the output
*/
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
$message = PMA_Message::success();
PMA_ajaxResponse($message, true);
}
diff --git a/docs.css b/docs.css
index 96574d9c66f8..7e1553741994 100644
--- a/docs.css
+++ b/docs.css
@@ -18,8 +18,8 @@ img {
#header {
margin: 0px;
padding: 1em 0.5em 0.5em 1em;
- background: #036;
- border: 0px;
+ background: #036;
+ border: 0px;
border-bottom: 1px solid black;
}
@@ -31,16 +31,16 @@ img {
}
#header h1 a {
- color: #7584b3;
+ color: #7584b3;
}
#header h1 a .myadmin {
- color: #ffad17;
+ color: #ffad17;
}
#body {
- margin: 2em 1em 1em 1em;
- padding: 0px;
+ margin: 2em 1em 1em 1em;
+ padding: 0px;
padding-right: 13em;
}
@@ -54,13 +54,13 @@ ul#footer {
font-size: smaller;
list-style: none;
float: left;
- padding: 1em;
+ padding: 1em;
color: gray;
border: none;
}
#footer a {
- color: #c19e66;
+ color: #c19e66;
}
abbr, acronym {
@@ -73,12 +73,12 @@ abbr, acronym {
a {
text-decoration: none;
- color: #c17d11;
+ color: #c17d11;
}
a:hover {
- text-decoration: underline;
- color: #8f5902;
+ text-decoration: underline;
+ color: #8f5902;
}
sup {
@@ -128,22 +128,22 @@ ul.header a:hover {
}
h2 {
- color: #727e0a;
+ color: #727e0a;
max-width: 70em;
}
h3 {
- color: #727e0a;
+ color: #727e0a;
max-width: 70em;
}
h4, h5 {
- color: #727e0a;
+ color: #727e0a;
max-width: 70em;
}
h4 a {
- color: #727e0a;
+ color: #727e0a;
}
p {
diff --git a/enum_editor.php b/enum_editor.php
index 5fe962fc10a8..9287bb3febcb 100644
--- a/enum_editor.php
+++ b/enum_editor.php
@@ -33,7 +33,7 @@
// Display the values in text fields, excluding empty strings
$field_counter = 0;
foreach ($values as $value) {
- if(trim($value) != "") {
+ if (trim($value) != "") {
$field_counter++;
echo sprintf('', htmlspecialchars(str_replace(array("''", '\\\\', "\\'"), array("'", '\\', "'"), substr($value, 1, -1))));
}
@@ -41,7 +41,7 @@
$total_fields = $field_counter;
// If extra empty fields are added, display them
- if(isset($_GET['extra_fields'])) {
+ if (isset($_GET['extra_fields'])) {
$total_fields += $_GET['extra_fields'];
for($i = $field_counter+1; $i <= $total_fields; $i++) {
echo '';
diff --git a/export.php b/export.php
index f5a985ac75af..d7c2f87e9705 100644
--- a/export.php
+++ b/export.php
@@ -1,7 +1,7 @@
$export_type, 'single_table' => isset($single_table)));
+$export_list = PMA_getPlugins(
+ './libraries/export/',
+ array(
+ 'export_type' => $export_type,
+ 'single_table' => isset($single_table)));
// Backward compatbility
$type = $what;
@@ -43,7 +47,7 @@
$buffer_needed = false;
// Is it a quick or custom export?
-if($_REQUEST['quick_or_custom'] == 'quick') {
+if ($_REQUEST['quick_or_custom'] == 'quick') {
$quick_export = true;
} else {
$quick_export = false;
@@ -58,7 +62,7 @@
$buffer_needed = true;
}
if (($quick_export && !empty($_REQUEST['quick_export_onserver'])) || (!$quick_export && !empty($_REQUEST['onserver']))) {
- if($quick_export) {
+ if ($quick_export) {
$onserver = $_REQUEST['quick_export_onserver'];
} else {
$onserver = $_REQUEST['onserver'];
@@ -125,7 +129,7 @@
* Output handler for all exports, if needed buffering, it stores data into
* $dump_buffer, otherwise it prints thems out.
*
- * @param string $line the insert statement
+ * @param string $line the insert statement
* @return bool Whether output suceeded
*/
function PMA_exportOutputHandler($line)
@@ -279,7 +283,7 @@ function PMA_exportOutputHandler($line)
$extension_start_pos = strlen($filename) - strlen($export_list[$type]['extension']) - 1;
$user_extension = substr($filename, $extension_start_pos, strlen($filename));
$required_extension = "." . $export_list[$type]['extension'];
- if(strtolower($user_extension) != $required_extension) {
+ if (strtolower($user_extension) != $required_extension) {
$filename .= $required_extension;
}
$mime_type = $export_list[$type]['mime_type'];
@@ -394,9 +398,9 @@ function PMA_exportOutputHandler($line)
}
// Convert the multiple select elements from an array to a string
- if($export_type == 'server' && isset($_REQUEST['db_select'])) {
+ if ($export_type == 'server' && isset($_REQUEST['db_select'])) {
$_REQUEST['db_select'] = implode(",", $_REQUEST['db_select']);
- } elseif($export_type == 'database' && isset($_REQUEST['table_select'])) {
+ } elseif ($export_type == 'database' && isset($_REQUEST['table_select'])) {
$_REQUEST['table_select'] = implode(",", $_REQUEST['table_select']);
}
@@ -419,123 +423,182 @@ function PMA_exportOutputHandler($line)
// need exceptions here :-)
do {
-// Add possibly some comments to export
-if (!PMA_exportHeader()) {
- break;
-}
-
-// Will we need relation & co. setup?
-$do_relation = isset($GLOBALS[$what . '_relation']);
-$do_comments = isset($GLOBALS[$what . '_include_comments']);
-$do_mime = isset($GLOBALS[$what . '_mime']);
-if ($do_relation || $do_comments || $do_mime) {
- $cfgRelation = PMA_getRelationsParam();
-}
-if ($do_mime) {
- require_once './libraries/transformations.lib.php';
-}
-
-// Include dates in export?
-$do_dates = isset($GLOBALS[$what . '_dates']);
+ // Add possibly some comments to export
+ if (!PMA_exportHeader()) {
+ break;
+ }
-/**
- * Builds the dump
- */
-// Gets the number of tables if a dump of a database has been required
-if ($export_type == 'server') {
- if (isset($db_select)) {
- $tmp_select = implode($db_select, '|');
- $tmp_select = '|' . $tmp_select . '|';
+ // Will we need relation & co. setup?
+ $do_relation = isset($GLOBALS[$what . '_relation']);
+ $do_comments = isset($GLOBALS[$what . '_include_comments']);
+ $do_mime = isset($GLOBALS[$what . '_mime']);
+ if ($do_relation || $do_comments || $do_mime) {
+ $cfgRelation = PMA_getRelationsParam();
}
- // Walk over databases
- foreach ($GLOBALS['pma']->databases as $current_db) {
- if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))
- || ! isset($tmp_select)) {
- if (!PMA_exportDBHeader($current_db)) {
- break 2;
- }
- if (!PMA_exportDBCreate($current_db)) {
- break 2;
- }
- if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) {
- PMA_exportRoutines($current_db);
- }
+ if ($do_mime) {
+ require_once './libraries/transformations.lib.php';
+ }
+
+ // Include dates in export?
+ $do_dates = isset($GLOBALS[$what . '_dates']);
- $tables = PMA_DBI_get_tables($current_db);
- $views = array();
- foreach ($tables as $table) {
- // if this is a view, collect it for later; views must be exported
- // after the tables
- $is_view = PMA_Table::isView($current_db, $table);
- if ($is_view) {
- $views[] = $table;
+ /**
+ * Builds the dump
+ */
+ // Gets the number of tables if a dump of a database has been required
+ if ($export_type == 'server') {
+ if (isset($db_select)) {
+ $tmp_select = implode($db_select, '|');
+ $tmp_select = '|' . $tmp_select . '|';
+ }
+ // Walk over databases
+ foreach ($GLOBALS['pma']->databases as $current_db) {
+ if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))
+ || ! isset($tmp_select)) {
+ if (!PMA_exportDBHeader($current_db)) {
+ break 2;
}
- if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- // for a view, export a stand-in definition of the table
- // to resolve view dependencies
- if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) {
- break 3;
- }
+ if (!PMA_exportDBCreate($current_db)) {
+ break 2;
}
- // if this is a view or a merge table, don't export data
- if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($current_db, $table))) {
- $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table);
- if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) {
- break 3;
+ if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) {
+ PMA_exportRoutines($current_db);
+ }
+
+ $tables = PMA_DBI_get_tables($current_db);
+ $views = array();
+ foreach ($tables as $table) {
+ // if this is a view, collect it for later; views must be exported
+ // after the tables
+ $is_view = PMA_Table::isView($current_db, $table);
+ if ($is_view) {
+ $views[] = $table;
+ }
+ if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
+ // for a view, export a stand-in definition of the table
+ // to resolve view dependencies
+ if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) {
+ break 3;
+ }
+ }
+ // if this is a view or a merge table, don't export data
+ if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($current_db, $table))) {
+ $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table);
+ if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) {
+ break 3;
+ }
+ }
+ // now export the triggers (needs to be done after the data because
+ // triggers can modify already imported tables)
+ if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
+ if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) {
+ break 2;
+ }
}
}
- // now export the triggers (needs to be done after the data because
- // triggers can modify already imported tables)
- if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) {
- break 2;
+ foreach ($views as $view) {
+ // no data export for a view
+ if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
+ if (!PMA_exportStructure($current_db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) {
+ break 3;
+ }
}
}
+ if (!PMA_exportDBFooter($current_db)) {
+ break 2;
+ }
}
- foreach ($views as $view) {
- // no data export for a view
- if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- if (!PMA_exportStructure($current_db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) {
- break 3;
- }
+ }
+ } elseif ($export_type == 'database') {
+ if (!PMA_exportDBHeader($db)) {
+ break;
+ }
+
+ if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) {
+ PMA_exportRoutines($db);
+ }
+
+ $i = 0;
+ $views = array();
+ // $tables contains the choices from the user (via $table_select)
+ foreach ($tables as $table) {
+ // if this is a view, collect it for later; views must be exported after
+ // the tables
+ $is_view = PMA_Table::isView($db, $table);
+ if ($is_view) {
+ $views[] = $table;
+ }
+ if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
+ // for a view, export a stand-in definition of the table
+ // to resolve view dependencies
+ if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) {
+ break 2;
}
}
- if (!PMA_exportDBFooter($current_db)) {
- break 2;
+ // if this is a view or a merge table, don't export data
+ if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($db, $table))) {
+ $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table);
+ if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) {
+ break 2;
+ }
+ }
+ // now export the triggers (needs to be done after the data because
+ // triggers can modify already imported tables)
+ if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
+ if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) {
+ break 2;
+ }
+ }
+ }
+ foreach ($views as $view) {
+ // no data export for a view
+ if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
+ if (!PMA_exportStructure($db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) {
+ break 2;
+ }
}
}
- }
-} elseif ($export_type == 'database') {
- if (!PMA_exportDBHeader($db)) {
- break;
- }
- if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) {
- PMA_exportRoutines($db);
- }
+ if (!PMA_exportDBFooter($db)) {
+ break;
+ }
+ } else {
+ if (!PMA_exportDBHeader($db)) {
+ break;
+ }
+ // We export just one table
+ // $allrows comes from the form when "Dump all rows" has been selected
+ if ($allrows == '0' && $limit_to > 0 && $limit_from >= 0) {
+ $add_query = ' LIMIT '
+ . (($limit_from > 0) ? $limit_from . ', ' : '')
+ . $limit_to;
+ } else {
+ $add_query = '';
+ }
- $i = 0;
- $views = array();
- // $tables contains the choices from the user (via $table_select)
- foreach ($tables as $table) {
- // if this is a view, collect it for later; views must be exported after
- // the tables
$is_view = PMA_Table::isView($db, $table);
- if ($is_view) {
- $views[] = $table;
- }
if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- // for a view, export a stand-in definition of the table
- // to resolve view dependencies
- if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) {
- break 2;
+ if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'create_view' : 'create_table', $export_type)) {
+ break;
}
}
- // if this is a view or a merge table, don't export data
- if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($db, $table))) {
- $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table);
+ // If this is an export of a single view, we have to export data;
+ // for example, a PDF report
+ // if it is a merge table, no data is exported
+ if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && ! PMA_Table::isMerge($db, $table)) {
+ if (!empty($sql_query)) {
+ // only preg_replace if needed
+ if (!empty($add_query)) {
+ // remove trailing semicolon before adding a LIMIT
+ $sql_query = preg_replace('%;\s*$%', '', $sql_query);
+ }
+ $local_query = $sql_query . $add_query;
+ PMA_DBI_select_db($db);
+ } else {
+ $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query;
+ }
if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) {
- break 2;
+ break;
}
}
// now export the triggers (needs to be done after the data because
@@ -545,72 +608,13 @@ function PMA_exportOutputHandler($line)
break 2;
}
}
- }
- foreach ($views as $view) {
- // no data export for a view
- if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- if (!PMA_exportStructure($db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) {
- break 2;
- }
- }
- }
-
- if (!PMA_exportDBFooter($db)) {
- break;
- }
-} else {
- if (!PMA_exportDBHeader($db)) {
- break;
- }
- // We export just one table
- // $allrows comes from the form when "Dump all rows" has been selected
- if ($allrows == '0' && $limit_to > 0 && $limit_from >= 0) {
- $add_query = ' LIMIT '
- . (($limit_from > 0) ? $limit_from . ', ' : '')
- . $limit_to;
- } else {
- $add_query = '';
- }
-
- $is_view = PMA_Table::isView($db, $table);
- if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'create_view' : 'create_table', $export_type)) {
+ if (!PMA_exportDBFooter($db)) {
break;
}
}
- // If this is an export of a single view, we have to export data;
- // for example, a PDF report
- // if it is a merge table, no data is exported
- if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && ! PMA_Table::isMerge($db, $table)) {
- if (!empty($sql_query)) {
- // only preg_replace if needed
- if (!empty($add_query)) {
- // remove trailing semicolon before adding a LIMIT
- $sql_query = preg_replace('%;\s*$%', '', $sql_query);
- }
- $local_query = $sql_query . $add_query;
- PMA_DBI_select_db($db);
- } else {
- $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query;
- }
- if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) {
- break;
- }
- }
- // now export the triggers (needs to be done after the data because
- // triggers can modify already imported tables)
- if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) {
- break 2;
- }
- }
- if (!PMA_exportDBFooter($db)) {
+ if (!PMA_exportFooter()) {
break;
}
-}
-if (!PMA_exportFooter()) {
- break;
-}
} while (false);
// End of fake loop
diff --git a/import_status.php b/import_status.php
index d739009ee9b3..7c77e31f86a4 100644
--- a/import_status.php
+++ b/import_status.php
@@ -18,7 +18,7 @@
header('Content-type: text/html');
// wait 0.3 sec before we check for $_SESSION variable, which is set inside import.php
- usleep(300000);
+ usleep(300000);
// wait until message is available
while ($_SESSION['Import_message']['message'] == null) {
@@ -27,7 +27,7 @@
echo $_SESSION['Import_message']['message'];
echo ''."\n";
} else {
diff --git a/js/db_structure.js b/js/db_structure.js
index efc8f2ad2d54..559819e11c9a 100644
--- a/js/db_structure.js
+++ b/js/db_structure.js
@@ -69,8 +69,8 @@ $(document).ready(function() {
if ($("#insert_table_dialog").length > 0) {
$("#insert_table_dialog").remove();
}
- var $div = $('');
- var target = "tbl_change.php";
+ var $div = $('');
+ var target = "tbl_change.php";
/**
* @var button_options Object that stores the options passed to jQueryUI
diff --git a/js/functions.js b/js/functions.js
index dbb962d32ea6..1e2cced85cee 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -28,7 +28,7 @@ var codemirror_editor = false;
* @var chart_activeTimeouts object active timeouts that refresh the charts. When disabling a realtime chart, this can be used to stop the continuous ajax requests
*/
var chart_activeTimeouts = new Object();
-
+
/**
* Add a hidden field to the form to indicate that this will be an
@@ -140,8 +140,8 @@ function PMA_addDatepicker($this_element, options) {
if ($this_element.is('.datetimefield')) {
showTimeOption = true;
}
-
- var defaultOptions = {
+
+ var defaultOptions = {
showOn: 'button',
buttonImage: themeCalendarImage, // defined in js/messages.php
buttonImageOnly: true,
@@ -159,11 +159,11 @@ function PMA_addDatepicker($this_element, options) {
// Fix wrong timepicker z-index, doesn't work without timeout
setTimeout(function() {
- $('#ui-timepicker-div').css('z-index',$('#ui-datepicker-div').css('z-index'))
+ $('#ui-timepicker-div').css('z-index',$('#ui-datepicker-div').css('z-index'))
},0);
},
constrainInput: false
- };
+ };
$this_element.datepicker($.extend(defaultOptions, options));
}
@@ -630,13 +630,13 @@ $(document).ready(function() {
return;
}
var $tr = $(this);
-
+
// make the table unselectable (to prevent default highlighting when shift+click)
$tr.parents('table').noSelect();
-
+
if (!e.shiftKey || last_clicked_row == -1) {
// usual click
-
+
// XXX: FF fires two click events for
yourself
* after the sliding section.
*
- * @param string $id the id of the
on which to apply the effect
- * @param string $message the message to show as a link
+ * @param string $id the id of the
on which to apply the effect
+ * @param string $message the message to show as a link
*/
function PMA_generate_slider_effect($id, $message)
{
@@ -2394,10 +2394,10 @@ function PMA_generate_slider_effect($id, $message)
/**
* Creates an AJAX sliding toggle button (or and equivalent form when AJAX is disabled)
*
- * @param string $action The URL for the request to be executed
- * @param string $select_name The name for the dropdown box
- * @param array $options An array of options (see rte_footer.lib.php)
- * @param string $callback A JS snippet to execute when the request is
+ * @param string $action The URL for the request to be executed
+ * @param string $select_name The name for the dropdown box
+ * @param array $options An array of options (see rte_footer.lib.php)
+ * @param string $callback A JS snippet to execute when the request is
* successfully processed
*
* @return string HTML code for the toggle button
@@ -2548,8 +2548,8 @@ function PMA_cacheUnset($var, $server = 0)
* in MySQL a BIT field can be from 1 to 64 bits so we need this
* function because in PHP, decbin() supports only 32 bits
*
- * @param numeric $value coming from a BIT field
- * @param integer $length
+ * @param numeric $value coming from a BIT field
+ * @param integer $length
* @return string the printable value
*/
function PMA_printable_bit_value($value, $length) {
@@ -2564,7 +2564,7 @@ function PMA_printable_bit_value($value, $length) {
/**
* Verifies whether the value contains a non-printable character
*
- * @param string $value
+ * @param string $value
* @return boolean
*/
function PMA_contains_nonprintable_ascii($value) {
@@ -2575,7 +2575,7 @@ function PMA_contains_nonprintable_ascii($value) {
* Converts a BIT type default value
* for example, b'010' becomes 010
*
- * @param string $bit_default_value
+ * @param string $bit_default_value
* @return string the converted value
*/
function PMA_convert_bit_default_value($bit_default_value) {
@@ -2585,7 +2585,7 @@ function PMA_convert_bit_default_value($bit_default_value) {
/**
* Extracts the various parts from a field type spec
*
- * @param string $fieldspec
+ * @param string $fieldspec
* @return array associative array containing type, spec_in_brackets
* and possibly enum_set_values (another array)
*/
@@ -2661,7 +2661,7 @@ function PMA_extractFieldSpec($fieldspec) {
/**
* Verifies if this table's engine supports foreign keys
*
- * @param string $engine
+ * @param string $engine
* @return boolean
*/
function PMA_foreignkey_supported($engine) {
@@ -2676,7 +2676,7 @@ function PMA_foreignkey_supported($engine) {
/**
* Replaces some characters by a displayable equivalent
*
- * @param string $content
+ * @param string $content
* @return string the content with characters replaced
*/
function PMA_replace_binary_contents($content) {
@@ -2697,7 +2697,7 @@ function PMA_replace_binary_contents($content) {
function PMA_duplicateFirstNewline($string) {
$first_occurence = strpos($string, "\r\n");
- if ($first_occurence === 0){
+ if ($first_occurence === 0) {
$string = "\n".$string;
}
return $string;
@@ -2803,15 +2803,15 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) {
* function that generates a json output for an ajax request and ends script
* execution
*
- * @param bool $message message string containing the html of the message
- * @param bool $success success whether the ajax request was successfull
- * @param array $extra_data extra_data optional - any other data as part of the json request
+ * @param bool $message message string containing the html of the message
+ * @param bool $success success whether the ajax request was successfull
+ * @param array $extra_data extra_data optional - any other data as part of the json request
*
*/
function PMA_ajaxResponse($message, $success = true, $extra_data = array())
{
$response = array();
- if( $success == true ) {
+ if ( $success == true ) {
$response['success'] = true;
if ($message instanceof PMA_Message) {
$response['message'] = $message->getDisplay();
@@ -2822,7 +2822,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
}
else {
$response['success'] = false;
- if($message instanceof PMA_Message) {
+ if ($message instanceof PMA_Message) {
$response['error'] = $message->getDisplay();
}
else {
@@ -2831,7 +2831,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
}
// If extra_data has been provided, append it to the response array
- if( ! empty($extra_data) && count($extra_data) > 0 ) {
+ if ( ! empty($extra_data) && count($extra_data) > 0 ) {
$response = array_merge($response, $extra_data);
}
@@ -2846,7 +2846,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
echo json_encode($response);
- if(!defined('TESTSUITE'))
+ if (!defined('TESTSUITE'))
exit;
}
@@ -2929,8 +2929,8 @@ function PMA_buildActionTitles() {
* $cfg['ColumnTypes'] and either returns an array (useful for quickly checking
* if a datatype is supported) or an HTML snippet that creates a drop-down list.
*
- * @param bool $html Whether to generate an html snippet or an array
- * @param string $selected The value to mark as selected in HTML mode
+ * @param bool $html Whether to generate an html snippet or an array
+ * @param string $selected The value to mark as selected in HTML mode
*
* @return mixed An HTML snippet or an array of datatypes.
*
@@ -3012,9 +3012,9 @@ function PMA_unsupportedDatatypes() {
/**
* Creates a dropdown box with MySQL functions for a particular column.
*
- * @param array $field Data about the column for which
+ * @param array $field Data about the column for which
* to generate the dropdown
- * @param bool $insert_mode Whether the operation is 'insert'
+ * @param bool $insert_mode Whether the operation is 'insert'
*
* @global array $cfg PMA configuration
* @global array $analyzed_sql Analyzed SQL query
@@ -3070,7 +3070,7 @@ function PMA_getFunctionsForField($field, $insert_mode)
// Create the output
$retval = ' ' . "\n";
// loop on the dropdown array and print all available options for that field.
- foreach ($dropdown as $each_dropdown){
+ foreach ($dropdown as $each_dropdown) {
$retval .= ' ';
$retval .= ' __('Open'), 'closed' => __('Closed'));
$cfg_db['Import']['format'] = array(
'csv', // CSV
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 840d760a6b02..37258787a267 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -334,8 +334,8 @@ private function _displayFieldInput(Form $form, $field, $system_path, $work_path
}
return;
case 'NULL':
- trigger_error("Field $system_path has no type", E_USER_WARNING);
- return;
+ trigger_error("Field $system_path has no type", E_USER_WARNING);
+ return;
}
// TrustedProxies requires changes before displaying
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index 8aac9ef33b0a..31d4305e2d26 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -67,9 +67,9 @@ function PMA_lang($lang_key)
function PMA_lang_name($canonical_path, $type = 'name', $default = 'key')
{
$lang_key = str_replace(
- array('Servers/1/', '/'),
- array('Servers/', '_'),
- $canonical_path) . '_' . $type;
+ array('Servers/1/', '/'),
+ array('Servers/', '_'),
+ $canonical_path) . '_' . $type;
return isset($GLOBALS["strConfig$lang_key"])
? ($type == 'desc' ? PMA_lang($lang_key) : $GLOBALS["strConfig$lang_key"])
: ($default == 'key' ? $lang_key : $default);
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 5598b9378662..5f3f729de578 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -224,7 +224,7 @@
'DefaultTabServer',
'DefaultTabDatabase',
'DefaultTabTable',
- 'QueryWindowDefTab');
+ 'QueryWindowDefTab');
$forms['Import']['Import_defaults'] = array('Import' => array(
'format',
'charset',
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index bcd62ae29d56..163ff8762aa3 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -132,7 +132,7 @@ function PMA_config_validate($validator_id, &$values, $isPostSource)
/**
* Empty error handler, used to temporarily restore PHP internal error handler
- *
+ *
* @return bool
*/
function PMA_null_error_handler()
@@ -337,8 +337,8 @@ function validate_trusted_proxies($path, $values)
$lines = array();
foreach ($values[$path] as $ip => $v) {
$lines[] = preg_match('/^-\d+$/', $ip)
- ? $v
- : $ip . ': ' . $v;
+ ? $v
+ : $ip . ': ' . $v;
}
} else {
// AJAX validation
@@ -441,7 +441,7 @@ function validate_by_regex($path, $values, $regex)
/**
* Validates upper bound for numeric inputs
- *
+ *
* @param string $path
* @param array $values
* @param int $max_value
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index fe533e35f332..bb542ba49d50 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -30,9 +30,9 @@
*
*
* @see PMA_isValid()
- * @param mixed $var param to check
- * @param mixed $default default value
- * @param mixed $type var type or array of values to check against $var
+ * @param mixed $var param to check
+ * @param mixed $default default value
+ * @param mixed $type var type or array of values to check against $var
* @return mixed $var or $default
*/
function PMA_ifSetOr(&$var, $default = null, $type = 'similar')
@@ -80,9 +80,9 @@ function PMA_ifSetOr(&$var, $default = null, $type = 'similar')
* @todo create some testsuites
* @todo add some more var types like hex, bin, ...?
* @see http://php.net/gettype
- * @param mixed $var variable to check
- * @param mixed $type var type or array of valid values to check against $var
- * @param mixed $compare var to compare with $var
+ * @param mixed $var variable to check
+ * @param mixed $type var type or array of valid values to check against $var
+ * @param mixed $compare var to compare with $var
* @return boolean whether valid or not
*/
function PMA_isValid(&$var, $type = 'length', $compare = null)
@@ -171,7 +171,7 @@ function PMA_isValid(&$var, $type = 'length', $compare = null)
* require() when a part of the path comes from an insecure source
* like a cookie or form.
*
- * @param string The path to check
+ * @param string The path to check
*
* @return string The secured path
*
@@ -192,8 +192,8 @@ function PMA_securePath($path)
* loads language file if not loaded already
*
* @todo use detected argument separator (PMA_Config)
- * @param string $error_message the error message or named error message
- * @param string|array $message_args arguments applied to $error_message
+ * @param string $error_message the error message or named error message
+ * @param string|array $message_args arguments applied to $error_message
* @return exit
*/
function PMA_fatalError($error_message, $message_args = null)
@@ -276,7 +276,7 @@ function PMA_warnMissingExtension($extension, $fatal = false, $extra = '')
/**
* returns count of tables in given db
*
- * @param string $db database to count tables for
+ * @param string $db database to count tables for
* @return integer count of tables in $db
*/
function PMA_getTableCount($db)
@@ -308,7 +308,7 @@ function PMA_getTableCount($db)
* (renamed with PMA prefix to avoid double definition when embedded
* in Moodle)
*
- * @param string $size
+ * @param string $size
* @return integer $size
*/
function PMA_get_real_size($size = 0)
@@ -343,9 +343,9 @@ function PMA_get_real_size($size = 0)
*
* @see http://php.net/array_merge
* @see http://php.net/array_merge_recursive
- * @param array array to merge
- * @param array array to merge
- * @param array ...
+ * @param array array to merge
+ * @param array array to merge
+ * @param array ...
* @return array merged array
*/
function PMA_array_merge_recursive()
@@ -398,8 +398,8 @@ function PMA_array_merge_recursive()
* @see http://www.php-security.org/MOPB/MOPB-02-2007.html
* @see http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1549
*
- * @param array $array array to walk
- * @param string $function function to call for every array element
+ * @param array $array array to walk
+ * @param string $function function to call for every array element
*/
function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false)
{
@@ -431,8 +431,8 @@ function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false)
* checks given given $page against given $whitelist and returns true if valid
* it ignores optionaly query paramters in $page (script.php?ignored)
*
- * @param string &$page page to check
- * @param array $whitelist whitelist to check page against
+ * @param string &$page page to check
+ * @param array $whitelist whitelist to check page against
* @return boolean whether $page is valid or not (in $whitelist or not)
*/
function PMA_checkPageValidity(&$page, $whitelist)
@@ -460,7 +460,7 @@ function PMA_checkPageValidity(&$page, $whitelist)
* searchs in $_SERVER, $_ENV than trys getenv() and apache_getenv()
* in this order
*
- * @param string $var_name variable name
+ * @param string $var_name variable name
* @return string value of $var or empty string
*/
function PMA_getenv($var_name) {
@@ -481,7 +481,7 @@ function PMA_getenv($var_name) {
/**
* Send HTTP header, taking IIS limits into account (600 seems ok)
*
- * @param string $uri the header to send
+ * @param string $uri the header to send
* @return boolean always true
*/
function PMA_sendHeaderLocation($uri)
@@ -542,9 +542,9 @@ function PMA_sendHeaderLocation($uri)
* $path is a string describing position of an element in an associative array,
* eg. Servers/1/host refers to $array[Servers][1][host]
*
- * @param string $path
- * @param array $array
- * @param mixed $default
+ * @param string $path
+ * @param array $array
+ * @param mixed $default
* @return mixed array element or $default
*/
function PMA_array_read($path, $array, $default = null)
@@ -563,9 +563,9 @@ function PMA_array_read($path, $array, $default = null)
/**
* Stores value in an array
*
- * @param string $path
- * @param array &$array
- * @param mixed $value
+ * @param string $path
+ * @param array &$array
+ * @param mixed $value
*/
function PMA_array_write($path, &$array, $value)
{
@@ -584,9 +584,9 @@ function PMA_array_write($path, &$array, $value)
/**
* Removes value from an array
*
- * @param string $path
- * @param array &$array
- * @param mixed $value
+ * @param string $path
+ * @param array &$array
+ * @param mixed $value
*/
function PMA_array_remove($path, &$array)
{
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 95a01a079802..2eaa1c53d202 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -22,7 +22,7 @@
/**
* Checks one of the mysql extensions
*
- * @param string $extension mysql extension to check
+ * @param string $extension mysql extension to check
*/
function PMA_DBI_checkMysqlExtension($extension = 'mysql') {
if (! function_exists($extension . '_connect')) {
@@ -148,7 +148,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r
* uses language to charset mapping from mysql/share/errmsg.txt
* and charset names to ISO charset from information_schema.CHARACTER_SETS
*
- * @param string $message
+ * @param string $message
* @return string $message
*/
function PMA_DBI_convert_message($message) {
@@ -221,8 +221,8 @@ function PMA_DBI_convert_message($message) {
/**
* returns array with table names for given db
*
- * @param string $database name of database
- * @param mixed $link mysql link resource|object
+ * @param string $database name of database
+ * @param mixed $link mysql link resource|object
* @return array tables names
*/
function PMA_DBI_get_tables($database, $link = null)
@@ -234,8 +234,8 @@ function PMA_DBI_get_tables($database, $link = null)
/**
* usort comparison callback
*
- * @param string $a first argument to sort
- * @param string $b second argument to sort
+ * @param string $a first argument to sort
+ * @param string $b second argument to sort
*
* @return integer a value representing whether $a should be before $b in the
* sorted array or not
@@ -278,14 +278,14 @@ function PMA_usort_comparison_callback($a, $b)
*
*
* @todo move into PMA_Table
- * @param string $database database
- * @param string|false $table table
- * @param boolean|string $tbl_is_group $table is a table group
- * @param resource $link mysql link
- * @param integer $limit_offset zero-based offset for the count
- * @param boolean|integer $limit_count number of tables to return
- * @param string $sort_by table attribute to sort by
- * @param string $sort_order direction to sort (ASC or DESC)
+ * @param string $database database
+ * @param string|false $table table
+ * @param boolean|string $tbl_is_group $table is a table group
+ * @param resource $link mysql link
+ * @param integer $limit_offset zero-based offset for the count
+ * @param boolean|integer $limit_count number of tables to return
+ * @param string $sort_by table attribute to sort by
+ * @param string $sort_order direction to sort (ASC or DESC)
* @return array list of tables in given db(s)
*/
function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = false, $link = null,
@@ -593,13 +593,13 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
* returns array with databases containing extended infos about them
*
* @todo move into PMA_List_Database?
- * @param string $database database
- * @param boolean $force_stats retrieve stats also for MySQL < 5
- * @param resource $link mysql link
- * @param string $sort_by column to order by
- * @param string $sort_order ASC or DESC
- * @param integer $limit_offset starting offset for LIMIT
- * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList']
+ * @param string $database database
+ * @param boolean $force_stats retrieve stats also for MySQL < 5
+ * @param resource $link mysql link
+ * @param string $sort_by column to order by
+ * @param string $sort_order ASC or DESC
+ * @param integer $limit_offset starting offset for LIMIT
+ * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList']
* @return array $databases
*/
function PMA_DBI_get_databases_full($database = null, $force_stats = false,
@@ -787,10 +787,10 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false,
* returns detailed array with all columns for given table in database,
* or all tables/databases
*
- * @param string $database name of database
- * @param string $table name of table to retrieve columns from
- * @param string $column name of specific column
- * @param mixed $link mysql link resource
+ * @param string $database name of database
+ * @param string $table name of table to retrieve columns from
+ * @param string $column name of specific column
+ * @param mixed $link mysql link resource
* @return array
*/
function PMA_DBI_get_columns_full($database = null, $table = null,
@@ -1005,11 +1005,11 @@ function PMA_DBI_get_columns_sql($database, $table, $column = null, $full = fals
/**
* Returns descriptions of columns in given table (all or given by $column)
*
- * @param string $database name of database
- * @param string $table name of table to retrieve columns from
- * @param string $column name of column, null to show all columns
- * @param boolean $full whether to return full info or only column names
- * @param mixed $link mysql link resource
+ * @param string $database name of database
+ * @param string $table name of table to retrieve columns from
+ * @param string $column name of column, null to show all columns
+ * @param boolean $full whether to return full info or only column names
+ * @param mixed $link mysql link resource
* @return false|array array indexed by column names or, if $column is given, flat array description
*/
function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $link = null)
@@ -1115,9 +1115,9 @@ function PMA_DBI_get_table_indexes($database, $table, $link = null)
/**
* returns value of given mysql server variable
*
- * @param string $var mysql server variable name
- * @param int $type PMA_DBI_GETVAR_SESSION|PMA_DBI_GETVAR_GLOBAL
- * @param mixed $link mysql link resource|object
+ * @param string $var mysql server variable name
+ * @param int $type PMA_DBI_GETVAR_SESSION|PMA_DBI_GETVAR_GLOBAL
+ * @param mixed $link mysql link resource|object
* @return mixed value for mysql server variable
*/
@@ -1150,8 +1150,8 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null
* Function called just after a connection to the MySQL database server has been established
* It sets the connection collation, and determins the version of MySQL which is running.
*
- * @param mixed $link mysql link resource|object
- * @param boolean $is_controluser
+ * @param mixed $link mysql link resource|object
+ * @param boolean $is_controluser
*/
function PMA_DBI_postConnect($link, $is_controluser = false)
{
@@ -1219,13 +1219,13 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
* // $user_name = 'John Doe'
*
*
- * @param string|mysql_result $result query or mysql result
- * @param integer $row_number row to fetch the value from,
+ * @param string|mysql_result $result query or mysql result
+ * @param integer $row_number row to fetch the value from,
* starting at 0, with 0 beeing default
- * @param integer|string $field field to fetch the value from,
+ * @param integer|string $field field to fetch the value from,
* starting at 0, with 0 beeing default
- * @param resource $link mysql link
- * @param mixed $options
+ * @param resource $link mysql link
+ * @param mixed $options
* @return mixed value of first field in first row from result
* or false if not found
*/
@@ -1274,12 +1274,12 @@ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null,
* // $user = array('id' => 123, 'name' => 'John Doe')
*
*
- * @param string|mysql_result $result query or mysql result
- * @param string $type NUM|ASSOC|BOTH
+ * @param string|mysql_result $result query or mysql result
+ * @param string $type NUM|ASSOC|BOTH
* returned array should either numeric
* associativ or booth
- * @param resource $link mysql link
- * @param mixed $options
+ * @param resource $link mysql link
+ * @param mixed $options
* @return array|boolean first row from result
* or false if result is empty
*/
@@ -1353,13 +1353,13 @@ function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null, $optio
* // $users['admin']['John Doe'] = '123'
*
*
- * @param string|mysql_result $result query or mysql result
- * @param string|integer $key field-name or offset
+ * @param string|mysql_result $result query or mysql result
+ * @param string|integer $key field-name or offset
* used as key for array
- * @param string|integer $value value-name or offset
+ * @param string|integer $value value-name or offset
* used as value for array
- * @param resource $link mysql link
- * @param mixed $options
+ * @param resource $link mysql link
+ * @param mixed $options
* @return array resultrows or values indexed by $key
*/
function PMA_DBI_fetch_result($result, $key = null, $value = null,
@@ -1488,7 +1488,7 @@ function PMA_DBI_getCompatibilities()
/**
* returns warnings for last query
*
- * @param resource $link mysql link resource
+ * @param resource $link mysql link resource
* @return array warnings
*/
function PMA_DBI_get_warnings($link = null)
@@ -1538,9 +1538,9 @@ function PMA_isSuperuser()
/**
* returns an array of PROCEDURE or FUNCTION names for a db
*
- * @param string $db db name
- * @param string $which PROCEDURE | FUNCTION
- * @param resource $link mysql link
+ * @param string $db db name
+ * @param string $which PROCEDURE | FUNCTION
+ * @param resource $link mysql link
*
* @return array the procedure names or function names
*/
@@ -1563,10 +1563,10 @@ function PMA_DBI_get_procedures_or_functions($db, $which, $link = null)
/**
* returns the definition of a specific PROCEDURE, FUNCTION or EVENT
*
- * @param string $db db name
- * @param string $which PROCEDURE | FUNCTION | EVENT
- * @param string $name the procedure|function|event name
- * @param resource $link mysql link
+ * @param string $db db name
+ * @param string $which PROCEDURE | FUNCTION | EVENT
+ * @param string $name the procedure|function|event name
+ * @param resource $link mysql link
*
* @return string the definition
*/
@@ -1584,9 +1584,9 @@ function PMA_DBI_get_definition($db, $which, $name, $link = null)
/**
* returns details about the TRIGGERs for a specific table or database
*
- * @param string $db db name
- * @param string $table table name
- * @param string $delimiter the delimiter to use (may be empty)
+ * @param string $db db name
+ * @param string $table table name
+ * @param string $delimiter the delimiter to use (may be empty)
*
* @return array information about triggers (may be empty)
*/
@@ -1654,8 +1654,8 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//')
/**
* Returns true if $db.$view_name is a view, false if not
*
- * @param string $db database name
- * @param string $view_name view/table name
+ * @param string $db database name
+ * @param string $view_name view/table name
*
* @return bool true if $db.$view_name is a view, false if not
*/
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index 91740e500335..d7c18f775288 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -69,7 +69,7 @@
* db charset change action on db_operations.php. If this causes a bug on
* other pages, we might have to move this to a different location.
*/
- if( $GLOBALS['is_ajax_request'] == true) {
+ if ( $GLOBALS['is_ajax_request'] == true) {
PMA_ajaxResponse($message, $message->isSuccess());
};
}
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index e7ae0d9526f7..70d3df4868a1 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -35,9 +35,9 @@
/**
* fills given tooltip arrays
*
- * @param array $tooltip_truename tooltip data
- * @param array $tooltip_aliasname tooltip data
- * @param array $table tabledata
+ * @param array $tooltip_truename tooltip data
+ * @param array $tooltip_aliasname tooltip data
+ * @param array $table tabledata
*/
function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table)
{
@@ -247,7 +247,7 @@ function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table)
* Displays top menu links
* If in an Ajax request, we do not need to show this
*/
-if($GLOBALS['is_ajax_request'] != true) {
+if ($GLOBALS['is_ajax_request'] != true) {
require './libraries/db_links.inc.php';
}
?>
diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
index 130dfe585aaa..d2cc823d00d9 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -61,7 +61,7 @@
$tab_search['icon'] = 'ic_b_search';
$tab_search['link'] = 'db_search.php';
-if(PMA_Tracker::isActive())
+if (PMA_Tracker::isActive())
{
$tab_tracking['text'] = __('Tracking');
$tab_tracking['icon'] = 'ic_eye';
diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php
index 68e4b9d9fdf7..179e752a086b 100644
--- a/libraries/db_structure.lib.php
+++ b/libraries/db_structure.lib.php
@@ -13,8 +13,8 @@
* void PMA_TableHeader([bool $db_is_information_schema = false])
* display table header (
...)
*
- * @param boolean $db_is_information_schema
- * @param boolean $replication
+ * @param boolean $db_is_information_schema
+ * @param boolean $replication
*/
function PMA_TableHeader($db_is_information_schema = false, $replication = false)
{
@@ -65,9 +65,9 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false
/**
* Creates a clickable column header for table information
*
- * @param string title to use for the link
- * @param string corresponds to sortable data name mapped in libraries/db_info.inc.php
- * @param string initial sort order
+ * @param string title to use for the link
+ * @param string corresponds to sortable data name mapped in libraries/db_info.inc.php
+ * @param string initial sort order
* @returns string link to be displayed in the table header
*/
function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
@@ -96,17 +96,17 @@ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
// current sort order is ASC
$order_img = ' ';
// but on mouse over, show the reverse order (DESC)
- $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }';
+ $order_link_params['onmouseover'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }';
// on mouse out, show current sort order (ASC)
- $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }';
+ $order_link_params['onmouseout'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }';
} else {
$future_sort_order = 'ASC';
// current sort order is DESC
$order_img = ' ';
// but on mouse over, show the reverse order (ASC)
- $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }';
+ $order_link_params['onmouseover'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }';
// on mouse out, show current sort order (DESC)
- $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }';
+ $order_link_params['onmouseout'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }';
}
}
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 28e0bf213c29..75ec919f2586 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -56,16 +56,16 @@ function PMA_exportIsActive($what, $val) {
echo '' . "\n";
// If the export method was not set, the default is quick
-if(isset($_GET['export_method'])) {
+if (isset($_GET['export_method'])) {
$cfg['Export']['method'] = $_GET['export_method'];
-} elseif(! isset($cfg['Export']['method'])) {
+} elseif (! isset($cfg['Export']['method'])) {
$cfg['Export']['method'] = 'quick';
}
// The export method (quick, custom or custom-no-form)
echo '';
-if(isset($_GET['sql_query'])) {
+if (isset($_GET['sql_query'])) {
echo '' . "\n";
} elseif (! empty($sql_query)) {
echo '' . "\n";
@@ -76,9 +76,9 @@ function PMA_exportIsActive($what, $val) {
';
// but on mouse over, show the reverse order (DESC)
- $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }';
+ $order_link_params['onmouseover'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }';
// on mouse out, show current sort order (ASC)
- $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }';
+ $order_link_params['onmouseout'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }';
} else {
$future_sort_order = 'ASC';
// current sort order is DESC
$order_img = '