diff --git a/ChangeLog b/ChangeLog index d9d455ec7b..b5a0cf0a28 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 1cf9de50b7..3fd3c00e9d 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/config.default.php b/libraries/config.default.php index 44e008fe7d..6a406de8f2 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/display_export.lib.php b/libraries/display_export.lib.php index 9f10d77cce..e47b170fdf 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -325,7 +325,7 @@ if(isset($_GET['sql_query'])) { -
  • />
    • +
  • />
    • diff --git a/po/pt_BR.po b/po/pt_BR.po index 3b28f6ea1d..cf21f9afe8 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@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 \n" +"PO-Revision-Date: 2011-06-30 23:48+0200\n" +"Last-Translator: \n" "Language-Team: brazilian_portuguese \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" diff --git a/tbl_replace.php b/tbl_replace.php index b0c71e6427..ab20d29453 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 507aee5599..782e29cf4f 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; } /**