[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-1044-g13b3195
Marc Delisle
lem9 at users.sourceforge.net
Mon May 9 18:49:27 CEST 2011
The branch, master has been updated
via 13b31956aed38141836faf386d97c042a3087f48 (commit)
from 555c04b4a1bb91780aa21bff2b420eb6171a995d (commit)
- Log -----------------------------------------------------------------
commit 13b31956aed38141836faf386d97c042a3087f48
Author: Marc Delisle <marc at infomarc.info>
Date: Mon May 9 12:49:05 2011 -0400
For easier reading, replace "!isset" with "! isset"
-----------------------------------------------------------------------
Summary of changes:
browse_foreigners.php | 2 +-
db_datadict.php | 4 ++--
db_operations.php | 2 +-
db_printview.php | 2 +-
db_qbe.php | 10 +++++-----
export.php | 4 ++--
import.php | 2 +-
libraries/Config.class.php | 16 ++++++++--------
libraries/List_Database.class.php | 2 +-
libraries/Table.class.php | 2 +-
libraries/chart.lib.php | 4 ++--
libraries/common.inc.php | 4 ++--
libraries/common.lib.php | 16 ++++++++--------
libraries/core.lib.php | 8 ++++----
libraries/database_interface.lib.php | 2 +-
libraries/db_info.inc.php | 4 ++--
libraries/display_export.lib.php | 2 +-
libraries/display_tbl.lib.php | 24 ++++++++++++------------
libraries/footer.inc.php | 2 +-
libraries/header.inc.php | 4 ++--
libraries/import.lib.php | 4 ++--
libraries/mysql_charsets.lib.php | 2 +-
libraries/plugin_interface.lib.php | 6 +++---
libraries/server_links.inc.php | 2 +-
libraries/session.inc.php | 2 +-
libraries/sqlparser.lib.php | 4 ++--
libraries/tbl_info.inc.php | 2 +-
libraries/tbl_properties.inc.php | 2 +-
libraries/user_preferences.inc.php | 2 +-
libraries/user_preferences.lib.php | 4 ++--
prefs_forms.php | 2 +-
schema_edit.php | 4 ++--
server_privileges.php | 16 ++++++++--------
setup/frames/form.inc.php | 2 +-
setup/lib/ConfigGenerator.class.php | 2 +-
setup/lib/index.lib.php | 4 ++--
sql.php | 14 +++++++-------
tbl_change.php | 6 +++---
tbl_printview.php | 2 +-
tbl_relation.php | 2 +-
tbl_replace.php | 2 +-
tbl_select.php | 4 ++--
tbl_structure.php | 2 +-
transformation_wrapper.php | 2 +-
44 files changed, 105 insertions(+), 105 deletions(-)
diff --git a/browse_foreigners.php b/browse_foreigners.php
index c8867af..16fa48c 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -27,7 +27,7 @@ $foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE
$override_total = TRUE;
-if (!isset($pos)) {
+if (! isset($pos)) {
$pos = 0;
}
diff --git a/db_datadict.php b/db_datadict.php
index e67c096..e9d18fd 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -10,7 +10,7 @@
*/
require_once './libraries/common.inc.php';
-if (!isset($selected_tbl)) {
+if (! isset($selected_tbl)) {
require_once './libraries/header.inc.php';
}
@@ -220,7 +220,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
if ($zerofill) {
$attribute = 'UNSIGNED ZEROFILL';
}
- if (!isset($row['Default'])) {
+ if (! isset($row['Default'])) {
if ($row['Null'] != 'NO') {
$row['Default'] = '<i>NULL</i>';
}
diff --git a/db_operations.php b/db_operations.php
index f48ba27..c3be352 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -37,7 +37,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
$move = false;
}
- if (!isset($newname) || !strlen($newname)) {
+ if (! isset($newname) || !strlen($newname)) {
$message = PMA_Message::error(__('The database name is empty!'));
} else {
$sql_query = ''; // in case target db exists
diff --git a/db_printview.php b/db_printview.php
index 36f297c..7e3c709 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -52,7 +52,7 @@ if ($cfg['SkipLockedTables'] == true) {
$result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
if ($result != false && PMA_DBI_num_rows($result) > 0) {
while ($tmp = PMA_DBI_fetch_row($result)) {
- if (!isset($sot_cache[$tmp[0]])) {
+ if (! isset($sot_cache[$tmp[0]])) {
$sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . addslashes($tmp[0]) . '\';');
$sts_tmp = PMA_DBI_fetch_assoc($sts_result);
$tables[] = $sts_tmp;
diff --git a/db_qbe.php b/db_qbe.php
index 751317d..34c85ee 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -339,7 +339,7 @@ for ($x = 0; $x < $col; $x++) {
if (isset($criteria[$x])) {
$tmp_criteria = $criteria[$x];
}
- if ((empty($prev_criteria) || !isset($prev_criteria[$x]))
+ if ((empty($prev_criteria) || ! isset($prev_criteria[$x]))
|| $prev_criteria[$x] != htmlspecialchars($tmp_criteria)) {
$curCriteria[$z] = $tmp_criteria;
} else {
@@ -497,7 +497,7 @@ for ($y = 0; $y <= $row; $y++) {
echo "\n";
$or = 'Or' . $y;
- if (!isset(${$or})) {
+ if (! isset(${$or})) {
${$or} = '';
}
if (!empty(${$or}) && isset(${$or}[$x])) {
@@ -667,7 +667,7 @@ foreach ($tbl_names as $key => $val) {
<?php
// 1. SELECT
$last_select = 0;
-if (!isset($qry_select)) {
+if (! isset($qry_select)) {
$qry_select = '';
}
for ($x = 0; $x < $col; $x++) {
@@ -892,7 +892,7 @@ if ($criteria_cnt > 1) {
$qry_where = '(' . $qry_where . ')';
}
// OR rows ${'cur' . $or}[$x]
-if (!isset($curAndOrRow)) {
+if (! isset($curAndOrRow)) {
$curAndOrRow = array();
}
for ($y = 0; $y <= $row; $y++) {
@@ -929,7 +929,7 @@ if (!empty($qry_where) && $qry_where != '()') {
// 4. ORDER BY
$last_orderby = 0;
-if (!isset($qry_orderby)) {
+if (! isset($qry_orderby)) {
$qry_orderby = '';
}
for ($x = 0; $x < $col; $x++) {
diff --git a/export.php b/export.php
index 7da25fc..22a6324 100644
--- a/export.php
+++ b/export.php
@@ -21,7 +21,7 @@ $export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $exp
$type = $what;
// Check export type
-if (!isset($export_list[$type])) {
+if (! isset($export_list[$type])) {
die('Bad type!');
}
@@ -451,7 +451,7 @@ if ($export_type == 'server') {
// Walk over databases
foreach ($GLOBALS['pma']->databases as $current_db) {
if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))
- || !isset($tmp_select)) {
+ || ! isset($tmp_select)) {
if (!PMA_exportDBHeader($current_db)) {
break 2;
}
diff --git a/import.php b/import.php
index 78e5ffd..0b029e5 100644
--- a/import.php
+++ b/import.php
@@ -332,7 +332,7 @@ if ($import_file != 'none' && !$error) {
$error = TRUE;
}
} elseif (!$error) {
- if (!isset($import_text) || empty($import_text)) {
+ if (! isset($import_text) || empty($import_text)) {
$message = PMA_Message::error(__('No data was received to import. Either no file name was submitted, or the file size exceeded the maximum size permitted by your PHP configuration. See [a at ./Documentation.html#faq1_16 at Documentation]FAQ 1.16[/a].'));
$error = TRUE;
}
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 4c2f281..f71a4e9 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -148,7 +148,7 @@ class PMA_Config
{
if (PMA_getenv('HTTP_USER_AGENT')) {
$HTTP_USER_AGENT = PMA_getenv('HTTP_USER_AGENT');
- } elseif (!isset($HTTP_USER_AGENT)) {
+ } elseif (! isset($HTTP_USER_AGENT)) {
$HTTP_USER_AGENT = '';
}
@@ -441,7 +441,7 @@ class PMA_Config
if ($server > 0 && !defined('PMA_MINIMUM_COMMON')) {
$config_mtime = max($this->default_source_mtime, $this->source_mtime);
// cache user preferences, use database only when needed
- if (!isset($_SESSION['cache'][$cache_key]['userprefs'])
+ if (! isset($_SESSION['cache'][$cache_key]['userprefs'])
|| $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime) {
// load required libraries
require_once './libraries/user_preferences.lib.php';
@@ -451,7 +451,7 @@ class PMA_Config
$_SESSION['cache'][$cache_key]['userprefs_type'] = $prefs['type'];
$_SESSION['cache'][$cache_key]['config_mtime'] = $config_mtime;
}
- } else if ($server == 0 || !isset($_SESSION['cache'][$cache_key]['userprefs'])) {
+ } else if ($server == 0 || ! isset($_SESSION['cache'][$cache_key]['userprefs'])) {
$this->set('user_preferences', false);
return;
}
@@ -476,7 +476,7 @@ class PMA_Config
// save theme
$tmanager = $_SESSION['PMA_Theme_Manager'];
if ($tmanager->getThemeCookie() || isset($_REQUEST['set_theme'])) {
- if ((!isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original')
+ if ((! isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original')
|| isset($config_data['ThemeDefault']) && $config_data['ThemeDefault'] != $tmanager->theme->getId()) {
// new theme was set in common.inc.php
$this->setUserValue(null, 'ThemeDefault', $tmanager->theme->getId(), 'original');
@@ -491,14 +491,14 @@ class PMA_Config
}
// save font size
- if ((!isset($config_data['fontsize']) && $org_fontsize != '82%')
+ if ((! isset($config_data['fontsize']) && $org_fontsize != '82%')
|| isset($config_data['fontsize']) && $org_fontsize != $config_data['fontsize']) {
$this->setUserValue(null, 'fontsize', $org_fontsize, '82%');
}
// save language
if (isset($_COOKIE['pma_lang']) || isset($_POST['lang'])) {
- if ((!isset($config_data['lang']) && $GLOBALS['lang'] != 'en')
+ if ((! isset($config_data['lang']) && $GLOBALS['lang'] != 'en')
|| isset($config_data['lang']) && $GLOBALS['lang'] != $config_data['lang']) {
$this->setUserValue(null, 'lang', $GLOBALS['lang'], 'en');
}
@@ -511,7 +511,7 @@ class PMA_Config
// save connection collation
if (isset($_COOKIE['pma_collation_connection']) || isset($_POST['collation_connection'])) {
- if ((!isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci')
+ if ((! isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci')
|| isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != $config_data['collation_connection']) {
$this->setUserValue(null, 'collation_connection', $GLOBALS['collation_connection'], 'utf8_general_ci');
}
@@ -678,7 +678,7 @@ class PMA_Config
*/
function set($setting, $value)
{
- if (!isset($this->settings[$setting]) || $this->settings[$setting] != $value) {
+ if (! isset($this->settings[$setting]) || $this->settings[$setting] != $value) {
$this->settings[$setting] = $value;
$this->set_mtime = time();
}
diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
index c29cc9d..2663673 100644
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@@ -498,7 +498,7 @@ require_once './libraries/List.class.php';
if (isset($tmp_mydbs[$tmp_db]) && $tmp_mydbs[$tmp_db] == 1) {
$dblist[] = $tmp_db;
$tmp_mydbs[$tmp_db] = 0;
- } elseif (!isset($dblist[$tmp_db])) {
+ } elseif (! isset($dblist[$tmp_db])) {
foreach ($tmp_mydbs as $tmp_matchpattern => $tmp_value) {
// fixed bad regexp
// TODO: db names may contain characters
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index a29900e..d41eadc 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -889,7 +889,7 @@ class PMA_Table
} else {
// we are copying
// Create new entries as duplicates from old PMA DBs
- if ($what != 'dataonly' && !isset($maintain_relations)) {
+ if ($what != 'dataonly' && ! isset($maintain_relations)) {
if ($GLOBALS['cfgRelation']['commwork']) {
// Get all comments and MIME-Types for current table
$comments_copy_query = 'SELECT
diff --git a/libraries/chart.lib.php b/libraries/chart.lib.php
index 3911f2e..83791fb 100644
--- a/libraries/chart.lib.php
+++ b/libraries/chart.lib.php
@@ -104,7 +104,7 @@ function PMA_chart_results($data, &$chartSettings)
// default for muti series
$chartSettings['multi'] = false;
- if (!isset($data[0])) {
+ if (! isset($data[0])) {
// empty data
return __('No data found for the chart.');
}
@@ -192,7 +192,7 @@ function PMA_chart_results($data, &$chartSettings)
// the value os for this serie
$chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = (int)$row[$yAxisKey];
}
- else if (!isset($chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]])) {
+ else if (! isset($chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]])) {
// if the value for this serie is not set, set it to 0
$chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = 0;
}
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 49937c8..ef6f64b 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -608,7 +608,7 @@ $GLOBALS['server'] = 0;
* @todo merge into PMA_Config
*/
// Do we have some server?
-if (!isset($cfg['Servers']) || count($cfg['Servers']) == 0) {
+if (! isset($cfg['Servers']) || count($cfg['Servers']) == 0) {
// No server => create one with defaults
$cfg['Servers'] = array(1 => $default_server);
} else {
@@ -664,7 +664,7 @@ if (! isset($_SESSION['PMA_Theme_Manager'])) {
}
// for the theme per server feature
-if (isset($_REQUEST['server']) && !isset($_REQUEST['set_theme'])) {
+if (isset($_REQUEST['server']) && ! isset($_REQUEST['set_theme'])) {
$GLOBALS['server'] = $_REQUEST['server'];
$tmp = $_SESSION['PMA_Theme_Manager']->getThemeCookie();
if (empty($tmp)) {
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 5b353ec..6972514 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -781,12 +781,12 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
$group_name = $parts[$i] . $sep;
$group_name_full .= $group_name;
- if (!isset($group[$group_name])) {
+ if (! isset($group[$group_name])) {
$group[$group_name] = array();
$group[$group_name]['is' . $sep . 'group'] = true;
$group[$group_name]['tab' . $sep . 'count'] = 1;
$group[$group_name]['tab' . $sep . 'group'] = $group_name_full;
- } elseif (!isset($group[$group_name]['is' . $sep . 'group'])) {
+ } elseif (! isset($group[$group_name]['is' . $sep . 'group'])) {
$table = $group[$group_name];
$group[$group_name] = array();
$group[$group_name][$group_name] = $table;
@@ -801,7 +801,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
$i++;
}
} else {
- if (!isset($table_groups[$table_name])) {
+ if (! isset($table_groups[$table_name])) {
$table_groups[$table_name] = array();
}
$group =& $table_groups;
@@ -963,7 +963,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;
@@ -1280,7 +1280,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;
@@ -2001,7 +2001,7 @@ function PMA_checkParameters($params, $die = true, $request = true)
{
global $checked_special;
- if (!isset($checked_special)) {
+ if (! isset($checked_special)) {
$checked_special = false;
}
@@ -2014,7 +2014,7 @@ function PMA_checkParameters($params, $die = true, $request = true)
$checked_special = true;
}
- if (!isset($GLOBALS[$param])) {
+ if (! isset($GLOBALS[$param])) {
$error_message .= $reported_script_name
. ': Missing parameter: ' . $param
. PMA_showDocu('faqmissingparameters')
@@ -2112,7 +2112,7 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
. PMA_backquote($meta->orgname) . ' ';
} // end if... else...
- if (!isset($row[$i]) || is_null($row[$i])) {
+ if (! isset($row[$i]) || is_null($row[$i])) {
$condition .= 'IS NULL AND';
} else {
// timestamp is numeric on some MySQL 4.1
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 76d2c86..505640b 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -603,7 +603,7 @@ function PMA_array_read($path, $array, $default = null)
$keys = explode('/', $path);
$value =& $array;
foreach ($keys as $key) {
- if (!isset($value[$key])) {
+ if (! isset($value[$key])) {
return $default;
}
$value =& $value[$key];
@@ -624,7 +624,7 @@ function PMA_array_write($path, &$array, $value)
$last_key = array_pop($keys);
$a =& $array;
foreach ($keys as $key) {
- if (!isset($a[$key])) {
+ if (! isset($a[$key])) {
$a[$key] = array();
}
$a =& $a[$key];
@@ -650,7 +650,7 @@ function PMA_array_remove($path, &$array)
$found = true;
// go as deep as required or possible
foreach ($keys as $key) {
- if (!isset($path[$depth][$key])) {
+ if (! isset($path[$depth][$key])) {
$found = false;
break;
}
@@ -665,7 +665,7 @@ function PMA_array_remove($path, &$array)
// remove empty nested arrays
for (; $depth >= 0; $depth--) {
- if (!isset($path[$depth+1]) || count($path[$depth+1]) == 0) {
+ if (! isset($path[$depth+1]) || count($path[$depth+1]) == 0) {
unset($path[$depth][$keys[$depth]]);
} else {
break;
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 22d9671..be8d9f5 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -196,7 +196,7 @@ function PMA_usort_comparison_callback($a, $b)
$sorter = 'strcasecmp';
}
/* No sorting when key is not present */
- if (!isset($a[$GLOBALS['callback_sort_by']]) || ! isset($b[$GLOBALS['callback_sort_by']])) {
+ if (! isset($a[$GLOBALS['callback_sort_by']]) || ! isset($b[$GLOBALS['callback_sort_by']])) {
return 0;
}
// produces f.e.:
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index d8610f2..f8bb5a0 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -152,7 +152,7 @@ if (true === $cfg['SkipLockedTables']) {
null, PMA_DBI_QUERY_STORE);
if ($db_info_result && PMA_DBI_num_rows($db_info_result) > 0) {
while ($tmp = PMA_DBI_fetch_row($db_info_result)) {
- if (!isset($sot_cache[$tmp[0]])) {
+ if (! isset($sot_cache[$tmp[0]])) {
$sts_result = PMA_DBI_query(
'SHOW TABLE STATUS FROM ' . PMA_backquote($db)
. ' LIKE \'' . addslashes($tmp[0]) . '\';');
@@ -160,7 +160,7 @@ if (true === $cfg['SkipLockedTables']) {
PMA_DBI_free_result($sts_result);
unset($sts_result);
- if (!isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) {
+ if (! isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) {
$sts_tmp['Type'] =& $sts_tmp['Engine'];
}
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 10e8178..88c80af 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -65,7 +65,7 @@ echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' .
// If the export method was not set, the default is quick
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)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 78b4bb6..8dc420c 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1272,7 +1272,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$condition_field = false;
}
- if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical' && (!isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1'))) {
+ if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical' && (! isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1'))) {
// the row number corresponds to a data row, not HTML table row
$class .= ' row_' . $row_no;
if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) {
@@ -1328,7 +1328,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// will show both fields NULL even if only one is NULL,
// so use the $pointer
- if (!isset($row[$i]) || is_null($row[$i])) {
+ if (! isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
} elseif ($row[$i] != '') {
@@ -1351,7 +1351,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$class = str_replace('inline_edit', '', $class);
if (stristr($field_flags, 'BINARY')) {
- if (!isset($row[$i]) || is_null($row[$i])) {
+ if (! isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
} else {
// for blobstreaming
@@ -1367,7 +1367,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
}
// not binary:
} else {
- if (!isset($row[$i]) || is_null($row[$i])) {
+ if (! isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
} elseif ($row[$i] != '') {
// if a transform function for blob is set, none of these replacements will be made
@@ -1395,7 +1395,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// n o t n u m e r i c a n d n o t B L O B
} else {
- if (!isset($row[$i]) || is_null($row[$i])) {
+ if (! isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
} elseif ($row[$i] != '') {
// support blanks in the key
@@ -1477,7 +1477,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// 4. Gather links of del_urls and edit_urls in an array for later
// output
- if (!isset($vertical_display['edit'][$row_no])) {
+ if (! isset($vertical_display['edit'][$row_no])) {
$vertical_display['edit'][$row_no] = '';
$vertical_display['copy'][$row_no] = '';
$vertical_display['delete'][$row_no] = '';
@@ -2070,7 +2070,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
PMA_showMessage($message, $sql_query, 'success');
- } elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
+ } elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
PMA_showMessage(__('Your SQL query has been executed successfully'), $sql_query, 'success');
}
@@ -2090,7 +2090,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
if ($is_display['nav_bar'] == '1') {
PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, 'top_direction_dropdown');
echo "\n";
- } elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
+ } elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
echo "\n" . '<br /><br />' . "\n";
}
@@ -2212,12 +2212,12 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
if ($is_display['nav_bar'] == '1') {
echo '<br />' . "\n";
PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, 'bottom_direction_dropdown');
- } elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
+ } elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
echo "\n" . '<br /><br />' . "\n";
}
// 6. ----- Displays "Query results operations"
- if (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
+ if (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
PMA_displayResultsOperations($the_disp_mode, $analyzed_sql);
}
} // end of the 'PMA_displayTable()' function
@@ -2298,8 +2298,8 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) {
// If the parser found a PROCEDURE clause
// (most probably PROCEDURE ANALYSE()) it makes no sense to
// display the Export link).
- if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && !isset($printview) && ! isset($analyzed_sql[0]['queryflags']['procedure'])) {
- if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) && !isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) {
+ if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && ! isset($printview) && ! isset($analyzed_sql[0]['queryflags']['procedure'])) {
+ if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) && ! isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) {
$_url_params['single_table'] = 'true';
}
if (!$header_shown) {
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index f5385d5..5a66351 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -166,7 +166,7 @@ if (window.parent.frame_content) {
}
// Link to itself to replicate windows including frameset
-if (!isset($GLOBALS['checked_special'])) {
+if (! isset($GLOBALS['checked_special'])) {
$GLOBALS['checked_special'] = false;
}
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 807ec0a..7148eac 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -30,7 +30,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
// if database storage for user preferences is transient, offer to load
// exported settings from localStorage (detection will be done in JavaScript)
$userprefs_offer_import = $GLOBALS['PMA_Config']->get('user_preferences') == 'session'
- && !isset($_SESSION['userprefs_autoload']);
+ && ! isset($_SESSION['userprefs_autoload']);
if ($userprefs_offer_import) {
$GLOBALS['js_include'][] = 'config.js';
}
@@ -143,7 +143,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
* @uses $show_comment from libraries/tbl_info.inc.php
* @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php
*/
- if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) {
+ if (!empty($show_comment) && ! isset($GLOBALS['avoid_show_comment'])) {
if (strstr($show_comment, '; InnoDB free')) {
$show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment);
}
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index a7d0b5e..0c77f54 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -127,7 +127,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
}
$msg = '# ';
if ($result === FALSE) { // execution failed
- if (!isset($my_die)) {
+ if (! isset($my_die)) {
$my_die = array();
}
$my_die[] = array('sql' => $import_run_buffer['full'], 'error' => PMA_DBI_getError());
@@ -697,7 +697,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type
/**
* This is the first row to be analyzed
*/
- elseif (!isset($last_cumulative_type) || $last_cumulative_type == NONE) {
+ elseif (! isset($last_cumulative_type) || $last_cumulative_type == NONE) {
return $curr_size;
}
/**
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 45fd55a..e1962c6 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -46,7 +46,7 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) {
if ($row['IS_DEFAULT'] == 'Yes') {
$mysql_default_collations[$row['CHARACTER_SET_NAME']] = $row['COLLATION_NAME'];
}
- //$mysql_collations_available[$row['Collation']] = !isset($row['Compiled']) || $row['Compiled'] == 'Yes';
+ //$mysql_collations_available[$row['Collation']] = ! isset($row['Compiled']) || $row['Compiled'] == 'Yes';
$mysql_collations_available[$row['COLLATION_NAME']] = true;
$mysql_charsets_available[$row['CHARACTER_SET_NAME']] =
!empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']])
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index 48dc975..edfd02a 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -71,7 +71,7 @@ function PMA_getString($name)
function PMA_pluginCheckboxCheck($section, $opt)
{
// If the form is being repopulated using $_GET data, that is priority
- if (isset($_GET[$opt]) || !isset($_GET['repopulate']) && ((isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) ||
+ if (isset($_GET[$opt]) || ! isset($_GET['repopulate']) && ((isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) ||
(isset($GLOBALS['cfg'][$section][$opt]) && $GLOBALS['cfg'][$section][$opt]))) {
return ' checked="checked"';
}
@@ -160,7 +160,7 @@ function PMA_pluginIsActive($section, $opt, $val)
*/
function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL)
{
- if (!isset($cfgname)) {
+ if (! isset($cfgname)) {
$cfgname = $name;
}
$ret = '<select id="plugins" name="' . $name . '">';
@@ -168,7 +168,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";
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index 8196269..b8b4dcd 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -27,7 +27,7 @@ if (!$GLOBALS['is_ajax_request']) {
/**
* Put something in $sub_part
*/
- if (!isset($sub_part)) {
+ if (! isset($sub_part)) {
$sub_part = '';
}
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index 4f8caec..465e3f0 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -95,7 +95,7 @@ if (! isset($_COOKIE[$session_name])) {
* Token which is used for authenticating access queries.
* (we use "space PMA_token space" to prevent overwriting)
*/
-if (!isset($_SESSION[' PMA_token '])) {
+if (! isset($_SESSION[' PMA_token '])) {
$_SESSION[' PMA_token '] = md5(uniqid(rand(), true));
}
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index cbad1d6..f13b5d6 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -46,7 +46,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
if (!defined('TESTSUITE')) {
require_once './libraries/mysql_charsets.lib.php';
}
- if (!isset($mysql_charsets)) {
+ if (! isset($mysql_charsets)) {
$mysql_charsets = array();
$mysql_charsets_count = 0;
$mysql_collations_flat = array();
@@ -828,7 +828,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
*/
function PMA_SQP_analyze($arr)
{
- if ($arr == array() || !isset($arr['len'])) {
+ if ($arr == array() || ! isset($arr['len'])) {
return array();
}
$result = array();
diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php
index 00c9904..ac3a26f 100644
--- a/libraries/tbl_info.inc.php
+++ b/libraries/tbl_info.inc.php
@@ -102,7 +102,7 @@ if ($showtable) {
}
}
// we need explicit DEFAULT value here (different from '0')
- $pack_keys = (!isset($pack_keys) || strlen($pack_keys) == 0) ? 'DEFAULT' : $pack_keys;
+ $pack_keys = (! isset($pack_keys) || strlen($pack_keys) == 0) ? 'DEFAULT' : $pack_keys;
unset($create_options, $each_create_option);
} // end if
?>
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 54e9d1d..395fa7b 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -378,7 +378,7 @@ for ($i = 0; $i < $num_fields; $i++) {
* having NULL enabled does not implicit having Default with NULL
*
if (isset($row)
- && !isset($row['Default']) && isset($row['Null']) && $row['Null'] == 'YES') {
+ && ! isset($row['Default']) && isset($row['Null']) && $row['Null'] == 'YES') {
$row['Default'] = 'NULL';
}
*/
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 2aad2e6..e93c477 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -15,7 +15,7 @@ require './libraries/server_links.inc.php';
// build user preferences menu
$form_param = filter_input(INPUT_GET, 'form');
-if (!isset($forms[$form_param])) {
+if (! isset($forms[$form_param])) {
$forms_keys = array_keys($forms);
$form_param = array_shift($forms_keys);
}
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 6c48116..cfba4e4 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -51,7 +51,7 @@ function PMA_load_userprefs()
$cfgRelation = PMA_getRelationsParam();
if (!$cfgRelation['userconfigwork']) {
// no pmadb table, use session storage
- if (!isset($_SESSION['userconfig'])) {
+ if (! isset($_SESSION['userconfig'])) {
$_SESSION['userconfig'] = array(
'db' => array(),
'ts' => time());
@@ -175,7 +175,7 @@ function PMA_apply_userprefs(array $config_data)
$whitelist['Server/hide_db'] = true;
$whitelist['Server/only_db'] = true;
foreach ($config_data as $path => $value) {
- if (!isset($whitelist[$path]) || isset($blacklist[$path])) {
+ if (! isset($whitelist[$path]) || isset($blacklist[$path])) {
continue;
}
PMA_array_write($path, $cfg, $value);
diff --git a/prefs_forms.php b/prefs_forms.php
index 22ffb4c..4aaea9c 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -23,7 +23,7 @@ PMA_userprefs_pageinit();
// handle form processing
$form_param = filter_input(INPUT_GET, 'form');
-if (!isset($forms[$form_param])) {
+if (! isset($forms[$form_param])) {
$forms_keys = array_keys($forms);
$form_param = array_shift($forms_keys);
}
diff --git a/schema_edit.php b/schema_edit.php
index a5d3a38..149709f 100644
--- a/schema_edit.php
+++ b/schema_edit.php
@@ -53,12 +53,12 @@ if (!$cfgRelation['displaywork']) {
require_once './libraries/footer.inc.php';
}
-if (!isset($cfgRelation['table_coords'])){
+if (! isset($cfgRelation['table_coords'])){
echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_coords', 'config.inc.php') . '<br />' . "\n"
. PMA_showDocu('table_coords') . "\n";
require_once './libraries/footer.inc.php';
}
-if (!isset($cfgRelation['pdf_pages'])) {
+if (! isset($cfgRelation['pdf_pages'])) {
echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'pdf_page', 'config.inc.php') . '<br />' . "\n"
. PMA_showDocu('pdf_pages') . "\n";
require_once './libraries/footer.inc.php';
diff --git a/server_privileges.php b/server_privileges.php
index 19f9dcb..daf8a99 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -270,7 +270,7 @@ function PMA_extractPrivInfo($row = '', $enableHTML = FALSE)
} else {
$privs[] = 'USAGE';
}
- } elseif ($allPrivileges && (!isset($GLOBALS['grant_count']) || count($privs) == $GLOBALS['grant_count'])) {
+ } elseif ($allPrivileges && (! isset($GLOBALS['grant_count']) || count($privs) == $GLOBALS['grant_count'])) {
if ($enableHTML) {
$privs = array('<dfn title="' . __('Includes all privileges except GRANT.') . '">ALL PRIVILEGES</dfn>');
} else {
@@ -725,7 +725,7 @@ function PMA_displayLoginInformationFields($mode = 'new')
. ' <select name="pred_username" id="select_pred_username" title="' . __('User name') . '"' . "\n"
. ' onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">' . "\n"
. ' <option value="any"' . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '') . '>' . __('Any user') . '</option>' . "\n"
- . ' <option value="userdefined"' . ((!isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</option>' . "\n"
+ . ' <option value="userdefined"' . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</option>' . "\n"
. ' </select>' . "\n"
. '</span>' . "\n"
. '<input type="text" name="username" maxlength="'
@@ -756,7 +756,7 @@ function PMA_displayLoginInformationFields($mode = 'new')
unset($_current_user);
// when we start editing a user, $GLOBALS['pred_hostname'] is not defined
- if (!isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) {
+ if (! isset($GLOBALS['pred_hostname']) && isset($GLOBALS['hostname'])) {
switch (strtolower($GLOBALS['hostname'])) {
case 'localhost':
case '127.0.0.1':
@@ -850,7 +850,7 @@ if (isset($_REQUEST['change_copy'])) {
// Recent MySQL versions have the field "Password" in mysql.user,
// so the previous extract creates $Password but this script
// uses $password
- if (!isset($password) && isset($Password)) {
+ if (! isset($password) && isset($Password)) {
$password = $Password;
}
$queries = array();
@@ -1140,7 +1140,7 @@ if (!empty($update_privs)) {
$sql_query0 =
'REVOKE ALL PRIVILEGES ON ' . $db_and_table
. ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';';
- if (!isset($Grant_priv) || $Grant_priv != 'Y') {
+ if (! isset($Grant_priv) || $Grant_priv != 'Y') {
$sql_query1 =
'REVOKE GRANT OPTION ON ' . $db_and_table
. ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\';';
@@ -1387,7 +1387,7 @@ $link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="s
* If we are in an Ajax request for Create User/Edit User/Revoke User/Flush Privileges,
* show $message and exit.
*/
-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'])) {
+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'])) {
if(isset($sql_query)) {
$extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
@@ -2056,7 +2056,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote(PMA_unescape_mysql_wildcards($dbname)) . ';', null, PMA_DBI_QUERY_STORE)) {
$pred_tbl_array = array();
while ($row = PMA_DBI_fetch_row($res)) {
- if (!isset($found_rows) || !in_array($row[0], $found_rows)) {
+ if (! isset($found_rows) || !in_array($row[0], $found_rows)) {
$pred_tbl_array[] = $row[0];
}
}
@@ -2279,7 +2279,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
foreach ($current_privileges as $current) {
echo ' <td>' . "\n"
. ' ';
- if (!isset($current['Db']) || $current['Db'] == '*') {
+ if (! isset($current['Db']) || $current['Db'] == '*') {
echo __('global');
} elseif ($current['Db'] == PMA_escape_mysql_wildcards($checkprivs)) {
echo __('database-specific');
diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php
index 27429b4..61484b2 100644
--- a/setup/frames/form.inc.php
+++ b/setup/frames/form.inc.php
@@ -21,7 +21,7 @@ require './libraries/config/setup.forms.php';
$formset_id = filter_input(INPUT_GET, 'formset');
$mode = filter_input(INPUT_GET, 'mode');
-if (!isset($forms[$formset_id])) {
+if (! isset($forms[$formset_id])) {
die('Incorrect formset, check $formsets array in setup/frames/form.inc.php');
}
diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php
index 95c3325..2872221 100644
--- a/setup/lib/ConfigGenerator.class.php
+++ b/setup/lib/ConfigGenerator.class.php
@@ -113,7 +113,7 @@ class ConfigGenerator
private static function _isZeroBasedArray(array $array)
{
for ($i = 0; $i < count($array); $i++) {
- if (!isset($array[$i])) {
+ if (! isset($array[$i])) {
return false;
}
}
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index aa0d044..2e20e5d 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -18,7 +18,7 @@ if (!defined('PHPMYADMIN')) {
*/
function messages_begin()
{
- if (!isset($_SESSION['messages']) || !is_array($_SESSION['messages'])) {
+ if (! isset($_SESSION['messages']) || !is_array($_SESSION['messages'])) {
$_SESSION['messages'] = array('error' => array(), 'notice' => array());
} else {
// reset message states
@@ -41,7 +41,7 @@ function messages_begin()
*/
function messages_set($type, $id, $title, $message)
{
- $fresh = !isset($_SESSION['messages'][$type][$id]);
+ $fresh = ! isset($_SESSION['messages'][$type][$id]);
$_SESSION['messages'][$type][$id] = array(
'fresh' => $fresh,
'active' => true,
diff --git a/sql.php b/sql.php
index 9b19174..d07022b 100644
--- a/sql.php
+++ b/sql.php
@@ -33,7 +33,7 @@ if (! empty($goto)) {
$is_gotofile = true;
} // end if
-if (!isset($err_url)) {
+if (! isset($err_url)) {
$err_url = (!empty($back) ? $back : $goto)
. '?' . PMA_generate_common_url($db)
. ((strpos(' ' . $goto, 'db_') != 1 && strlen($table)) ? '&table=' . urlencode($table) : '');
@@ -441,7 +441,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
if (!$is_affected) {
$num_rows = ($result) ? @PMA_DBI_num_rows($result) : 0;
- } elseif (!isset($num_rows)) {
+ } elseif (! isset($num_rows)) {
$num_rows = @PMA_DBI_affected_rows();
}
@@ -492,11 +492,11 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
// due to $find_real_end == true
if (!$is_group
- && !isset($analyzed_sql[0]['queryflags']['union'])
- && !isset($analyzed_sql[0]['table_ref'][1]['table_name'])
+ && ! isset($analyzed_sql[0]['queryflags']['union'])
+ && ! isset($analyzed_sql[0]['table_ref'][1]['table_name'])
&& (empty($analyzed_sql[0]['where_clause'])
|| $analyzed_sql[0]['where_clause'] == '1 ')
- && !isset($find_real_end)
+ && ! isset($find_real_end)
) {
// "j u s t b r o w s i n g"
@@ -526,7 +526,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
// long delays. Returned count will be complete anyway.
// (but a LIMIT would disrupt results in an UNION)
- if (!isset($analyzed_sql[0]['queryflags']['union'])) {
+ if (! isset($analyzed_sql[0]['queryflags']['union'])) {
$count_query .= ' LIMIT 1';
}
@@ -969,7 +969,7 @@ window.onload = function()
/**
* Displays the footer
*/
-if(!isset($_REQUEST['table_maintenance'])) {
+if(! isset($_REQUEST['table_maintenance'])) {
require './libraries/footer.inc.php';
}
?>
diff --git a/tbl_change.php b/tbl_change.php
index 22584db..efdbd3f 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -514,7 +514,7 @@ foreach ($rows as $row_id => $vrow) {
} else {
// (we are inserting)
// display default values
- if (!isset($field['Default'])) {
+ if (! isset($field['Default'])) {
$field['Default'] = '';
$real_null_value = TRUE;
$data = '';
@@ -620,7 +620,7 @@ foreach ($rows as $row_id => $vrow) {
// yet.
$cnt_functions = count($cfg['Functions']);
for ($j = 0; $j < $cnt_functions; $j++) {
- if (!isset($dropdown_built[$cfg['Functions'][$j]]) || $dropdown_built[$cfg['Functions'][$j]] != 'TRUE') {
+ if (! isset($dropdown_built[$cfg['Functions'][$j]]) || $dropdown_built[$cfg['Functions'][$j]] != 'TRUE') {
// Is current function defined as default?
$selected = ($field['first_timestamp'] && $cfg['Functions'][$j] == $cfg['DefaultFunctions']['first_timestamp'])
|| (!$field['first_timestamp'] && $cfg['Functions'][$j] == $default_function)
@@ -1062,7 +1062,7 @@ if (isset($where_clause)) {
<?php
echo "\n";
-if (!isset($after_insert)) {
+if (! isset($after_insert)) {
$after_insert = 'back';
}
?>
diff --git a/tbl_printview.php b/tbl_printview.php
index 74b6818..f2b80ab 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -189,7 +189,7 @@ foreach ($the_tables as $key => $table) {
if ($zerofill) {
$attribute = 'UNSIGNED ZEROFILL';
}
- if (!isset($row['Default'])) {
+ if (! isset($row['Default'])) {
if ($row['Null'] != '' && $row['Null'] != 'NO') {
$row['Default'] = '<i>NULL</i>';
}
diff --git a/tbl_relation.php b/tbl_relation.php
index 400fc63..90bd153 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -186,7 +186,7 @@ if (isset($_REQUEST['destination_foreign'])) {
if (! empty($foreign_string)) {
list($foreign_db, $foreign_table, $foreign_field) = PMA_backquote_split($foreign_string);
- if (!isset($existrel_foreign[$master_field])) {
+ if (! isset($existrel_foreign[$master_field])) {
// no key defined for this field
// The next few lines are repeated below, so they
diff --git a/tbl_replace.php b/tbl_replace.php
index 40d0ad4..5b722c6 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -276,7 +276,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
// u p d a t e
} elseif (!empty($me_fields_null_prev[$key])
- && !isset($me_fields_null[$key])) {
+ && ! isset($me_fields_null[$key])) {
// field had the null checkbox before the update
// field no longer has the null checkbox
$query_values[] = PMA_backquote($me_fields_name[$key]) . ' = ' . $cur_value;
diff --git a/tbl_select.php b/tbl_select.php
index 2cb0086..ca6530a 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -36,7 +36,7 @@ if ($GLOBALS['cfg']['PropertiesIconic'] == true) {
/**
* Not selection yet required -> displays the selection form
*/
-if (!isset($param) || $param[0] == '') {
+if (! isset($param) || $param[0] == '') {
// Gets some core libraries
require_once './libraries/tbl_common.php';
//$err_url = 'tbl_select.php' . $err_url;
@@ -52,7 +52,7 @@ if (!isset($param) || $param[0] == '') {
*/
require_once './libraries/tbl_links.inc.php';
- if (!isset($goto)) {
+ if (! isset($goto)) {
$goto = $GLOBALS['cfg']['DefaultTabTable'];
}
// Defines the url to return to in case of error in the next sql statement
diff --git a/tbl_structure.php b/tbl_structure.php
index 99ec0e9..9878b9e 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -337,7 +337,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
}
- if (!isset($row['Default'])) {
+ if (! isset($row['Default'])) {
if ($row['Null'] == 'YES') {
$row['Default'] = '<i>NULL</i>';
}
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index 3699dd0..50d7ceb 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -71,7 +71,7 @@ if (isset($cn) && !empty($cn)) {
header('Content-Disposition: attachment; filename=' . $cn);
}
-if (!isset($resize)) {
+if (! isset($resize)) {
echo $row[$transform_key];
} else {
// if image_*__inline.inc.php finds that we can resize,
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list