[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11676-g219ec73
Michal Čihař
nijel at users.sourceforge.net
Fri Jul 22 09:10:28 CEST 2011
The branch, master has been updated
via 219ec73d69a0bee94ac3bf98757db25360862b39 (commit)
from 36298932e2a80bbd207b3b86475033f8b728a0b4 (commit)
- Log -----------------------------------------------------------------
commit 219ec73d69a0bee94ac3bf98757db25360862b39
Author: Michal Čihař <mcihar at suse.cz>
Date: Fri Jul 22 09:10:37 2011 +0200
Spacing around if
-----------------------------------------------------------------------
Summary of changes:
chart_export.php | 8 +++---
db_create.php | 4 +-
db_export.php | 6 ++--
db_operations.php | 2 +-
db_search.php | 4 +-
db_structure.php | 2 +-
db_tracking.php | 4 +-
enum_editor.php | 4 +-
libraries/common.inc.php | 2 +-
libraries/common.lib.php | 30 ++++++++++++++--------------
libraries/db_common.inc.php | 2 +-
libraries/db_info.inc.php | 2 +-
libraries/db_links.inc.php | 2 +-
libraries/db_structure.lib.php | 8 +++---
libraries/display_export.lib.php | 36 +++++++++++++++++-----------------
libraries/display_import.lib.php | 6 ++--
libraries/display_tbl.lib.php | 22 ++++++++++----------
libraries/header.inc.php | 2 +-
libraries/mult_submits.inc.php | 2 +-
libraries/plugin_interface.lib.php | 12 +++++-----
libraries/server_links.inc.php | 2 +-
libraries/server_synchronize.lib.php | 20 +++++++++---------
libraries/sql_query_form.lib.php | 2 +-
libraries/sysinfo.lib.php | 2 +-
libraries/tbl_links.inc.php | 4 +-
main.php | 2 +-
navigation.php | 2 +-
pmd_general.php | 14 ++++++------
pmd_save_pos.php | 2 +-
schema_edit.php | 2 +-
server_databases.php | 2 +-
server_export.php | 6 ++--
server_privileges.php | 18 ++++++++--------
server_status.php | 20 +++++++++---------
server_synchronize.php | 4 +-
server_variables.php | 8 +++---
tbl_alter.php | 2 +-
tbl_chart.php | 4 +-
tbl_create.php | 8 +++---
tbl_indexes.php | 4 +-
tbl_operations.php | 4 +-
tbl_replace.php | 4 +-
tbl_structure.php | 26 ++++++++++++------------
tbl_tracking.php | 10 ++++----
user_password.php | 4 +-
45 files changed, 168 insertions(+), 168 deletions(-)
diff --git a/chart_export.php b/chart_export.php
index e3a02f0..c05332a 100644
--- a/chart_export.php
+++ b/chart_export.php
@@ -11,12 +11,12 @@ define('PMA_MINIMUM_COMMON', true);
require_once './libraries/common.inc.php';
-if(isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
+if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
$allowed = Array( 'image/png'=>'png', 'image/svg+xml'=>'svg');
- if(! isset($allowed[$_REQUEST['type']])) exit('Invalid export type');
+ if (! isset($allowed[$_REQUEST['type']])) exit('Invalid export type');
- if(! preg_match("/(".implode("|",$allowed).")$/i", $_REQUEST['filename']))
+ if (! preg_match("/(".implode("|",$allowed).")$/i", $_REQUEST['filename']))
$_REQUEST['filename'] .= '.' . $allowed[$_REQUEST['type']];
header("Cache-Control: public");
@@ -25,7 +25,7 @@ if(isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
header("Content-Type: ".$_REQUEST['type']);
header("Content-Transfer-Encoding: binary");
- if($allowed[$_REQUEST['type']] != 'svg')
+ if ($allowed[$_REQUEST['type']] != 'svg')
echo base64_decode(substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1));
else
echo $_REQUEST['image'];
diff --git a/db_create.php b/db_create.php
index 502ac7f..2d7877a 100644
--- a/db_create.php
+++ b/db_create.php
@@ -48,7 +48,7 @@ if (! $result) {
/**
* If in an Ajax request, just display the message with {@link PMA_ajaxResponse}
*/
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
PMA_ajaxResponse($message, false);
}
@@ -62,7 +62,7 @@ if (! $result) {
/**
* If in an Ajax request, build the output and send it
*/
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
/**
* String containing the SQL Query formatted in pretty HTML
diff --git a/db_export.php b/db_export.php
index aab4c51..f8a4762 100644
--- a/db_export.php
+++ b/db_export.php
@@ -49,14 +49,14 @@ if (!empty($selected_tbl) && empty($table_select)) {
}
// Check if the selected tables are defined in $_GET (from clicking Back button on export.php)
-if(isset($_GET['table_select'])) {
+if (isset($_GET['table_select'])) {
$_GET['table_select'] = urldecode($_GET['table_select']);
$_GET['table_select'] = explode(",", $_GET['table_select']);
}
foreach ($tables as $each_table) {
- if(isset($_GET['table_select'])) {
- if(in_array($each_table['Name'], $_GET['table_select'])) {
+ if (isset($_GET['table_select'])) {
+ if (in_array($each_table['Name'], $_GET['table_select'])) {
$is_selected = ' selected="selected"';
} else {
$is_selected = '';
diff --git a/db_operations.php b/db_operations.php
index e2d1e2b..2382389 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -300,7 +300,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
* Database has been successfully renamed/moved. If in an Ajax request,
* generate the output with {@link PMA_ajaxResponse} and exit
*/
- if( $GLOBALS['is_ajax_request'] == true) {
+ if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['newname'] = $newname;
$extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
diff --git a/db_search.php b/db_search.php
index 69350cd..6191b14 100644
--- a/db_search.php
+++ b/db_search.php
@@ -92,7 +92,7 @@ if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) {
*/
$sub_part = '';
-if( $GLOBALS['is_ajax_request'] != true) {
+if ( $GLOBALS['is_ajax_request'] != true) {
require './libraries/db_info.inc.php';
echo '<div id="searchresults">';
}
@@ -254,7 +254,7 @@ if (isset($_REQUEST['submit_search'])) {
/**
* 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 d1ffdc3..6dc82bf 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -372,7 +372,7 @@ foreach ($tables as $keyname => $each_table) {
$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 at ./Documentation.html#cfg_MaxExactCountViews at _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 38a231d..df1106e 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -16,7 +16,7 @@ $GLOBALS['js_include'][] = 'db_structure.js';
/**
* 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 (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) {
* 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/enum_editor.php b/enum_editor.php
index 5fe962f..9287bb3 100644
--- a/enum_editor.php
+++ b/enum_editor.php
@@ -33,7 +33,7 @@ require_once './libraries/header_meta_style.inc.php';
// 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('<input type="text" size="30" value="%s" name="field' . $field_counter . '" />', htmlspecialchars(str_replace(array("''", '\\\\', "\\'"), array("'", '\\', "'"), substr($value, 1, -1))));
}
@@ -41,7 +41,7 @@ require_once './libraries/header_meta_style.inc.php';
$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 '<input type="text" size="30" name="field' . $i . '"/>';
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index ed32fab..daf1173 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -1008,7 +1008,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
* Set to true if this is a request made during an inline edit process. This
* request is made to retrieve the non-truncated/transformed values.
*/
-if(isset($_REQUEST['inline_edit']) && $_REQUEST['inline_edit'] == true) {
+if (isset($_REQUEST['inline_edit']) && $_REQUEST['inline_edit'] == true) {
$GLOBALS['inline_edit'] = true;
}
else {
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index f710b80..fd0701b 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -600,7 +600,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
* - avoid displaying a Back link
* - use PMA_ajaxResponse() to transmit the message and exit
*/
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
PMA_ajaxResponse($error_msg_output, false);
}
if (! empty($back_url)) {
@@ -779,7 +779,7 @@ function PMA_backquote($a_name, $do_it = true)
if (! $do_it) {
global $PMA_SQPdata_forbidden_word;
- if(! in_array(strtoupper($a_name), $PMA_SQPdata_forbidden_word)) {
+ if (! in_array(strtoupper($a_name), $PMA_SQPdata_forbidden_word)) {
return $a_name;
}
}
@@ -869,7 +869,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
* in a string. In some special cases on sql.php, buffering has to be disabled
* and hence we check with $GLOBALS['buffer_message']
*/
- if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
+ if ( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
ob_start();
}
global $cfg;
@@ -1202,7 +1202,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
// If we are in an Ajax request, we have most probably been called in
// PMA_ajaxResponse(). Hence, collect the buffer contents and return it
// to PMA_ajaxResponse(), which will encode it for JSON.
- if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
+ if ( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
$buffer_contents = ob_get_contents();
ob_end_clean();
return $buffer_contents;
@@ -1341,13 +1341,13 @@ function PMA_localizeNumber($value)
*/
function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_down = false, $noTrailingZero = true)
{
- if($value==0) return '0';
+ if ($value==0) return '0';
$originalValue = $value;
//number_format is not multibyte safe, str_replace is safe
if ($digits_left === 0) {
$value = number_format($value, $digits_right);
- if($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$digits_right));
+ if ($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$digits_right));
return PMA_localizeNumber($value);
}
@@ -1388,22 +1388,22 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow
// Lowering the SI prefix by 1 gives us an additional 3 zeros
// So if we have 3,6,9,12.. free digits ($digits_left - $cur_digits) to use, then lower the SI prefix
$cur_digits = floor(log10($value / PMA_pow(1000, $d, 'pow'))+1);
- if($digits_left > $cur_digits) {
+ if ($digits_left > $cur_digits) {
$d-= floor(($digits_left - $cur_digits)/3);
}
- if($d<0 && $only_down) $d=0;
+ if ($d<0 && $only_down) $d=0;
$value = round($value / (PMA_pow(1000, $d, 'pow') / $dh)) /$dh;
$unit = $units[$d];
// If we dont want any zeros after the comma just add the thousand seperator
- if($noTrailingZero)
+ if ($noTrailingZero)
$value = PMA_localizeNumber(preg_replace("/(?<=\d)(?=(\d{3})+(?!\d))/",",",$value));
else
$value = PMA_localizeNumber(number_format($value, $digits_right)); //number_format is not multibyte safe, str_replace is safe
- if($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$digits_right)).' '.$unit;
+ if ($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$digits_right)).' '.$unit;
return $sign . $value . ' ' . $unit;
} // end of the 'PMA_formatNumber' function
@@ -1541,7 +1541,7 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='')
}
// If there are any tab specific URL parameters, merge those with the general URL parameters
- if(! empty($tab['url_params']) && is_array($tab['url_params'])) {
+ if (! empty($tab['url_params']) && is_array($tab['url_params'])) {
$url_params = array_merge($url_params, $tab['url_params']);
}
@@ -2806,7 +2806,7 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) {
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();
@@ -2817,7 +2817,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 {
@@ -2826,7 +2826,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);
}
@@ -2841,7 +2841,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
echo json_encode($response);
- if(!defined('TESTSUITE'))
+ if (!defined('TESTSUITE'))
exit;
}
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index 4682122..290bcd1 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -69,7 +69,7 @@ if (isset($submitcollation) && !empty($db_collation)) {
* 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 eebad23..de56e83 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -247,7 +247,7 @@ unset($each_table, $tbl_group_sql, $db_info_result);
* 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 5a95622..2210899 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -61,7 +61,7 @@ $tab_search['text'] = __('Search');
$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 68e4b9d..82a3f58 100644
--- a/libraries/db_structure.lib.php
+++ b/libraries/db_structure.lib.php
@@ -96,17 +96,17 @@ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
// current sort order is ASC
$order_img = ' <img class="icon ic_s_asc" src="themes/dot.gif" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="sort_arrow" />';
// 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 = ' <img class="icon ic_s_desc" src="themes/dot.gif" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="sort_arrow" />';
// 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 28e0bf2..75ec919 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -56,16 +56,16 @@ if (isset($single_table)) {
echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' . "\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 '<input type="hidden" name="export_method" value="' . htmlspecialchars($cfg['Export']['method']) . '" />';
-if(isset($_GET['sql_query'])) {
+if (isset($_GET['sql_query'])) {
echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($_GET['sql_query']) . '" />' . "\n";
} elseif (! empty($sql_query)) {
echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n";
@@ -76,9 +76,9 @@ if(isset($_GET['sql_query'])) {
<h2>
<img class="icon ic_b_export" src="themes/dot.gif" alt="export" />
<?php
- if($export_type == 'server') {
+ if ($export_type == 'server') {
echo __('Exporting databases from the current server');
- } elseif($export_type == 'database') {
+ } elseif ($export_type == 'database') {
printf(__('Exporting tables from "%s" database'), htmlspecialchars($db));
} else {
printf(__('Exporting rows from "%s" table'), htmlspecialchars($table));
@@ -91,14 +91,14 @@ if(isset($_GET['sql_query'])) {
<ul>
<li>
<?php echo '<input type="radio" name="quick_or_custom" value="quick" id="radio_quick_export"';
- if(isset($_GET['quick_or_custom'])) {
+ if (isset($_GET['quick_or_custom'])) {
$export_method = $_GET['quick_or_custom'];
- if($export_method == 'custom' || $export_method == 'custom_no_form') {
+ if ($export_method == 'custom' || $export_method == 'custom_no_form') {
echo ' />';
} else {
echo ' checked="checked" />';
}
- } elseif($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') {
+ } elseif ($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') {
echo ' />';
} else {
echo ' checked="checked" />';
@@ -107,14 +107,14 @@ if(isset($_GET['sql_query'])) {
</li>
<li>
<?php echo '<input type="radio" name="quick_or_custom" value="custom" id="radio_custom_export"';
- if(isset($_GET['quick_or_custom'])) {
+ if (isset($_GET['quick_or_custom'])) {
$export_method = $_GET['quick_or_custom'];
- if($export_method == 'custom' || $export_method == 'custom_no_form') {
+ if ($export_method == 'custom' || $export_method == 'custom_no_form') {
echo ' checked="checked" />';
} else {
echo ' />';
}
- } elseif($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') {
+ } elseif ($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') {
echo ' checked="checked" />';
} else {
echo ' />';
@@ -126,9 +126,9 @@ if(isset($_GET['sql_query'])) {
<div class="exportoptions" id="databases_and_tables">
<?php
- if($export_type == 'server') {
+ if ($export_type == 'server') {
echo '<h3>' . __('Database(s):') . '</h3>';
- } else if($export_type == 'database') {
+ } else if ($export_type == 'database') {
echo '<h3>' . __('Table(s):') . '</h3>';
}
if (! empty($multi_values)) {
@@ -142,7 +142,7 @@ if(isset($_GET['sql_query'])) {
<h3><?php echo __('Rows:'); ?></h3>
<ul>
<li>
- <?php if(isset($_GET['allrows']) && $_GET['allrows'] == 1) {
+ <?php if (isset($_GET['allrows']) && $_GET['allrows'] == 1) {
echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" />';
} else {
echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" checked="checked" />';
@@ -158,7 +158,7 @@ if(isset($_GET['sql_query'])) {
</ul>
</li>
<li>
- <?php if(isset($_GET['allrows']) && $_GET['allrows'] == 0) {
+ <?php if (isset($_GET['allrows']) && $_GET['allrows'] == 0) {
echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1" />';
} else {
echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1" checked="checked" />';
@@ -241,7 +241,7 @@ if(isset($_GET['sql_query'])) {
<input type="text" name="filename_template" id="filename_template"
<?php
echo ' value="';
- if(isset($_GET['filename_template'])) {
+ if (isset($_GET['filename_template'])) {
echo $_GET['filename_template'];
} else {
if ($export_type == 'database') {
@@ -276,7 +276,7 @@ if(isset($_GET['sql_query'])) {
echo '<select id="select_charset_of_file" name="charset_of_file" size="1">';
foreach ($cfg['AvailableCharsets'] as $temp_charset) {
echo '<option value="' . $temp_charset . '"';
- if(isset($_GET['charset_of_file']) && ($_GET['charset_of_file'] != $temp_charset)) {
+ if (isset($_GET['charset_of_file']) && ($_GET['charset_of_file'] != $temp_charset)) {
echo '';
} elseif ((empty($cfg['Export']['charset']) && $temp_charset == 'utf-8')
|| $temp_charset == $cfg['Export']['charset']) {
@@ -288,7 +288,7 @@ if(isset($_GET['sql_query'])) {
} // end if
?>
<?php
- if(isset($_GET['compression'])) {
+ if (isset($_GET['compression'])) {
$selected_compression = $_GET['compression'];
} elseif (isset($cfg['Export']['compression'])) {
$selected_compression = $cfg['Export']['compression'];
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 119ccd1..052a023 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -125,9 +125,9 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
<h2>
<img class="icon ic_b_import" src="themes/dot.gif" alt="import" />
<?php
- if($import_type == 'server') {
+ if ($import_type == 'server') {
echo __('Importing into the current server');
- } elseif($import_type == 'database') {
+ } elseif ($import_type == 'database') {
printf(__('Importing into the database "%s"'), htmlspecialchars($db));
} else {
printf(__('Importing into the table "%s"'), htmlspecialchars($table));
@@ -160,7 +160,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
}?>
<div class="formelementrow" id="upload_form">
- <?php if($GLOBALS['is_upload'] && !empty($cfg['UploadDir'])) { ?>
+ <?php if ($GLOBALS['is_upload'] && !empty($cfg['UploadDir'])) { ?>
<ul>
<li>
<input type="radio" name="file_location" id="radio_import_file" />
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 8bf4f3c..adaa407 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -913,11 +913,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$order_link_params = array();
if (isset($order_img) && $order_img!='') {
if (strstr($order_img, 'asc')) {
- $order_link_params['onmouseover'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }';
- $order_link_params['onmouseout'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }';
+ $order_link_params['onmouseover'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }';
+ $order_link_params['onmouseout'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }';
} elseif (strstr($order_img, 'desc')) {
- $order_link_params['onmouseover'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }';
- $order_link_params['onmouseout'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }';
+ $order_link_params['onmouseover'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }';
+ $order_link_params['onmouseout'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }';
}
}
if ($GLOBALS['cfg']['HeaderFlipType'] == 'auto') {
@@ -1113,22 +1113,22 @@ function PMA_buildEmptyDisplay($class, $condition_field, $meta, $align = '') {
function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_truncated = false, $transform_function = '', $default_function = '') {
// Define classes to be added to this data field based on the type of data
$enum_class = '';
- if(strpos($meta->flags, 'enum') !== false) {
+ if (strpos($meta->flags, 'enum') !== false) {
$enum_class = ' enum';
}
$set_class = '';
- if(strpos($meta->flags, 'set') !== false) {
+ if (strpos($meta->flags, 'set') !== false) {
$set_class = ' set';
}
$bit_class = '';
- if(strpos($meta->type, 'bit') !== false) {
+ if (strpos($meta->type, 'bit') !== false) {
$bit_class = ' bit';
}
$mime_type_class = '';
- if(isset($meta->mimetype)) {
+ if (isset($meta->mimetype)) {
$mime_type_class = ' ' . preg_replace('/\//', '_', $meta->mimetype);
}
@@ -1301,7 +1301,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// Class definitions required for inline editing jQuery scripts
$edit_anchor_class = "edit_row_anchor";
- if( $clause_is_unique == 0) {
+ if ( $clause_is_unique == 0) {
$edit_anchor_class .= ' nonunique';
}
} // end if (1.2.1)
@@ -2726,7 +2726,7 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher
* Where clause for selecting this row uniquely is provided as
* a hidden input. Used by jQuery scripts for handling inline editing
*/
- if(! empty($where_clause)) {
+ if (! empty($where_clause)) {
$ret .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />';
}
$ret .= '</span></td>';
@@ -2756,7 +2756,7 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause
* Where clause for selecting this row uniquely is provided as
* a hidden input. Used by jQuery scripts for handling inline editing
*/
- if(! empty($where_clause)) {
+ if (! empty($where_clause)) {
$ret .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />';
}
$ret .= '</span></td>';
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 5700047..a6ed8ed 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -198,7 +198,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
* Sets a variable to remember headers have been sent
*/
$GLOBALS['is_header_sent'] = true;
-} //end if(!$GLOBALS['is_ajax_request'])
+} //end if (!$GLOBALS['is_ajax_request'])
else {
if (empty($GLOBALS['is_header_sent'])) {
require_once './libraries/header_http.inc.php';
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 46a89fc..0f7e218 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -263,7 +263,7 @@ if (!empty($submit_mult) && !empty($what)) {
</fieldset>
<?php
}
- elseif($what == 'add_prefix_tbl'){ ?>
+ elseif ($what == 'add_prefix_tbl'){ ?>
<fieldset class = "input">
<legend><?php echo __('Add table prefix') ?>:</legend>
<table>
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index ed2f4f9..703215f 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -80,7 +80,7 @@ function PMA_pluginCheckboxCheck($section, $opt)
*/
function PMA_pluginGetDefault($section, $opt)
{
- if(isset($_GET[$opt])) { // If the form is being repopulated using $_GET data, that is priority
+ if (isset($_GET[$opt])) { // If the form is being repopulated using $_GET data, that is priority
return htmlspecialchars($_GET[$opt]);
} elseif (isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) {
return htmlspecialchars($_REQUEST[$opt]);
@@ -148,7 +148,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null)
foreach ($list as $plugin_name => $val) {
$ret .= '<option';
// If the form is being repopulated using $_GET data, that is priority
- if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || ! isset($_GET[$name]) && $plugin_name == $default) {
+ if (isset($_GET[$name]) && $plugin_name == $_GET[$name] || ! isset($_GET[$name]) && $plugin_name == $default) {
$ret .= ' selected="selected"';
}
$ret .= ' value="' . $plugin_name . '">' . PMA_getString($val['text']) . '</option>' . "\n";
@@ -158,7 +158,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null)
// Whether each plugin has to be saved as a file
foreach ($list as $plugin_name => $val) {
$ret .= '<input type="hidden" id="force_file_' . $plugin_name . '" value="';
- if(isset($val['force_file'])) {
+ if (isset($val['force_file'])) {
$ret .= 'true';
} else {
$ret .= 'false';
@@ -230,7 +230,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt)
foreach ($opt['values'] as $key => $val) {
$ret .= '<li><input type="radio" name="' . $plugin_name . '_' . $opt['name'] . '" value="' . $key
. '" id="radio_' . $plugin_name . '_' . $opt['name'] . '_' . $key . '"';
- if($key == $default) {
+ if ($key == $default) {
$ret .= 'checked="checked"';
}
$ret .= ' />' . '<label for="radio_' . $plugin_name . '_' . $opt['name'] . '_' . $key . '">'
@@ -250,7 +250,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt)
} elseif ($opt['type'] == 'begin_subgroup') {
/* each subgroup can have a header, which may also be a form element */
$ret .= PMA_pluginGetOneOption($section, $plugin_name, $id, $opt['subgroup_header']) . '<li class="subgroup"><ul';
- if(isset($opt['subgroup_header']['name'])) {
+ if (isset($opt['subgroup_header']['name'])) {
$ret .= ' id="ul_' . $opt['subgroup_header']['name'] . '">';
} else {
$ret .= '>';
@@ -273,7 +273,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt)
}
// Close the list element after $opt['doc'] link is displayed
- if($opt['type'] == 'bool' || $opt['type'] == 'text' || $opt['type'] == 'message_only' || $opt['type'] == 'select') {
+ if ($opt['type'] == 'bool' || $opt['type'] == 'text' || $opt['type'] == 'message_only' || $opt['type'] == 'select') {
$ret .= '</li>';
}
$ret .= "\n";
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index 4b7198e..19ee5d7 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -114,5 +114,5 @@ if (!$GLOBALS['is_ajax_request']) {
PMA_showMessage($message);
unset($message);
}
-}// end if($GLOBALS['is_ajax_request'] == true)
+}// end if ($GLOBALS['is_ajax_request'] == true)
?>
diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index c32ac4d..2c7e69c 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -477,7 +477,7 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
$matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields,$uncommon_cols,
&$alter_str_array,&$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$delete_array, &$update_array, $display)
{
- if(isset($array_insert[$matching_table_index])) {
+ if (isset($array_insert[$matching_table_index])) {
if (sizeof($array_insert[$matching_table_index])) {
for ($insert_row = 0; $insert_row< sizeof($array_insert[$matching_table_index]); $insert_row++) {
if (isset($array_insert[$matching_table_index][$insert_row][$matching_tables_keys[$matching_table_index][0]])) {
@@ -828,7 +828,7 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma
$query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]). " ADD COLUMN " .
$add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . " " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Type'];
- if($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'NO') {
+ if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'NO') {
$query .= ' Not Null ';
} elseif ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'YES') {
$query .= ' Null ';
@@ -1004,23 +1004,23 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s
$sql_query .= " Null " ;
}
if ($criteria[$i] == 'Collation') {
- if( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
+ if ( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
$sql_query .= " Not Null " ;
}
$sql_query .= " COLLATE " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] ;
}
if (($criteria[$i] == 'Default') && ($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] == 'None')) {
- if( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
+ if ( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
$sql_query .= " Not Null " ;
}
- } elseif($criteria[$i] == 'Default') {
- if(! (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
+ } elseif ($criteria[$i] == 'Default') {
+ if (! (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
$sql_query .= " Not Null " ;
}
if (is_string($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]])) {
if ($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] != 'timestamp') {
$sql_query .= " DEFAULT '" . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] . "'";
- } elseif($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] == 'timestamp') {
+ } elseif ($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] == 'timestamp') {
$sql_query .= " DEFAULT " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]];
}
} elseif (is_numeric($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]])) {
@@ -1028,7 +1028,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s
}
}
if ($criteria[$i] == 'Comment') {
- if( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
+ if ( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
$sql_query .= " Not Null " ;
}
$sql_query .= " COMMENT '" . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] . "'" ;
@@ -1162,7 +1162,7 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi
$z++;
}
if ($found === false) {
- if(! ($source_indexes[$table_counter][$a]['Key_name'] == 'PRIMARY')) {
+ if (! ($source_indexes[$table_counter][$a]['Key_name'] == 'PRIMARY')) {
$add_indexes_array [$table_counter][] = $source_indexes[$table_counter][$a]['Column_name'];
}
}
@@ -1364,7 +1364,7 @@ function PMA_get_column_values($database, $table, $column, $link = null)
for ($i=0; $i< sizeof($column); $i++)
{
$query.= PMA_backquote($column[$i]);
- if($i < (sizeof($column)-1))
+ if ($i < (sizeof($column)-1))
{
$query.= ', ';
}
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 1a3fd92..5a0f364 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -252,7 +252,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
.' dir="' . $GLOBALS['text_dir'] . '"'
.$auto_sel . $locking . '>' . htmlspecialchars($query) . '</textarea>' . "\n";
// Add buttons to generate query easily for select all,single select,insert,update and delete
- if(count($fields_list)) {
+ if (count($fields_list)) {
echo '<input type="button" value="SELECT *" id="selectall" class="sqlbutton" />';
echo '<input type="button" value="SELECT" id="select" class="sqlbutton" />';
echo '<input type="button" value="INSERT" id="insert" class="sqlbutton" />';
diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php
index e996db6..9bcc2dd 100644
--- a/libraries/sysinfo.lib.php
+++ b/libraries/sysinfo.lib.php
@@ -14,7 +14,7 @@ function getSysInfo() {
$sysinfo = array();
- if(in_array(PHP_OS, $supported)) {
+ if (in_array(PHP_OS, $supported)) {
return eval("return new ".PHP_OS."();");
}
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index ac5bfb3..3de9ed2 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -92,7 +92,7 @@ if (! $tbl_is_view && !$db_is_information_schema) {
$tabs['operation']['link'] = 'tbl_operations.php';
$tabs['operation']['text'] = __('Operations');
}
-if(PMA_Tracker::isActive()) {
+if (PMA_Tracker::isActive()) {
$tabs['tracking']['icon'] = 'ic_eye';
$tabs['tracking']['text'] = __('Tracking');
$tabs['tracking']['link'] = 'tbl_tracking.php';
@@ -122,7 +122,7 @@ if ($table_info_num_rows == 0 && !$tbl_is_view) {
echo PMA_generate_html_tabs($tabs, $url_params);
unset($tabs);
-if(PMA_Tracker::isActive() and PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"]))
+if (PMA_Tracker::isActive() and PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"]))
{
$msg = PMA_Message::notice('<a href="tbl_tracking.php?'.$url_query.'">'.sprintf(__('Tracking of %s.%s is activated.'), htmlspecialchars($GLOBALS["db"]), htmlspecialchars($GLOBALS["table"])).'</a>');
$msg->display();
diff --git a/main.php b/main.php
index f340e80..e1eec63 100644
--- a/main.php
+++ b/main.php
@@ -295,7 +295,7 @@ if (file_exists('./config')) {
*/
if ($server > 0) {
$cfgRelation = PMA_getRelationsParam();
- if(! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
+ if (! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
$message = PMA_Message::notice(__('The phpMyAdmin configuration storage is not completely configured, some extended features have been deactivated. To find out why click %shere%s.'));
$message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">', false);
$message->addParam('</a>', false);
diff --git a/navigation.php b/navigation.php
index 27859fe..e473dd8 100644
--- a/navigation.php
+++ b/navigation.php
@@ -576,7 +576,7 @@ function PMA_displayTableList($tables, $visible = false,
while (isset($table['is' . $sep . 'group'])) {
// get the array with the actual table information
foreach ($table as $value) {
- if(is_array($value)) {
+ if (is_array($value)) {
$table = $value;
}
}
diff --git a/pmd_general.php b/pmd_general.php
index 1307571..10a862c 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -42,7 +42,7 @@ echo '
var db = "' . PMA_escapeJsString($db) . '";
var token = "' . PMA_escapeJsString($token) . '";';
echo "\n";
- if($_REQUEST['query']) {
+ if ($_REQUEST['query']) {
echo '
$(document).ready(function(){
$(".trigger").click(function(){
@@ -113,7 +113,7 @@ echo $script_tabs . $script_contr . $script_display_field;
><img src="pmd/images/pdf.png" alt="key" width="20" height="20"
title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a
>
- <?php if($_REQUEST['query']){
+ <?php if ($_REQUEST['query']){
echo '<a href="#" onClick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;"
class="M_butt" target="_self">';
echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="';
@@ -205,7 +205,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<thead>
<tr>
<?php
- if(isset($_REQUEST['query'])) {
+ if (isset($_REQUEST['query'])) {
echo '<td class="select_all">';
echo '<input type="checkbox" value="select_all_'.htmlspecialchars($t_n_url).'" style="margin: 0px;" ';
echo 'id="select_all_'.htmlspecialchars($t_n_url).'" title="select all" ';
@@ -238,7 +238,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
echo $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i];
?></td>
<?php
- if(isset($_REQUEST['query'])) {
+ if (isset($_REQUEST['query'])) {
echo '<td class="tab_zag" onmouseover="Table_onover(\''.htmlspecialchars($t_n_url).'\',0,1)" id="id_zag_'.htmlspecialchars($t_n_url).'_2"';
echo 'onmousedown="cur_click=document.getElementById(\''.htmlspecialchars($t_n_url).'\');"';
echo 'onmouseout="Table_onover(\''.htmlspecialchars($t_n_url).'\',1,1)">';
@@ -274,7 +274,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
}
?>)">
<?php
- if(isset($_REQUEST['query'])) {
+ if (isset($_REQUEST['query'])) {
echo '<td class="select_all">';
echo '<input value="'.htmlspecialchars($t_n_url).urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'"';
echo 'type="checkbox" id="select_'.htmlspecialchars($t_n_url).'._'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" ';
@@ -315,7 +315,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</div>
</td>
<?php
- if(isset($_REQUEST['query'])) {
+ if (isset($_REQUEST['query'])) {
//$temp = $GLOBALS['PMD_OUT']["OWNER"][$i].'.'.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i];
echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"';
echo 'onmouseout="this.className=\'small_tab_pref\';"';
@@ -801,7 +801,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</table>
<?php
-if($_REQUEST['query']) {
+if ($_REQUEST['query']) {
echo '<div class="panel">';
echo '<div style="clear:both;"></div>';
echo '<div id="ab"></div>';
diff --git a/pmd_save_pos.php b/pmd_save_pos.php
index 6fefe63..b95b20f 100644
--- a/pmd_save_pos.php
+++ b/pmd_save_pos.php
@@ -45,7 +45,7 @@ function PMD_err_sav() {
}
}
-if(! empty($die_save_pos)) {
+if (! empty($die_save_pos)) {
header("Content-Type: text/xml; charset=utf-8");
header("Cache-Control: no-cache");
?>
diff --git a/schema_edit.php b/schema_edit.php
index 9b71500..1545d8f 100644
--- a/schema_edit.php
+++ b/schema_edit.php
@@ -83,7 +83,7 @@ if ($cfgRelation['pdfwork']) {
* @param string $do It tells what the Schema is supposed to do
* create and select a page, generate schema etc
*/
- if(isset($_REQUEST['do'])){
+ if (isset($_REQUEST['do'])){
$user_schema->setAction($_REQUEST['do']);
$user_schema->processUserChoice();
}
diff --git a/server_databases.php b/server_databases.php
index fb9d1d6..544db90 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -180,7 +180,7 @@ if ($databases_count > 0) {
{
if ($type=="master")
$name = __('Master replication');
- elseif($type == "slave")
+ elseif ($type == "slave")
$name = __('Slave replication');
if (${"server_{$type}_status"})
echo ' <th>'. $name .'</th>' . "\n";
diff --git a/server_export.php b/server_export.php
index b5a4ca6..d6dd2cf 100644
--- a/server_export.php
+++ b/server_export.php
@@ -31,14 +31,14 @@ $multi_values .= '<select name="db_select[]" id="db_select" size="10" multiple="
$multi_values .= "\n";
// Check if the selected databases are defined in $_GET (from clicking Back button on export.php)
-if(isset($_GET['db_select'])) {
+if (isset($_GET['db_select'])) {
$_GET['db_select'] = urldecode($_GET['db_select']);
$_GET['db_select'] = explode(",", $_GET['db_select']);
}
foreach ($GLOBALS['pma']->databases as $current_db) {
- if(isset($_GET['db_select'])) {
- if(in_array($current_db, $_GET['db_select'])) {
+ if (isset($_GET['db_select'])) {
+ if (in_array($current_db, $_GET['db_select'])) {
$is_selected = ' selected="selected"';
} else {
$is_selected = '';
diff --git a/server_privileges.php b/server_privileges.php
index e2f19a9..ecd1fa6 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1046,7 +1046,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
/**
* If we are not in an Ajax request, we can't reload navigation now
*/
- if($GLOBALS['is_ajax_request'] != true) {
+ if ($GLOBALS['is_ajax_request'] != true) {
// this is needed in case tracking is on:
$GLOBALS['db'] = $username;
$GLOBALS['reload'] = true;
@@ -1346,7 +1346,7 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[
$queries[] = 'DROP DATABASE IF EXISTS ' . PMA_backquote($this_user) . ';';
$GLOBALS['reload'] = true;
- if($GLOBALS['is_ajax_request'] != true) {
+ if ($GLOBALS['is_ajax_request'] != true) {
PMA_reloadNavigation();
}
}
@@ -1446,11 +1446,11 @@ $link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="s
*/
if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) {
- if(isset($sql_query)) {
+ if (isset($sql_query)) {
$extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
}
- if(isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
+ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
/**
* generate html on the fly for the new user that was just created.
*/
@@ -1460,7 +1460,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE
.'<td>' . htmlspecialchars($hostname) . '</td>' . "\n";
$new_user_string .= '<td>';
- if(!empty($password) || isset($pma_pw)) {
+ if (!empty($password) || isset($pma_pw)) {
$new_user_string .= __('Yes');
}
else {
@@ -1471,7 +1471,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE
$new_user_string .= '<td><tt>' . join(', ', PMA_extractPrivInfo('', true)) . '</tt></td>'; //Fill in privileges here
$new_user_string .= '<td>';
- if((isset($Grant_priv) && $Grant_priv == 'Y')) {
+ if ((isset($Grant_priv) && $Grant_priv == 'Y')) {
$new_user_string .= __('Yes');
}
else {
@@ -1498,7 +1498,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE
$extra_data['new_user_initial_string'] = $new_user_initial_string;
}
- if(isset($update_privs)) {
+ if (isset($update_privs)) {
$extra_data['db_specific_privs'] = false;
if (isset($dbname_is_wildcard)) {
$extra_data['db_specific_privs'] = !$dbname_is_wildcard;
@@ -1806,7 +1806,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
// A user was selected -> display the user's properties
// In an Ajax request, prevent cached values from showing
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
header('Cache-Control: no-cache');
}
@@ -2376,7 +2376,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
$user_form .= '</tbody>' . "\n"
. '</table></form>' . "\n";
- if($GLOBALS['is_ajax_request'] == true){
+ if ($GLOBALS['is_ajax_request'] == true){
$extra_data['user_form'] = $user_form;
$message = PMA_Message::success(__('User has been added.'));
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
diff --git a/server_status.php b/server_status.php
index cf02da7..c88ccdd 100644
--- a/server_status.php
+++ b/server_status.php
@@ -222,15 +222,15 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
// Ignore undefined index warning, just increase counter by one
@$return['sum'][$type] += $row['#'];
- if($type=='insert' || $type=='update') {
+ if ($type=='insert' || $type=='update') {
// Group inserts if selected
- if($type=='insert' && isset($_REQUEST['groupInserts']) && $_REQUEST['groupInserts'] && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) {
+ if ($type=='insert' && isset($_REQUEST['groupInserts']) && $_REQUEST['groupInserts'] && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) {
$insertTables[$matches[2]]++;
if ($insertTables[$matches[2]] > 1) {
$return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]];
// Add a ... to the end of this query to indicate that there's been other queries
- if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.')
+ if ($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.')
$return['rows'][$insertTablesFirst]['argument'] .= '<br/>...';
// Group this value, thus do not add to the result list
@@ -557,7 +557,7 @@ require './libraries/server_common.inc.php';
require './libraries/server_links.inc.php';
$server = 1;
-if(isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']);
+if (isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']);
$server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost'
|| $cfg['Servers'][$server]['host'] == '127.0.0.1'
@@ -722,7 +722,7 @@ function printQueryStatistics() {
echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0);
echo '<br>';
- if($total_queries / $server_status['Uptime'] >= 1) {
+ if ($total_queries / $server_status['Uptime'] >= 1) {
echo 'ø '.__('per second').': ';
echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0);
}
@@ -768,7 +768,7 @@ function printQueryStatistics() {
$name = str_replace(array('Com_', '_'), array('', ' '), $name);
// Group together values that make out less than 2% into "Other", but only if we have more than 6 fractions already
- if($value < $query_sum * 0.02 && count($chart_json)>6)
+ if ($value < $query_sum * 0.02 && count($chart_json)>6)
$other_sum += $value;
else $chart_json[$name] = $value;
?>
@@ -1364,7 +1364,7 @@ function printMonitor() {
<div id="addChartDialog" title="Add chart" style="display:none;">
<div id="tabGridVariables">
<p><input type="text" name="chartTitle" value="<?php echo __('Chart Title'); ?>" /></p>
- <?php if($server_db_isLocal) { ?>
+ <?php if ($server_db_isLocal) { ?>
<input type="radio" name="chartType" value="cpu" id="chartCPU">
<label for="chartCPU"><?php echo __('CPU Usage'); ?></label><br/>
@@ -1444,8 +1444,8 @@ function printMonitor() {
variableNames = [ <?php
$i=0;
foreach ($server_status as $name=>$value) {
- if(is_numeric($value)) {
- if($i++ > 0) echo ", ";
+ if (is_numeric($value)) {
+ if ($i++ > 0) echo ", ";
echo "'".$name."'";
}
}
@@ -1462,7 +1462,7 @@ function refreshList($name,$defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20,
foreach ($refreshRates as $rate) {
$selected = ($rate == $defaultRate)?' selected="selected"':'';
- if($rate<60)
+ if ($rate<60)
echo '<option value="'.$rate.'"'.$selected.'>'.sprintf(_ngettext('%d second', '%d seconds', $rate), $rate).'</option>';
else
echo '<option value="'.$rate.'"'.$selected.'>'.sprintf(_ngettext('%d minute', '%d minutes', $rate/60), $rate/60).'</option>';
diff --git a/server_synchronize.php b/server_synchronize.php
index 2cb6898..3412336 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -88,10 +88,10 @@ if ((isset($_REQUEST['submit_connect']))) {
*/
echo '<div class="error">';
- if(! $src_connection && $src_type != 'cur') {
+ if (! $src_connection && $src_type != 'cur') {
echo __('Could not connect to the source') . '<br />';
}
- if(! $trg_connection && $trg_type != 'cur'){
+ if (! $trg_connection && $trg_type != 'cur'){
echo __('Could not connect to the target');
}
echo '</div>';
diff --git a/server_variables.php b/server_variables.php
index fbe7094..dcbe192 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -34,7 +34,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
// Send with correct charset
header('Content-Type: text/html; charset=UTF-8');
- if(isset($_REQUEST['type'])) {
+ if (isset($_REQUEST['type'])) {
switch($_REQUEST['type']) {
case 'getval':
$varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="'.PMA_sqlAddslashes($_REQUEST['varName']).'";','NUM');
@@ -42,9 +42,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
break;
case 'setval':
$value = PMA_sqlAddslashes($_REQUEST['varValue']);
- if(!is_numeric($value)) $value="'".$value."'";
+ if (!is_numeric($value)) $value="'".$value."'";
- if(! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']) && PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value))
+ if (! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']) && PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value))
// Some values are rounded down etc.
$varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="'.PMA_sqlAddslashes($_REQUEST['varName']).'";','NUM');
@@ -153,7 +153,7 @@ function formatVariable($name,$value) {
global $VARIABLE_DOC_LINKS;
if (is_numeric($value)) {
- if(isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte')
+ if (isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte')
return '<abbr title="'.PMA_formatNumber($value, 0).'">'.implode(' ',PMA_formatByteDown($value,3,3)).'</abbr>';
else return PMA_formatNumber($value, 0);
}
diff --git a/tbl_alter.php b/tbl_alter.php
index 316c48e..807a39e 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -130,7 +130,7 @@ if (isset($_REQUEST['do_save_data'])) {
}
}
- if( $GLOBALS['is_ajax_request'] == true) {
+ if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(),$extra_data);
}
diff --git a/tbl_chart.php b/tbl_chart.php
index 96befa7..b3589e3 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -94,13 +94,13 @@ url_query = '<?php echo $url_query;?>';
<input type="text" name="chartTitle" value="<?php echo __('Chart title'); ?>">
<?php $keys = array_keys($data[0]);
$yaxis=-1;
- if(count($keys)>1) {
+ if (count($keys)>1) {
echo '<br>';
echo __('X-Axis:'); ?> <select name="chartXAxis">
<?php
foreach ($keys as $idx=>$key) {
- if($yaxis==-1 && ($idx==count($data[0])-1 || preg_match("/(date|time)/i",$key))) {
+ if ($yaxis==-1 && ($idx==count($data[0])-1 || preg_match("/(date|time)/i",$key))) {
echo '<option value="'.$idx.'" selected>'.$key.'</option>';
$yaxis=$idx;
} else {
diff --git a/tbl_create.php b/tbl_create.php
index 5259374..fb9c72f 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -216,7 +216,7 @@ if (isset($_REQUEST['do_save_data'])) {
$message = PMA_Message::success(__('Table %1$s has been created.'));
$message->addParam(PMA_backquote($db) . '.' . PMA_backquote($table));
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
/**
* construct the html for the newly created table's row to be appended
@@ -296,7 +296,7 @@ if (isset($_REQUEST['do_save_data'])) {
$new_table_string .= '<td> <dfn title="' . PMA_getCollationDescr($tbl_stats['Collation']) . '">'. $tbl_stats['Collation'] .'</dfn></td>' . "\n";
- if($is_show_stats) {
+ if ($is_show_stats) {
$new_table_string .= '<td class="value"> <a href="tbl_structure.php' . PMA_generate_common_url($tbl_url_params) . '#showusage" >' . $formatted_size . ' ' . $unit . '</a> </td>' . "\n" ;
$new_table_string .= '<td class="value">' . $overhead . '</td>' . "\n" ;
}
@@ -342,7 +342,7 @@ if (isset($_REQUEST['do_save_data'])) {
*/
// This div is used to show the content(eg: create table form with more columns) fetched with AJAX subsequently.
-if($GLOBALS['is_ajax_request'] != true) {
+if ($GLOBALS['is_ajax_request'] != true) {
echo('<div id="create_table_div">');
}
@@ -350,7 +350,7 @@ require './libraries/tbl_properties.inc.php';
// Displays the footer
require './libraries/footer.inc.php';
-if($GLOBALS['is_ajax_request'] != true) {
+if ($GLOBALS['is_ajax_request'] != true) {
echo('</div>');
}
?>
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 39205f2..84555d8 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -98,7 +98,7 @@ if (isset($_REQUEST['do_save_data'])) {
$message = PMA_Message::success(__('Table %1$s has been altered successfully'));
$message->addParam($table);
- if( $GLOBALS['is_ajax_request'] == true) {
+ if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['index_table'] = PMA_Index::getView($table, $db);
$extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
@@ -108,7 +108,7 @@ if (isset($_REQUEST['do_save_data'])) {
require './tbl_structure.php';
exit;
} else {
- if( $GLOBALS['is_ajax_request'] == true) {
+ if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['error'] = $error;
PMA_ajaxResponse($error,false);
}
diff --git a/tbl_operations.php b/tbl_operations.php
index 6cc913d..11021ba 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -70,14 +70,14 @@ $table_alters = array();
/**
* If the table has to be moved to some other database
*/
-if(isset($_REQUEST['submit_move']) || isset($_REQUEST['submit_copy'])) {
+if (isset($_REQUEST['submit_move']) || isset($_REQUEST['submit_copy'])) {
$_message = '';
require_once './tbl_move_copy.php';
}
/**
* If the table has to be maintained
*/
-if(isset($_REQUEST['table_maintenance'])) {
+if (isset($_REQUEST['table_maintenance'])) {
require_once './sql.php';
unset($result);
}
diff --git a/tbl_replace.php b/tbl_replace.php
index ab20d29..48d01fc 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -312,7 +312,7 @@ if ($is_insert && count($value_sets) > 0) {
// Note: logic passes here for inline edit
$message = PMA_Message::success(__('No change'));
$active_page = $goto_include;
- if(! $GLOBALS['is_ajax_request'] == true) {
+ if (! $GLOBALS['is_ajax_request'] == true) {
require_once './libraries/header.inc.php';
}
require './' . PMA_securePath($goto_include);
@@ -404,7 +404,7 @@ if (! empty($error_messages)) {
}
unset($error_messages, $warning_messages, $total_affected_rows, $last_messages, $last_message);
-if($GLOBALS['is_ajax_request'] == true) {
+if ($GLOBALS['is_ajax_request'] == true) {
/**Get the total row count of the table*/
$extra_data['row_count'] = PMA_Table::countRecords($_REQUEST['db'],$_REQUEST['table']);
$extra_data['sql_query'] = PMA_showMessage(NULL, $GLOBALS['display_query']);
diff --git a/tbl_structure.php b/tbl_structure.php
index 3cad9d8..afac23f 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -188,7 +188,7 @@ $i = 0;
<form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?>>
<?php echo PMA_generate_common_hidden_inputs($db, $table);
echo '<input type="hidden" name="table_type" value=';
- if($db_is_information_schema) {
+ if ($db_is_information_schema) {
echo '"information_schema" />';
} else if ($tbl_is_view) {
echo '"view" />';
@@ -257,7 +257,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
// for the case ENUM('–','“')
$type = htmlspecialchars($type);
- if(strlen($type) > $GLOBALS['cfg']['LimitChars']) {
+ if (strlen($type) > $GLOBALS['cfg']['LimitChars']) {
$type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>';
}
@@ -504,8 +504,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
</div>
<div <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="action_primary"' : ''); ?>>
<?php
- if(isset($primary_enabled)) {
- if($primary_enabled) { ?>
+ if (isset($primary_enabled)) {
+ if ($primary_enabled) { ?>
<a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>">
<?php echo $hidden_titles['Primary']; ?>
</a>
@@ -517,8 +517,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
</div>
<div class="action_unique">
<?php
- if(isset($unique_enabled)) {
- if($unique_enabled) { ?>
+ if (isset($unique_enabled)) {
+ if ($unique_enabled) { ?>
<a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
<?php echo $hidden_titles['Unique']; ?>
</a>
@@ -530,8 +530,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
</div>
<div class="action_index">
<?php
- if(isset($index_enabled)) {
- if($index_enabled) { ?>
+ if (isset($index_enabled)) {
+ if ($index_enabled) { ?>
<a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
<?php echo $hidden_titles['Index']; ?>
</a>
@@ -543,8 +543,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
</div>
<div class="action_spatial">
<?php
- if(isset($spatial_enabled)) {
- if($spatial_enabled) { ?>
+ if (isset($spatial_enabled)) {
+ if ($spatial_enabled) { ?>
<a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD SPATIAL(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
<?php echo $hidden_titles['Spatial']; ?>
</a>
@@ -556,8 +556,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
</div>
<div class="action_fulltext">
<?php
- if(isset($fulltext_enabled)) {
- if($fulltext_enabled) { ?>
+ if (isset($fulltext_enabled)) {
+ if ($fulltext_enabled) { ?>
<a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
<?php echo $hidden_titles['IdxFulltext']; ?>
</a>
@@ -655,7 +655,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n";
- if(PMA_Tracker::isActive())
+ if (PMA_Tracker::isActive())
{
echo '<a href="tbl_tracking.php?' . $url_query . '">';
diff --git a/tbl_tracking.php b/tbl_tracking.php
index edfc237..b249f4c 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -27,7 +27,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
}
if ($_REQUEST['logtype'] == 'schema') {
$selection_schema = true;
- } elseif($_REQUEST['logtype'] == 'data') {
+ } elseif ($_REQUEST['logtype'] == 'data') {
$selection_data = true;
} else {
$selection_both = true;
@@ -369,13 +369,13 @@ if (isset($_REQUEST['snapshot'])) {
*/
if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_REQUEST['delete_dmlog']))) {
- if(isset($_REQUEST['delete_ddlog'])){
+ if (isset($_REQUEST['delete_ddlog'])){
// Delete ddlog row data
$delete_id = $_REQUEST['delete_ddlog'];
// Only in case of valable id
- if($delete_id == (int)$delete_id){
+ if ($delete_id == (int)$delete_id){
unset($data['ddlog'][$delete_id]);
if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DDL', $data['ddlog']))
@@ -386,13 +386,13 @@ if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_R
}
}
- if(isset($_REQUEST['delete_dmlog'])){
+ if (isset($_REQUEST['delete_dmlog'])){
// Delete dmlog row data
$delete_id = $_REQUEST['delete_dmlog'];
// Only in case of valable id
- if($delete_id == (int)$delete_id){
+ if ($delete_id == (int)$delete_id){
unset($data['dmlog'][$delete_id]);
if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DML', $data['dmlog']))
diff --git a/user_password.php b/user_password.php
index a4eeffe..3ca3442 100644
--- a/user_password.php
+++ b/user_password.php
@@ -56,7 +56,7 @@ if (isset($_REQUEST['nopass'])) {
$password = $_REQUEST['pma_pw'];
}
- if($GLOBALS['is_ajax_request'] == true && $_error == true) {
+ if ($GLOBALS['is_ajax_request'] == true && $_error == true) {
/**
* If in an Ajax request, we don't need to show the rest of the page
*/
@@ -95,7 +95,7 @@ if (isset($_REQUEST['nopass'])) {
$message = PMA_Message::success(__('The profile has been updated.'));
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
$extra_data['sql_query'] = PMA_showMessage($message, $sql_query, 'success');
PMA_ajaxResponse($message, true, $extra_data);
}
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list