The branch, MAINT_3_4_0 has been updated discards 523f86ef6e5232d841e94a44080806f9333d4bd4 (commit) discards 071bc679dbd8bd2ece5182bdb471c027f33daf6c (commit) discards b5d235593a24cb469d651a9df0d41305946eab07 (commit) discards 7698df152041315049ad0e8b7db235e7fbbe7d7c (commit) discards f56619e48251f1745d3f6bc51711fa789822a836 (commit) discards 4a4c7b84276dc983912fa8ec39af243238658deb (commit) discards 5cda32da092764f38346f984fe28a5b9142365fe (commit) discards 69c1e15473447eff3ea337eb75b6dc2432b06189 (commit) discards a604d2152904f663ad1061d4e759e893878c82fc (commit) discards 485fb634cae6c23280face51ce2891dd2dbd0795 (commit) discards 329c5551d4bc8e8a2c7fe378b6d0ed26e6e2ff78 (commit) discards 994606bb23a693c9568314b016db582b20f26b1c (commit) discards 8d3ebd746dfbfe4e2ca86121f0448ba7d5187432 (commit) discards 34ed9aa67a65b4333425014d43ccac3ddbccefda (commit) discards d086c01ba140b366c4cb61dee6914146df3820d5 (commit) discards ed7cd53e2aab7c1a3c296a7b2931520ce38c5db0 (commit) discards e6211f0c2fb025007125456299165d572894983f (commit) discards 13b31956aed38141836faf386d97c042a3087f48 (commit) discards d40617abc7f0f7c4e7b078e50bbb394f5cec0709 (commit) discards d37a47017e341fdf61a2739a93d4fbceafdc51d5 (commit) discards 0adf49922f4f341e7920991e2d16bd1cc667808c (commit) discards f1694d2c02fd9b66e8d6bd0265ea98051caf965f (commit) discards 555c04b4a1bb91780aa21bff2b420eb6171a995d (commit) discards 9a9e3b6a37bf3a0df4fc53847238666c968fff10 (commit) discards 197d6ffe2d648c22710c7da8b06a7c188be2f883 (commit) discards eb0ea6b20d0b98192d1af3c02a55fd82e0a45f4e (commit) discards b4a46962e950c46e25a1f72f009d5af6fe12c1cc (commit) discards e8f0a023f3b90e4f0d973fec5eebb286be712a13 (commit) discards 83a73a2a8e8514e100fe26d8c4704c830f686525 (commit) discards ad687ae58fc0e516150531e053aa786baf6f75e7 (commit) discards a9bb12a8b9f8c6bf26cb315e15e064268e418e83 (commit) discards 1e7e0704e79bc19a8f2c29bea4e94f7dd8d27022 (commit) discards bcb528ad5ea8dd6d28b81fba83726f6b41ac38b5 (commit) discards 1b41e9cb8779288de454445b552471660e2fbd23 (commit) discards 98f390d4827da63293937ca5ddfdead4fb731945 (commit) discards 5b9b1cb613b300a7e9397c7ff5295b75073dc1db (commit) discards 50a4191ae99488e95020d38aadbbf29b0e5b4af9 (commit) discards e8539bd778bc77548d97ff866e40f2319c2fe702 (commit) discards f897eaeb3caf33fb0ffae1d424346966b3df3a71 (commit) discards 0358007018029af939ffd62e6ac42b597dcf83d3 (commit) discards e880d4ffde0f940f526a5e9e4f4f9ca228b4e081 (commit) discards 5ec068f346756d1e19c345cb5f661eb7d1f2423a (commit) discards 821814ff50f2c1a4a237d2aca3c28f2c0b58b3c0 (commit) discards 064e875f10b0244a15da56c4ca590d516c51f6b6 (commit) discards a22c528ad40cc20924ec789ace883d29193f4761 (commit) discards 50bc50ecdf924b441756c440195f9d5d8dcfd643 (commit) discards 0e40c042cf32db6a92ab73a8db0803e17c0e3fa7 (commit) discards 9d42dfc1c4afa1e028df7fa45ec3f82c2d7d5396 (commit) discards 92bffeee8f13ce3c76d8ec3a3ede20be42d92749 (commit) discards e2ffec079236176eeb56cbaeeb3e1984612d48bc (commit) discards 9e99fb3a3ca4c99625a37e5c93963e930431ca1d (commit) discards fd1ac3cdac0a302ace44c966337822d7589a129c (commit) discards 401cb3c1de764c118d1e3672eca3d567f48f1450 (commit) discards d52a0476345f40b4e16183e7bd94beb99600cf44 (commit) discards de3f7e3f66ed82e1f6f4cdf36784521e00e9f8e6 (commit) discards 0dd3fe3efff0a5861e5c5af9a96828a8a3b004e9 (commit) discards 0289f78d2b73f0a394214e1441499bcb421d7bf1 (commit) discards eef8ec8e66f185cc9a066f966430b8e18bc49ad0 (commit) discards 11c8ab302507485172ab9cc25b920182b48ea71e (commit) discards 8c9af0750bf5b90ce00dfd49306b13f069a12333 (commit) discards 09e7df2d59f045a0cb44fa7a9bce383f041bd4fb (commit) discards b312e74fc4c1857e424f8563a461e973008cab62 (commit) discards 74918d3ef6bc4c1c66df369b435c6e421fb81cf3 (commit) discards 2a3009cc7e0eceba4d09523c13d2130a781c649d (commit) discards 11bef52f9b3df13eb8d089a278d0a1f6624bd9a5 (commit) discards 5b48bdbdd0a64f87520e645af916ec07c9f1f6b7 (commit) discards acf8203be2065ac84c8e314cfdf1975b2ee29695 (commit) discards 834b7be02f447f460c42e21417c63a4fb3d7cf82 (commit) discards 0d5a9ff74a7fd2fbd9cd11f612188e7e88a86de9 (commit) discards bd32365ab5a8414e626387402800fe3a5964cca7 (commit) discards a20cdada3d11eead7c25ba3e66a147f706bf46e6 (commit) discards f8304073a6ebf9fa0db393045363c90fbb9e3dda (commit) discards 5c0475100a1e8d21ab53e47de18dcb61829a4d56 (commit) discards f8748fa77faf50e37efe141b592ef87d6bb8fdc1 (commit) discards 0468e0c6fa075c74fefa5c55ebd5bb8ecb0d33c2 (commit) discards b41df896f40d732440d3f0ee2467abcf6d14632d (commit) discards f0efbc1745abf07435a4e462bbae1e262ff60776 (commit) discards 4225386a9b1ee643a9ac2a66a82875748003a942 (commit) via 0d1772b6f19529a991724fc3b455f45b75be0e42 (commit)

This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this:

* -- * -- B -- O -- O -- O (523f86ef6e5232d841e94a44080806f9333d4bd4) \ N -- N -- N (0d1772b6f19529a991724fc3b455f45b75be0e42)

When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B.

- Log ----------------------------------------------------------------- -----------------------------------------------------------------------

Summary of changes: ChangeLog | 4 -- Documentation.html | 4 +- README | 2 +- browse_foreigners.php | 2 +- db_datadict.php | 4 +- db_operations.php | 4 +- db_printview.php | 2 +- db_qbe.php | 10 ++-- export.php | 4 +- import.php | 2 +- libraries/Config.class.php | 18 ++++---- 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 | 22 +++++----- libraries/core.lib.php | 10 ++-- libraries/database_interface.lib.php | 2 +- libraries/db_info.inc.php | 4 +- libraries/display_export.lib.php | 2 +- libraries/display_tbl.lib.php | 38 +++++++++--------- libraries/footer.inc.php | 2 +- libraries/header.inc.php | 4 +- libraries/import.lib.php | 4 +- libraries/mysql_charsets.lib.php | 4 +- libraries/plugin_interface.lib.php | 6 +- libraries/schema/Dia_Relation_Schema.class.php | 6 +- libraries/schema/Eps_Relation_Schema.class.php | 6 +- libraries/schema/Pdf_Relation_Schema.class.php | 8 ++-- libraries/schema/Svg_Relation_Schema.class.php | 6 +- libraries/schema/User_Schema.class.php | 6 +- libraries/schema/Visio_Relation_Schema.class.php | 6 +- libraries/server_links.inc.php | 2 +- libraries/session.inc.php | 2 +- libraries/sqlparser.lib.php | 6 +- libraries/tbl_info.inc.php | 2 +- libraries/tbl_properties.inc.php | 2 +- libraries/user_preferences.inc.php | 4 +- libraries/user_preferences.lib.php | 8 ++-- main.php | 2 +- po/hi.po | 6 +- po/hu.po | 13 +++--- po/ja.po | 45 ++++++++++++++------- po/zh_CN.po | 8 ++-- prefs_forms.php | 2 +- prefs_manage.php | 2 +- schema_edit.php | 8 ++-- 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 | 6 +- tbl_structure.php | 2 +- transformation_wrapper.php | 2 +- 59 files changed, 193 insertions(+), 183 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 1fdbbe9..5a15934 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,6 @@ phpMyAdmin - ChangeLog ======================

-3.5.0.0 (not yet released) - -3.4.1.0 (not yet released) - 3.4.0.0 (not yet released) + rfe #2890226 [view] Enable VIEW rename + rfe #838637 [privileges] Export a user's privileges diff --git a/Documentation.html b/Documentation.html index cee6a42..6b16dc3 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.5.0-dev - Documentation</title> + <title>phpMyAdmin 3.4.0 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head>

@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.5.0-dev + 3.4.0 Documentation </h1> </div> diff --git a/README b/README index bbc7762..bf564ac 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.5.0-dev +Version 3.4.0

A set of PHP-scripts to manage MySQL over the web.

diff --git a/browse_foreigners.php b/browse_foreigners.php index 16fa48c..c8867af 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 e9d18fd..e67c096 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 2e0244f..f48ba27 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 @@ -561,7 +561,7 @@ echo __('Remove database'); . '</form></div>' . "\n";

if ($num_tables > 0 - && ! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { + && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { $message = PMA_Message::notice(__('The phpMyAdmin configuration storage has been deactivated. To find out why click %shere%s.')); $message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">', false); $message->addParam('</a>', false); diff --git a/db_printview.php b/db_printview.php index 7e3c709..36f297c 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 34c85ee..751317d 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 22a6324..7da25fc 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 0b029e5..78e5ffd 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@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a].')); $error = TRUE; } diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f71a4e9..6f4dff8 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.0-dev'); + $this->set('PMA_VERSION', '3.4.0'); /** * @deprecated */ @@ -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 2663673..c29cc9d 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 d41eadc..a29900e 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 83791fb..3911f2e 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 ef6f64b..49937c8 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 e8e6b8a..5b353ec 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -301,7 +301,7 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '') return htmlspecialchars($parsed_sql['raw']); } // then check for an array - if (! is_array($parsed_sql)) { + if (!is_array($parsed_sql)) { // We don't so just return the input directly // This is intended to be used for when the SQL Parser is turned off $formatted_sql = '<pre>' . "\n" @@ -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 @@ -2434,8 +2434,8 @@ function PMA_userDir($dir) */ function PMA_getDbLink($database = null) { - if (! strlen($database)) { - if (! strlen($GLOBALS['db'])) { + if (!strlen($database)) { + if (!strlen($GLOBALS['db'])) { return ''; } $database = $GLOBALS['db']; diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 1d0f3a6..76d2c86 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -386,7 +386,7 @@ function PMA_array_merge_recursive() break; case 2 : $args = func_get_args(); - if (! is_array($args[0]) || ! is_array($args[1])) { + if (!is_array($args[0]) || !is_array($args[1])) { return $args[1]; } foreach ($args[1] as $key2 => $value2) { @@ -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 be8d9f5..22d9671 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 f8bb5a0..d8610f2 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 88c80af..10e8178 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 6fa8e9b..78b4bb6 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1091,7 +1091,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } }

- if (! is_array($map)) { + if (!is_array($map)) { $map = array(); } $row_no = 0; @@ -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] = ''; @@ -1563,7 +1563,7 @@ function PMA_displayVerticalTable() // Displays "edit" link at top if required if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1581,7 +1581,7 @@ function PMA_displayVerticalTable() // Displays "copy" link at top if required if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1599,7 +1599,7 @@ function PMA_displayVerticalTable() // Displays "delete" link at top if required if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['edit']) && !is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1652,7 +1652,7 @@ function PMA_displayVerticalTable() // Displays "edit" link at bottom if required if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1670,7 +1670,7 @@ function PMA_displayVerticalTable() // Displays "copy" link at bottom if required if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -1688,7 +1688,7 @@ function PMA_displayVerticalTable() // Displays "delete" link at bottom if required if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) { echo '<tr>' . "\n"; - if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) { + if (!is_array($vertical_display['edit']) && !is_array($vertical_display['row_delete'])) { echo $vertical_display['textbtn']; } $foo_counter = 0; @@ -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 5a66351..f5385d5 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 f6c3dcd..a23d2fa 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 0c77f54..a7d0b5e 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 51b79ba..45fd55a 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -37,7 +37,7 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) { : 'SELECT * FROM information_schema.COLLATIONS'; $res = PMA_DBI_query($sql); while ($row = PMA_DBI_fetch_assoc($res)) { - if (! is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) { + if (!is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) { $mysql_collations[$row['CHARACTER_SET_NAME']] = array($row['COLLATION_NAME']); } else { $mysql_collations[$row['CHARACTER_SET_NAME']][] = $row['COLLATION_NAME']; @@ -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 edfd02a..48dc975 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/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php index a781307..e58381e 100644 --- a/libraries/schema/Dia_Relation_Schema.class.php +++ b/libraries/schema/Dia_Relation_Schema.class.php @@ -680,7 +680,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema $dia->startDiaDoc($this->paper,$this->_topMargin,$this->_bottomMargin,$this->_leftMargin,$this->_rightMargin,$this->orientation); $alltables = $this->getAllTables($db,$this->pageNumber); foreach ($alltables as $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys); } } @@ -725,10 +725,10 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showKeys) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $this->pageNumber, $showKeys); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->pageNumber, $showKeys); } $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index edea703..5435db4 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -759,7 +759,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema $alltables = $this->getAllTables($db,$this->pageNumber);

foreach ($alltables AS $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table,$eps->getFont(),$eps->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); }

@@ -809,10 +809,10 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tablewidth, false, $showInfo); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo); } $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index ef60264..6078537 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -882,7 +882,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema

/* snip */ foreach ($alltables as $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table, $this->_ff, $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); } if ($this->sameWide) { @@ -962,11 +962,11 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showInfo) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo); $this->_setMinMax($this->tables[$masterTable]); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo); $this->_setMinMax($this->tables[$foreignTable]); } @@ -1305,7 +1305,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema if ($zerofill) { $attribute = 'UNSIGNED ZEROFILL'; } - if (! isset($row['Default'])) { + if (!isset($row['Default'])) { if ($row['Null'] != '' && $row['Null'] != 'NO') { $row['Default'] = 'NULL'; } diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index 0f6b55b..afafda7 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -742,7 +742,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema $alltables = $this->getAllTables($db,$this->pageNumber);

foreach ($alltables AS $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table,$svg->getFont(),$svg->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); }

@@ -805,11 +805,11 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tathis->_tablewidth, $this->showKeys, $this->tableDimension);ration. See [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a].'));���p���~�+6 �
�!�! �����x���+���"
~�+~�+ ���~�+_������+�~�+���+ؤ��+����+Ȅ�+x���+���p���~�+�!�! ������}z�+���"
~�+~�+ ���~�+_��P��H����+�p�����~�+Ȅ�+���P���~�+GHIJKMNOP �����H5Q�+ ��"
~�+~�+ ��0���+�~�+���+�i.�+���+ؤ��+����+Ȅ�+H5Q�+ ��`���~�+85Q�+ ������~�+(5Q�+ ������~�+5Q�+ ������~�+ ����+�~�+
����+p����.�+�~�+
ؤ��+���y�.�+�~�+
���+���Z�.�+�~�+�d.�+���+�i.�+���+�Ě�+ؤ��+����+Ȅ�+�,�+@�����~�+#%')*-.035678:<= �����p���+`��"
~�+8Ϛ�+�~�+�Ě�+�ɚ�+Ȅ�+cf-��+���p���+`��0���~�+�%�����wq�-��
���s��,~9��u]�� 4Q��U^Qʉ��u������*ēv

����+���F�a �+F�a �+?��+
���������-��+�~�+���+ ��B�a �+���_������+�����������B�a �+����~
blewidth, false, $showInfo); $this->_setMinMax($this->tables[$masterTable]); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo); $this->_setMinMax($this->tables[$foreignTable]); } diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 7e8dbfb..fbec138 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -222,7 +222,7 @@ class PMA_User_Schema * Display WYSIWYG parts */

- if (! isset($_POST['with_field_names']) && ! isset($_POST['showwysiwyg'])) { + if (!isset($_POST['with_field_names']) && !isset($_POST['showwysiwyg'])) { $with_field_names = TRUE; } $this->_displayScratchboardTables($array_sh_page); @@ -783,10 +783,10 @@ class PMA_User_Schema $arrvalue = 'c_table_' . $i; global $$arrvalue; $arrvalue = $$arrvalue; - if (! isset($arrvalue['x']) || $arrvalue['x'] == '') { + if (!isset($arrvalue['x']) || $arrvalue['x'] == '') { $arrvalue['x'] = 0; } - if (! isset($arrvalue['y']) || $arrvalue['y'] == '') { + if (!isset($arrvalue['y']) || $arrvalue['y'] == '') { $arrvalue['y'] = 0; } if (isset($arrvalue['name']) && $arrvalue['name'] != '--') { diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index a9be622..ab45b13 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -505,7 +505,7 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema $alltables = $this->getAllTables($db,$this->pageNumber);

foreach ($alltables as $table) { - if (! isset($this->tables[$table])) { + if (!isset($this->tables[$table])) { $this->tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys); } } @@ -550,10 +550,10 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema */ private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showKeys) { - if (! isset($this->tables[$masterTable])) { + if (!isset($this->tables[$masterTable])) { $this->tables[$masterTable] = new Table_Stats($masterTable, $this->pageNumber, $showKeys); } - if (! isset($this->tables[$foreignTable])) { + if (!isset($this->tables[$foreignTable])) { $this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->pageNumber, $showKeys); } $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index b8b4dcd..8196269 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 465e3f0..4f8caec 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 a46b720..cbad1d6 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(); @@ -2090,7 +2090,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { { //DEBUG echo 'in Format<pre>'; print_r($arr); echo '</pre>'; // then check for an array - if (! is_array($arr)) { + if (!is_array($arr)) { return htmlspecialchars($arr); } // first check for the SQL parser having hit an error diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index ac3a26f..00c9904 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 395fa7b..54e9d1d 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 7d1a2d7..2aad2e6 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); } @@ -64,7 +64,7 @@ $msg->display();

// warn about using session storage for settings $cfgRelation = PMA_getRelationsParam(); -if (! $cfgRelation['userconfigwork']) { +if (!$cfgRelation['userconfigwork']) { $msg = __('Your preferences will be saved for current session only. Storing them permanently requires %sphpMyAdmin configuration storage%s.'); $msg = PMA_sanitize(sprintf($msg, '[a@./Documentation.html#linked-tables@_blank]', '[/a]')); PMA_Message::notice($msg)->display(); diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index 3fb8c1b..6c48116 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -49,9 +49,9 @@ function PMA_userprefs_pageinit() function PMA_load_userprefs() { $cfgRelation = PMA_getRelationsParam(); - if (! $cfgRelation['userconfigwork']) { + if (!$cfgRelation['userconfigwork']) { // no pmadb table, use session storage - if (! isset($_SESSION['userconfig'])) { + if (!isset($_SESSION['userconfig'])) { $_SESSION['userconfig'] = array( 'db' => array(), 'ts' => time()); @@ -104,7 +104,7 @@ function PMA_save_userprefs(array $config_array) ? $GLOBALS['server'] : $GLOBALS['cfg']['ServerDefault']; $cache_key = 'server_' . $server; - if (! $cfgRelation['userconfigwork']) { + if (!$cfgRelation['userconfigwork']) { // no pmadb table, use session storage $_SESSION['userconfig'] = array( 'db' => $config_array, @@ -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/main.php b/main.php index d69b4bb..c7c25bc 100644 --- a/main.php +++ b/main.php @@ -292,7 +292,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/po/hi.po b/po/hi.po index 5a673c8..a04d453 100644 --- a/po/hi.po +++ b/po/hi.po @@ -3,9 +3,9 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" -"PO-Revision-Date: 2011-05-06 09:13+0200\n" -"Last-Translator: manojonemail@gmail.com\n" +"POT-Creation-Date: 2011-05-09 07:40+0200\n" +"PO-Revision-Date: 2011-04-24 00:23+0200\n" +"Last-Translator: rsedwardian@gmail.com\n" "Language-Team: hindi hi@li.org\n" "Language: hi\n" "MIME-Version: 1.0\n" diff --git a/po/hu.po b/po/hu.po index 6a6a7ff..4dd32fb 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3,9 +3,9 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" -"PO-Revision-Date: 2011-05-09 14:22+0200\n" -"Last-Translator: gergo314@gmail.com\n" +"POT-Creation-Date: 2011-05-09 14:14+0200\n" +"PO-Revision-Date: 2011-05-05 12:49+0200\n" +"Last-Translator: gergo314@gmail.com\n" "Language-Team: hungarian hu@li.org\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3481,9 +3481,8 @@ msgstr "" " nem található"

#: libraries/config/messages.inc.php:328 -#, fuzzy msgid "Missing phpMyAdmin configuration storage tables" -msgstr "Hiányzó táblák a phpMyAdmin konfigurációs tárolóhoz" +msgstr ""

#: libraries/config/messages.inc.php:330 msgid "Iconic table operations" @@ -3788,8 +3787,8 @@ msgstr "" "Használhatja a MySQL-karakterhelyettesítőket (% és _), vezérelheti őket, ha " "akarja, a literális példányaik használatához, pl. használja a 'my\_db' " "alakot, s ne a 'my_db' alakot. Ezt a lehetőséget választva rendezhet " -"adatbázislistákat, beírva a nevüket sorrendben és használja a [kbd]*[/kbd]-t " -"a végén, hogy a többi abc-sorrendben jelenjen meg." +"adatbázislistákat, beírva a nevüket sorrendben és használja a [kbd]*[/kbd]-t" +" a végén, hogy a többi abc-sorrendben jelenjen meg."

#: libraries/config/messages.inc.php:394 msgid "Show only listed databases" diff --git a/po/ja.po b/po/ja.po index 11eed48..890d5a2 100644 --- a/po/ja.po +++ b/po/ja.po @@ -111,7 +111,9 @@ msgstr "リモート URL を開けませんでした。" msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." -msgstr "ファイル %s は、このシステムでは使用できません。詳細については www.phpmyadmin.net をご覧ください。" +msgstr "" +"ファイル %s は、このシステムでは使用できません。詳細については www." +"phpmyadmin.net をご覧ください。"

#: db_create.php:58 #, php-format @@ -3443,7 +3445,7 @@ msgstr ""

#: libraries/config/messages.inc.php:328 msgid "Missing phpMyAdmin configuration storage tables" -msgstr "phpMyAdmin の設定保存用テーブルが不明" +msgstr "phpMyAdmin の設定保存用テーブルがありません"

#: libraries/config/messages.inc.php:330 msgid "Iconic table operations" @@ -5093,7 +5095,9 @@ msgstr "ポート" msgid "" "The port for the PBMS stream-based communications. Setting this value to 0 " "will disable HTTP communication with the daemon." -msgstr "PBMS ストリームに基づいた通信用のポートです。この値を 0 に設定すると、デーモンとの HTTP 通信を無効にします。" +msgstr "" +"PBMS ストリームに基づいた通信用のポートです。この値を 0 に設定すると、デーモ" +"ンとの HTTP 通信を無効にします。"

#: libraries/engines/pbms.lib.php:40 msgid "Repository Threshold" @@ -5164,7 +5168,9 @@ msgstr "" msgid "" "Documentation and further information about PBMS can be found on %sThe " "PrimeBase Media Streaming home page%s." -msgstr "PBMS に関するドキュメントおよび詳細な情報は、%sPrimeBase Media Streaming オフィシャルサイト%sにあります。" +msgstr "" +"PBMS に関するドキュメントおよび詳細な情報は、%sPrimeBase Media Streaming オ" +"フィシャルサイト%sにあります。"

#: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 msgid "Related Links" @@ -5330,7 +5336,9 @@ msgstr "" msgid "" "Documentation and further information about PBXT can be found on the " "%sPrimeBase XT Home Page%s." -msgstr "PBXT に関するドキュメントおよび詳細な情報は、%sPrimeBase XT オフィシャルサイト%sにあります。" +msgstr "" +"PBXT に関するドキュメントおよび詳細な情報は、%sPrimeBase XT オフィシャルサイ" +"ト%sにあります。"

#: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" @@ -6785,7 +6793,9 @@ msgstr "設定を保存しました" msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." -msgstr "環境設定は、現在のセッションでのみ有効です。この設定を永続的に有効にするには、%sphpMyAdmin の設定保存場所%sが必要です。" +msgstr "" +"環境設定は、現在のセッションでのみ有効です。この設定を永続的に有効にするに" +"は、%sphpMyAdminの設定保存場所%sが必要です。"

#: libraries/user_preferences.lib.php:142 msgid "Could not save configuration" @@ -9025,7 +9035,8 @@ msgstr "フォームを表示する" #: setup/lib/index.lib.php:119 msgid "" "Neither URL wrapper nor CURL is available. Version check is not possible." -msgstr "URL ラッパ、cURL、いずれも利用できません。バージョンチェックが行えません。" +msgstr "" +"URL ラッパ、cURL、いずれも利用できません。バージョンチェックが行えません。"

#: setup/lib/index.lib.php:126 msgid "" @@ -9064,10 +9075,11 @@ msgid "" "proxies list%s. However, IP-based protection may not be reliable if your IP " "belongs to an ISP where thousands of users, including you, are connected to." msgstr "" -"この%sオプション%sは無効にするべきです。そうしなければ、いずれかの MySQL " -"サーバへのブルートフォース（しらみつぶし）ログインによる攻撃を許すことになります。これが必要と思われる場合には、%s信頼されたプロキシリスト%" -"sを使用します。しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接続されている場合には、IP " -"アドレスを基にした保護は信頼性が高いとはいえません。" +"この%sオプション%sは無効にするべきです。そうしなければ、いずれかの MySQL サー" +"バへのブルートフォース（しらみつぶし）ログインによる攻撃を許すことになりま" +"す。これが必要と思われる場合には、%s信頼されたプロキシリスト%sを使用します。" +"しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接" +"続されている場合には、IP アドレスを基にした保護は信頼性が高いとはいえません。"

#: setup/lib/index.lib.php:252 msgid "" @@ -9150,9 +9162,11 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"それでも、[kbd]config[/kbd] 認証が必要であると思われる場合、追加の保護設定（%sホスト認証%s設定および%s信頼されたプロキシのリスト" -"%s）を使用してください。しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接続されている場合には、IP " -"アドレスを基にした保護は信頼性が高いとはいえません。" +"それでも、[kbd]config[/kbd] 認証が必要であると思われる場合、追加の保護設定" +"（%sホスト認証%s設定および%s信頼されたプロキシのリスト%s）を使用してくださ" +"い。しかしながら、ユーザが数千人もいるような ISP に所属している、使用してい" +"る、接続されている場合には、IP アドレスを基にした保護は信頼性が高いとはいえま" +"せん。"

#: setup/lib/index.lib.php:268 #, php-format @@ -9391,7 +9405,8 @@ msgstr "" #: tbl_chart.php:166 msgid "" "When drawing a radar chart all values are normalized to a range [0..10]." -msgstr "レーダグラフを描画する時は、全ての値が範囲 [0..10] に正規化されています。" +msgstr "" +"レーダグラフを描画する時は、全ての値が範囲 [0..10] に正規化されています。"

#: tbl_chart.php:173 msgid "" diff --git a/po/zh_CN.po b/po/zh_CN.po index ce19bb5..132a530 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-05-05 13:15+0200\n" -"PO-Revision-Date: 2011-05-06 03:13+0200\n" +"POT-Creation-Date: 2011-05-09 07:40+0200\n" +"PO-Revision-Date: 2011-03-04 09:47+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: chinese_simplified zh_CN@li.org\n" "Language: zh_CN\n" @@ -3123,7 +3123,7 @@ msgstr "树状数据库分隔符" msgid "" "Only light version; display databases in a tree (determined by the separator " "defined below)" -msgstr "只使用简洁版，以树形显示数据库 (以下面的树形分隔符来显示)" +msgstr "只使用轻量级版本，以树形显示数据库 (以下面的树形分隔符来显示)"

#: libraries/config/messages.inc.php:273 msgid "Display databases in a tree" @@ -3135,7 +3135,7 @@ msgstr "如果想一次性浏览所有数据库，则禁用该选项"

#: libraries/config/messages.inc.php:275 msgid "Use light version" -msgstr "使用简洁版" +msgstr "使用轻量级版本"

#: libraries/config/messages.inc.php:276 msgid "Maximum table tree depth" diff --git a/prefs_forms.php b/prefs_forms.php index 4aaea9c..22ffb4c 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/prefs_manage.php b/prefs_manage.php index ec1b481..e5dbe3f 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -76,7 +76,7 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==

$config = json_decode($json, true); $return_url = filter_input(INPUT_POST, 'return_url'); - if (! is_array($config)) { + if (!is_array($config)) { $error = __('Could not import configuration'); } else { // sanitize input values: treat them as though they came from HTTP POST request diff --git a/schema_edit.php b/schema_edit.php index 9b71500..a5d3a38 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -41,24 +41,24 @@ $query_default_option = PMA_DBI_QUERY_STORE; * correctly, so it is a good place to see which tables we can and * complain ;-) */ -if (! $cfgRelation['relwork']) { +if (!$cfgRelation['relwork']) { echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'relation', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('relation') . "\n"; require_once './libraries/footer.inc.php'; }

-if (! $cfgRelation['displaywork']) { +if (!$cfgRelation['displaywork']) { echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_info', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('table_info') . "\n"; 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 daf8a99..19f9dcb 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 61484b2..27429b4 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 2872221..95c3325 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 2e20e5d..aa0d044 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 d07022b..9b19174 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)) ? '&amp;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 efdbd3f..22584db 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 f2b80ab..74b6818 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 90bd153..400fc63 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 5b722c6..40d0ad4 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 681083a..2cb0086 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 @@ -336,7 +336,7 @@ else {

} elseif (strncasecmp($types[$i], 'enum', 4) == 0) { if (!empty($fields[$i])) { - if (! is_array($fields[$i])) { + if (!is_array($fields[$i])) { $fields[$i] = explode(',', $fields[$i]); } $enum_selected_count = count($fields[$i]); diff --git a/tbl_structure.php b/tbl_structure.php index 9878b9e..99ec0e9 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 50d7ceb..3699dd0 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