gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix checkstyle MultiLineAssignment warnings

Browse Source
This commit is contained in:
Jo Michael 2012-04-29 02:16:40 +02:00
parent 35a7d22ca6
commit 6839781e88
5 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/Table.class.php
View File

@ -1488,15 +1488,19 @@ class PMA_Table
{
$server_id = $GLOBALS['server'];
// set session variable if it's still undefined
if (! isset($_SESSION['tmp_user_values']['table_uiprefs'][$server_id][$this->db_name][$this->name])) {
$_SESSION['tmp_user_values']['table_uiprefs'][$server_id][$this->db_name][$this->name] =
if (! isset($_SESSION['tmp_user_values']['table_uiprefs'][$server_id]
[$this->db_name][$this->name])) {
$_SESSION['tmp_user_values']['table_uiprefs'][$server_id][$this->db_name]
[$this->name]
=
// check whether we can get from pmadb
(strlen($GLOBALS['cfg']['Server']['pmadb'])
&& strlen($GLOBALS['cfg']['Server']['table_uiprefs']))
? $this->getUiPrefsFromDb()
: array();
}
$this->uiprefs =& $_SESSION['tmp_user_values']['table_uiprefs'][$server_id][$this->db_name][$this->name];
$this->uiprefs =& $_SESSION['tmp_user_values']['table_uiprefs'][$server_id]
[$this->db_name][$this->name];
}
/**

4
libraries/config/ConfigFile.class.php
View File

@ -454,8 +454,8 @@ class ConfigFile
$last_server = $this->getServerCount();
for ($i = $server; $i < $last_server; $i++) {
$_SESSION[$this->id]['Servers'][$i] =
$_SESSION[$this->id]['Servers'][$i+1];
$_SESSION[$this->id]['Servers'][$i]
= $_SESSION[$this->id]['Servers'][$i + 1];
}
unset($_SESSION[$this->id]['Servers'][$last_server]);

27
sql.php
View File

@ -213,7 +213,8 @@ if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) {
// set column order
if (isset($_REQUEST['col_order'])) {
$col_order = explode(',', $_REQUEST['col_order']);
$retval = $pmatable->setUiProp(PMA_Table::PROP_COLUMN_ORDER, $col_order, $_REQUEST['table_create_time']);
$retval = $pmatable->setUiProp(PMA_Table::PROP_COLUMN_ORDER, $col_order,
$_REQUEST['table_create_time']);
if (gettype($retval) != 'boolean') {
PMA_ajaxResponse($retval->getString(), false);
}
@ -222,7 +223,8 @@ if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) {
// set column visibility
if ($retval === true && isset($_REQUEST['col_visib'])) {
$col_visib = explode(',', $_REQUEST['col_visib']);
$retval = $pmatable->setUiProp(PMA_Table::PROP_COLUMN_VISIB, $col_visib, $_REQUEST['table_create_time']);
$retval = $pmatable->setUiProp(PMA_Table::PROP_COLUMN_VISIB, $col_visib,
$_REQUEST['table_create_time']);
if (gettype($retval) != 'boolean') {
PMA_ajaxResponse($retval->getString(), false);
}
@ -244,7 +246,8 @@ if (empty($sql_query) && strlen($table) && strlen($db)) {
);
if (! empty($book_sql_query)) {
$GLOBALS['using_bookmark_message'] = PMA_message::notice(__('Using bookmark "%s" as default browse query.'));
$GLOBALS['using_bookmark_message'] = PMA_message::notice(__(
'Using bookmark "%s" as default browse query.'));
$GLOBALS['using_bookmark_message']->addParam($table);
$GLOBALS['using_bookmark_message']->addMessage(PMA_showDocu('faq6_22'));
$sql_query = $book_sql_query;
@ -290,7 +293,9 @@ PMA_displayTable_checkConfigParams();
*/
if (isset($find_real_end) && $find_real_end) {
$unlim_num_rows = PMA_Table::countRecords($db, $table, $force_exact = true);
$_SESSION['tmp_user_values']['pos'] = @((ceil($unlim_num_rows / $_SESSION['tmp_user_values']['max_rows']) - 1) * $_SESSION['tmp_user_values']['max_rows']);
$_SESSION['tmp_user_values']['pos'] = @((ceil($unlim_num_rows
/ $_SESSION['tmp_user_values']['max_rows']) - 1)
* $_SESSION['tmp_user_values']['max_rows']);
}
@ -298,9 +303,13 @@ if (isset($find_real_end) && $find_real_end) {
* Bookmark add
*/
if (isset($store_bkm)) {
PMA_Bookmark_save($fields, (isset($bkm_all_users) && $bkm_all_users == 'true' ? true : false));
PMA_Bookmark_save($fields, (isset($bkm_all_users)
&& $bkm_all_users == 'true'
? true
: false));
// go back to sql.php to redisplay query; do not use &amp; in this case:
PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . $goto . '&label=' . $fields['label']);
PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . $goto
. '&label=' . $fields['label']);
} // end if
/**
@ -333,7 +342,8 @@ if (isset($btnDrop) && $btnDrop == __('No')) {
$active_page = $goto;
include '' . PMA_securePath($goto);
} else {
PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . str_replace('&amp;', '&', $goto));
PMA_sendHeaderLocation($cfg['PmaAbsoluteUri']
. str_replace('&amp;', '&', $goto));
}
exit();
} // end if
@ -365,7 +375,8 @@ if ($do_confirm) {
$stripped_sql_query = $sql_query;
include_once 'libraries/header.inc.php';
if ($is_drop_database) {
echo '<h1 class="error">' . __('You are about to DESTROY a complete database!') . '</h1>';
echo '<h1 class="error">' . __(
'You are about to DESTROY a complete database!') . '</h1>';
}
echo '<form action="sql.php" method="post">' . "\n"
.PMA_generate_common_hidden_inputs($db, $table);

4
tbl_alter.php
View File

@ -69,8 +69,8 @@ if (isset($_REQUEST['move_columns'])
if ($data['Type'] == 'timestamp' && $data['Default'] == 'CURRENT_TIMESTAMP') {
$current_timestamp = true;
}
$default_type =
$data['Null'] === 'YES' && $data['Default'] === null
$default_type
= $data['Null'] === 'YES' && $data['Default'] === null
? 'NULL'
: ($current_timestamp
? 'CURRENT_TIMESTAMP'

5
tbl_operations.php
View File

@ -256,8 +256,9 @@ if (isset($result) && empty($message_to_show)) {
unset($_message, $_type);
}
$url_params['goto'] =
$url_params['back'] = 'tbl_operations.php';
$url_params['goto']
= $url_params['back']
= 'tbl_operations.php';
/**
* Get columns names