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 1a478b7874..0e0b9c8ad4 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 50ae58b736..bcafbb190c 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/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/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 8fd73de361..3a39bc6cb8 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -876,7 +876,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $order_img = ' '. __('Ascending') . ''; } - if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@i', $unsorted_sql_query, $regs3)) { + if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@is', $unsorted_sql_query, $regs3)) { $sorted_sql_query = $regs3[1] . $sort_order . $regs3[2]; } else { $sorted_sql_query = $unsorted_sql_query . $sort_order; diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 1c48982268..ac804674b2 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -206,7 +206,7 @@ function PMA_replication_get_username_hostname_length() { $fields_info = PMA_DBI_get_columns('mysql', 'user'); $username_length = 16; $hostname_length = 41; - foreach ($fields_info as $key => $val) { + foreach ($fields_info as $val) { if ($val['Field'] == 'User') { strtok($val['Type'], '()'); $v = strtok('()'); diff --git a/po/br.po b/po/br.po index c48d96aa61..c9cef09359 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ 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-29 13:00+0200\n" +"PO-Revision-Date: 2011-06-29 20:12+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -2127,26 +2127,26 @@ msgstr "Meneger servijer faziek : %s" #: libraries/common.inc.php:637 #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." -msgstr "" +msgstr "Anv ostiz direizh evit ar servijer %1$s. Gwiriit ar c'hefluniadur." #: libraries/common.inc.php:646 libraries/config/messages.inc.php:495 #: libraries/header.inc.php:129 main.php:161 server_synchronize.php:1170 msgid "Server" -msgstr "" +msgstr "Servijer" #: libraries/common.inc.php:825 msgid "Invalid authentication method set in configuration:" -msgstr "" +msgstr "Termenet ez eus bet c'hefluniadur un hentenn dilesa direizh." #: libraries/common.inc.php:928 #, php-format msgid "You should upgrade to %s %s or later." -msgstr "" +msgstr "Ret e vefe deoc'h ober gant ar stumm %s %s pe unan nevesoc'h c'hoazh." #: libraries/common.lib.php:134 #, php-format msgid "Max: %s%s" -msgstr "" +msgstr "Ment vrasañ : %s%s" #. l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:386 @@ -2175,123 +2175,123 @@ msgstr "en" #: libraries/sql_query_form.lib.php:428 libraries/sql_query_form.lib.php:431 #: main.php:212 server_variables.php:114 msgid "Documentation" -msgstr "" +msgstr "Teuliadur" #: libraries/common.lib.php:573 libraries/header_printview.inc.php:60 #: server_status.php:260 server_status.php:803 msgid "SQL query" -msgstr "" +msgstr "Reked SQL" #: libraries/common.lib.php:1078 msgid "Failed to connect to SQL validator!" -msgstr "" +msgstr "DIbosupl kevreañ d'ar c'hadarnataer SQL !" #: libraries/common.lib.php:1119 libraries/config/messages.inc.php:472 msgid "Explain SQL" -msgstr "" +msgstr "Displegañ SQL" #: libraries/common.lib.php:1123 msgid "Skip Explain SQL" -msgstr "" +msgstr "N'eo ket dav displegañ SQL" #: libraries/common.lib.php:1157 msgid "Without PHP Code" -msgstr "" +msgstr "Hep kod PHP" #: libraries/common.lib.php:1160 libraries/config/messages.inc.php:474 msgid "Create PHP Code" -msgstr "" +msgstr "Krouiñ kod PHP" #: libraries/common.lib.php:1178 libraries/config/messages.inc.php:473 #: server_status.php:410 server_status.php:436 server_status.php:457 msgid "Refresh" -msgstr "" +msgstr "Freskaat" #: libraries/common.lib.php:1187 msgid "Skip Validate SQL" -msgstr "" +msgstr "N'eo ket dav kadarnaat SQL" #: libraries/common.lib.php:1190 libraries/config/messages.inc.php:476 msgid "Validate SQL" -msgstr "" +msgstr "Kadarnaat SQL" #: libraries/common.lib.php:1245 msgid "Inline edit of this query" -msgstr "" +msgstr "Kemmañ ar reked-mañ enlinenn" #: libraries/common.lib.php:1247 msgid "Inline" -msgstr "" +msgstr "Enlinenn" #: libraries/common.lib.php:1314 sql.php:931 msgid "Profiling" -msgstr "" +msgstr "O profilañ" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ #: libraries/common.lib.php:1334 msgid "B" -msgstr "" +msgstr "o" #: libraries/common.lib.php:1334 msgid "KiB" -msgstr "" +msgstr "Kio" #: libraries/common.lib.php:1334 msgid "MiB" -msgstr "" +msgstr "Mio" #: libraries/common.lib.php:1334 msgid "GiB" -msgstr "" +msgstr "Gio" #: libraries/common.lib.php:1334 msgid "TiB" -msgstr "" +msgstr "Tio" #: libraries/common.lib.php:1334 msgid "PiB" -msgstr "" +msgstr "Pio" #: libraries/common.lib.php:1334 msgid "EiB" -msgstr "" +msgstr "Eio" #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string #: libraries/common.lib.php:1552 #: libraries/transformations/text_plain__dateformat.inc.php:33 msgid "%B %d, %Y at %I:%M %p" -msgstr "" +msgstr "%A %d %B %Y da %H:%M" #: libraries/common.lib.php:1867 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" -msgstr "" +msgstr "%s deiz, %s eur, %s munut ha %s eilenn" #: libraries/common.lib.php:2278 libraries/common.lib.php:2281 #: libraries/display_tbl.lib.php:307 msgid "Begin" -msgstr "" +msgstr "Kregiñ" #: libraries/common.lib.php:2279 libraries/common.lib.php:2282 #: libraries/display_tbl.lib.php:308 server_binlog.php:154 #: server_binlog.php:156 msgid "Previous" -msgstr "" +msgstr "Kent" #: libraries/common.lib.php:2309 libraries/common.lib.php:2312 #: libraries/display_tbl.lib.php:387 msgid "End" -msgstr "" +msgstr "Fin" #: libraries/common.lib.php:2384 #, php-format msgid "Jump to database "%s"." -msgstr "" +msgstr "Mont d'an diaz roadennoù "%s"." #: libraries/common.lib.php:2403 #, php-format msgid "The %s functionality is affected by a known bug, see %s" -msgstr "" +msgstr "Direizhet eo an arc'hwel %s gant un draen anavezet, sellit ouzh %s" #: libraries/common.lib.php:2760 libraries/common.lib.php:2767 #: libraries/common.lib.php:2955 libraries/config/setup.forms.php:295 @@ -2304,7 +2304,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:623 pmd_general.php:151 #: server_privileges.php:513 server_replication.php:313 tbl_tracking.php:262 msgid "Structure" -msgstr "" +msgstr "Framm" #: libraries/common.lib.php:2761 libraries/common.lib.php:2768 #: libraries/config/messages.inc.php:214 libraries/db_links.inc.php:53 @@ -2312,89 +2312,89 @@ msgstr "" #: libraries/server_links.inc.php:47 libraries/tbl_links.inc.php:65 #: querywindow.php:88 msgid "SQL" -msgstr "" +msgstr "SQL" #: libraries/common.lib.php:2763 libraries/common.lib.php:2953 #: libraries/common.lib.php:2954 libraries/sql_query_form.lib.php:318 #: libraries/sql_query_form.lib.php:321 libraries/tbl_links.inc.php:74 msgid "Insert" -msgstr "" +msgstr "Ensoc'hañ" #: libraries/common.lib.php:2770 libraries/db_links.inc.php:86 #: libraries/tbl_links.inc.php:93 libraries/tbl_links.inc.php:113 #: view_operations.php:87 msgid "Operations" -msgstr "" +msgstr "Oberiadennoù" #: libraries/common.lib.php:2900 msgid "Browse your computer:" -msgstr "" +msgstr "Furchal en hoc'h urzhiataer" #: libraries/common.lib.php:2916 #, php-format msgid "Select from the web server upload directory %s:" -msgstr "" +msgstr "Diuzit e-mesk kavlec'h pellgargañ ar servijer web %s :" #: libraries/common.lib.php:2928 libraries/sql_query_form.lib.php:499 #: tbl_change.php:884 msgid "The directory you set for upload work cannot be reached" -msgstr "" +msgstr "Ar c'havlec'h treuzkas n'hall ket bezañ diraezet." #: libraries/common.lib.php:2936 msgid "There are no files to upload" -msgstr "" +msgstr "N'eus restr ebet da enporzhiañ" #: libraries/common.lib.php:2964 libraries/common.lib.php:2965 msgid "Execute" -msgstr "" +msgstr "Seveniñ" #: libraries/config.values.php:45 libraries/config.values.php:47 #: libraries/config.values.php:51 msgid "Both" -msgstr "" +msgstr "An daou" #: libraries/config.values.php:47 msgid "Nowhere" -msgstr "" +msgstr "Neblec'h" #: libraries/config.values.php:47 msgid "Left" -msgstr "" +msgstr "Kleiz" #: libraries/config.values.php:47 msgid "Right" -msgstr "" +msgstr "Dehou" #: libraries/config.values.php:75 msgid "Open" -msgstr "" +msgstr "Digor" #: libraries/config.values.php:75 msgid "Closed" -msgstr "" +msgstr "Serr" #: libraries/config.values.php:96 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:122 libraries/export/texytext.php:24 #: libraries/import.lib.php:1172 msgid "structure" -msgstr "" +msgstr "Framm" #: libraries/config.values.php:97 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:123 libraries/export/texytext.php:24 msgid "data" -msgstr "" +msgstr "roadennoù" #: libraries/config.values.php:98 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:124 libraries/export/texytext.php:24 msgid "structure and data" -msgstr "" +msgstr "Framm ha roadennoù" #: libraries/config.values.php:100 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "Prim - na ziskouez nemet nebeudik-tre a zibarzhioù da gefluniañ" #: libraries/config.values.php:101 msgid "Custom - display all possible options to configure" 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/server_privileges.php b/server_privileges.php index 7cd802f232..0e75d39873 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -666,7 +666,7 @@ function PMA_displayLoginInformationFields($mode = 'new') $fields_info = PMA_DBI_get_columns('mysql', 'user', true); $username_length = 16; $hostname_length = 41; - foreach ($fields_info as $key => $val) { + foreach ($fields_info as $val) { if ($val['Field'] == 'User') { strtok($val['Type'], '()'); $v = strtok('()'); 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 ba5a926c38..272c17be9f 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; } /**