Git July 2011

git@phpmyadmin.net

6 participants
320 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_3, updated. RELEASE_3_4_3-5-ge214683
by Marc Delisle 03 Jul '11

03 Jul '11

The branch, MAINT_3_4_3 has been updated via e214683f9fe4955dcbf0ffce045983728c7fa9d3 (commit) via b434320eff8ca9c2fc1b043c1804f868341af9a7 (commit) via 69fb0f8e7dc38075427aceaf09bcac697d0590ff (commit) via 0fbedaf5fd7a771d0885c6b7385d934fc90d0d7f (commit) via 7ebd958b2bf59f96fecd5b3322bdbd0b244a7967 (commit) from 9fc6e35cfd1d8270d943f5577807a3c79f5c6168 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 18 ++++++++++++------ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- libraries/auth/swekey/swekey.auth.lib.php | 5 ++--- libraries/display_tbl.lib.php | 2 +- libraries/server_synchronize.lib.php | 2 +- setup/lib/ConfigGenerator.class.php | 2 +- 8 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb3ba9a..fe71031 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ phpMyAdmin - ChangeLog ====================== +3.4.3.1 (2011-07-02) +- [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 +- [security] Fixed possible code injection incase session variables are compromised, see PMASA-2011-6 +- [security] Fixed regexp quoting issue in Synchronize code, see PMASA-2011-7 +- [security] Fixed filtering of a file path, which allowed for directory traversal, see PMASA-2011-8 + 3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong @@ -89,7 +95,7 @@ phpMyAdmin - ChangeLog + patch #2974341 [structure] Clicking on table name in db Structure should Browse the table if possible, thanks to bhdouglass - dougboybhd + patch #2975533 [search] New search operators, thanks to - Martynas Mickevičius + Martynas MickeviÄius + patch #2967320 [designer] Colored relations based on the primary key, thanks to GreenRover - greenrover - [core] Provide way for vendors to easily change paths to config files. @@ -243,7 +249,7 @@ phpMyAdmin - ChangeLog 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after - a page size increase, thanks to Martin Schönberger - mad05 + a page size increase, thanks to Martin SchÃ¶nberger - mad05 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name @@ -264,7 +270,7 @@ phpMyAdmin - ChangeLog 3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of - databases, thanks to Stéphane Pontier - shadow_walker + databases, thanks to StÃ©phane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible - bug [replication] Do not offer information_schema in the list of databases @@ -304,9 +310,9 @@ phpMyAdmin - ChangeLog - patch #2984893 [engines] InnoDB storage page emits a warning, thanks to Madhura Jayaratne - madhuracj - bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work, - thanks to Björn Wiberg - bwiberg + thanks to BjÃ¶rn Wiberg - bwiberg - bug #2983066 [interface] Flush table on table operations shows the query twice, - thanks to Martynas Mickevičius - BlinK_ + thanks to Martynas MickeviÄius - BlinK_ - bug #2983060, patch #2987900 [interface] Fix initial state of tables in designer, thanks to Sutharshan Balachandren. - bug #2983062, patch #2989408 [engines] Fix warnings when changing table @@ -385,7 +391,7 @@ phpMyAdmin - ChangeLog + rfe #2839504 [engines] Support InnoDB plugin's new row formats + [core] Added ability for synchronizing databases among servers. + [lang] #2843101 Dutch update, thanks to scavenger2008 -+ [lang] Galician update, thanks to Xosé Calvo - xosecalvo ++ [lang] Galician update, thanks to XosÃ© Calvo - xosecalvo + [export] Added MediaWiki export module, thanks to Derek Schaefer - drummingds1 + [lang] Turkish update, thanks to Burak Yavuz diff --git a/Documentation.html b/Documentation.html index 576c1f0..25b9731 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.4.3 - Documentation</title> + <title>phpMyAdmin 3.4.3.1 - 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.4.3 + 3.4.3.1 Documentation </h1> </div> diff --git a/README b/README index 02ad016..e57152a 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.3 +Version 3.4.3.1 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index cd1a0bf..28625f2 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.4.3'); + $this->set('PMA_VERSION', '3.4.3.1'); /** * @deprecated */ diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index d2ec1b1..c5f613b 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -263,11 +263,10 @@ function Swekey_login($input_name, $input_go) } } -if (strstr($_SERVER['QUERY_STRING'],'session_to_unset') != false) +if (!empty($_GET['session_to_unset'])) { - parse_str($_SERVER['QUERY_STRING']); session_write_close(); - session_id($session_to_unset); + session_id($_GET['session_to_unset']); session_start(); $_SESSION = array(); session_write_close(); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 64a0383..c7d74ef 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1308,7 +1308,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($GLOBALS['cfgRelation']['mimework'] && $GLOBALS['cfg']['BrowseMIME']) { if (isset($GLOBALS['mime_map'][$meta->name]['mimetype']) && isset($GLOBALS['mime_map'][$meta->name]['transformation']) && !empty($GLOBALS['mime_map'][$meta->name]['transformation'])) { - $include_file = $GLOBALS['mime_map'][$meta->name]['transformation']; + $include_file = PMA_securePath($GLOBALS['mime_map'][$meta->name]['transformation']); if (file_exists('./libraries/transformations/' . $include_file)) { $transformfunction_name = str_replace('.inc.php', '', $GLOBALS['mime_map'][$meta->name]['transformation']); diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index ba6f813..c9f1242 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -624,7 +624,7 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm $Create_Query = PMA_DBI_fetch_value("SHOW CREATE TABLE " . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), 0, 1, $src_link); // Replace the src table name with a `dbname`.`tablename` - $Create_Table_Query = preg_replace('/' . PMA_backquote($uncommon_tables[$table_index]) . '/', + $Create_Table_Query = preg_replace('/' . preg_quote(PMA_backquote($uncommon_tables[$table_index]), '/') . '/', PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]), $Create_Query, $limit = 1 diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index 95c3325..e33775e 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -39,7 +39,7 @@ class ConfigGenerator if ($cf->getServerCount() > 0) { $ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf; foreach ($c['Servers'] as $id => $server) { - $ret .= '/* Server: ' . strtr($cf->getServerName($id), '*/', '-') . " [$id] */" . $crlf + $ret .= '/* Server: ' . strtr($cf->getServerName($id) . " [$id] ", '*/', '-') . "*/" . $crlf . '$i++;' . $crlf; foreach ($server as $k => $v) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_10, updated. RELEASE_3_3_10_1-6-gab31a25
by Marc Delisle 03 Jul '11

03 Jul '11

The branch, MAINT_3_3_10 has been updated via ab31a2565f494c69e6b0d9a82a2932c7656592b5 (commit) via 5ee357a572866e730d83f56d6187a67c7c48e523 (commit) via 911a83393e5b7064084fd140889d0fb2f3166b99 (commit) via ca74f480f119a53ef07ca40d2ab28f063cc89ec9 (commit) via 2e01647949df937040e73a94ce0bac0daecbdcf4 (commit) via 6e6e129f26295c83d67b74e202628a4b8bc49e54 (commit) from 6eae88e65f39347e480cf67008f3d98f19f47248 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 ++++++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- libraries/auth/swekey/swekey.auth.lib.php | 5 ++--- libraries/display_tbl.lib.php | 2 +- libraries/server_synchronize.lib.php | 2 +- setup/lib/ConfigFile.class.php | 2 +- translators.html | 4 ++-- 9 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index f207579..3816fdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,12 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.10.2 (2011-07-02) +- [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 +- [security] Fixed possible code injection incase session variables are compromised, see PMASA-2011-6 +- [security] Fixed regexp quoting issue in Synchronize code, see PMASA-2011-7 +- [security] Fixed filtering of a file path, which allowed for directory traversal, see PMASA-2011-8 + 3.3.10.1 (2011-05-20) - [security] XSS on Tracking page diff --git a/Documentation.html b/Documentation.html index 7797037..89640a1 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,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.3.10.1 - Documentation</title> + <title>phpMyAdmin 3.3.10.2 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,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.3.10.1 + 3.3.10.2 Documentation </h1> </div> diff --git a/README b/README index 3e821bf..5bce68c 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.10.1 + Version 3.3.10.2 ---------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 614cc2e..79a006b 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.10.1'); + $this->set('PMA_VERSION', '3.3.10.2'); /** * @deprecated */ diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index 3dbad75..2a790c4 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -263,11 +263,10 @@ function Swekey_login($input_name, $input_go) } } -if (strstr($_SERVER['QUERY_STRING'],'session_to_unset') != false) +if (!empty($_GET['session_to_unset'])) { - parse_str($_SERVER['QUERY_STRING']); session_write_close(); - session_id($session_to_unset); + session_id($_GET['session_to_unset']); session_start(); $_SESSION = array(); session_write_close(); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 7ef333d..186ce3e 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1220,7 +1220,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($GLOBALS['cfgRelation']['mimework'] && $GLOBALS['cfg']['BrowseMIME']) { if (isset($GLOBALS['mime_map'][$meta->name]['mimetype']) && isset($GLOBALS['mime_map'][$meta->name]['transformation']) && !empty($GLOBALS['mime_map'][$meta->name]['transformation'])) { - $include_file = $GLOBALS['mime_map'][$meta->name]['transformation']; + $include_file = PMA_securePath($GLOBALS['mime_map'][$meta->name]['transformation']); if (file_exists('./libraries/transformations/' . $include_file)) { $transformfunction_name = str_replace('.inc.php', '', $GLOBALS['mime_map'][$meta->name]['transformation']); diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 79948b9..646ef25 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -624,7 +624,7 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm $Create_Query = PMA_DBI_fetch_value("SHOW CREATE TABLE " . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), 0, 1, $src_link); // Replace the src table name with a `dbname`.`tablename` - $Create_Table_Query = preg_replace('/' . PMA_backquote($uncommon_tables[$table_index]) . '/', + $Create_Table_Query = preg_replace('/' . preg_quote(PMA_backquote($uncommon_tables[$table_index]), '/') . '/', PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]), $Create_Query, $limit = 1 diff --git a/setup/lib/ConfigFile.class.php b/setup/lib/ConfigFile.class.php index c0ff63d..978eba3 100644 --- a/setup/lib/ConfigFile.class.php +++ b/setup/lib/ConfigFile.class.php @@ -286,7 +286,7 @@ class ConfigFile if ($this->getServerCount() > 0) { $ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf; foreach ($c['Servers'] as $id => $server) { - $ret .= '/* Server: ' . strtr($this->getServerName($id), '*/', '-') . " [$id] */" . $crlf + $ret .= '/* Server: ' . strtr($this->getServerName($id) . " [$id] ", '*/', '-') . "*/" . $crlf . '$i++;' . $crlf; foreach ($server as $k => $v) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); diff --git a/translators.html b/translators.html index 3238f69..5ca2669 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <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.3.10.1 - Official translators</title> + <title>phpMyAdmin 3.3.10.2 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.10.1 + 3.3.10.2 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6489-ga45a11f
by Madhura Jayaratne 02 Jul '11

02 Jul '11

The branch, master has been updated via a45a11f4e84c19dfa9e4ce0c2e25fc0e9dd8c01f (commit) via 5217946601b64ee6e92f97443cf4e515c03c0c27 (commit) from 6d883454046623718bd777e0f6044eb57a65a55e (commit) - Log ----------------------------------------------------------------- commit a45a11f4e84c19dfa9e4ce0c2e25fc0e9dd8c01f Merge: 6d883454046623718bd777e0f6044eb57a65a55e 5217946601b64ee6e92f97443cf4e515c03c0c27 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Jul 2 07:12:39 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_export.lib.php | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5a0cf0..504f54c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323101 [parser] Invalid escape sequence in SQL parser - bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option +- bug #3340151 [export] Working SQL query exports error page 3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index e47b170..dd6c347 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -35,13 +35,6 @@ if (empty($export_list)) { PMA_Message::error( __('Could not load export plugins, please check your installation!'))->display(); require './libraries/footer.inc.php'; } - -// If the form data is being loaded from GET data, decode it -foreach($_GET as $name => $value) { - if(is_string($value)) { - $_GET[urldecode($name)] = urldecode($value); - } -} ?> <form method="post" action="export.php" name="dump"> @@ -73,7 +66,7 @@ echo '<input type="hidden" name="export_method" value="' . htmlspecialchars($cfg if(isset($_GET['sql_query'])) { - echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars(urldecode($_GET['sql_query'])) . '" />' . "\n"; + echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($_GET['sql_query']) . '" />' . "\n"; } elseif (! empty($sql_query)) { echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n"; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3-15-g5217946
by Madhura Jayaratne 02 Jul '11

02 Jul '11

The branch, QA_3_4 has been updated via 5217946601b64ee6e92f97443cf4e515c03c0c27 (commit) from 4d1540cc1c8136040968bcfb3a4629aad2551b3a (commit) - Log ----------------------------------------------------------------- commit 5217946601b64ee6e92f97443cf4e515c03c0c27 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Jul 2 07:05:54 2011 +0530 bug #3340151 [export] Working SQL query exports error page ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_export.lib.php | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e47917..8ac61c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323101 [parser] Invalid escape sequence in SQL parser - bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option +- bug #3340151 [export] Working SQL query exports error page 3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 3bc9c7f..637b069 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -35,13 +35,6 @@ if (empty($export_list)) { PMA_Message::error( __('Could not load export plugins, please check your installation!'))->display(); require './libraries/footer.inc.php'; } - -// If the form data is being loaded from GET data, decode it -foreach($_GET as $name => $value) { - if(is_string($value)) { - $_GET[urldecode($name)] = urldecode($value); - } -} ?> <form method="post" action="export.php" name="dump"> @@ -73,7 +66,7 @@ echo '<input type="hidden" name="export_method" value="' . htmlspecialchars($cfg if(isset($_GET['sql_query'])) { - echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars(urldecode($_GET['sql_query'])) . '" />' . "\n"; + echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($_GET['sql_query']) . '" />' . "\n"; } elseif (! empty($sql_query)) { echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n"; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6487-g6d88345
by Piotr Przybylski 02 Jul '11

02 Jul '11

The branch, master has been updated via 6d883454046623718bd777e0f6044eb57a65a55e (commit) via e6b1d479cff08bbbc70539e98dfc060f19261b95 (commit) via 5021bae02fbba6ef7fa232670f0a134cc6b1ce8c (commit) via b23294197674816d7e575d67b4306f7cbfa3cf51 (commit) from d5dd8a2d37f0fab931df449d4c6a744821a78afb (commit) - Log ----------------------------------------------------------------- commit 6d883454046623718bd777e0f6044eb57a65a55e Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sat Jul 2 00:48:14 2011 +0200 Remove DBI from moved functions' names commit e6b1d479cff08bbbc70539e98dfc060f19261b95 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sat Jul 2 00:45:08 2011 +0200 Move PMA_DBI_get_column_values and PMA_DBI_get_table_indexes to server_synchronize.lib.php They are used only there, no need to parse 1,5 KB of code on every page load commit 5021bae02fbba6ef7fa232670f0a134cc6b1ce8c Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sat Jul 2 00:34:25 2011 +0200 Remove unused PMA_DBI_get_table_data commit b23294197674816d7e575d67b4306f7cbfa3cf51 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sat Jul 2 00:30:09 2011 +0200 Whitespace and comments ----------------------------------------------------------------------- Summary of changes: libraries/config.default.php | 70 ++++++++++++++++++++------------ libraries/database_interface.lib.php | 73 ---------------------------------- libraries/server_synchronize.lib.php | 64 +++++++++++++++++++++++++++--- 3 files changed, 101 insertions(+), 106 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 0e0b9c8..b355c02 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1117,6 +1117,7 @@ $cfg['DefaultTabDatabase'] = 'db_structure.php'; */ $cfg['DefaultTabTable'] = 'sql.php'; + /******************************************************************************* * Export defaults */ @@ -1824,6 +1825,7 @@ $cfg['Export']['xml_export_contents'] = true; */ $cfg['Export']['yaml_structure_or_data'] = 'data'; + /******************************************************************************* * Import defaults */ @@ -2411,6 +2413,7 @@ $cfg['UserprefsDisallow'] = array(); */ $cfg['UserprefsDeveloperTab'] = false; + /******************************************************************************* * Window title settings */ @@ -2521,7 +2524,9 @@ $cfg['DefaultQueryDatabase'] = ''; /******************************************************************************* * SQL Query box settings * These are the links display in all of the SQL Query boxes - * + */ + +/** * @global array $cfg['SQLQuery'] */ $cfg['SQLQuery'] = array(); @@ -2593,7 +2598,7 @@ $cfg['SaveDir'] = ''; $cfg['TempDir'] = ''; -/** +/******************************************************************************* * Misc. settings */ @@ -2635,7 +2640,12 @@ $cfg['LinkLengthLimit'] = 2000; */ $cfg['DisableMultiTableMaintenance'] = false; + /******************************************************************************* + * SQL Parser + */ + +/** * SQL Parser Settings * * @global array $cfg['SQP'] @@ -2665,6 +2675,10 @@ $cfg['SQP']['fmtIndUnit'] = 'em'; /******************************************************************************* + * SQL Validator + */ + +/** * If you wish to use the SQL Validator service, you should be aware of the * following: * All SQL statements are stored anonymously for statistical purposes. @@ -2699,6 +2713,10 @@ $cfg['SQLValidator']['password'] = ''; /******************************************************************************* * Developers ONLY! + */ + +/** + * Debugging settings * * @global array $cfg['DBG'] */ @@ -2934,29 +2952,29 @@ if ($cfg['ShowFunctionFields']) { 'TIME' => 'FUNC_DATE', 'YEAR' => 'FUNC_DATE', - 'CHAR' => 'FUNC_CHAR', - 'VARCHAR' => 'FUNC_CHAR', - 'TINYTEXT' => 'FUNC_CHAR', - 'TEXT' => 'FUNC_CHAR', - 'MEDIUMTEXT' => 'FUNC_CHAR', - 'LONGTEXT' => 'FUNC_CHAR', - 'BINARY' => 'FUNC_CHAR', - 'VARBINARY' => 'FUNC_CHAR', - 'TINYBLOB' => 'FUNC_CHAR', - 'MEDIUMBLOB' => 'FUNC_CHAR', - 'BLOB' => 'FUNC_CHAR', - 'LONGBLOB' => 'FUNC_CHAR', - 'ENUM' => '', - 'SET' => '', - - 'GEOMETRY' => 'FUNC_SPATIAL', - 'POINT' => 'FUNC_SPATIAL', - 'LINESTRING' => 'FUNC_SPATIAL', - 'POLYGON' => 'FUNC_SPATIAL', - 'MULTIPOINT' => 'FUNC_SPATIAL', - 'MULTILINESTRING' => 'FUNC_SPATIAL', - 'MULTIPOLYGON' => 'FUNC_SPATIAL', - 'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL', + 'CHAR' => 'FUNC_CHAR', + 'VARCHAR' => 'FUNC_CHAR', + 'TINYTEXT' => 'FUNC_CHAR', + 'TEXT' => 'FUNC_CHAR', + 'MEDIUMTEXT' => 'FUNC_CHAR', + 'LONGTEXT' => 'FUNC_CHAR', + 'BINARY' => 'FUNC_CHAR', + 'VARBINARY' => 'FUNC_CHAR', + 'TINYBLOB' => 'FUNC_CHAR', + 'MEDIUMBLOB' => 'FUNC_CHAR', + 'BLOB' => 'FUNC_CHAR', + 'LONGBLOB' => 'FUNC_CHAR', + 'ENUM' => '', + 'SET' => '', + + 'GEOMETRY' => 'FUNC_SPATIAL', + 'POINT' => 'FUNC_SPATIAL', + 'LINESTRING' => 'FUNC_SPATIAL', + 'POLYGON' => 'FUNC_SPATIAL', + 'MULTIPOINT' => 'FUNC_SPATIAL', + 'MULTILINESTRING' => 'FUNC_SPATIAL', + 'MULTIPOLYGON' => 'FUNC_SPATIAL', + 'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL', ); @@ -3103,8 +3121,6 @@ if ($cfg['ShowFunctionFields']) { 'first_timestamp' => 'NOW', 'pk_char36' => 'UUID', ); - - } // end if /** diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index bcafbb1..e6d4094 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -843,79 +843,6 @@ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) return $fields; } -/** - * array PMA_DBI_get_column_values (string $database, string $table, string $column , mysql db link $link = null) - * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of the column to retrieve data from - * @param mixed $link mysql link resource - * @return array $field_values - */ - -function PMA_DBI_get_column_values($database, $table, $column, $link = null) -{ - $query = 'SELECT '; - for($i=0; $i< sizeof($column); $i++) - { - $query.= PMA_backquote($column[$i]); - if($i < (sizeof($column)-1)) - { - $query.= ', '; - } - } - $query.= ' FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table); - $field_values = PMA_DBI_fetch_result($query, null, null, $link); - - if (! is_array($field_values) || count($field_values) < 1) { - return false; - } - return $field_values; -} -/** - * array PMA_DBI_get_table_data (string $database, string $table, mysql db link $link = null) - * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param mixed $link mysql link resource - * @return array $result - */ - - function PMA_DBI_get_table_data($database, $table, $link = null) - { - - $result = PMA_DBI_fetch_result( - 'SELECT * FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table), - null,null, $link); - - if (! is_array($result) || count($result) < 1) { - return false; - } - return $result; - } - -/** -* array PMA_DBI_get_table_indexes($database, $table, $link = null) -* -* @param string $database name of database -* @param string $table name of the table whose indexes are to be retreived -* @param mixed $link mysql link resource -* @return array $indexes -*/ - -function PMA_DBI_get_table_indexes($database, $table, $link = null) -{ - - $indexes = PMA_DBI_fetch_result( - 'SHOW INDEXES FROM ' .PMA_backquote($database) . '.' . PMA_backquote($table), - null, null, $link); - - if (! is_array($indexes) || count($indexes) < 1) { - return false; - } - return $indexes; -} - /** * returns value of given mysql server variable * diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 8f276be..1d8aaa5 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -107,7 +107,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching $fields_num[$matching_table_index] = sizeof($fld); $matching_tables_keys[$matching_table_index] = $is_key; - $source_result_set = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $is_key, $src_link); + $source_result_set = PMA_get_column_values($src_db, $matching_table[$matching_table_index], $is_key, $src_link); $source_size = sizeof($source_result_set); $trg_fld_results = PMA_DBI_get_columns($trg_db, $matching_table[$matching_table_index], true, $trg_link); @@ -309,11 +309,11 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link,$src_db, $src_link) { if (isset($trg_keys[$matching_table_index])) { - $target_key_values = PMA_DBI_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link); + $target_key_values = PMA_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link); $target_row_size = sizeof($target_key_values); } if (isset($src_keys[$matching_table_index])) { - $source_key_values = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $src_keys[$matching_table_index], $src_link); + $source_key_values = PMA_get_column_values($src_db, $matching_table[$matching_table_index], $src_keys[$matching_table_index], $src_link); $source_size = sizeof($source_key_values); } $all_keys_match = 1; @@ -1115,7 +1115,7 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, * indexes to be altered in $alter_indexes_array and indexes to be removed from target table in $remove_indexes_array. * Only keyname and uniqueness characteristic of the indexes are altered. * @uses sizeof() -* @uses PMA_DBI_get_table_indexes() +* @uses PMA_get_table_indexes() * * @param $src_db name of source database * @param $trg_db name of target database @@ -1133,8 +1133,8 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi &$alter_indexes_array, &$remove_indexes_array, $table_counter) { //Gets indexes information for source and target table - $source_indexes[$table_counter] = PMA_DBI_get_table_indexes($src_db, $matching_tables[$table_counter],$src_link); - $target_indexes[$table_counter] = PMA_DBI_get_table_indexes($trg_db, $matching_tables[$table_counter],$trg_link); + $source_indexes[$table_counter] = PMA_get_table_indexes($src_db, $matching_tables[$table_counter],$src_link); + $target_indexes[$table_counter] = PMA_get_table_indexes($trg_db, $matching_tables[$table_counter],$trg_link); for ($a = 0; $a < sizeof($source_indexes[$table_counter]); $a++) { $found = false; $z = 0; @@ -1338,4 +1338,56 @@ function PMA_syncDisplayBeginTableRow($odd_row) { echo '">'; return $odd_row; } + +/** + * array PMA_get_column_values (string $database, string $table, string $column , mysql db link $link = null) + * + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of the column to retrieve data from + * @param mixed $link mysql link resource + * @return array $field_values + */ + +function PMA_get_column_values($database, $table, $column, $link = null) +{ + $query = 'SELECT '; + for($i=0; $i< sizeof($column); $i++) + { + $query.= PMA_backquote($column[$i]); + if($i < (sizeof($column)-1)) + { + $query.= ', '; + } + } + $query.= ' FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table); + $field_values = PMA_DBI_fetch_result($query, null, null, $link); + + if (! is_array($field_values) || count($field_values) < 1) { + return false; + } + return $field_values; +} + +/** +* array PMA_get_table_indexes($database, $table, $link = null) +* +* @param string $database name of database +* @param string $table name of the table whose indexes are to be retreived +* @param mixed $link mysql link resource +* @return array $indexes +*/ + +function PMA_get_table_indexes($database, $table, $link = null) +{ + + $indexes = PMA_DBI_fetch_result( + 'SHOW INDEXES FROM ' .PMA_backquote($database) . '.' . PMA_backquote($table), + null, null, $link); + + if (! is_array($indexes) || count($indexes) < 1) { + return false; + } + return $indexes; +} ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6483-gd5dd8a2
by Piotr Przybylski 01 Jul '11

01 Jul '11

The branch, master has been updated via d5dd8a2d37f0fab931df449d4c6a744821a78afb (commit) via a28d43abf3948f44d036a009462d48cedf597b5b (commit) via 56d4b081a0020d03b988d322a39ac4a05d803384 (commit) via f53f5d76473c7d88ebd8b8a361ffb7a5d1643cb4 (commit) from 9fde1b5b23c00a1c9be499122f5d46d4d9b257f3 (commit) - Log ----------------------------------------------------------------- commit d5dd8a2d37f0fab931df449d4c6a744821a78afb Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Jul 1 20:35:38 2011 +0200 Fix PMA_DBI_get_columns commit a28d43abf3948f44d036a009462d48cedf597b5b Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Jul 1 20:31:21 2011 +0200 Updated MySQL function list commit 56d4b081a0020d03b988d322a39ac4a05d803384 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Jul 1 20:01:37 2011 +0200 Remove STDDEV_* and VAR_* Standard deviation and variance make no sense when called with one argument commit f53f5d76473c7d88ebd8b8a361ffb7a5d1643cb4 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Jul 1 18:33:23 2011 +0200 Changed background color for invalid inputs ----------------------------------------------------------------------- Summary of changes: libraries/config.default.php | 67 +++++++++++++++++++++++++++---- libraries/database_interface.lib.php | 2 +- tbl_replace.php | 30 +++++++++----- themes/pmahomme/css/theme_right.css.php | 2 +- 4 files changed, 80 insertions(+), 21 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 1a478b7..0e0b9c8 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2824,14 +2824,19 @@ if ($cfg['ShowFunctionFields']) { 'CHAR', 'CHAR_LENGTH', 'COMPRESS', + 'CONNECTION_ID', 'COS', 'COT', 'CRC32', 'CURDATE', 'CURRENT_USER', 'CURTIME', + 'DATABASE', 'DATE', 'DAYNAME', + 'DAYOFMONTH', + 'DAYOFWEEK', + 'DAYOFYEAR', 'DEGREES', 'DES_DECRYPT', 'DES_ENCRYPT', @@ -2841,35 +2846,53 @@ if ($cfg['ShowFunctionFields']) { 'FROM_DAYS', 'FROM_UNIXTIME', 'HEX', + 'HOUR', 'INET_ATON', 'INET_NTOA', + 'LAST_DAY', 'LENGTH', 'LN', + 'LOAD_FILE', 'LOG', 'LOG10', 'LOG2', 'LOWER', + 'LTRIM', 'MD5', + 'MICROSECOND', + 'MINUTE', + 'MONTH', + 'MONTHNAME', 'NOW', 'OCT', 'OLD_PASSWORD', 'ORD', 'PASSWORD', + 'PI', + 'QUARTER', + 'QUOTE', 'RADIANS', 'RAND', 'REVERSE', 'ROUND', + 'RTRIM', + 'SECOND', 'SEC_TO_TIME', 'SHA1', + 'SIGN', + 'SIN', 'SOUNDEX', 'SPACE', 'SQRT', - 'STDDEV_POP', - 'STDDEV_SAMP', + 'SYSDATE', 'TAN', + 'TIME', 'TIMESTAMP', 'TIME_TO_SEC', + 'TO_DAYS', + 'TRIM', 'UNCOMPRESS', + 'UNCOMPRESSED_LENGTH', 'UNHEX', 'UNIX_TIMESTAMP', 'UPPER', @@ -2878,9 +2901,12 @@ if ($cfg['ShowFunctionFields']) { 'UTC_TIME', 'UTC_TIMESTAMP', 'UUID', - 'VAR_POP', - 'VAR_SAMP', + 'VERSION', + 'WEEK', + 'WEEKDAY', + 'WEEKOFYEAR', 'YEAR', + 'YEARWEEK', ); /** @@ -2945,20 +2971,27 @@ if ($cfg['ShowFunctionFields']) { 'CHAR', 'CURRENT_USER', 'COMPRESS', + 'DATABASE', 'DAYNAME', 'DES_DECRYPT', 'DES_ENCRYPT', 'ENCRYPT', 'HEX', 'INET_NTOA', + 'LOAD_FILE', 'LOWER', + 'LTRIM', 'MD5', + 'MONTHNAME', 'OLD_PASSWORD', 'PASSWORD', + 'QUOTE', 'REVERSE', + 'RTRIM', 'SHA1', 'SOUNDEX', 'SPACE', + 'TRIM', 'UNCOMPRESS', 'UNHEX', 'UPPER', @@ -2972,8 +3005,11 @@ if ($cfg['ShowFunctionFields']) { 'DATE', 'FROM_DAYS', 'FROM_UNIXTIME', + 'LAST_DAY', 'NOW', 'SEC_TO_TIME', + 'SYSDATE', + 'TIME', 'TIMESTAMP', 'UTC_DATE', 'UTC_TIME', @@ -2991,31 +3027,46 @@ if ($cfg['ShowFunctionFields']) { 'BIT_COUNT', 'CEILING', 'CHAR_LENGTH', + 'CONNECTION_ID', 'COS', 'COT', 'CRC32', + 'DAYOFMONTH', + 'DAYOFWEEK', + 'DAYOFYEAR', 'DEGREES', 'EXP', 'FLOOR', + 'HOUR', 'INET_ATON', 'LENGTH', 'LN', 'LOG', 'LOG2', 'LOG10', + 'MICROSECOND', + 'MINUTE', + 'MONTH', 'OCT', 'ORD', + 'PI', + 'QUARTER', 'RADIANS', 'RAND', 'ROUND', + 'SECOND', + 'SIGN', + 'SIN', 'SQRT', - 'STDDEV_POP', - 'STDDEV_SAMP', 'TAN', + 'TO_DAYS', 'TIME_TO_SEC', + 'UNCOMPRESSED_LENGTH', 'UNIX_TIMESTAMP', - 'VAR_POP', - 'VAR_SAMP', + 'WEEK', + 'WEEKDAY', + 'WEEKOFYEAR', + 'YEARWEEK', ), 'FUNC_SPATIAL' => array( diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 50ae58b..bcafbb1 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -836,7 +836,7 @@ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) $fields = PMA_DBI_fetch_result( 'SHOW ' . ($full ? 'FULL' : '') . ' COLUMNS FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table), - 'Field', ($full ? null : 'Field'), $link); + 'Field', null, $link); if (! is_array($fields) || count($fields) < 1) { return false; } diff --git a/tbl_replace.php b/tbl_replace.php index b0c71e6..ab20d29 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -130,18 +130,27 @@ if (isset($_REQUEST['where_clause'])) { $query = array(); $value_sets = array(); $func_no_param = array( - 'NOW', + 'CONNECTION_ID', + 'CURRENT_USER', 'CURDATE', 'CURTIME', + 'DATABASE', + 'LAST_INSERT_ID', + 'NOW', + 'PI', + 'RAND', + 'SYSDATE', + 'UNIX_TIMESTAMP', + 'USER', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP', - 'UNIX_TIMESTAMP', - 'RAND', - 'USER', - 'LAST_INSERT_ID', 'UUID', - 'CURRENT_USER', + 'VERSION', +); +$func_optional_param = array( + 'RAND', + 'UNIX_TIMESTAMP', ); foreach ($loop_array as $rownumber => $where_clause) { @@ -225,16 +234,15 @@ foreach ($loop_array as $rownumber => $where_clause) { if (empty($me_funcs[$key])) { $cur_value = $val; - } elseif ('UNIX_TIMESTAMP' === $me_funcs[$key] && $val != "''") { - $cur_value = $me_funcs[$key] . '(' . $val . ')'; } elseif ('UUID' === $me_funcs[$key]) { /* This way user will know what UUID new row has */ $uuid = PMA_DBI_fetch_value('SELECT UUID()'); $cur_value = "'" . $uuid . "'"; - } elseif (in_array($me_funcs[$key], $func_no_param)) { - $cur_value = $me_funcs[$key] . '()'; - } else { + } elseif (!in_array($me_funcs[$key], $func_no_param) + || ($val != "''" && in_array($me_funcs[$key], $func_optional_param))) { $cur_value = $me_funcs[$key] . '(' . $val . ')'; + } else { + $cur_value = $me_funcs[$key] . '()'; } // i n s e r t diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index ba5a926..272c17b 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1729,7 +1729,7 @@ table#serverconnection_trg_local { */ input[type=text].invalid_value, .invalid_value { - background:#F00; + background:#FFCCCC; } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6479-g9fde1b5
by Madhura Jayaratne 01 Jul '11

01 Jul '11

The branch, master has been updated via 9fde1b5b23c00a1c9be499122f5d46d4d9b257f3 (commit) via 4d1540cc1c8136040968bcfb3a4629aad2551b3a (commit) from 2279fd9c98ee43acba942d08c0dd3ca987748a1c (commit) - Log ----------------------------------------------------------------- commit 9fde1b5b23c00a1c9be499122f5d46d4d9b257f3 Merge: 2279fd9c98ee43acba942d08c0dd3ca987748a1c 4d1540cc1c8136040968bcfb3a4629aad2551b3a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Jul 1 23:00:57 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/export.js | 25 +++++++++++++++---------- libraries/display_export.lib.php | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9d455e..b5a0cf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ phpMyAdmin - ChangeLog 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323101 [parser] Invalid escape sequence in SQL parser +- bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option 3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize diff --git a/js/export.js b/js/export.js index 1cf9de5..3fd3c00 100644 --- a/js/export.js +++ b/js/export.js @@ -89,18 +89,23 @@ $(document).ready(function() { /** * Toggles the disabling of the "save to file" options */ +function toggle_save_to_file() { + if($("#radio_dump_asfile:checked").length == 0) { + $("#ul_save_asfile > li").fadeTo('fast', 0.4); + $("#ul_save_asfile > li > input").attr('disabled', 'disabled'); + $("#ul_save_asfile > li> select").attr('disabled', 'disabled'); + } else { + $("#ul_save_asfile > li").fadeTo('fast', 1); + $("#ul_save_asfile > li > input").removeAttr('disabled'); + $("#ul_save_asfile > li> select").removeAttr('disabled'); + } +} + $(document).ready(function() { + toggle_save_to_file(); $("input[type='radio'][name='output_format']").change(function() { - if($("#radio_dump_asfile:checked").length == 0) { - $("#ul_save_asfile > li").fadeTo('fast', 0.4); - $("#ul_save_asfile > li > input").attr('disabled', 'disabled'); - $("#ul_save_asfile > li> select").attr('disabled', 'disabled'); - } else { - $("#ul_save_asfile > li").fadeTo('fast', 1); - $("#ul_save_asfile > li > input").removeAttr('disabled'); - $("#ul_save_asfile > li> select").removeAttr('disabled'); - } - }); + toggle_save_to_file(); + }); }); /** diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 9f10d77..e47b170 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -325,7 +325,7 @@ if(isset($_GET['sql_query'])) { <?php } ?> </ul> </li> - <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo isset($_GET['repopulate']) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li> + <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo (isset($_GET['repopulate']) || $GLOBALS['cfg']['Export']['asfile'] == false) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li> </ul> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3-14-g4d1540c
by Madhura Jayaratne 01 Jul '11

01 Jul '11

The branch, QA_3_4 has been updated via 4d1540cc1c8136040968bcfb3a4629aad2551b3a (commit) from 614639a5c5d94b9c693f7ec6e32c1a6e71a7e203 (commit) - Log ----------------------------------------------------------------- commit 4d1540cc1c8136040968bcfb3a4629aad2551b3a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Jul 1 22:58:35 2011 +0530 bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/export.js | 25 +++++++++++++++---------- libraries/display_export.lib.php | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71db213..4e47917 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323101 [parser] Invalid escape sequence in SQL parser +- bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option 3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize diff --git a/js/export.js b/js/export.js index 1cf9de5..3fd3c00 100644 --- a/js/export.js +++ b/js/export.js @@ -89,18 +89,23 @@ $(document).ready(function() { /** * Toggles the disabling of the "save to file" options */ +function toggle_save_to_file() { + if($("#radio_dump_asfile:checked").length == 0) { + $("#ul_save_asfile > li").fadeTo('fast', 0.4); + $("#ul_save_asfile > li > input").attr('disabled', 'disabled'); + $("#ul_save_asfile > li> select").attr('disabled', 'disabled'); + } else { + $("#ul_save_asfile > li").fadeTo('fast', 1); + $("#ul_save_asfile > li > input").removeAttr('disabled'); + $("#ul_save_asfile > li> select").removeAttr('disabled'); + } +} + $(document).ready(function() { + toggle_save_to_file(); $("input[type='radio'][name='output_format']").change(function() { - if($("#radio_dump_asfile:checked").length == 0) { - $("#ul_save_asfile > li").fadeTo('fast', 0.4); - $("#ul_save_asfile > li > input").attr('disabled', 'disabled'); - $("#ul_save_asfile > li> select").attr('disabled', 'disabled'); - } else { - $("#ul_save_asfile > li").fadeTo('fast', 1); - $("#ul_save_asfile > li > input").removeAttr('disabled'); - $("#ul_save_asfile > li> select").removeAttr('disabled'); - } - }); + toggle_save_to_file(); + }); }); /** diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 87c3a8e..3bc9c7f 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -325,7 +325,7 @@ if(isset($_GET['sql_query'])) { <?php } ?> </ul> </li> - <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo isset($_GET['repopulate']) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li> + <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo (isset($_GET['repopulate']) || $GLOBALS['cfg']['Export']['asfile'] == false) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li> </ul> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. 381d6b4d2f3d894e4ca6ceed4c4ca0ae6c9f95f7
by Michal Čihař 01 Jul '11

01 Jul '11

The branch, master has been updated via 381d6b4d2f3d894e4ca6ceed4c4ca0ae6c9f95f7 (commit) from 47f8b5b5dd42059dd6e0a723355ba7532121f5a0 (commit) - Log ----------------------------------------------------------------- commit 381d6b4d2f3d894e4ca6ceed4c4ca0ae6c9f95f7 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jul 1 16:20:07 2011 +0200 Remove adbard ----------------------------------------------------------------------- Summary of changes: theme/index.html.tmpl | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/theme/index.html.tmpl b/theme/index.html.tmpl index 66b1035..f1ceebd 100644 --- a/theme/index.html.tmpl +++ b/theme/index.html.tmpl @@ -170,17 +170,6 @@ new TWTR.Widget({ <a href="http://www.intertwingly.net/code/venus/"><img class="button" src="images/venus.png" width="80" height="15" alt="[Venus]"></a> </p> -<h3>Advertisement</h3> -<p> - -<script type='text/javascript'> - var ab_h = '22e342dc6a6a99267a46f18fc5dcecf1'; - var ab_s = 'e837f957b30be6f80f9c06167253766a'; -</script> -<script type='text/javascript' src='http://cdn1.adbard.net/js/ab2.js'></script> - -</p> - <h3>Planetarium</h3> <p> <ul> hooks/post-receive -- Planet phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6477-g2279fd9
by Michal Čihař 01 Jul '11

01 Jul '11

The branch, master has been updated via 2279fd9c98ee43acba942d08c0dd3ca987748a1c (commit) via e35bd7e265f6e3645aabebb5ca3e35aadd7c0466 (commit) via 71e32b614618c46c3094f17bcc566959ba3d3db8 (commit) via 246367f86e6dfc929ce36e86af87562b09b10eb7 (commit) via 0a7a170413058960ae97429aab458b5b0cf22e24 (commit) via 2fa65ecb9f16540b466fec8bd8bbec6638ea16ad (commit) via 8a1080e6339c6cc7a587861c32375d43e0aaf152 (commit) via 085e3ae448afd505779e248a273272fb7859d530 (commit) via 0d5c862daeae6e2d72f4ca9cbdb92d68c44a2426 (commit) via edcfcfb4bcda7e5889aaba0e90336830ada2ccb3 (commit) via 77d6daf4f8bd12f6a51c33cd32172deee248667c (commit) via 204007d24825d12d6f90cce16815daa2b7284d36 (commit) via d0ddec83e479f5f88fabaf8f79fd5518e8c3da1f (commit) via 33b1a5f354e8068fdcc828ca5023abd43f231bff (commit) from cbf00bca6ccbe25ec1210f860c0f2c3c22c5c3ea (commit) - Log ----------------------------------------------------------------- commit 2279fd9c98ee43acba942d08c0dd3ca987748a1c Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:48:41 2011 +0200 Translation update done using Pootle. commit e35bd7e265f6e3645aabebb5ca3e35aadd7c0466 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:37:17 2011 +0200 Translation update done using Pootle. commit 71e32b614618c46c3094f17bcc566959ba3d3db8 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:24:34 2011 +0200 Translation update done using Pootle. commit 246367f86e6dfc929ce36e86af87562b09b10eb7 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:22:08 2011 +0200 Translation update done using Pootle. commit 0a7a170413058960ae97429aab458b5b0cf22e24 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:19:53 2011 +0200 Translation update done using Pootle. commit 2fa65ecb9f16540b466fec8bd8bbec6638ea16ad Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:19:36 2011 +0200 Translation update done using Pootle. commit 8a1080e6339c6cc7a587861c32375d43e0aaf152 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:17:29 2011 +0200 Translation update done using Pootle. commit 085e3ae448afd505779e248a273272fb7859d530 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:12:51 2011 +0200 Translation update done using Pootle. commit 0d5c862daeae6e2d72f4ca9cbdb92d68c44a2426 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:10:42 2011 +0200 Translation update done using Pootle. commit edcfcfb4bcda7e5889aaba0e90336830ada2ccb3 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:10:19 2011 +0200 Translation update done using Pootle. commit 77d6daf4f8bd12f6a51c33cd32172deee248667c Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:10:16 2011 +0200 Translation update done using Pootle. commit 204007d24825d12d6f90cce16815daa2b7284d36 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:09:57 2011 +0200 Translation update done using Pootle. commit d0ddec83e479f5f88fabaf8f79fd5518e8c3da1f Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:09:41 2011 +0200 Translation update done using Pootle. commit 33b1a5f354e8068fdcc828ca5023abd43f231bff Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:05:38 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 3b28f6e..cf21f9a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-27 10:29+0200\n" -"PO-Revision-Date: 2011-06-15 13:55+0200\n" -"Last-Translator: Jose Ivan Bezerra Vilarouca Filho <joseivan(a)lavid.ufpb.br>\n" +"PO-Revision-Date: 2011-06-30 23:48+0200\n" +"Last-Translator: <wiltave(a)gmail.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -412,7 +412,7 @@ msgstr[1] "%s tabelas" #: db_qbe.php:41 msgid "You have to choose at least one column to display" -msgstr "Deve escolher pelo menos uma coluna para exibir" +msgstr "Você deve escolher pelo menos uma coluna para exibir" #: db_qbe.php:186 msgid "Switch to" @@ -514,10 +514,10 @@ msgstr[0] "" msgstr[1] "" #: db_routines.php:167 -#, fuzzy, php-format +#, php-format #| msgid "Allows executing stored routines." msgid "Execution results of routine %s" -msgstr "Permitir executar stored routines." +msgstr "Resultados da execução da rotina %s" #: db_routines.php:187 libraries/import.lib.php:153 sql.php:678 #: tbl_change.php:180 tbl_get_field.php:34 @@ -7212,7 +7212,7 @@ msgstr "Nenhum" #: libraries/tbl_properties.inc.php:378 msgid "As defined:" -msgstr "" +msgstr "Como definido:" #: libraries/tbl_properties.inc.php:497 tbl_structure.php:155 #: tbl_structure.php:160 tbl_structure.php:605 @@ -7255,9 +7255,8 @@ msgid "PARTITION definition" msgstr "Definição da PARTIÇÃO" #: libraries/tbl_properties.inc.php:776 -#, fuzzy msgid "+ Add a value" -msgstr "Adicionar novo usuário" +msgstr "+ Adicionar um valor" #: libraries/transformations/application_octetstream__download.inc.php:9 #, fuzzy @@ -10449,7 +10448,7 @@ msgstr "" #: tbl_structure.php:165 tbl_structure.php:169 msgid "Browse distinct values" -msgstr "Navegador distingue valores" +msgstr "Procurar valores distintos" #: tbl_structure.php:170 tbl_structure.php:171 msgid "Add primary key" @@ -10514,10 +10513,9 @@ msgid "Propose table structure" msgstr "Propor estrutura da tabela" #: tbl_structure.php:676 -#, fuzzy #| msgid "Add %s field(s)" msgid "Add column" -msgstr "Adicionar %s campo(s)" +msgstr "Adicionar coluna" #: tbl_structure.php:690 msgid "At End of Table" @@ -10619,7 +10617,7 @@ msgstr "Excluir dados de monitoramento desta tabela" #, fuzzy #| msgid "No databases" msgid "No data" -msgstr "Sem bases" +msgstr "Não existem dados" #: tbl_tracking.php:453 tbl_tracking.php:510 msgid "Date" @@ -10664,7 +10662,7 @@ msgid "Version" msgstr "Versão" #: tbl_tracking.php:692 -#, fuzzy, php-format +#, php-format msgid "Deactivate tracking for %s.%s" msgstr "Desativar rastreamento para %s.%s" @@ -10687,12 +10685,14 @@ msgid "Create version %s of %s.%s" msgstr "Criar versão %s de %s.%s" #: tbl_tracking.php:724 +#, fuzzy msgid "Track these data definition statements:" -msgstr "" +msgstr "Rastrear estas instruções de definição de dados:" #: tbl_tracking.php:732 +#, fuzzy msgid "Track these data manipulation statements:" -msgstr "" +msgstr "Rastrear estas instruções de manipulação de dados:" #: tbl_tracking.php:740 msgid "Create version" hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git July 2011