- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3166-gdb07b65
by Piotr Przybylski 06 Jun '11

06 Jun '11

The branch, master has been updated via db07b65c657162ce04c50ec1164390f0fb68b905 (commit) from 41376df2b088a83778067d1f4f6e7c7669ab3561 (commit) - Log ----------------------------------------------------------------- commit db07b65c657162ce04c50ec1164390f0fb68b905 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Mon Jun 6 16:40:43 2011 +0200 Add missing 'server' argument to PMA_reloadRecentTable Was causing token regeneration on non-default servers, if the next action required valid token it would fail ----------------------------------------------------------------------- Summary of changes: js/navigation.js | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 7f9a013..20aea18 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -171,13 +171,16 @@ function clear_fast_filter() { * Reloads the recent tables list. */ function PMA_reloadRecentTable() { - $.get('navigation.php', - { 'token' : window.parent.token, 'ajax_request' : true, 'recent_table' : true }, - function (data) { - if (data.success == true) { - $('#recentTable').html(data.options); - } - }); + $.get('navigation.php', { + 'token': window.parent.token, + 'server': window.parent.server, + 'ajax_request': true, + 'recent_table': true}, + function (data) { + if (data.success == true) { + $('#recentTable').html(data.options); + } + }); } /* Performed on load */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3165-g41376df
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via 41376df2b088a83778067d1f4f6e7c7669ab3561 (commit) via 91c16608f8afa5d51975bd5e7aa54a828662da83 (commit) via 55d8b1efa04851fc1572154dead2d77820cb596d (commit) via 9b0b9b0b59311aa3274e5ed2060d47240504bfd0 (commit) via 0c964ca10ba0f7b2181332517bd8c62149626500 (commit) via c13e64468b9afed3f5963debbf01533f07bce444 (commit) via 4b3b0c616cc34f9f68da24553741a5e4096e1370 (commit) via cbd0b7d8f7a4887365170251fdd26fb6d44e9af5 (commit) via 6c6ae1c1cc8fec669749f9fbcbdb862b81d206d5 (commit) from d147fd26db0cf8a5965c640c3047494acc2b9d44 (commit) - Log ----------------------------------------------------------------- commit 41376df2b088a83778067d1f4f6e7c7669ab3561 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:36:57 2011 +0200 Properly end multi word links commit 91c16608f8afa5d51975bd5e7aa54a828662da83 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:33:22 2011 +0200 Documentation for other reserved words commit 55d8b1efa04851fc1572154dead2d77820cb596d Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:21:23 2011 +0200 Add documentation links to function names commit 9b0b9b0b59311aa3274e5ed2060d47240504bfd0 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:13:33 2011 +0200 Move doc back to correct place commit 0c964ca10ba0f7b2181332517bd8c62149626500 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 16:12:33 2011 +0200 Provide doc links for operators commit c13e64468b9afed3f5963debbf01533f07bce444 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 15:58:06 2011 +0200 Coding style commit 4b3b0c616cc34f9f68da24553741a5e4096e1370 Author: Mateusz Lewandowski <gandalfml(a)users.sourceforge.net> Date: Mon Jun 6 15:56:58 2011 +0200 Add data for documentation links. commit cbd0b7d8f7a4887365170251fdd26fb6d44e9af5 Merge: d147fd26db0cf8a5965c640c3047494acc2b9d44 6c6ae1c1cc8fec669749f9fbcbdb862b81d206d5 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 15:54:29 2011 +0200 Merge branch 'integration' Conflicts: libraries/sqlparser.lib.php commit 6c6ae1c1cc8fec669749f9fbcbdb862b81d206d5 Author: Mateusz Lewandowski <gandalfml(a)users.sourceforge.net> Date: Tue Apr 5 21:30:20 2011 +0200 Better names for some variables ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.data.php | 266 ++++++++++++++++++++++++++++++++++++++++++ libraries/sqlparser.lib.php | 55 +++++++-- 2 files changed, 312 insertions(+), 9 deletions(-) diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 5011ca7..d1c4b16 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -1222,4 +1222,270 @@ $PMA_SQPdata_column_type = array ( 'YEAR' ); +/** + * Documentation links for operators. + */ +$PMA_SQPdata_operators_docs = array( + '!=' => array('link' => 'comparison-operators','anchor' => 'operator_not-equal'), + '<>' => array('link' => 'comparison-operators','anchor' => 'operator_not-equal'), + '!' => array('link' => 'logical-operators','anchor' => 'operator_not'), + '||' => array('link' => 'logical-operators','anchor' => 'operator_or'), + '+' => array('link' => 'arithmetic-functions','anchor' => 'operator_plus'), + '>>' => array('link' => 'bit-functions','anchor' => 'operator_right-shift'), + '-' => array('link' => 'arithmetic-functions','anchor' => 'operator_minus'), + '*' => array('link' => 'arithmetic-functions','anchor' => 'operator_times'), + '&&' => array('link' => 'logical-operators','anchor' => 'operator_and'), + '&' => array('link' => 'bit-functions','anchor' => 'operator_bitwise-and'), + '~' => array('link' => 'bit-functions','anchor' => 'operator_bitwise-invert'), + '|' => array('link' => 'bit-functions','anchor' => 'operator_bitwise-or'), + '^' => array('link' => 'bit-functions','anchor' => 'operator_bitwise-xor'), + '=' => array('link' => 'assignment-operators','anchor' => 'operator_assign-equal'), + ':=' => array('link' => 'assignment-operators','anchor' => 'operator_assign-value'), + '/' => array('link' => 'arithmetic-functions','anchor' => 'operator_divide'), + '<=>' => array('link' => 'comparison-operators','anchor' => 'operator_equal-to'), + '=' => array('link' => 'comparison-operators','anchor' => 'operator_equal'), + '>=' => array('link' => 'comparison-operators','anchor' => 'operator_greater-than-or-equal'), + '>' => array('link' => 'comparison-operators','anchor' => 'operator_greater-than'), + '<<' => array('link' => 'bit-functions','anchor' => 'operator_left-shift'), + '<=' => array('link' => 'comparison-operators','anchor' => 'operator_less-than-or-equal'), + '<' => array('link' => 'comparison-operators','anchor' => 'operator_less-than'), + '%' => array('link' => 'arithmetic-functions','anchor' => 'operator_mod') +); + +/** + * Documentation links for functions. + */ +$PMA_SQPdata_functions_docs = array( + 'ABS' => array('link' => 'mathematical-functions','anchor' => 'function_abs'), + 'ACOS' => array('link' => 'mathematical-functions','anchor' => 'function_acos'), + 'ADDDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_adddate'), + 'ADDTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_addtime'), + 'AES_DECRYPT' => array('link' => 'encryption-functions','anchor' => 'function_aes_decrypt'), + 'AES_ENCRYPT' => array('link' => 'encryption-functions','anchor' => 'function_aes_encrypt'), + 'AND' => array('link' => 'logical-operators','anchor' => 'operator_and'), + 'ASCII' => array('link' => 'string-functions','anchor' => 'function_ascii'), + 'ASIN' => array('link' => 'mathematical-functions','anchor' => 'function_asin'), + 'ATAN2' => array('link' => 'mathematical-functions','anchor' => 'function_atan2'), + 'ATAN' => array('link' => 'mathematical-functions','anchor' => 'function_atan2'), + 'ATAN' => array('link' => 'mathematical-functions','anchor' => 'function_atan'), + 'AVG' => array('link' => 'group-by-functions','anchor' => 'function_avg'), + 'BENCHMARK' => array('link' => 'information-functions','anchor' => 'function_benchmark'), + 'BIN' => array('link' => 'string-functions','anchor' => 'function_bin'), + 'BINARY' => array('link' => 'cast-functions','anchor' => 'operator_binary'), + 'BIT_AND' => array('link' => 'group-by-functions','anchor' => 'function_bit_and'), + 'BIT_COUNT' => array('link' => 'bit-functions','anchor' => 'function_bit_count'), + 'BIT_LENGTH' => array('link' => 'string-functions','anchor' => 'function_bit_length'), + 'BIT_OR' => array('link' => 'group-by-functions','anchor' => 'function_bit_or'), + 'BIT_XOR' => array('link' => 'group-by-functions','anchor' => 'function_bit_xor'), + 'CASE' => array('link' => 'control-flow-functions','anchor' => 'operator_case'), + 'CAST' => array('link' => 'cast-functions','anchor' => 'function_cast'), + 'CEIL' => array('link' => 'mathematical-functions','anchor' => 'function_ceil'), + 'CEILING' => array('link' => 'mathematical-functions','anchor' => 'function_ceiling'), + 'CHAR_LENGTH' => array('link' => 'string-functions','anchor' => 'function_char_length'), + 'CHAR' => array('link' => 'string-functions','anchor' => 'function_char'), + 'CHARACTER_LENGTH' => array('link' => 'string-functions','anchor' => 'function_character_length'), + 'CHARSET' => array('link' => 'information-functions','anchor' => 'function_charset'), + 'COALESCE' => array('link' => 'comparison-operators','anchor' => 'function_coalesce'), + 'COERCIBILITY' => array('link' => 'information-functions','anchor' => 'function_coercibility'), + 'COLLATION' => array('link' => 'information-functions','anchor' => 'function_collation'), + 'COMPRESS' => array('link' => 'encryption-functions','anchor' => 'function_compress'), + 'CONCAT_WS' => array('link' => 'string-functions','anchor' => 'function_concat_ws'), + 'CONCAT' => array('link' => 'string-functions','anchor' => 'function_concat'), + 'CONNECTION_ID' => array('link' => 'information-functions','anchor' => 'function_connection_id'), + 'CONV' => array('link' => 'mathematical-functions','anchor' => 'function_conv'), + 'CONVERT_TZ' => array('link' => 'date-and-time-functions','anchor' => 'function_convert_tz'), + 'Convert' => array('link' => 'cast-functions','anchor' => 'function_convert'), + 'COS' => array('link' => 'mathematical-functions','anchor' => 'function_cos'), + 'COT' => array('link' => 'mathematical-functions','anchor' => 'function_cot'), + 'COUNT' => array('link' => 'group-by-functions','anchor' => 'function_count'), + 'CRC32' => array('link' => 'mathematical-functions','anchor' => 'function_crc32'), + 'CURDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_curdate'), + 'CURRENT_DATE' => array('link' => 'date-and-time-functions','anchor' => 'function_current_date'), + 'CURRENT_TIME' => array('link' => 'date-and-time-functions','anchor' => 'function_current_time'), + 'CURRENT_TIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_current_timestamp'), + 'CURRENT_USER' => array('link' => 'information-functions','anchor' => 'function_current_user'), + 'CURTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_curtime'), + 'DATABASE' => array('link' => 'information-functions','anchor' => 'function_database'), + 'DATE_ADD' => array('link' => 'date-and-time-functions','anchor' => 'function_date_add'), + 'DATE_FORMAT' => array('link' => 'date-and-time-functions','anchor' => 'function_date_format'), + 'DATE_SUB' => array('link' => 'date-and-time-functions','anchor' => 'function_date_sub'), + 'DATE' => array('link' => 'date-and-time-functions','anchor' => 'function_date'), + 'DATEDIFF' => array('link' => 'date-and-time-functions','anchor' => 'function_datediff'), + 'DAY' => array('link' => 'date-and-time-functions','anchor' => 'function_day'), + 'DAYNAME' => array('link' => 'date-and-time-functions','anchor' => 'function_dayname'), + 'DAYOFMONTH' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofmonth'), + 'DAYOFWEEK' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofweek'), + 'DAYOFYEAR' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofyear'), + 'DECODE' => array('link' => 'encryption-functions','anchor' => 'function_decode'), + 'DEFAULT' => array('link' => 'miscellaneous-functions','anchor' => 'function_default'), + 'DEGREES' => array('link' => 'mathematical-functions','anchor' => 'function_degrees'), + 'DES_DECRYPT' => array('link' => 'encryption-functions','anchor' => 'function_des_decrypt'), + 'DES_ENCRYPT' => array('link' => 'encryption-functions','anchor' => 'function_des_encrypt'), + 'DIV' => array('link' => 'arithmetic-functions','anchor' => 'operator_div'), + 'ELT' => array('link' => 'string-functions','anchor' => 'function_elt'), + 'ENCODE' => array('link' => 'encryption-functions','anchor' => 'function_encode'), + 'ENCRYPT' => array('link' => 'encryption-functions','anchor' => 'function_encrypt'), + 'EXP' => array('link' => 'mathematical-functions','anchor' => 'function_exp'), + 'EXPORT_SET' => array('link' => 'string-functions','anchor' => 'function_export_set'), + 'EXTRACT' => array('link' => 'date-and-time-functions','anchor' => 'function_extract'), + 'ExtractValue' => array('link' => 'xml-functions','anchor' => 'function_extractvalue'), + 'FIELD' => array('link' => 'string-functions','anchor' => 'function_field'), + 'FIND_IN_SET' => array('link' => 'string-functions','anchor' => 'function_find_in_set'), + 'FLOOR' => array('link' => 'mathematical-functions','anchor' => 'function_floor'), + 'FORMAT' => array('link' => 'string-functions','anchor' => 'function_format'), + 'FOUND_ROWS' => array('link' => 'information-functions','anchor' => 'function_found_rows'), + 'FROM_DAYS' => array('link' => 'date-and-time-functions','anchor' => 'function_from_days'), + 'FROM_UNIXTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_from_unixtime'), + 'GET_FORMAT' => array('link' => 'date-and-time-functions','anchor' => 'function_get_format'), + 'GET_LOCK' => array('link' => 'miscellaneous-functions','anchor' => 'function_get_lock'), + 'GREATEST' => array('link' => 'comparison-operators','anchor' => 'function_greatest'), + 'GROUP_CONCAT' => array('link' => 'group-by-functions','anchor' => 'function_group_concat'), + 'HEX' => array('link' => 'string-functions','anchor' => 'function_hex'), + 'HOUR' => array('link' => 'date-and-time-functions','anchor' => 'function_hour'), + 'IF' => array('link' => 'control-flow-functions','anchor' => 'function_if'), + 'IFNULL' => array('link' => 'control-flow-functions','anchor' => 'function_ifnull'), + 'IN' => array('link' => 'comparison-operators','anchor' => 'function_in'), + 'INET_ATON' => array('link' => 'miscellaneous-functions','anchor' => 'function_inet_aton'), + 'INET_NTOA' => array('link' => 'miscellaneous-functions','anchor' => 'function_inet_ntoa'), + 'INSERT' => array('link' => 'string-functions','anchor' => 'function_insert'), + 'INSTR' => array('link' => 'string-functions','anchor' => 'function_instr'), + 'INTERVAL' => array('link' => 'comparison-operators','anchor' => 'function_interval'), + 'IS_FREE_LOCK' => array('link' => 'miscellaneous-functions','anchor' => 'function_is_free_lock'), + 'IS_USED_LOCK' => array('link' => 'miscellaneous-functions','anchor' => 'function_is_used_lock'), + 'IS' => array('link' => 'comparison-operators','anchor' => 'operator_is'), + 'ISNULL' => array('link' => 'comparison-operators','anchor' => 'function_isnull'), + 'LAST_DAY' => array('link' => 'date-and-time-functions','anchor' => 'function_last_day'), + 'LAST_INSERT_ID' => array('link' => 'information-functions','anchor' => 'function_last_insert_id'), + 'LCASE' => array('link' => 'string-functions','anchor' => 'function_lcase'), + 'LEAST' => array('link' => 'comparison-operators','anchor' => 'function_least'), + 'LEFT' => array('link' => 'string-functions','anchor' => 'function_left'), + 'LENGTH' => array('link' => 'string-functions','anchor' => 'function_length'), + 'LIKE' => array('link' => 'string-comparison-functions','anchor' => 'operator_like'), + 'LN' => array('link' => 'mathematical-functions','anchor' => 'function_ln'), + 'LOAD_FILE' => array('link' => 'string-functions','anchor' => 'function_load_file'), + 'LOCALTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_localtime'), + 'LOCALTIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_localtimestamp'), + 'LOCATE' => array('link' => 'string-functions','anchor' => 'function_locate'), + 'LOG10' => array('link' => 'mathematical-functions','anchor' => 'function_log10'), + 'LOG2' => array('link' => 'mathematical-functions','anchor' => 'function_log2'), + 'LOG' => array('link' => 'mathematical-functions','anchor' => 'function_log'), + 'LOWER' => array('link' => 'string-functions','anchor' => 'function_lower'), + 'LPAD' => array('link' => 'string-functions','anchor' => 'function_lpad'), + 'LTRIM' => array('link' => 'string-functions','anchor' => 'function_ltrim'), + 'MAKE_SET' => array('link' => 'string-functions','anchor' => 'function_make_set'), + 'MAKEDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_makedate'), + 'MAKETIME' => array('link' => 'date-and-time-functions','anchor' => 'function_maketime'), + 'MASTER_POS_WAIT' => array('link' => 'miscellaneous-functions','anchor' => 'function_master_pos_wait'), + 'MATCH' => array('link' => 'fulltext-search','anchor' => 'function_match'), + 'MAX' => array('link' => 'group-by-functions','anchor' => 'function_max'), + 'MD5' => array('link' => 'encryption-functions','anchor' => 'function_md5'), + 'MICROSECOND' => array('link' => 'date-and-time-functions','anchor' => 'function_microsecond'), + 'MID' => array('link' => 'string-functions','anchor' => 'function_mid'), + 'MIN' => array('link' => 'group-by-functions','anchor' => 'function_min'), + 'MINUTE' => array('link' => 'date-and-time-functions','anchor' => 'function_minute'), + 'MOD' => array('link' => 'mathematical-functions','anchor' => 'function_mod'), + 'MONTH' => array('link' => 'date-and-time-functions','anchor' => 'function_month'), + 'MONTHNAME' => array('link' => 'date-and-time-functions','anchor' => 'function_monthname'), + 'NAME_CONST' => array('link' => 'miscellaneous-functions','anchor' => 'function_name_const'), + 'NOT' => array('link' => 'logical-operators','anchor' => 'operator_not'), + 'NOW' => array('link' => 'date-and-time-functions','anchor' => 'function_now'), + 'NULLIF' => array('link' => 'control-flow-functions','anchor' => 'function_nullif'), + 'OCT' => array('link' => 'mathematical-functions','anchor' => 'function_oct'), + 'OCTET_LENGTH' => array('link' => 'string-functions','anchor' => 'function_octet_length'), + 'OLD_PASSWORD' => array('link' => 'encryption-functions','anchor' => 'function_old_password'), + 'OR' => array('link' => 'logical-operators','anchor' => 'operator_or'), + 'ORD' => array('link' => 'string-functions','anchor' => 'function_ord'), + 'PASSWORD' => array('link' => 'encryption-functions','anchor' => 'function_password'), + 'PERIOD_ADD' => array('link' => 'date-and-time-functions','anchor' => 'function_period_add'), + 'PERIOD_DIFF' => array('link' => 'date-and-time-functions','anchor' => 'function_period_diff'), + 'PI' => array('link' => 'mathematical-functions','anchor' => 'function_pi'), + 'POSITION' => array('link' => 'string-functions','anchor' => 'function_position'), + 'POW' => array('link' => 'mathematical-functions','anchor' => 'function_pow'), + 'POWER' => array('link' => 'mathematical-functions','anchor' => 'function_power'), + 'QUARTER' => array('link' => 'date-and-time-functions','anchor' => 'function_quarter'), + 'QUOTE' => array('link' => 'string-functions','anchor' => 'function_quote'), + 'RADIANS' => array('link' => 'mathematical-functions','anchor' => 'function_radians'), + 'RAND' => array('link' => 'mathematical-functions','anchor' => 'function_rand'), + 'REGEXP' => array('link' => 'regexp','anchor' => 'operator_regexp'), + 'RELEASE_LOCK' => array('link' => 'miscellaneous-functions','anchor' => 'function_release_lock'), + 'REPEAT' => array('link' => 'string-functions','anchor' => 'function_repeat'), + 'REPLACE' => array('link' => 'string-functions','anchor' => 'function_replace'), + 'REVERSE' => array('link' => 'string-functions','anchor' => 'function_reverse'), + 'RIGHT' => array('link' => 'string-functions','anchor' => 'function_right'), + 'RLIKE' => array('link' => 'regexp','anchor' => 'operator_rlike'), + 'ROUND' => array('link' => 'mathematical-functions','anchor' => 'function_round'), + 'ROW_COUNT' => array('link' => 'information-functions','anchor' => 'function_row_count'), + 'RPAD' => array('link' => 'string-functions','anchor' => 'function_rpad'), + 'RTRIM' => array('link' => 'string-functions','anchor' => 'function_rtrim'), + 'SCHEMA' => array('link' => 'information-functions','anchor' => 'function_schema'), + 'SEC_TO_TIME' => array('link' => 'date-and-time-functions','anchor' => 'function_sec_to_time'), + 'SECOND' => array('link' => 'date-and-time-functions','anchor' => 'function_second'), + 'SESSION_USER' => array('link' => 'information-functions','anchor' => 'function_session_user'), + 'SHA' => array('link' => 'encryption-functions','anchor' => 'function_sha1'), + 'SHA1' => array('link' => 'encryption-functions','anchor' => 'function_sha1'), + 'SIGN' => array('link' => 'mathematical-functions','anchor' => 'function_sign'), + 'SIN' => array('link' => 'mathematical-functions','anchor' => 'function_sin'), + 'SLEEP' => array('link' => 'miscellaneous-functions','anchor' => 'function_sleep'), + 'SOUNDEX' => array('link' => 'string-functions','anchor' => 'function_soundex'), + 'SPACE' => array('link' => 'string-functions','anchor' => 'function_space'), + 'SQRT' => array('link' => 'mathematical-functions','anchor' => 'function_sqrt'), + 'STD' => array('link' => 'group-by-functions','anchor' => 'function_std'), + 'STDDEV_POP' => array('link' => 'group-by-functions','anchor' => 'function_stddev_pop'), + 'STDDEV_SAMP' => array('link' => 'group-by-functions','anchor' => 'function_stddev_samp'), + 'STDDEV' => array('link' => 'group-by-functions','anchor' => 'function_stddev'), + 'STR_TO_DATE' => array('link' => 'date-and-time-functions','anchor' => 'function_str_to_date'), + 'STRCMP' => array('link' => 'string-comparison-functions','anchor' => 'function_strcmp'), + 'SUBDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_subdate'), + 'SUBSTR' => array('link' => 'string-functions','anchor' => 'function_substr'), + 'SUBSTRING_INDEX' => array('link' => 'string-functions','anchor' => 'function_substring_index'), + 'SUBSTRING' => array('link' => 'string-functions','anchor' => 'function_substring'), + 'SUBTIME' => array('link' => 'date-and-time-functions','anchor' => 'function_subtime'), + 'SUM' => array('link' => 'group-by-functions','anchor' => 'function_sum'), + 'SYSDATE' => array('link' => 'date-and-time-functions','anchor' => 'function_sysdate'), + 'SYSTEM_USER' => array('link' => 'information-functions','anchor' => 'function_system_user'), + 'TAN' => array('link' => 'mathematical-functions','anchor' => 'function_tan'), + 'TIME_FORMAT' => array('link' => 'date-and-time-functions','anchor' => 'function_time_format'), + 'TIME_TO_SEC' => array('link' => 'date-and-time-functions','anchor' => 'function_time_to_sec'), + 'TIME' => array('link' => 'date-and-time-functions','anchor' => 'function_time'), + 'TIMEDIFF' => array('link' => 'date-and-time-functions','anchor' => 'function_timediff'), + 'TIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_timestamp'), + 'TIMESTAMPADD' => array('link' => 'date-and-time-functions','anchor' => 'function_timestampadd'), + 'TIMESTAMPDIFF' => array('link' => 'date-and-time-functions','anchor' => 'function_timestampdiff'), + 'TO_DAYS' => array('link' => 'date-and-time-functions','anchor' => 'function_to_days'), + 'TRIM' => array('link' => 'string-functions','anchor' => 'function_trim'), + 'TRUNCATE' => array('link' => 'mathematical-functions','anchor' => 'function_truncate'), + 'UCASE' => array('link' => 'string-functions','anchor' => 'function_ucase'), + 'UNCOMPRESS' => array('link' => 'encryption-functions','anchor' => 'function_uncompress'), + 'UNCOMPRESSED_LENGTH' => array('link' => 'encryption-functions','anchor' => 'function_uncompressed_length'), + 'UNHEX' => array('link' => 'string-functions','anchor' => 'function_unhex'), + 'UNIX_TIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_unix_timestamp'), + 'UpdateXML' => array('link' => 'xml-functions','anchor' => 'function_updatexml'), + 'UPPER' => array('link' => 'string-functions','anchor' => 'function_upper'), + 'USER' => array('link' => 'information-functions','anchor' => 'function_user'), + 'UTC_DATE' => array('link' => 'date-and-time-functions','anchor' => 'function_utc_date'), + 'UTC_TIME' => array('link' => 'date-and-time-functions','anchor' => 'function_utc_time'), + 'UTC_TIMESTAMP' => array('link' => 'date-and-time-functions','anchor' => 'function_utc_timestamp'), + 'UUID_SHORT' => array('link' => 'miscellaneous-functions','anchor' => 'function_uuid_short'), + 'UUID' => array('link' => 'miscellaneous-functions','anchor' => 'function_uuid'), + 'VALUES' => array('link' => 'miscellaneous-functions','anchor' => 'function_values'), + 'VAR_POP' => array('link' => 'group-by-functions','anchor' => 'function_var_pop'), + 'VAR_SAMP' => array('link' => 'group-by-functions','anchor' => 'function_var_samp'), + 'VARIANCE' => array('link' => 'group-by-functions','anchor' => 'function_variance'), + 'VERSION' => array('link' => 'information-functions','anchor' => 'function_version'), + 'WEEK' => array('link' => 'date-and-time-functions','anchor' => 'function_week'), + 'WEEKDAY' => array('link' => 'date-and-time-functions','anchor' => 'function_weekday'), + 'WEEKOFYEAR' => array('link' => 'date-and-time-functions','anchor' => 'function_weekofyear'), + 'XOR' => array('link' => 'logical-operators','anchor' => 'operator_xor'), + 'YEAR' => array('link' => 'date-and-time-functions','anchor' => 'function_year'), + 'YEARWEEK' => array('link' => 'date-and-time-functions','anchor' => 'function_yearweek'), + 'SOUNDS_LIKE' => array('link' => 'string-functions','anchor' => 'operator_sounds-like'), + 'IS_NOT_NULL' => array('link' => 'comparison-operators','anchor' => 'operator_is-not-null'), + 'IS_NOT' => array('link' => 'comparison-operators','anchor' => 'operator_is-not'), + 'IS_NULL' => array('link' => 'comparison-operators','anchor' => 'operator_is-null'), + 'NOT_LIKE' => array('link' => 'string-comparison-functions','anchor' => 'operator_not-like'), + 'NOT_REGEXP' => array('link' => 'regexp','anchor' => 'operator_not-regexp'), + 'COUNT_DISTINCT' => array('link' => 'group-by-functions','anchor' => 'function_count-distinct'), + 'NOT_IN' => array('link' => 'comparison-operators','anchor' => 'function_not-in') +); + ?> diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index e05d011..46ae2b2 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2089,6 +2089,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { function PMA_SQP_formatHtml($arr, $mode='color', $start_token=0, $number_of_tokens=-1) { + global $PMA_SQPdata_operators_docs, $PMA_SQPdata_functions_docs; //DEBUG echo 'in Format<pre>'; print_r($arr); echo '</pre>'; // then check for an array if (! is_array($arr)) { @@ -2180,21 +2181,18 @@ if (! defined('PMA_MINIMUM_COMMON')) { $keywords_priv_list_cnt = 2; if ($number_of_tokens == -1) { - $arraysize = $arr['len']; - } else { - $arraysize = $number_of_tokens; + $number_of_tokens = $arr['len']; } $typearr = array(); - if ($arraysize >= 0) { + if ($number_of_tokens >= 0) { $typearr[0] = ''; $typearr[1] = ''; $typearr[2] = ''; - //$typearr[3] = $arr[0]['type']; $typearr[3] = $arr[$start_token]['type']; } $in_priv_list = false; - for ($i = $start_token; $i < $arraysize; $i++) { + for ($i = $start_token; $i < $number_of_tokens; $i++) { // DEBUG echo "Loop format <strong>" . $arr[$i]['data'] . "</strong> " . $arr[$i]['type'] . "<br />"; $before = ''; $after = ''; @@ -2205,11 +2203,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { 2 current 3 next */ - if (($i + 1) < $arraysize) { - // array_push($typearr, $arr[$i + 1]['type']); + if (($i + 1) < $number_of_tokens) { $typearr[4] = $arr[$i + 1]['type']; } else { - //array_push($typearr, null); $typearr[4] = ''; } @@ -2285,6 +2281,17 @@ if (! defined('PMA_MINIMUM_COMMON')) { break; case 'punct': $before .= ' '; + if ($docu && isset($PMA_SQPdata_operators_docs[$arr[$i]['data']]) && + ($arr[$i]['data'] != '*' || in_array($arr[$i]['type'], array('digit_integer','digit_float','digit_hex')))) { + $before .= PMA_showMySQLDocu( + 'functions', + $PMA_SQPdata_operators_docs[$arr[$i]['data']]['link'], + false, + $PMA_SQPdata_operators_docs[$arr[$i]['data']]['anchor'], + true); + $after .= '</a>'; + } + // workaround for // select * from mytable limit 0,-1 // (a side effect of this workaround is that @@ -2388,6 +2395,18 @@ if (! defined('PMA_MINIMUM_COMMON')) { $after .= ' '; } break; + case 'alpha_functionName': + $funcname = strtoupper($arr[$i]['data']); + if ($docu && isset($PMA_SQPdata_functions_docs[$funcname])) { + $before .= PMA_showMySQLDocu( + 'functions', + $PMA_SQPdata_functions_docs[$funcname]['link'], + false, + $PMA_SQPdata_functions_docs[$funcname]['anchor'], + true); + $after .= '</a>'; + } + break; case 'alpha_reservedWord': // do not uppercase the reserved word if we are calling // this function in query_only mode, because we need @@ -2544,6 +2563,24 @@ if (! defined('PMA_MINIMUM_COMMON')) { } break; default: + if ($close_docu_link && in_array($arr[$i]['data'], array('LIKE', 'NOT', 'IN', 'REGEXP', 'NULL'))){ + $after .= '</a>'; + $close_docu_link = false; + } else if ($docu && isset($PMA_SQPdata_functions_docs[$arr[$i]['data']])) { + /* Handle multi word statements first */ + if (isset($typearr[4]) && $typearr[4] == 'alpha_reservedWord' && $typearr[3] == 'alpha_reservedWord' && isset($PMA_SQPdata_functions_docs[strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'] . '_' . $arr[$i + 2]['data'])])) { + $tempname = strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'] . '_' . $arr[$i + 2]['data']); + $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$tempname]['link'], false, $PMA_SQPdata_functions_docs[$tempname]['anchor'], true); + $close_docu_link = true; + } else if (isset($typearr[3]) && $typearr[3] == 'alpha_reservedWord' && isset($PMA_SQPdata_functions_docs[strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'])])) { + $tempname = strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data']); + $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$tempname]['link'], false, $PMA_SQPdata_functions_docs[$tempname]['anchor'], true); + $close_docu_link = true; + } else { + $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$arr[$i]['data']]['link'], false, $PMA_SQPdata_functions_docs[$arr[$i]['data']]['anchor'], true); + $after .= '</a>'; + } + } break; } // end switch ($arr[$i]['data']) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3156-gd147fd2
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via d147fd26db0cf8a5965c640c3047494acc2b9d44 (commit) from f2fe4db5f1d100f29152445e4367789707007800 (commit) - Log ----------------------------------------------------------------- commit d147fd26db0cf8a5965c640c3047494acc2b9d44 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 15:01:50 2011 +0200 Update keywords to list from http://dev.mysql.com/doc/refman/5.5/en/reserved-words.html ----------------------------------------------------------------------- Summary of changes: js/codemirror/mode/mysql/mysql.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/codemirror/mode/mysql/mysql.js b/js/codemirror/mode/mysql/mysql.js index 704825e..fd53d6c 100644 --- a/js/codemirror/mode/mysql/mysql.js +++ b/js/codemirror/mode/mysql/mysql.js @@ -127,7 +127,7 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { for (var i = 0; i < words.length; ++i) obj[words[i]] = true; return obj; } - var cKeywords = "accessible action add after against aggregate algorithm all alter analyse analyze and as asc autocommit auto_increment avg_row_length backup begin between binlog both by cascade case change changed charset check checksum collate collation column columns comment commit committed compressed concurrent constraint contains convert create cross current_timestamp database databases day day_hour day_minute day_second definer delayed delay_key_write delete desc describe deterministic distinct distinctrow div do drop dumpfile duplicate dynamic else enclosed end engine engines escape escaped events execute exists explain extended fast fields file first fixed flush for force foreign from full fulltext function gemini gemini_spin_retries global grant grants group having heap high_priority hosts hour hour_minute hour_second identified if ignore in index indexes infile inner insert insert_id insert_method interval into invoker is isolation join key keys kill last_insert_id leading left like limit linear lines load local lock locks logs low_priority maria master master_connect_retry master_host master_log_file master_log_pos master_password master_port master_user match max_connections_per_hour max_queries_per_hour max_rows max_updates_per_hour max_user_connections medium merge minute minute_second min_rows mode modify month mrg_myisam myisam names natural no not null offset on open optimize option optionally or order outer outfile pack_keys page page_checksum partial partition partitions password primary privileges procedure process processlist purge quick raid0 raid_chunks raid_chunksize raid_type range read read_only read_write references regexp reload rename repair repeatable replace replication reset restore restrict return returns revoke right rlike rollback row rows row_format second security select separator serializable session share show shutdown slave soname sounds sql sql_auto_is_null sql_big_result sql_big_selects sql_big_tables sql_buffer_result sql_cache sql_calc_found_rows sql_log_bin sql_log_off sql_log_update sql_low_priority_updates sql_max_join_size sql_no_cache sql_quote_show_create sql_safe_updates sql_select_limit sql_slave_skip_counter sql_small_result sql_warnings start starting status stop storage straight_join string striped super table tables temporary terminated then to trailing transactional truncate type types uncommitted union unique unlock update usage use using values variables view when where with work write xor year_month"; + var cKeywords = "accessible add all alter analyze and as asc asensitive before between bigint binary blob both by call cascade case change char character check collate column condition constraint continue convert create cross current_date current_time current_timestamp current_user cursor database databases day_hour day_microsecond day_minute day_second dec decimal declare default delayed delete desc describe deterministic distinct distinctrow div double drop dual each else elseif enclosed escaped exists exit explain false fetch float float4 float8 for force foreign from fulltext grant group having high_priority hour_microsecond hour_minute hour_second if ignore in index infile inner inout insensitive insert int int1 int2 int3 int4 int8 integer interval into is iterate join key keys kill leading leave left like limit linear lines load localtime localtimestamp lock long longblob longtext loop low_priority master_ssl_verify_server_cert match maxvalue mediumblob mediumint mediumtext middleint minute_microsecond minute_second mod modifies natural not no_write_to_binlog null numeric on optimize option optionally or order out outer outfile precision primary procedure purge range read reads read_write real references regexp release rename repeat replace require resignal restrict return revoke right rlike schema schemas second_microsecond select sensitive separator set show signal smallint spatial specific sql sqlexception sqlstate sqlwarning sql_big_result sql_calc_found_rows sql_small_result ssl starting straight_join table terminated then tinyblob tinyint tinytext to trailing trigger true undo union unique unlock unsigned update usage use using utc_date utc_time utc_timestamp values varbinary varchar varcharacter varying when where while with write xor year_month zerofill"; var cFunctions = "abs acos adddate addtime aes_decrypt aes_encrypt area asbinary ascii asin astext atan atan2 avg bdmpolyfromtext bdmpolyfromwkb bdpolyfromtext bdpolyfromwkb benchmark bin bit_and bit_count bit_length bit_or bit_xor boundary buffer cast ceil ceiling centroid char character_length charset char_length coalesce coercibility collation compress concat concat_ws connection_id contains conv convert convert_tz convexhull cos cot count crc32 crosses curdate current_date current_time current_timestamp current_user curtime database date datediff date_add date_diff date_format date_sub day dayname dayofmonth dayofweek dayofyear decode default degrees des_decrypt des_encrypt difference dimension disjoint distance elt encode encrypt endpoint envelope equals exp export_set exteriorring extract extractvalue field find_in_set floor format found_rows from_days from_unixtime geomcollfromtext geomcollfromwkb geometrycollection geometrycollectionfromtext geometrycollectionfromwkb geometryfromtext geometryfromwkb geometryn geometrytype geomfromtext geomfromwkb get_format get_lock glength greatest group_concat group_unique_users hex hour if ifnull inet_aton inet_ntoa insert instr interiorringn intersection intersects interval isclosed isempty isnull isring issimple is_free_lock is_used_lock last_day last_insert_id lcase least left length linefromtext linefromwkb linestring linestringfromtext linestringfromwkb ln load_file localtime localtimestamp locate log log10 log2 lower lpad ltrim makedate maketime make_set master_pos_wait max mbrcontains mbrdisjoint mbrequal mbrintersects mbroverlaps mbrtouches mbrwithin md5 microsecond mid min minute mlinefromtext mlinefromwkb mod month monthname mpointfromtext mpointfromwkb mpolyfromtext mpolyfromwkb multilinestring multilinestringfromtext multilinestringfromwkb multipoint multipointfromtext multipointfromwkb multipolygon multipolygonfromtext multipolygonfromwkb name_const now nullif numgeometries numinteriorrings numpoints oct octet_length old_password ord overlaps password period_add period_diff pi point pointfromtext pointfromwkb pointn pointonsurface polyfromtext polyfromwkb polygon polygonfromtext polygonfromwkb position pow power quarter quote radians rand related release_lock repeat replace reverse right round row_count rpad rtrim schema second sec_to_time session_user sha sha1 sign sin sleep soundex space sqrt srid startpoint std stddev stddev_pop stddev_samp strcmp str_to_date subdate substr substring substring_index subtime sum symdifference sysdate system_user tan time timediff timestamp timestampadd timestampdiff time_format time_to_sec touches to_days trim truncate ucase uncompress uncompressed_length unhex unique_users unix_timestamp updatexml upper user utc_date utc_time utc_timestamp uuid variance var_pop var_samp version week weekday weekofyear within x y year yearweek"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3155-gf2fe4db
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via f2fe4db5f1d100f29152445e4367789707007800 (commit) from 4603ca7001b1d39389f622671e53ee957b2adf66 (commit) - Log ----------------------------------------------------------------- commit f2fe4db5f1d100f29152445e4367789707007800 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 14:11:11 2011 +0200 Remove not used code ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 432aa78..b1bd457 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -681,8 +681,6 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a { global $sql_drop_table; global $sql_backquotes; - global $cfgRelation; - global $sql_constraints; global $sql_constraints_query; // just the text of the query global $sql_drop_foreign_keys; @@ -1044,7 +1042,6 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { global $sql_backquotes; - global $rows_cnt; global $current_row; $formatted_table_name = (isset($GLOBALS['sql_backquotes'])) @@ -1067,9 +1064,6 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) return true; } - // it's not a VIEW - $buffer = ''; - // analyze the query to get the true column names, not the aliases // (this fixes an undefined index, also if Complete inserts // are used, we did not get the true column name in case of aliases) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3154-g4603ca7
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via 4603ca7001b1d39389f622671e53ee957b2adf66 (commit) from d14e49f8271c25b11cdc98962e6b24338aaef90e (commit) - Log ----------------------------------------------------------------- commit 4603ca7001b1d39389f622671e53ee957b2adf66 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 14:03:13 2011 +0200 Factor out common code for PMA_DBI_try_query. PMA_DBI_try_query is now shared for mysql and mysqli as the only difference there was real call to the database, the rest was same (timing, tracking, debugging,..). ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 64 +++++++++++++++++++++++++++++++ libraries/dbi/mysql.dbi.lib.php | 60 ++-------------------------- libraries/dbi/mysqli.dbi.lib.php | 70 ++------------------------------- 3 files changed, 74 insertions(+), 120 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 57c8568..ec82416 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -76,6 +76,70 @@ function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows } /** + * runs a query and returns the result + * + * @param string $query query to run + * @param resource $link mysql link resource + * @param integer $options + * @return mixed + */ +function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) +{ + if (empty($link)) { + if (isset($GLOBALS['userlink'])) { + $link = $GLOBALS['userlink']; + } else { + return false; + } + } + + if ($GLOBALS['cfg']['DBG']['sql']) { + $time = microtime(true); + } + + $r = PMA_DBI_real_query($query, $link, $options); + + if ($cache_affected_rows) { + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + } + + if ($GLOBALS['cfg']['DBG']['sql']) { + $time = microtime(true) - $time; + + $hash = md5($query); + + if (isset($_SESSION['debug']['queries'][$hash])) { + $_SESSION['debug']['queries'][$hash]['count']++; + } else { + $_SESSION['debug']['queries'][$hash] = array(); + $_SESSION['debug']['queries'][$hash]['count'] = 1; + $_SESSION['debug']['queries'][$hash]['query'] = $query; + $_SESSION['debug']['queries'][$hash]['time'] = $time; + } + + $trace = array(); + foreach (debug_backtrace() as $trace_step) { + $trace[] = PMA_Error::relPath($trace_step['file']) . '#' + . $trace_step['line'] . ': ' + . (isset($trace_step['class']) ? $trace_step['class'] : '') + //. (isset($trace_step['object']) ? get_class($trace_step['object']) : '') + . (isset($trace_step['type']) ? $trace_step['type'] : '') + . (isset($trace_step['function']) ? $trace_step['function'] : '') + . '(' + . (isset($trace_step['params']) ? implode(', ', $trace_step['params']) : '') + . ')' + ; + } + $_SESSION['debug']['queries'][$hash]['trace'][] = $trace; + } + if ($r != false && PMA_Tracker::isActive() == true ) { + PMA_Tracker::handleQuery($query); + } + + return $r; +} + +/** * converts charset of a mysql message, usually coming from mysql_error(), * into PMA charset, usally UTF-8 * uses language to charset mapping from mysql/share/errmsg.txt diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index e96e167..e84e6b0 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -154,65 +154,15 @@ function PMA_DBI_select_db($dbname, $link = null) * @param integer $options * @return mixed */ -function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) +function PMA_DBI_real_query($query, $link, $options) { - if (empty($link)) { - if (isset($GLOBALS['userlink'])) { - $link = $GLOBALS['userlink']; - } else { - return false; - } - } - - if ($GLOBALS['cfg']['DBG']['sql']) { - $time = microtime(true); - } if ($options == ($options | PMA_DBI_QUERY_STORE)) { - $r = mysql_query($query, $link); + return mysql_query($query, $link); } elseif ($options == ($options | PMA_DBI_QUERY_UNBUFFERED)) { - $r = mysql_unbuffered_query($query, $link); + return mysql_unbuffered_query($query, $link); } else { - $r = mysql_query($query, $link); - } - - if ($cache_affected_rows) { - $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + return mysql_query($query, $link); } - - if ($GLOBALS['cfg']['DBG']['sql']) { - $time = microtime(true) - $time; - - $hash = md5($query); - - if (isset($_SESSION['debug']['queries'][$hash])) { - $_SESSION['debug']['queries'][$hash]['count']++; - } else { - $_SESSION['debug']['queries'][$hash] = array(); - $_SESSION['debug']['queries'][$hash]['count'] = 1; - $_SESSION['debug']['queries'][$hash]['query'] = $query; - $_SESSION['debug']['queries'][$hash]['time'] = $time; - } - - $trace = array(); - foreach (debug_backtrace() as $trace_step) { - $trace[] = PMA_Error::relPath($trace_step['file']) . '#' - . $trace_step['line'] . ': ' - . (isset($trace_step['class']) ? $trace_step['class'] : '') - //. (isset($trace_step['object']) ? get_class($trace_step['object']) : '') - . (isset($trace_step['type']) ? $trace_step['type'] : '') - . (isset($trace_step['function']) ? $trace_step['function'] : '') - . '(' - . (isset($trace_step['params']) ? implode(', ', $trace_step['params']) : '') - . ')' - ; - } - $_SESSION['debug']['queries'][$hash]['trace'][] = $trace; - } - if ($r != false && PMA_Tracker::isActive() == true ) { - PMA_Tracker::handleQuery($query); - } - - return $r; } function PMA_DBI_fetch_array($result) @@ -406,7 +356,7 @@ function PMA_DBI_insert_id($link = null) * @uses $GLOBALS['userlink'] * @uses mysql_affected_rows() * @param object mysql $link the mysql object - * @param boolean $get_from_cache + * @param boolean $get_from_cache * @return string integer */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index a40e32d..2418fd2 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -164,18 +164,15 @@ function PMA_DBI_select_db($dbname, $link = null) * * @uses PMA_DBI_QUERY_STORE * @uses PMA_DBI_QUERY_UNBUFFERED - * @uses $GLOBALS['userlink'] * @uses MYSQLI_STORE_RESULT * @uses MYSQLI_USE_RESULT * @uses mysqli_query() - * @uses defined() * @param string $query query to execute * @param object mysqli $link mysqli object * @param integer $options - * @param boolean $cache_affected_rows * @return mixed true, false or result object */ -function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) +function PMA_DBI_real_query($query, $link, $options) { if ($options == ($options | PMA_DBI_QUERY_STORE)) { $method = MYSQLI_STORE_RESULT; @@ -185,64 +182,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r $method = 0; } - if (empty($link)) { - if (isset($GLOBALS['userlink'])) { - $link = $GLOBALS['userlink']; - } else { - return false; - } - } - - if ($GLOBALS['cfg']['DBG']['sql']) { - $time = microtime(true); - } - $r = mysqli_query($link, $query, $method); - - if ($cache_affected_rows) { - $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); - } - - if ($GLOBALS['cfg']['DBG']['sql']) { - $time = microtime(true) - $time; - - $hash = md5($query); - - if (isset($_SESSION['debug']['queries'][$hash])) { - $_SESSION['debug']['queries'][$hash]['count']++; - } else { - $_SESSION['debug']['queries'][$hash] = array(); - $_SESSION['debug']['queries'][$hash]['count'] = 1; - $_SESSION['debug']['queries'][$hash]['query'] = $query; - $_SESSION['debug']['queries'][$hash]['time'] = $time; - } - - $trace = array(); - foreach (debug_backtrace() as $trace_step) { - $trace[] = PMA_Error::relPath($trace_step['file']) . '#' - . $trace_step['line'] . ': ' - . (isset($trace_step['class']) ? $trace_step['class'] : '') - //. (isset($trace_step['object']) ? get_class($trace_step['object']) : '') - . (isset($trace_step['type']) ? $trace_step['type'] : '') - . (isset($trace_step['function']) ? $trace_step['function'] : '') - . '(' - . (isset($trace_step['params']) ? implode(', ', $trace_step['params']) : '') - . ')' - ; - } - $_SESSION['debug']['queries'][$hash]['trace'][] = $trace; - } - - if ($r != false && PMA_Tracker::isActive() == true ) { - PMA_Tracker::handleQuery($query); - } - - return $r; - - // From the PHP manual: - // "note: returns true on success or false on failure. For SELECT, - // SHOW, DESCRIBE or EXPLAIN, mysqli_query() will return a result object" - // so, do not use the return value to feed mysqli_num_rows() if it's - // a boolean + return mysqli_query($link, $query, $method); } /** @@ -452,9 +392,9 @@ function PMA_DBI_insert_id($link = '') return false; } } - // When no controluser is defined, using mysqli_insert_id($link) + // When no controluser is defined, using mysqli_insert_id($link) // does not always return the last insert id due to a mixup with - // the tracking mechanism, but this works: + // the tracking mechanism, but this works: return PMA_DBI_fetch_value('SELECT LAST_INSERT_ID();', 0, 0, $link); // Curiously, this problem does not happen with the mysql extension but // there is another problem with BIGINT primary keys so PMA_DBI_insert_id() @@ -467,7 +407,7 @@ function PMA_DBI_insert_id($link = '') * @uses $GLOBALS['userlink'] * @uses mysqli_affected_rows() * @param object mysqli $link the mysqli object - * @param boolean $get_from_cache + * @param boolean $get_from_cache * @return string integer */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3153-gd14e49f
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via d14e49f8271c25b11cdc98962e6b24338aaef90e (commit) from 3cf4830bbb94ce8fe7078f4a3f4fbac1c6253a8c (commit) - Log ----------------------------------------------------------------- commit d14e49f8271c25b11cdc98962e6b24338aaef90e Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 13:47:00 2011 +0200 Simplify code ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 55d330e..432aa78 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -449,7 +449,11 @@ function PMA_exportHeader() . PMA_exportComment('version ' . PMA_VERSION) . PMA_exportComment('http://www.phpmyadmin.net') . PMA_exportComment(); - $head .= empty($cfg['Server']['port']) ? PMA_exportComment(__('Host') . ': ' . $cfg['Server']['host']) : PMA_exportComment(__('Host') . ': ' . $cfg['Server']['host'] . ':' . $cfg['Server']['port']); + $host_string = __('Host') . ': ' . $cfg['Server']['host']; + if (!empty($cfg['Server']['port'])) { + $host_string .= ':' . $cfg['Server']['port']; + } + $head .= PMA_exportComment($host_string); $head .= PMA_exportComment(__('Generation Time') . ': ' . PMA_localisedDate()) . PMA_exportComment(__('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3)) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3152-g3cf4830
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via 3cf4830bbb94ce8fe7078f4a3f4fbac1c6253a8c (commit) from 8b0fc6073a71097852e1330508cc20e8995ff5ae (commit) - Log ----------------------------------------------------------------- commit 3cf4830bbb94ce8fe7078f4a3f4fbac1c6253a8c Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 11:55:09 2011 +0200 Replace TRUE/FALSE with true/false. At least this seems to be the coding standard, so make all files compliant. ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 6 +- bs_disp_as_mime_type.php | 4 +- chk_rel.php | 2 +- db_create.php | 2 +- db_datadict.php | 6 +- db_sql.php | 2 +- db_structure.php | 2 +- import.php | 62 ++-- libraries/File.class.php | 12 +- libraries/StorageEngine.class.php | 2 +- libraries/Theme_Manager.class.php | 2 +- libraries/Tracker.class.php | 4 +- libraries/auth/config.auth.lib.php | 12 +- libraries/auth/swekey/swekey.php | 2 +- libraries/blobstreaming.lib.php | 116 ++++---- libraries/bookmark.lib.php | 4 +- libraries/chart/pma_pchart_chart.php | 6 +- libraries/chart/pma_pchart_multi_line.php | 2 +- libraries/chart/pma_pchart_multi_radar.php | 4 +- libraries/chart/pma_pchart_pie.php | 4 +- libraries/chart/pma_pchart_single_line.php | 2 +- libraries/chart/pma_pchart_single_radar.php | 4 +- libraries/common.inc.php | 2 +- libraries/common.lib.php | 4 +- libraries/config.default.php | 2 +- libraries/core.lib.php | 2 +- libraries/database_interface.lib.php | 8 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/display_create_database.lib.php | 2 +- libraries/display_import.lib.php | 2 +- libraries/display_select_lang.lib.php | 2 +- libraries/display_tbl.lib.php | 14 +- libraries/export/codegen.php | 12 +- libraries/export/csv.php | 18 +- libraries/export/htmlword.php | 32 +- libraries/export/json.php | 2 +- libraries/export/latex.php | 34 ++-- libraries/export/mediawiki.php | 12 +- libraries/export/ods.php | 16 +- libraries/export/odt.php | 24 +- libraries/export/pdf.php | 16 +- libraries/export/php_array.php | 2 +- libraries/export/sql.php | 40 ++-- libraries/export/texytext.php | 26 +- libraries/export/xls.php | 16 +- libraries/export/xlsx.php | 16 +- libraries/export/xml.php | 12 +- libraries/export/yaml.php | 2 +- libraries/file_listing.php | 10 +- libraries/header_printview.inc.php | 2 +- libraries/iconv_wrapper.lib.php | 4 +- libraries/import.lib.php | 38 ++-- libraries/import/README | 4 +- libraries/import/csv.php | 58 ++-- libraries/import/docsql.php | 6 +- libraries/import/ldi.php | 10 +- libraries/import/ods.php | 8 +- libraries/import/sql.php | 26 +- libraries/import/xml.php | 6 +- libraries/kanji-encoding.lib.php | 4 +- libraries/mult_submits.inc.php | 18 +- libraries/mysql_charsets.lib.php | 6 +- libraries/navigation_header.inc.php | 2 +- libraries/relation.lib.php | 16 +- libraries/schema/Dia_Relation_Schema.class.php | 4 +- libraries/schema/Eps_Relation_Schema.class.php | 2 +- libraries/schema/Pdf_Relation_Schema.class.php | 2 +- libraries/schema/Svg_Relation_Schema.class.php | 4 +- libraries/schema/User_Schema.class.php | 28 +- libraries/schema/Visio_Relation_Schema.class.php | 4 +- libraries/select_lang.lib.php | 6 +- libraries/server_links.inc.php | 2 +- libraries/sql_query_form.lib.php | 6 +- libraries/sqlparser.lib.php | 320 +++++++++++----------- libraries/sqlvalidator.class.php | 6 +- libraries/sqlvalidator.lib.php | 4 +- libraries/zip_extension.lib.php | 2 +- pmd_pdf.php | 4 +- pmd_relation_upd.php | 2 +- server_privileges.php | 42 ++-- setup/lib/common.inc.php | 4 +- sql.php | 4 +- tbl_change.php | 24 +- tbl_relation.php | 16 +- tbl_row_action.php | 2 +- 86 files changed, 645 insertions(+), 645 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 16fa48c..0b10484 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -23,9 +23,9 @@ require_once './libraries/header_http.inc.php'; */ require_once './libraries/transformations.lib.php'; // Transformations $cfgRelation = PMA_getRelationsParam(); -$foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE); +$foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : false); -$override_total = TRUE; +$override_total = true; if (! isset($pos)) { $pos = 0; @@ -180,7 +180,7 @@ if (is_array($foreignData['disp_row'])) { $values = array(); $keys = array(); foreach ($foreignData['disp_row'] as $relrow) { - if ($foreignData['foreign_display'] != FALSE) { + if ($foreignData['foreign_display'] != false) { $values[] = $relrow[$foreignData['foreign_display']]; } else { $values[] = ''; diff --git a/bs_disp_as_mime_type.php b/bs_disp_as_mime_type.php index 085d888..03a8c8b 100644 --- a/bs_disp_as_mime_type.php +++ b/bs_disp_as_mime_type.php @@ -31,13 +31,13 @@ if (empty($filename)) { $hdrs = get_headers($filename, 1); -if ($hdrs === FALSE) { +if ($hdrs === false) { die(__('Failed to fetch headers')); } $fHnd = fopen($filename, "rb"); -if ($fHnd === FALSE) { +if ($fHnd === false) { die(__('Failed to open remote URL')); } diff --git a/chk_rel.php b/chk_rel.php index 8955350..d13f075 100644 --- a/chk_rel.php +++ b/chk_rel.php @@ -15,7 +15,7 @@ require_once './libraries/header.inc.php'; /** * Gets the relation settings */ -$cfgRelation = PMA_getRelationsParam(TRUE); +$cfgRelation = PMA_getRelationsParam(true); /** diff --git a/db_create.php b/db_create.php index 3609bf6..502ac7f 100644 --- a/db_create.php +++ b/db_create.php @@ -49,7 +49,7 @@ if (! $result) { * If in an Ajax request, just display the message with {@link PMA_ajaxResponse} */ if($GLOBALS['is_ajax_request'] == true) { - PMA_ajaxResponse($message, FALSE); + PMA_ajaxResponse($message, false); } require_once './libraries/header.inc.php'; diff --git a/db_datadict.php b/db_datadict.php index 9941ef4..102724d 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -142,12 +142,12 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { $res_rel = PMA_getForeigners($db, $table); if (count($res_rel) > 0) { - $have_rel = TRUE; + $have_rel = true; } else { - $have_rel = FALSE; + $have_rel = false; } } else { - $have_rel = FALSE; + $have_rel = false; } // end if diff --git a/db_sql.php b/db_sql.php index 2020dea..08eb5ca 100644 --- a/db_sql.php +++ b/db_sql.php @@ -31,7 +31,7 @@ $back = 'db_sql.php'; require './libraries/db_info.inc.php'; if ($num_tables == 0 && empty($db_query_force)) { $sub_part = ''; - $is_info = TRUE; + $is_info = true; require './db_structure.php'; exit(); } diff --git a/db_structure.php b/db_structure.php index 6d301d5..864a668 100644 --- a/db_structure.php +++ b/db_structure.php @@ -28,7 +28,7 @@ if (empty($is_info)) { // db_structure.php -> libraries/mult_submits.inc.php -> sql.php // -> db_structure.php and if we got an error on the multi submit, // we must display it here and not call again mult_submits.inc.php - if (! isset($error) || FALSE === $error) { + if (! isset($error) || false === $error) { require './libraries/mult_submits.inc.php'; } if (empty($message)) { diff --git a/import.php b/import.php index 8837af2..cd56bc2 100644 --- a/import.php +++ b/import.php @@ -130,21 +130,21 @@ if (isset($allow_interrupt)) { } // set default values -$timeout_passed = FALSE; -$error = FALSE; +$timeout_passed = false; +$error = false; $read_multiply = 1; -$finished = FALSE; +$finished = false; $offset = 0; $max_sql_len = 0; $file_to_unlink = ''; $sql_query = ''; -$sql_query_disabled = FALSE; -$go_sql = FALSE; +$sql_query_disabled = false; +$go_sql = false; $executed_queries = 0; -$run_query = TRUE; -$charset_conversion = FALSE; -$reset_charset = FALSE; -$bookmark_created = FALSE; +$run_query = true; +$charset_conversion = false; +$reset_charset = false; +$bookmark_created = false; // Bookmark Support: get a query back from bookmark if required if (!empty($id_bookmark)) { @@ -165,21 +165,21 @@ if (!empty($id_bookmark)) { break; case 1: // bookmarked query that have to be displayed $import_text = PMA_Bookmark_get($db, $id_bookmark); - $run_query = FALSE; + $run_query = false; break; case 2: // bookmarked query that have to be deleted $import_text = PMA_Bookmark_get($db, $id_bookmark); PMA_Bookmark_delete($db, $id_bookmark); - $run_query = FALSE; - $error = TRUE; // this is kind of hack to skip processing the query + $run_query = false; + $error = true; // this is kind of hack to skip processing the query break; } } // end bookmarks reading // Do no run query if we show PHP code if (isset($GLOBALS['show_as_php'])) { - $run_query = FALSE; - $go_sql = TRUE; + $run_query = false; + $go_sql = true; } // Store the query as a bookmark before executing it if bookmarklabel was given @@ -204,7 +204,7 @@ if (!empty($bkm_label) && !empty($import_text)) { PMA_Bookmark_save($bfields, isset($bkm_all_users)); - $bookmark_created = TRUE; + $bookmark_created = true; } // end store bookmarks // We can not read all at once, otherwise we can run out of memory @@ -274,9 +274,9 @@ if ($import_file != 'none' && !$error) { * @todo duplicate code exists in File.class.php */ $compression = PMA_detectCompression($import_file); - if ($compression === FALSE) { + if ($compression === false) { $message = PMA_Message::error(__('File could not be read')); - $error = TRUE; + $error = true; } else { switch ($compression) { case 'application/bzip2': @@ -285,7 +285,7 @@ if ($import_file != 'none' && !$error) { } else { $message = PMA_Message::error(__('You attempted to load file with unsupported compression (%s). Either support for it is not implemented or disabled by your configuration.')); $message->addParam($compression); - $error = TRUE; + $error = true; } break; case 'application/gzip': @@ -294,7 +294,7 @@ if ($import_file != 'none' && !$error) { } else { $message = PMA_Message::error(__('You attempted to load file with unsupported compression (%s). Either support for it is not implemented or disabled by your configuration.')); $message->addParam($compression); - $error = TRUE; + $error = true; } break; case 'application/zip': @@ -306,14 +306,14 @@ if ($import_file != 'none' && !$error) { $result = PMA_getZipContents($import_file); if (! empty($result['error'])) { $message = PMA_Message::rawError($result['error']); - $error = TRUE; + $error = true; } else { $import_text = $result['data']; } } else { $message = PMA_Message::error(__('You attempted to load file with unsupported compression (%s). Either support for it is not implemented or disabled by your configuration.')); $message->addParam($compression); - $error = TRUE; + $error = true; } break; case 'none': @@ -322,19 +322,19 @@ if ($import_file != 'none' && !$error) { default: $message = PMA_Message::error(__('You attempted to load file with unsupported compression (%s). Either support for it is not implemented or disabled by your configuration.')); $message->addParam($compression); - $error = TRUE; + $error = true; break; } } // use isset() because zip compression type does not use a handle - if (!$error && isset($import_handle) && $import_handle === FALSE) { + if (!$error && isset($import_handle) && $import_handle === false) { $message = PMA_Message::error(__('File could not be read')); - $error = TRUE; + $error = true; } } elseif (!$error) { 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; + $error = true; } } @@ -344,13 +344,13 @@ if ($import_file != 'none' && !$error) { // Convert the file's charset if necessary if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE && isset($charset_of_file)) { if ($charset_of_file != 'utf-8') { - $charset_conversion = TRUE; + $charset_conversion = true; } } elseif (isset($charset_of_file) && $charset_of_file != 'utf8') { PMA_DBI_query('SET NAMES \'' . $charset_of_file . '\''); // We can not show query in this case, it is in different charset - $sql_query_disabled = TRUE; - $reset_charset = TRUE; + $sql_query_disabled = true; + $reset_charset = true; } // Something to skip? @@ -367,7 +367,7 @@ if (!$error && isset($skip)) { if (!$error) { // Check for file existance if (!file_exists('./libraries/import/' . $format . '.php')) { - $error = TRUE; + $error = true; $message = PMA_Message::error(__('Could not load import plugins, please check your installation!')); } else { // Do the real import @@ -376,7 +376,7 @@ if (!$error) { } } -if (! $error && FALSE !== $import_handle && NULL !== $import_handle) { +if (! $error && false !== $import_handle && NULL !== $import_handle) { fclose($import_handle); } @@ -395,7 +395,7 @@ if ($reset_charset) { if (!empty($id_bookmark) && $action_bookmark == 2) { $message = PMA_Message::success(__('The bookmark has been deleted.')); $display_query = $import_text; - $error = FALSE; // unset error marker, it was used just to skip processing + $error = false; // unset error marker, it was used just to skip processing } elseif (!empty($id_bookmark) && $action_bookmark == 1) { $message = PMA_Message::notice(__('Showing bookmark')); } elseif ($bookmark_created) { diff --git a/libraries/File.class.php b/libraries/File.class.php index 109c188..2a33bf3 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -271,11 +271,11 @@ class PMA_File $file = PMA_File::fetchUploadedFromTblChangeRequestMultiple($_FILES['fields_upload'], $rownumber, $key); // for blobstreaming - $is_bs_upload = FALSE; + $is_bs_upload = false; // check if this field requires a repository upload if (isset($_REQUEST['upload_blob_repo']['multi_edit'][$rownumber][$key])) { - $is_bs_upload = ($_REQUEST['upload_blob_repo']['multi_edit'][$rownumber][$key] == "on") ? TRUE : FALSE; + $is_bs_upload = ($_REQUEST['upload_blob_repo']['multi_edit'][$rownumber][$key] == "on") ? true : false; } // if request is an upload to the BLOB repository if ($is_bs_upload) { @@ -290,7 +290,7 @@ class PMA_File if (! $bs_db || ! $bs_table) { $this->_error_message = $GLOBALS['strUploadErrorUnknown']; - return FALSE; + return false; } $blob_url = PMA_BS_UpLoadFile($bs_db, $bs_table, $tmp_file_type, $tmp_filename); PMA_File::setRecentBLOBReference($blob_url); @@ -388,11 +388,11 @@ class PMA_File && is_string($_REQUEST['fields_uploadlocal']['multi_edit'][$rownumber][$key])) { // ... whether with multiple rows ... // for blobstreaming - $is_bs_upload = FALSE; + $is_bs_upload = false; // check if this field requires a repository upload if (isset($_REQUEST['upload_blob_repo']['multi_edit'][$rownumber][$key])) { - $is_bs_upload = ($_REQUEST['upload_blob_repo']['multi_edit'][$rownumber][$key] == "on") ? TRUE : FALSE; + $is_bs_upload = ($_REQUEST['upload_blob_repo']['multi_edit'][$rownumber][$key] == "on") ? true : false; } // is a request to upload file to BLOB repository using uploadDir mechanism @@ -423,7 +423,7 @@ class PMA_File if (! $bs_db || !$bs_table) { $this->_error_message = $GLOBALS['strUploadErrorUnknown']; - return FALSE; + return false; } $blob_url = PMA_BS_UpLoadFile($bs_db, $bs_table, $tmp_file_type, $tmp_filename); PMA_File::setRecentBLOBReference($blob_url); diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index 71b3636..7504895 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -140,7 +140,7 @@ class PMA_StorageEngine static public function isValid($engine) { if ($engine == "PBMS") { - return TRUE; + return true; } $storage_engines = PMA_StorageEngine::getStorageEngines(); return isset($storage_engines[$engine]); diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 4ca8517..cb5454b 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -283,7 +283,7 @@ class PMA_Theme_Manager $select_box .= PMA_generate_common_hidden_inputs(); } - $theme_selected = FALSE; + $theme_selected = false; $theme_preview_path= './themes.php'; $theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" onclick="' . "window.open('" . $theme_preview_path . "','themes','left=10,top=20,width=510,height=350,scrollbars=yes,status=yes,resizable=yes');" diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index 7592c2c..35ab7f4 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -752,7 +752,7 @@ class PMA_Tracker $prefix = explode('DROP VIEW ', $query); $str = strstr($prefix[1], 'IF EXISTS'); - if ($str == FALSE ) { + if ($str == false ) { $str = $prefix[1]; } $result['tablename'] = self::getTableName($str); @@ -810,7 +810,7 @@ class PMA_Tracker $prefix = explode('DROP TABLE ', $query); $str = strstr($prefix[1], 'IF EXISTS'); - if ($str == FALSE ) { + if ($str == false ) { $str = $prefix[1]; } $result['tablename'] = self::getTableName($str); diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index dfa2f2c..5c98d25 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -16,7 +16,7 @@ */ function PMA_auth() { - return TRUE; + return true; } // end of the 'PMA_auth()' function @@ -29,7 +29,7 @@ function PMA_auth() */ function PMA_auth_check() { - return TRUE; + return true; } // end of the 'PMA_auth_check()' function @@ -42,7 +42,7 @@ function PMA_auth_check() */ function PMA_auth_set_user() { - return TRUE; + return true; } // end of the 'PMA_auth_set_user()' function @@ -96,7 +96,7 @@ function PMA_auth_fails() <td> <?php - $GLOBALS['is_header_sent'] = TRUE; + $GLOBALS['is_header_sent'] = true; if (isset($GLOBALS['allowDeny_forbidden']) && $GLOBALS['allowDeny_forbidden']) { trigger_error(__('Access denied'), E_USER_NOTICE); @@ -126,13 +126,13 @@ function PMA_auth_fails() require_once './libraries/select_server.lib.php'; echo '<tr>' . "\n"; echo ' <td>' . "\n"; - PMA_select_server(TRUE, TRUE); + PMA_select_server(true, true); echo ' </td>' . "\n"; echo '</tr>' . "\n"; } echo '</table>' . "\n"; require './libraries/footer.inc.php'; - return TRUE; + return true; } // end of the 'PMA_auth_fails()' function ?> diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php index 3e91e23..b456061 100644 --- a/libraries/auth/swekey/swekey.php +++ b/libraries/auth/swekey/swekey.php @@ -393,7 +393,7 @@ function Swekey_GetFastHalfRndToken() // we unlink the file so no possible tempfile race attack unlink($cachefile); $file = fopen($cachefile , "x"); - if ($file != FALSE) + if ($file != false) { @fwrite($file, $res); @fclose($file); diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index 4efaf34..ce1711c 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -18,7 +18,7 @@ function initPBMSDatabase() $target = ""; foreach ($db_array as $current_db) { if ($current_db == 'pbms') { - return TRUE; + return true; } if ($target == "") { if (($current_db != 'pbxt') && ($current_db != 'mysql') && ($current_db != 'information_schema')) { @@ -34,9 +34,9 @@ function initPBMSDatabase() $result = PMA_DBI_query($query ); if (! $result) { - return FALSE; + return false; } - return TRUE; + return true; } /** @@ -58,7 +58,7 @@ function checkBLOBStreamingPlugins() // return if unable to load PMA configuration if (empty($PMA_Config)) { - return FALSE; + return false; } // If we don't know that we can skip blobstreaming, we continue @@ -77,7 +77,7 @@ function checkBLOBStreamingPlugins() // return if unable to retrieve current server configuration if (! $serverCfg) { - return FALSE; + return false; } // if PHP extension in use is 'mysql', specify element 'PersistentConnections' @@ -115,26 +115,26 @@ function checkBLOBStreamingPlugins() // if no BS variables exist, set plugin existence to false and return if (count($bs_variables) <= 0) { - $PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', FALSE); + $PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', false); PMA_cacheSet('skip_blobstreaming', true, true); - return FALSE; + return false; } // end if (count($bs_variables) <= 0) // Check that the required pbms functions exist: - if ((function_exists("pbms_connect") == FALSE) || - (function_exists("pbms_error") == FALSE) || - (function_exists("pbms_close") == FALSE) || - (function_exists("pbms_is_blob_reference") == FALSE) || - (function_exists("pbms_get_info") == FALSE) || - (function_exists("pbms_get_metadata_value") == FALSE) || - (function_exists("pbms_add_metadata") == FALSE) || - (function_exists("pbms_read_stream") == FALSE)) { + if ((function_exists("pbms_connect") == false) || + (function_exists("pbms_error") == false) || + (function_exists("pbms_close") == false) || + (function_exists("pbms_is_blob_reference") == false) || + (function_exists("pbms_get_info") == false) || + (function_exists("pbms_get_metadata_value") == false) || + (function_exists("pbms_add_metadata") == false) || + (function_exists("pbms_read_stream") == false)) { // We should probably notify the user that they need to install // the pbms client lib and PHP extension to make use of blob streaming. - $PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', FALSE); + $PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', false); PMA_cacheSet('skip_blobstreaming', true, true); - return FALSE; + return false; } if (function_exists("pbms_connection_pool_size")) { @@ -154,31 +154,31 @@ function checkBLOBStreamingPlugins() // if no BS server port or 'pbms' database exists, set plugin existance to false and return if ((! $BS_PORT) || (! initPBMSDatabase())) { - $PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', FALSE); + $PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', false); PMA_cacheSet('skip_blobstreaming', true, true); - return FALSE; + return false; } // end if (!$BS_PORT) // Ping PBMS: the database doesn't need to exist for this to work. - if (pbms_connect($serverCfg['host'], $BS_PORT, "anydb") == FALSE) { - $PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', FALSE); + if (pbms_connect($serverCfg['host'], $BS_PORT, "anydb") == false) { + $PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', false); PMA_cacheSet('skip_blobstreaming', true, true); - return FALSE; + return false; } pbms_close(); if (function_exists("pbms_pconnect")) { - $PMA_Config->set('PBMS_PCONNECT_EXISTS', TRUE); + $PMA_Config->set('PBMS_PCONNECT_EXISTS', true); } else { - $PMA_Config->set('PBMS_PCONNECT_EXISTS', FALSE); + $PMA_Config->set('PBMS_PCONNECT_EXISTS', false); } // add selected BS, CURL and fileinfo library variables to PMA configuration $PMA_Config->set('BLOBSTREAMING_PORT', $BS_PORT); $PMA_Config->set('BLOBSTREAMING_HOST', $serverCfg['host']); $PMA_Config->set('BLOBSTREAMING_SERVER', $serverCfg['host'] . ':' . $BS_PORT); - $PMA_Config->set('PHP_PBMS_EXISTS', FALSE); - $PMA_Config->set('FILEINFO_EXISTS', FALSE); + $PMA_Config->set('PHP_PBMS_EXISTS', false); + $PMA_Config->set('FILEINFO_EXISTS', false); // check if PECL's fileinfo library exist $finfo = NULL; @@ -189,16 +189,16 @@ function checkBLOBStreamingPlugins() // fileinfo library exists, set necessary variable and close resource if (! empty($finfo)) { - $PMA_Config->set('FILEINFO_EXISTS', TRUE); + $PMA_Config->set('FILEINFO_EXISTS', true); finfo_close($finfo); } // end if (!empty($finfo)) } else { PMA_cacheSet('skip_blobstreaming', true, true); - return FALSE; + return false; } // end if ($has_blobstreaming) - return TRUE; + return true; } /** @@ -248,7 +248,7 @@ function PMA_do_connect($db_name, $quiet) // return if unable to load PMA configuration if (empty($PMA_Config)) { - return FALSE; + return false; } // generate bs reference link @@ -262,13 +262,13 @@ function PMA_do_connect($db_name, $quiet) $ok = pbms_connect($pbms_host, $pbms_port, $db_name); } - if ($ok == FALSE) { - if ($quiet == FALSE) { + if ($ok == false) { + if ($quiet == false) { PMA_BS_ReportPBMSError(__('PBMS connection failed:') . " pbms_connect($pbms_host, $pbms_port, $db_name)"); } - return FALSE; + return false; } - return TRUE; + return true; } //------------ @@ -285,7 +285,7 @@ function PMA_do_disconnect() function PMA_BS_IsPBMSReference($bs_reference, $db_name) { if (PMA_cacheGet('skip_blobstreaming', true)) { - return FALSE; + return false; } // You do not really need a connection to the PBMS Daemon @@ -293,8 +293,8 @@ function PMA_BS_IsPBMSReference($bs_reference, $db_name) // requires one at this point so until the API is updated // we need to epen one here. If you use pool connections this // will not be a performance problem. - if (PMA_do_connect($db_name, FALSE) == FALSE) { - return FALSE; + if (PMA_do_connect($db_name, false) == false) { + return false; } $ok = pbms_is_blob_reference($bs_reference); @@ -304,18 +304,18 @@ function PMA_BS_IsPBMSReference($bs_reference, $db_name) //------------ function PMA_BS_CreateReferenceLink($bs_reference, $db_name) { - if (PMA_do_connect($db_name, FALSE) == FALSE) { + if (PMA_do_connect($db_name, false) == false) { return __('Error'); } - if (pbms_get_info(trim($bs_reference)) == FALSE) { + if (pbms_get_info(trim($bs_reference)) == false) { PMA_BS_ReportPBMSError(__('PBMS get BLOB info failed:') . " pbms_get_info($bs_reference)"); PMA_do_disconnect(); return __('Error'); } $content_type = pbms_get_metadata_value("Content-Type"); - if ($content_type == FALSE) { + if ($content_type == false) { $br = trim($bs_reference); PMA_BS_ReportPBMSError("PMA_BS_CreateReferenceLink('$br', '$db_name'): " . __('get BLOB Content-Type failed')); } @@ -371,11 +371,11 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name) function PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type) { if (PMA_cacheGet('skip_blobstreaming', true)) { - return FALSE; + return false; } - if ((isset($tbl_type) == FALSE) || (strlen($tbl_type) == 0)) { - return FALSE; + if ((isset($tbl_type) == false) || (strlen($tbl_type) == 0)) { + return false; } // load PMA configuration @@ -383,11 +383,11 @@ function PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type) // return if unable to load PMA configuration if (empty($PMA_Config)) { - return FALSE; + return false; } if (! $PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST')) { - return FALSE; + return false; } // This information should be cached rather than selecting it each time. @@ -397,10 +397,10 @@ function PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type) $data = PMA_DBI_fetch_row($result); if ($data[0] == 1) { - return TRUE; + return true; } - return FALSE; + return false; } //------------ @@ -408,18 +408,18 @@ function PMA_BS_UpLoadFile($db_name, $tbl_name, $file_type, $file_name) { if (PMA_cacheGet('skip_blobstreaming', true)) { - return FALSE; + return false; } - if (PMA_do_connect($db_name, FALSE) == FALSE) { - return FALSE; + if (PMA_do_connect($db_name, false) == false) { + return false; } $fh = fopen($file_name, 'r'); if (! $fh) { PMA_do_disconnect(); PMA_showMessage(sprintf(__('Could not open file: %s'), $file_name)); - return FALSE; + return false; } pbms_add_metadata("Content-Type", $file_type); @@ -438,7 +438,7 @@ function PMA_BS_UpLoadFile($db_name, $tbl_name, $file_type, $file_name) function PMA_BS_SetContentType($db_name, $bsTable, $blobReference, $contentType) { if (PMA_cacheGet('skip_blobstreaming', true)) { - return FALSE; + return false; } // This is a really ugly way to do this but currently there is nothing better. @@ -463,9 +463,9 @@ function PMA_BS_SetContentType($db_name, $bsTable, $blobReference, $contentType) //error_log("$query\n", 3, "/tmp/mylog"); PMA_DBI_query($query); } else { - return FALSE; + return false; } - return TRUE; + return true; } //------------ @@ -473,9 +473,9 @@ function PMA_BS_IsHiddenTable($table) { if ($table === 'pbms_repository' || $table === 'pbms_reference' || $table === 'pbms_metadata' || $table === 'pbms_metadata_header' || $table === 'pbms_dump') { - return TRUE; + return true; } - return FALSE; + return false; } //------------ @@ -484,13 +484,13 @@ function PMA_BS_getURL($reference) // load PMA configuration $PMA_Config = $GLOBALS['PMA_Config']; if (empty($PMA_Config)) { - return FALSE; + return false; } // retrieve BS server variables from PMA configuration $bs_server = $PMA_Config->get('BLOBSTREAMING_SERVER'); if (empty($bs_server)) { - return FALSE; + return false; } $bs_url = PMA_linkURL('http://' . $bs_server . '/' . rtrim($reference)); diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index 62d7e1b..dfc1946 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -103,14 +103,14 @@ function PMA_Bookmark_getList($db) * @param string the current database name * @param mixed the id of the bookmark to get * @param string which field to look up the $id - * @param boolean TRUE: get all bookmarks regardless of the owning user + * @param boolean true: get all bookmarks regardless of the owning user * @param boolean whether to ignore bookmarks with no user * * @return string the sql query * * @access public */ -function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = FALSE, $exact_user_match = FALSE) +function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = false, $exact_user_match = false) { global $controllink; diff --git a/libraries/chart/pma_pchart_chart.php b/libraries/chart/pma_pchart_chart.php index c4277d8..e68a9b3 100644 --- a/libraries/chart/pma_pchart_chart.php +++ b/libraries/chart/pma_pchart_chart.php @@ -190,7 +190,7 @@ abstract class PMA_pChart_chart extends PMA_chart $this->getGraphAreaColor(RED), $this->getGraphAreaColor(GREEN), $this->getGraphAreaColor(BLUE), - FALSE + false ); $this->chart->drawScale( $this->dataSet->GetData(), @@ -199,7 +199,7 @@ abstract class PMA_pChart_chart extends PMA_chart $this->getScaleColor(RED), $this->getScaleColor(GREEN), $this->getScaleColor(BLUE), - TRUE,0,2,TRUE + true,0,2,true ); if($this->settings['gradientIntensity']>0) @@ -218,7 +218,7 @@ abstract class PMA_pChart_chart extends PMA_chart $this->chart->drawGrid( 4, - TRUE, + true, $this->getGridColor(RED), $this->getGridColor(GREEN), $this->getGridColor(BLUE), diff --git a/libraries/chart/pma_pchart_multi_line.php b/libraries/chart/pma_pchart_multi_line.php index bd7b6ea..502f386 100644 --- a/libraries/chart/pma_pchart_multi_line.php +++ b/libraries/chart/pma_pchart_multi_line.php @@ -31,7 +31,7 @@ class PMA_pChart_multi_line extends PMA_pChart_multi // Draw the bar chart $this->chart->drawLineGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription()); - $this->chart->drawPlotGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 3, 1, -1, -1, -1, TRUE); + $this->chart->drawPlotGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 3, 1, -1, -1, -1, true); } } diff --git a/libraries/chart/pma_pchart_multi_radar.php b/libraries/chart/pma_pchart_multi_radar.php index c96fb3c..8c32cb3 100644 --- a/libraries/chart/pma_pchart_multi_radar.php +++ b/libraries/chart/pma_pchart_multi_radar.php @@ -55,7 +55,7 @@ class PMA_pChart_multi_radar extends PMA_pChart_multi $this->getGraphAreaColor(RED), $this->getGraphAreaColor(GREEN), $this->getGraphAreaColor(BLUE), - FALSE + false ); if($this->settings['gradientIntensity']>0) @@ -98,7 +98,7 @@ class PMA_pChart_multi_radar extends PMA_pChart_multi $borderOffset += 40; // Draw the radar chart - $this->chart->drawRadarAxis($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), TRUE, $borderOffset, + $this->chart->drawRadarAxis($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), true, $borderOffset, 120, 120, 120, 230, 230, 230, -1, 2); $this->chart->drawFilledRadar($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 50, $borderOffset); } diff --git a/libraries/chart/pma_pchart_pie.php b/libraries/chart/pma_pchart_pie.php index 0366ba4..56148e0 100644 --- a/libraries/chart/pma_pchart_pie.php +++ b/libraries/chart/pma_pchart_pie.php @@ -45,7 +45,7 @@ class PMA_pChart_Pie extends PMA_pChart_multi $this->getGraphAreaColor(RED), $this->getGraphAreaColor(GREEN), $this->getGraphAreaColor(BLUE), - FALSE + false ); if($this->settings['gradientIntensity']>0) @@ -83,7 +83,7 @@ class PMA_pChart_Pie extends PMA_pChart_multi // lower part. This is why we set an offset to the // Y middle coordiantes. $middleY - 15, - 120, PIE_PERCENTAGE, FALSE, 60, 30, 10, 1); + 120, PIE_PERCENTAGE, false, 60, 30, 10, 1); } /** diff --git a/libraries/chart/pma_pchart_single_line.php b/libraries/chart/pma_pchart_single_line.php index 799a48b..3003581 100644 --- a/libraries/chart/pma_pchart_single_line.php +++ b/libraries/chart/pma_pchart_single_line.php @@ -27,7 +27,7 @@ class PMA_pChart_single_line extends PMA_pChart_single { // Draw the line chart $this->chart->drawLineGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription()); - $this->chart->drawPlotGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 3, 1, -1, -1, -1, TRUE); + $this->chart->drawPlotGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 3, 1, -1, -1, -1, true); } } diff --git a/libraries/chart/pma_pchart_single_radar.php b/libraries/chart/pma_pchart_single_radar.php index 6590582..0c5d9ec 100644 --- a/libraries/chart/pma_pchart_single_radar.php +++ b/libraries/chart/pma_pchart_single_radar.php @@ -46,7 +46,7 @@ class PMA_pChart_single_radar extends PMA_pChart_single $this->getGraphAreaColor(RED), $this->getGraphAreaColor(GREEN), $this->getGraphAreaColor(BLUE), - FALSE + false ); if($this->settings['gradientIntensity']>0) @@ -88,7 +88,7 @@ class PMA_pChart_single_radar extends PMA_pChart_single $borderOffset += 40; $this->chart->drawRadarAxis($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), - TRUE, $borderOffset, 120, 120, 120, 230, 230, 230, -1, 2); + true, $borderOffset, 120, 120, 120, 230, 230, 230, -1, 2); $this->chart->drawFilledRadar($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 50, $borderOffset); } } diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 70b70fe..5be5c76 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -55,7 +55,7 @@ require './libraries/Error_Handler.class.php'; * initialize the error handler */ $GLOBALS['error_handler'] = new PMA_Error_Handler(); -$cfg['Error_Handler']['display'] = TRUE; +$cfg['Error_Handler']['display'] = true; /* * This setting was removed in PHP 5.3. But at this point PMA_PHP_INT_VERSION diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 807376f..b09570c 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2850,7 +2850,7 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) { } /* Fetch fields list if required */ - if (strpos($string, '@FIELDS@') !== FALSE) { + if (strpos($string, '@FIELDS@') !== false) { $fields_list = PMA_DBI_fetch_result( 'SHOW COLUMNS FROM ' . PMA_backquote($GLOBALS['db']) . '.' . PMA_backquote($GLOBALS['table'])); @@ -2953,7 +2953,7 @@ function PMA_selectUploadFile($import_list, $uploaddir) { $matcher = '@\.(' . $extensions . ')(\.(' . PMA_supportedDecompressions() . '))?$@'; $files = PMA_getFileSelectOptions(PMA_userDir($uploaddir), $matcher, (isset($timeout_passed) && $timeout_passed && isset($local_import_file)) ? $local_import_file : ''); - if ($files === FALSE) { + if ($files === false) { PMA_Message::error(__('The directory you set for upload work cannot be reached'))->display(); } elseif (!empty($files)) { echo "\n"; diff --git a/libraries/config.default.php b/libraries/config.default.php index ad1d9ac..d6e47c2 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1309,7 +1309,7 @@ $cfg['Export']['texytext_structure_or_data'] = 'structure_and_data'; * * @global boolean $cfg['Export']['texytext_columns'] */ -$cfg['Export']['texytext_columns'] = FALSE; +$cfg['Export']['texytext_columns'] = false; /** * diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 51315d7..6494d49 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -698,7 +698,7 @@ function PMA_linkURL($url) { * @return string HTML code for javascript inclusion. */ function PMA_includeJS($url) { - if (strpos($url, '?') === FALSE) { + if (strpos($url, '?') === false) { return '<script src="./js/' . $url . '?ts=' . filemtime('./js/' . $url) . '" type="text/javascript"></script>' . "\n"; } else { return '<script src="./js/' . $url . '" type="text/javascript"></script>' . "\n"; diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 91a2283..57c8568 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1412,22 +1412,22 @@ function PMA_DBI_get_triggers($db, $table, $delimiter = '//') } /** - * Returns TRUE if $db.$view_name is a view, FALSE if not + * Returns true if $db.$view_name is a view, false if not * * @uses PMA_DBI_fetch_result() * @param string $db database name * @param string $view_name view/table name * - * @return bool TRUE if $db.$view_name is a view, FALSE if not + * @return bool true if $db.$view_name is a view, false if not */ function PMA_isView($db, $view_name) { $result = PMA_DBI_fetch_result("SELECT TABLE_NAME FROM information_schema.VIEWS WHERE TABLE_SCHEMA = '".$db."' and TABLE_NAME = '".$view_name."';"); if ($result) { - return TRUE; + return true; } else { - return FALSE; + return false; } } ?> diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index c4f22fb..e96e167 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -208,7 +208,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r } $_SESSION['debug']['queries'][$hash]['trace'][] = $trace; } - if ($r != FALSE && PMA_Tracker::isActive() == TRUE ) { + if ($r != false && PMA_Tracker::isActive() == true ) { PMA_Tracker::handleQuery($query); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index a6eff91..a40e32d 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -232,7 +232,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r $_SESSION['debug']['queries'][$hash]['trace'][] = $trace; } - if ($r != FALSE && PMA_Tracker::isActive() == TRUE ) { + if ($r != false && PMA_Tracker::isActive() == true ) { PMA_Tracker::handleQuery($query); } diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php index 02c05df..e0031a4 100644 --- a/libraries/display_create_database.lib.php +++ b/libraries/display_create_database.lib.php @@ -24,7 +24,7 @@ if ($is_create_db_priv) { <input type="text" name="new_db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" id="text_create_db"/> <?php require_once './libraries/mysql_charsets.lib.php'; - echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', null, null, TRUE, 5); + echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', null, null, true, 5); if (! empty($dbstats)) { echo '<input type="hidden" name="dbstats" value="1" />'; diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 756de10..05df2d0 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -199,7 +199,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { echo ' </select><br />'; } else { echo '<label for="charset_of_file">' . __('Character set of the file:') . '</label>' . "\n"; - echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_CHARSET, 'charset_of_file', 'charset_of_file', 'utf8', FALSE); + echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_CHARSET, 'charset_of_file', 'charset_of_file', 'utf8', false); } // end if (recoding) ?> </div> diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index 5ce0599..4f846bf 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -26,7 +26,7 @@ function PMA_language_cmp(&$a, &$b) { * * @access public */ -function PMA_select_language($use_fieldset = FALSE, $show_doc = TRUE) { +function PMA_select_language($use_fieldset = false, $show_doc = true) { global $cfg, $lang; ?> diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 08b3ea1..a16fc23 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -2291,7 +2291,7 @@ function default_function($buffer) { function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { global $db, $table, $sql_query, $unlim_num_rows; - $header_shown = FALSE; + $header_shown = false; $header = '<fieldset><legend>' . __('Query results operations') . '</legend>'; if ($the_disp_mode[6] == '1' || $the_disp_mode[9] == '1') { @@ -2300,7 +2300,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { if (!$header_shown) { echo $header; - $header_shown = TRUE; + $header_shown = true; } $_url_params = array( @@ -2340,7 +2340,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { } if (!$header_shown) { echo $header; - $header_shown = TRUE; + $header_shown = true; } $_url_params['unlim_num_rows'] = $unlim_num_rows; @@ -2378,7 +2378,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { */ if (!$header_shown) { echo $header; - $header_shown = TRUE; + $header_shown = true; } if (! isset($analyzed_sql[0]['queryflags']['procedure'])) { echo PMA_linkOrButton( @@ -2598,7 +2598,7 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher $ret = ''; if (! empty($edit_url)) { $ret .= '<td class="' . $class . '" align="center" ' . ' ><span class="nowrap">' - . PMA_linkOrButton($edit_url, $edit_str, array(), FALSE); + . PMA_linkOrButton($edit_url, $edit_str, array(), false); /* * Where clause for selecting this row uniquely is provided as * a hidden input. Used by jQuery scripts for handling inline editing @@ -2629,7 +2629,7 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause $ret .= 'class="' . $class . '" '; } $ret .= 'align="center" ' . ' ><span class="nowrap">' - . PMA_linkOrButton($copy_url, $copy_str, array(), FALSE); + . PMA_linkOrButton($copy_url, $copy_str, array(), false); /* * Where clause for selecting this row uniquely is provided as * a hidden input. Used by jQuery scripts for handling inline editing @@ -2660,7 +2660,7 @@ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class) { $ret .= 'class="' . $class . '" '; } $ret .= 'align="center" ' . ' >' - . PMA_linkOrButton($del_url, $del_str, $js_conf, FALSE) + . PMA_linkOrButton($del_url, $del_str, $js_conf, false) . '</td>'; } return $ret; diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 8e36f40..56c9d08 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -54,7 +54,7 @@ if (isset($plugin_list)) { */ function PMA_exportComment($text) { - return TRUE; + return true; } /** @@ -66,7 +66,7 @@ function PMA_exportComment($text) */ function PMA_exportFooter() { - return TRUE; + return true; } /** @@ -78,7 +78,7 @@ function PMA_exportFooter() */ function PMA_exportHeader() { - return TRUE; + return true; } /** @@ -92,7 +92,7 @@ function PMA_exportHeader() */ function PMA_exportDBHeader($db) { - return TRUE; + return true; } /** @@ -106,7 +106,7 @@ function PMA_exportDBHeader($db) */ function PMA_exportDBFooter($db) { - return TRUE; + return true; } /** @@ -120,7 +120,7 @@ function PMA_exportDBFooter($db) */ function PMA_exportDBCreate($db) { - return TRUE; + return true; } /** diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 6d6242e..41c3cf3 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -40,7 +40,7 @@ if (isset($plugin_list)) { * @return bool Whether it suceeded */ function PMA_exportComment($text) { - return TRUE; + return true; } /** @@ -51,7 +51,7 @@ function PMA_exportComment($text) { * @access public */ function PMA_exportFooter() { - return TRUE; + return true; } /** @@ -98,7 +98,7 @@ function PMA_exportHeader() { } // end if $csv_separator = str_replace('\\t', "\011", $csv_separator); } - return TRUE; + return true; } /** @@ -111,7 +111,7 @@ function PMA_exportHeader() { * @access public */ function PMA_exportDBHeader($db) { - return TRUE; + return true; } /** @@ -124,7 +124,7 @@ function PMA_exportDBHeader($db) { * @access public */ function PMA_exportDBFooter($db) { - return TRUE; + return true; } /** @@ -137,7 +137,7 @@ function PMA_exportDBFooter($db) { * @access public */ function PMA_exportDBCreate($db) { - return TRUE; + return true; } /** @@ -179,7 +179,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } // end for $schema_insert =trim(substr($schema_insert, 0, -1)); if (!PMA_exportOutputHandler($schema_insert . $csv_terminated)) { - return FALSE; + return false; } } // end if @@ -223,12 +223,12 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } // end for if (!PMA_exportOutputHandler($schema_insert . $csv_terminated)) { - return FALSE; + return false; } } // end while PMA_DBI_free_result($result); - return TRUE; + return true; } // end of the 'PMA_getTableCsv()' function } diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index b88cb8f..7b54476 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -41,7 +41,7 @@ if (isset($plugin_list)) { * @return bool Whether it suceeded */ function PMA_exportComment($text) { - return TRUE; + return true; } /** @@ -99,7 +99,7 @@ function PMA_exportDBHeader($db) { * @access public */ function PMA_exportDBFooter($db) { - return TRUE; + return true; } /** @@ -112,7 +112,7 @@ function PMA_exportDBFooter($db) { * @access public */ function PMA_exportDBCreate($db) { - return TRUE; + return true; } /** @@ -133,10 +133,10 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) global $what; if (! PMA_exportOutputHandler('<h2>' . __('Dumping data for table') . ' ' . $table . '</h2>')) { - return FALSE; + return false; } if (! PMA_exportOutputHandler('<table class="width100" cellspacing="1">')) { - return FALSE; + return false; } // Gets the data from the database @@ -151,7 +151,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) } // end for $schema_insert .= '</tr>'; if (! PMA_exportOutputHandler($schema_insert)) { - return FALSE; + return false; } } // end if @@ -170,15 +170,15 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) } // end for $schema_insert .= '</tr>'; if (! PMA_exportOutputHandler($schema_insert)) { - return FALSE; + return false; } } // end while PMA_DBI_free_result($result); if (! PMA_exportOutputHandler('</table>')) { - return FALSE; + return false; } - return TRUE; + return true; } function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy) @@ -186,7 +186,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals global $cfgRelation; if (! PMA_exportOutputHandler('<h2>' . __('Table structure for table') . ' ' .$table . '</h2>')) { - return FALSE; + return false; } /** @@ -217,19 +217,19 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $res_rel = PMA_getForeigners($db, $table); if ($res_rel && count($res_rel) > 0) { - $have_rel = TRUE; + $have_rel = true; } else { - $have_rel = FALSE; + $have_rel = false; } } else { - $have_rel = FALSE; + $have_rel = false; } // end if /** * Displays the table structure */ if (! PMA_exportOutputHandler('<table class="width100" cellspacing="1">')) { - return FALSE; + return false; } $columns_cnt = 4; @@ -262,7 +262,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $schema_insert .= '</tr>'; if (! PMA_exportOutputHandler($schema_insert)) { - return FALSE; + return false; } while ($row = PMA_DBI_fetch_assoc($result)) { @@ -340,7 +340,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $schema_insert .= '</tr>'; if (! PMA_exportOutputHandler($schema_insert)) { - return FALSE; + return false; } } // end while PMA_DBI_free_result($result); diff --git a/libraries/export/json.php b/libraries/export/json.php index 40f4a4d..6f70dd4 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -174,7 +174,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) $buffer .= ']'; if (! PMA_exportOutputHandler($buffer)) { - return FALSE; + return false; } PMA_DBI_free_result($result); diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 2a434ae..9709dc4 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -118,7 +118,7 @@ function PMA_exportComment($text) { * @access public */ function PMA_exportFooter() { - return TRUE; + return true; } /** @@ -174,7 +174,7 @@ function PMA_exportDBHeader($db) { * @access public */ function PMA_exportDBFooter($db) { - return TRUE; + return true; } /** @@ -187,7 +187,7 @@ function PMA_exportDBFooter($db) { * @access public */ function PMA_exportDBCreate($db) { - return TRUE; + return true; } /** @@ -226,7 +226,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\'; } if (!PMA_exportOutputHandler($buffer)) { - return FALSE; + return false; } // show column names @@ -238,17 +238,17 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { $buffer = substr($buffer, 0, -2) . '\\\\ \\hline \hline '; if (!PMA_exportOutputHandler($buffer . ' \\endfirsthead ' . $crlf)) { - return FALSE; + return false; } if (isset($GLOBALS['latex_caption'])) { - if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) . '} \\\\ ')) return FALSE; + if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) . '} \\\\ ')) return false; } if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) { - return FALSE; + return false; } } else { if (!PMA_exportOutputHandler('\\\\ \hline')) { - return FALSE; + return false; } } @@ -274,17 +274,17 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } $buffer .= ' \\\\ \\hline ' . $crlf; if (!PMA_exportOutputHandler($buffer)) { - return FALSE; + return false; } } $buffer = ' \\end{longtable}' . $crlf; if (!PMA_exportOutputHandler($buffer)) { - return FALSE; + return false; } PMA_DBI_free_result($result); - return TRUE; + return true; } // end getTableLaTeX @@ -337,12 +337,12 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $res_rel = PMA_getForeigners($db, $table); if ($res_rel && count($res_rel) > 0) { - $have_rel = TRUE; + $have_rel = true; } else { - $have_rel = FALSE; + $have_rel = false; } } else { - $have_rel = FALSE; + $have_rel = false; } // end if /** @@ -351,7 +351,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $buffer = $crlf . '%' . $crlf . '% ' . __('Structure') . ': ' . $table . $crlf . '%' . $crlf . ' \\begin{longtable}{'; if (!PMA_exportOutputHandler($buffer)) { - return FALSE; + return false; } $columns_cnt = 4; @@ -401,7 +401,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf; if (!PMA_exportOutputHandler($buffer)) { - return FALSE; + return false; } while ($row = PMA_DBI_fetch_assoc($result)) { @@ -475,7 +475,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $buffer .= ' \\\\ \\hline ' . $crlf; if (!PMA_exportOutputHandler($buffer)) { - return FALSE; + return false; } } // end while PMA_DBI_free_result($result); diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index 9fa1b48..386b63e 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -32,7 +32,7 @@ if (isset($plugin_list)) { * @return bool Whether it suceeded */ function PMA_exportComment($text) { - return TRUE; + return true; } /** @@ -43,7 +43,7 @@ function PMA_exportComment($text) { * @access public */ function PMA_exportFooter() { - return TRUE; + return true; } /** @@ -54,7 +54,7 @@ function PMA_exportFooter() { * @access public */ function PMA_exportHeader() { - return TRUE; + return true; } /** @@ -67,7 +67,7 @@ function PMA_exportHeader() { * @access public */ function PMA_exportDBHeader($db) { - return TRUE; + return true; } /** @@ -80,7 +80,7 @@ function PMA_exportDBHeader($db) { * @access public */ function PMA_exportDBFooter($db) { - return TRUE; + return true; } /** @@ -93,7 +93,7 @@ function PMA_exportDBFooter($db) { * @access public */ function PMA_exportDBCreate($db) { - return TRUE; + return true; } /** diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 0533741..0237627 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -40,7 +40,7 @@ require_once './libraries/opendocument.lib.php'; * @return bool Whether it suceeded */ function PMA_exportComment($text) { - return TRUE; + return true; } /** @@ -55,9 +55,9 @@ function PMA_exportFooter() { . '</office:body>' . '</office:document-content>'; if (!PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.spreadsheet', $GLOBALS['ods_buffer']))) { - return FALSE; + return false; } - return TRUE; + return true; } /** @@ -106,7 +106,7 @@ function PMA_exportHeader() { . '</office:automatic-styles>' . '<office:body>' . '<office:spreadsheet>'; - return TRUE; + return true; } /** @@ -119,7 +119,7 @@ function PMA_exportHeader() { * @access public */ function PMA_exportDBHeader($db) { - return TRUE; + return true; } /** @@ -132,7 +132,7 @@ function PMA_exportDBHeader($db) { * @access public */ function PMA_exportDBFooter($db) { - return TRUE; + return true; } /** @@ -145,7 +145,7 @@ function PMA_exportDBFooter($db) { * @access public */ function PMA_exportDBCreate($db) { - return TRUE; + return true; } /** @@ -228,7 +228,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { $GLOBALS['ods_buffer'] .= '</table:table>'; - return TRUE; + return true; } } diff --git a/libraries/export/odt.php b/libraries/export/odt.php index 7af6013..2210a12 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -72,7 +72,7 @@ require_once './libraries/opendocument.lib.php'; * @return bool Whether it suceeded */ function PMA_exportComment($text) { - return TRUE; + return true; } /** @@ -87,9 +87,9 @@ function PMA_exportFooter() { . '</office:body>' . '</office:document-content>'; if (!PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.text', $GLOBALS['odt_buffer']))) { - return FALSE; + return false; } - return TRUE; + return true; } /** @@ -104,7 +104,7 @@ function PMA_exportHeader() { . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">' . '<office:body>' . '<office:text>'; - return TRUE; + return true; } /** @@ -118,7 +118,7 @@ function PMA_exportHeader() { */ function PMA_exportDBHeader($db) { $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' . htmlspecialchars(__('Database') . ' ' . $db) . '</text:h>'; - return TRUE; + return true; } /** @@ -131,7 +131,7 @@ function PMA_exportDBHeader($db) { * @access public */ function PMA_exportDBFooter($db) { - return TRUE; + return true; } /** @@ -144,7 +144,7 @@ function PMA_exportDBFooter($db) { * @access public */ function PMA_exportDBCreate($db) { - return TRUE; + return true; } /** @@ -217,7 +217,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { $GLOBALS['odt_buffer'] .= '</table:table>'; - return TRUE; + return true; } /** @@ -272,12 +272,12 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $res_rel = PMA_getForeigners($db, $table); if ($res_rel && count($res_rel) > 0) { - $have_rel = TRUE; + $have_rel = true; } else { - $have_rel = FALSE; + $have_rel = false; } } else { - $have_rel = FALSE; + $have_rel = false; } // end if /** @@ -412,7 +412,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals PMA_DBI_free_result($result); $GLOBALS['odt_buffer'] .= '</table:table>'; - return TRUE; + return true; } // end of the 'PMA_exportStructure' function } // end else diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index 431df0d..fe9b46c 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -365,7 +365,7 @@ $pdf = new PMA_PDF('L', 'pt', 'A3'); */ function PMA_exportComment($text) { - return TRUE; + return true; } /** @@ -381,10 +381,10 @@ function PMA_exportFooter() // instead of $pdf->Output(): if (!PMA_exportOutputHandler($pdf->getPDFData())) { - return FALSE; + return false; } - return TRUE; + return true; } /** @@ -412,7 +412,7 @@ function PMA_exportHeader() $pdf->setAttributes($attr); $pdf->setTopMargin(45); - return TRUE; + return true; } /** @@ -426,7 +426,7 @@ function PMA_exportHeader() */ function PMA_exportDBHeader($db) { - return TRUE; + return true; } /** @@ -440,7 +440,7 @@ function PMA_exportDBHeader($db) */ function PMA_exportDBFooter($db) { - return TRUE; + return true; } /** @@ -454,7 +454,7 @@ function PMA_exportDBFooter($db) */ function PMA_exportDBCreate($db) { - return TRUE; + return true; } /** @@ -479,7 +479,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) $pdf->setAttributes($attr); $pdf->mysql_report($sql_query); - return TRUE; + return true; } // end of the 'PMA_exportData()' function } ?> diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 983673c..2c3b4e6 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -167,7 +167,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) $buffer .= $crlf . ');' . $crlf; if (! PMA_exportOutputHandler($buffer)) { - return FALSE; + return false; } PMA_DBI_free_result($result); diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 1530c53..55d330e 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -526,7 +526,7 @@ function PMA_exportDBCreate($db) global $crlf; if (isset($GLOBALS['sql_drop_database'])) { if (!PMA_exportOutputHandler('DROP DATABASE ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : $db) . ';' . $crlf)) { - return FALSE; + return false; } } $create_query = 'CREATE DATABASE ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : $db); @@ -538,7 +538,7 @@ function PMA_exportDBCreate($db) } $create_query .= ';' . $crlf; if (!PMA_exportOutputHandler($create_query)) { - return FALSE; + return false; } if (isset($GLOBALS['sql_backquotes']) && isset($GLOBALS['sql_compatibility']) && $GLOBALS['sql_compatibility'] == 'NONE') { $result = PMA_exportOutputHandler('USE ' . PMA_backquote($db) . ';' . $crlf); @@ -579,7 +579,7 @@ function PMA_exportDBFooter($db) { global $crlf; - $result = TRUE; + $result = true; if (isset($GLOBALS['sql_constraints'])) { $result = PMA_exportOutputHandler($GLOBALS['sql_constraints']); unset($GLOBALS['sql_constraints']); @@ -688,7 +688,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a // need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli $result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddslashes($table) . '\'', null, PMA_DBI_QUERY_STORE); - if ($result != FALSE) { + if ($result != false) { if (PMA_DBI_num_rows($result) > 0) { $tmpres = PMA_DBI_fetch_assoc($result); // Here we optionally add the AUTO_INCREMENT next value, @@ -747,7 +747,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a return PMA_exportComment(__('in use') . '(' . $tmp_error . ')'); } - if ($result != FALSE && ($row = PMA_DBI_fetch_row($result))) { + if ($result != false && ($row = PMA_DBI_fetch_row($result))) { $create_query = $row[1]; unset($row); @@ -821,13 +821,13 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a $sql_constraints .= 'ALTER TABLE ' . PMA_backquote($table) . $crlf; $sql_drop_foreign_keys .= 'ALTER TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $crlf; - $first = TRUE; + $first = true; for ($j = $i; $j < $sql_count; $j++) { if (preg_match('@CONSTRAINT|FOREIGN[\s]+KEY@', $sql_lines[$j])) { if (!$first) { $sql_constraints .= $crlf; } - if (strpos($sql_lines[$j], 'CONSTRAINT') === FALSE) { + if (strpos($sql_lines[$j], 'CONSTRAINT') === false) { $tmp_str = preg_replace('/(FOREIGN[\s]+KEY)/', 'ADD \1', $sql_lines[$j]); $sql_constraints_query .= $tmp_str; $sql_constraints .= $tmp_str; @@ -841,7 +841,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a } $sql_drop_foreign_keys .= 'DROP FOREIGN KEY ' . $matches[3]; } - $first = FALSE; + $first = false; } else { break; } @@ -895,12 +895,12 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mim $res_rel = PMA_getForeigners($db, $table); if ($res_rel && count($res_rel) > 0) { - $have_rel = TRUE; + $have_rel = true; } else { - $have_rel = FALSE; + $have_rel = false; } } else { - $have_rel = FALSE; + $have_rel = false; } // end if if ($do_mime && $cfgRelation['mimework']) { @@ -958,7 +958,7 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mim * * @access public */ -function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE, $comments = FALSE, $mime = FALSE, $dates = FALSE, $export_mode, $export_type) +function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, $comments = false, $mime = false, $dates = false, $export_mode, $export_type) { $formatted_table_name = (isset($GLOBALS['sql_backquotes'])) ? PMA_backquote($table) @@ -1058,7 +1058,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) . PMA_possibleCRLF(); if (! PMA_exportOutputHandler($head)) { - return FALSE; + return false; } return true; } @@ -1078,7 +1078,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) return PMA_exportOutputHandler(PMA_exportComment(__('in use') . ' (' . $tmp_error . ')')); } - if ($result != FALSE) { + if ($result != false) { $fields_cnt = PMA_DBI_num_fields($result); // Get field information @@ -1155,7 +1155,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) . PMA_exportComment() . $crlf; if (! PMA_exportOutputHandler($head)) { - return FALSE; + return false; } } $current_row++; @@ -1221,7 +1221,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) $insert_line = '(' . implode(', ', $values) . ')'; if (isset($GLOBALS['sql_max_query_size']) && $GLOBALS['sql_max_query_size'] > 0 && $query_size + strlen($insert_line) > $GLOBALS['sql_max_query_size']) { if (!PMA_exportOutputHandler(';' . $crlf)) { - return FALSE; + return false; } $query_size = 0; $current_row = 1; @@ -1238,19 +1238,19 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) unset($values); if (!PMA_exportOutputHandler(($current_row == 1 ? '' : $separator . $crlf) . $insert_line)) { - return FALSE; + return false; } } // end while if ($current_row > 0) { if (!PMA_exportOutputHandler(';' . $crlf)) { - return FALSE; + return false; } } - } // end if ($result != FALSE) + } // end if ($result != false) PMA_DBI_free_result($result); - return TRUE; + return true; } // end of the 'PMA_exportData()' function } ?> diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 1895bcf..d15b43e 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -39,7 +39,7 @@ if (isset($plugin_list)) { * @return bool Whether it suceeded */ function PMA_exportComment($text) { - return TRUE; + return true; } /** @@ -87,7 +87,7 @@ function PMA_exportDBHeader($db) { * @access public */ function PMA_exportDBFooter($db) { - return TRUE; + return true; } /** @@ -100,7 +100,7 @@ function PMA_exportDBFooter($db) { * @access public */ function PMA_exportDBCreate($db) { - return TRUE; + return true; } /** @@ -121,7 +121,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) global $what; if (! PMA_exportOutputHandler('== ' . __('Dumping data for table') . ' ' . $table . "\n\n")) { - return FALSE; + return false; } // Gets the data from the database @@ -136,7 +136,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) } // end for $text_output .= "\n|------\n"; if (! PMA_exportOutputHandler($text_output)) { - return FALSE; + return false; } } // end if @@ -155,12 +155,12 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) } // end for $text_output .= "\n"; if (! PMA_exportOutputHandler($text_output)) { - return FALSE; + return false; } } // end while PMA_DBI_free_result($result); - return TRUE; + return true; } function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy) @@ -168,7 +168,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals global $cfgRelation; if (! PMA_exportOutputHandler('== ' . __('Table structure for table') . ' ' .$table . "\n\n")) { - return FALSE; + return false; } /** @@ -199,12 +199,12 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $res_rel = PMA_getForeigners($db, $table); if ($res_rel && count($res_rel) > 0) { - $have_rel = TRUE; + $have_rel = true; } else { - $have_rel = FALSE; + $have_rel = false; } } else { - $have_rel = FALSE; + $have_rel = false; } // end if /** @@ -241,7 +241,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $text_output .= "\n|------\n"; if (! PMA_exportOutputHandler($text_output)) { - return FALSE; + return false; } while ($row = PMA_DBI_fetch_assoc($result)) { @@ -319,7 +319,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $text_output .= "\n"; if (! PMA_exportOutputHandler($text_output)) { - return FALSE; + return false; } } // end while PMA_DBI_free_result($result); diff --git a/libraries/export/xls.php b/libraries/export/xls.php index 599025d..01e2ae4 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -43,7 +43,7 @@ require_once './libraries/PHPExcel/PHPExcel/Writer/Excel5.php'; * @return bool Whether it suceeded */ function PMA_exportComment($text) { - return TRUE; + return true; } /** @@ -64,7 +64,7 @@ function PMA_exportFooter() { $workbookWriter->save($tmp_filename); if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) { - return FALSE; + return false; } unlink($tmp_filename); @@ -72,7 +72,7 @@ function PMA_exportFooter() { unset($GLOBALS['workbook']); unset($GLOBALS['sheet_index']); - return TRUE; + return true; } /** @@ -95,7 +95,7 @@ function PMA_exportHeader() { $workbook->getProperties()->setTitle($db); $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLS Dump'); - return TRUE; + return true; } /** @@ -110,7 +110,7 @@ function PMA_exportHeader() { function PMA_exportDBHeader($db) { - return TRUE; + return true; } /** @@ -123,7 +123,7 @@ function PMA_exportDBHeader($db) { * @access public */ function PMA_exportDBFooter($db) { - return TRUE; + return true; } /** @@ -136,7 +136,7 @@ function PMA_exportDBFooter($db) { * @access public */ function PMA_exportDBCreate($db) { - return TRUE; + return true; } /** @@ -200,7 +200,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { $sheet_index++; } - return TRUE; + return true; } } diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 89c5288..190cd2f 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -43,7 +43,7 @@ require_once './libraries/PHPExcel/PHPExcel/Writer/Excel2007.php'; * @return bool Whether it suceeded */ function PMA_exportComment($text) { - return TRUE; + return true; } /** @@ -63,7 +63,7 @@ function PMA_exportFooter() { $workbookWriter->save($tmp_filename); if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) { - return FALSE; + return false; } unlink($tmp_filename); @@ -71,7 +71,7 @@ function PMA_exportFooter() { unset($GLOBALS['workbook']); unset($GLOBALS['sheet_index']); - return TRUE; + return true; } /** @@ -94,7 +94,7 @@ function PMA_exportHeader() { $workbook->getProperties()->setTitle($db); $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLSX Dump'); - return TRUE; + return true; } /** @@ -109,7 +109,7 @@ function PMA_exportHeader() { function PMA_exportDBHeader($db) { - return TRUE; + return true; } /** @@ -122,7 +122,7 @@ function PMA_exportDBHeader($db) { * @access public */ function PMA_exportDBFooter($db) { - return TRUE; + return true; } /** @@ -135,7 +135,7 @@ function PMA_exportDBFooter($d) {' . PMA_VERSION . ' XLSX Dump');on = fals, $do_mime = false, $dates = false, $dummy)BALS['sql_max_query_size']) {; '} \\\\ ')) return false;n.html#faq1_16@Documentation]FAQ 1.16[/a].'));P�� ]�g/+6 ��!�!��@��x��h/+P��"A�g/+^�g/+��@�g/+��i/+�H�g/+�i/+��i/+��i/+�Ćg/+x��h/+P�� ]�g/+�!�!��@��Ƚ�h/+0��"A�g/+^�g/+��@�g/+��[�g/+�p�@��H�g/+�Ćg/+0��]�g/+GHIJKMNOP��@��HuXh/+��"A�g/+^�g/+��0�i/+�H�g/+�h/+��5h/+�i/+��i/+��i/+�Ćg/+HuXh/+��]�g/+8uXh/+��@��]�g/+(uXh/+��p��]�g/+uXh/+��]�g/+ ��i/+�H�g/+��i/+ ��5h/+�G�g/+��i/+@��y�5h/+�G�g/+�i/+p��Z�5h/+�G�g/+ؤ5h/+�h/+��5h/+�i/+��h/+��i/+��i/+�Ćg/+��3h/+��]�g/+#%')*-.035678:<=��@��p+h/+��"A�g/+8�h/+�H�g/+��h/+� �h/+�Ćg/+cfm�g/+@��p+h/+��]�g/+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��g/+��Fii/+Fii/+?U�g/+@��`��m�g/+�G�g/+�T�g/+��Bii/+��g/+@��Bii/+H��]�gb) { * @access public */ function PMA_exportDBCreate($db) { - return TRUE; + return true; } /** @@ -199,7 +199,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { $sheet_index++; } - return TRUE; + return true; } } diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 55b272d..e27bd2f 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -263,7 +263,7 @@ function PMA_exportDBHeader($db) { } else { - return TRUE; + return true; } } @@ -285,7 +285,7 @@ function PMA_exportDBFooter($db) { } else { - return TRUE; + return true; } } @@ -299,7 +299,7 @@ function PMA_exportDBFooter($db) { * @access public */ function PMA_exportDBCreate($db) { - return TRUE; + return true; } @@ -330,7 +330,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { $buffer = ' ' . $crlf; if (!PMA_exportOutputHandler($buffer)) { - return FALSE; + return false; } while ($record = PMA_DBI_fetch_row($result)) { @@ -346,13 +346,13 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { $buffer .= ' </table>' . $crlf; if (!PMA_exportOutputHandler($buffer)) { - return FALSE; + return false; } } PMA_DBI_free_result($result); } - return TRUE; + return true; } // end of the 'PMA_getTableXML()' function } } diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index 550eb1d..9d9f7e5 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -173,7 +173,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) } if (! PMA_exportOutputHandler($buffer)) { - return FALSE; + return false; } } PMA_DBI_free_result($result); diff --git a/libraries/file_listing.php b/libraries/file_listing.php index 1ca9711..ff1cf9d 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -12,7 +12,7 @@ * * @param string directory to list * @param string regular expression to match files - * @returns array sorted file list on success, FALSE on failure + * @returns array sorted file list on success, false on failure */ function PMA_getDirContent($dir, $expression = '') { @@ -32,7 +32,7 @@ function PMA_getDirContent($dir, $expression = '') asort($result); return $result; } else { - return FALSE; + return false; } } @@ -42,13 +42,13 @@ function PMA_getDirContent($dir, $expression = '') * @param string directory to list * @param string regullar expression to match files * @param string currently active choice - * @returns array sorted file list on success, FALSE on failure + * @returns array sorted file list on success, false on failure */ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '') { $list = PMA_getDirContent($dir, $extensions); - if ($list === FALSE) { - return FALSE; + if ($list === false) { + return false; } $result = ''; foreach ($list as $key => $val) { diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index a96fb74..bef4658 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -69,5 +69,5 @@ if ($text_dir == 'ltr') { /** * Sets a variable to remember headers have been sent */ -$is_header_sent = TRUE; +$is_header_sent = true; ?> diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php index 2efd615..1f00c13 100644 --- a/libraries/iconv_wrapper.lib.php +++ b/libraries/iconv_wrapper.lib.php @@ -44,7 +44,7 @@ $gnu_iconv_to_aix_iconv_codepage_map = array ( * @param string output character set * @param string the string to convert * - * @return mixed converted string or FALSE on failure + * @return mixed converted string or false on failure * * @access public * @@ -55,7 +55,7 @@ function PMA_aix_iconv_wrapper($in_charset, $out_charset, $str) { // Check for transliteration argument at the end of output character set name $translit_search = strpos(strtolower($out_charset), '//translit'); - $using_translit = (!($translit_search === FALSE)); + $using_translit = (!($translit_search === false)); // Extract "plain" output character set name (without any transliteration argument) $out_charset_plain = ($using_translit ? substr($out_charset, 0, $translit_search) : $out_charset); diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 54858a6..11ae523 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -29,15 +29,15 @@ function PMA_checkTimeout() { global $timestamp, $maximum_time, $timeout_passed; if ($maximum_time == 0) { - return FALSE; + return false; } elseif ($timeout_passed) { - return TRUE; + return true; /* 5 in next row might be too much */ } elseif ((time() - $timestamp) > ($maximum_time - 5)) { - $timeout_passed = TRUE; - return TRUE; + $timeout_passed = true; + return true; } else { - return FALSE; + return false; } } @@ -52,7 +52,7 @@ function PMA_detectCompression($filepath) { $file = @fopen($filepath, 'rb'); if (!$file) { - return FALSE; + return false; } $test = fread($file, 4); $len = strlen($test); @@ -101,14 +101,14 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) && !$is_superuser && preg_match('@^[[:space:]]*DROP[[:space:]]+(IF EXISTS[[:space:]]+)?DATABASE @i', $import_run_buffer['sql'])) { $GLOBALS['message'] = PMA_Message::error(__('"DROP DATABASE" statements are disabled.')); - $error = TRUE; + $error = true; } else { $executed_queries++; if ($run_query && $GLOBALS['finished'] && empty($sql) && !$error && ( (!empty($import_run_buffer['sql']) && preg_match('/^[\s]*(SELECT|SHOW|HANDLER)/i', $import_run_buffer['sql'])) || ($executed_queries == 1) )) { - $go_sql = TRUE; + $go_sql = true; if (!$sql_query_disabled) { $complete_query = $sql_query; $display_query = $sql_query; @@ -126,7 +126,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) $result = PMA_DBI_try_query($import_run_buffer['sql']); } $msg = '# '; - if ($result === FALSE) { // execution failed + if ($result === false) { // execution failed if (! isset($my_die)) { $my_die = array(); } @@ -137,7 +137,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) } if (!$cfg['IgnoreMultiSubmitErrors']) { - $error = TRUE; + $error = true; return; } } elseif ($cfg['VerboseMultiSubmit']) { @@ -158,12 +158,12 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) } // If a 'USE <db>' SQL-clause was found and the query succeeded, set our current $db to the new one - if ($result != FALSE) { + if ($result != false) { list($db, $reload) = PMA_lookForUse($import_run_buffer['sql'], $db, $reload); } - if ($result != FALSE && preg_match('@^[\s]*(DROP|CREATE)[\s]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)@im', $import_run_buffer['sql'])) { - $reload = TRUE; + if ($result != false && preg_match('@^[\s]*(DROP|CREATE)[\s]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)@im', $import_run_buffer['sql'])) { + $reload = true; } } // end run query } // end if not DROP DATABASE @@ -185,12 +185,12 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) if ($cfg['VerboseMultiSubmit'] && ! empty($sql_query)) { if (strlen($sql_query) > 50000 || $executed_queries > 50 || $max_sql_len > 1000) { $sql_query = ''; - $sql_query_disabled = TRUE; + $sql_query_disabled = true; } } else { if (strlen($sql_query) > 10000 || $executed_queries > 10 || $max_sql_len > 500) { $sql_query = ''; - $sql_query_disabled = TRUE; + $sql_query_disabled = true; } } } @@ -219,7 +219,7 @@ function PMA_lookForUse($buffer, $db, $reload) if (preg_match('@^[\s]*USE[[:space:]]*([\S]+)@i', $buffer, $match)) { $db = trim($match[1]); $db = trim($db,';'); // for example, USE abc; - $reload = TRUE; + $reload = true; } return(array($db, $reload)); } @@ -257,16 +257,16 @@ function PMA_importGetNextChunk($size = 32768) } if (PMA_checkTimeout()) { - return FALSE; + return false; } if ($GLOBALS['finished']) { - return TRUE; + return true; } if ($GLOBALS['import_file'] == 'none') { // Well this is not yet supported and tested, but should return content of textarea if (strlen($GLOBALS['import_text']) < $size) { - $GLOBALS['finished'] = TRUE; + $GLOBALS['finished'] = true; return $GLOBALS['import_text']; } else { $r = substr($GLOBALS['import_text'], 0, $size); diff --git a/libraries/import/README b/libraries/import/README index 6cb7d10..0f0d3d3 100644 --- a/libraries/import/README +++ b/libraries/import/README @@ -22,11 +22,11 @@ if (isset($plugin_list)) { $buffer = ''; while (!($finished && $i >= $len) && !$error && !$timeout_passed) { $data = PMA_importGetNextChunk(); - if ($data === FALSE) { + if ($data === false) { // subtract data we didn't handle yet and stop processing $offset -= strlen($buffer); break; - } elseif ($data === TRUE) { + } elseif ($data === true) { // Handle rest of buffer } else { // Append new data to buffer diff --git a/libraries/import/csv.php b/libraries/import/csv.php index 757e3b4..6386333 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -56,12 +56,12 @@ $csv_enclosed = strtr($csv_enclosed, $replacements); $csv_escaped = strtr($csv_escaped, $replacements); $csv_new_line = strtr($csv_new_line, $replacements); -$param_error = FALSE; +$param_error = false; if (strlen($csv_terminated) != 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); $message->addParam(__('Columns terminated by'), false); - $error = TRUE; - $param_error = TRUE; + $error = true; + $param_error = true; // The default dialog of MS Excel when generating a CSV produces a // semi-colon-separated file with no chance of specifying the // enclosing character. Thus, users who want to import this file @@ -73,18 +73,18 @@ if (strlen($csv_terminated) != 1) { } elseif (strlen($csv_enclosed) > 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); $message->addParam(__('Columns enclosed by'), false); - $error = TRUE; - $param_error = TRUE; + $error = true; + $param_error = true; } elseif (strlen($csv_escaped) != 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); $message->addParam(__('Columns escaped by'), false); - $error = TRUE; - $param_error = TRUE; + $error = true; + $param_error = true; } elseif (strlen($csv_new_line) != 1 && $csv_new_line != 'auto') { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); $message->addParam(__('Lines terminated by'), false); - $error = TRUE; - $param_error = TRUE; + $error = true; + $param_error = true; } // If there is an error in the parameters entered, indicate that immediately. @@ -120,17 +120,17 @@ if (!$analyze) { } /* Trim also `, if user already included backquoted fields */ $val = trim($val, " \t\r\n\0\x0B`"); - $found = FALSE; + $found = false; foreach ($tmp_fields as $id => $field) { if ($field['Field'] == $val) { - $found = TRUE; + $found = true; break; } } if (!$found) { $message = PMA_Message::error(__('Invalid column (%s) specified! Ensure that columns names are spelled correctly, separated by commas, and not enclosed in quotes.' )); $message->addParam($val); - $error = TRUE; + $error = true; break; } $fields[] = $field; @@ -150,7 +150,7 @@ $len = 0; $line = 1; $lasti = -1; $values = array(); -$csv_finish = FALSE; +$csv_finish = false; $tempRow = array(); $rows = array(); @@ -162,19 +162,19 @@ $max_cols = 0; while (!($finished && $i >= $len) && !$error && !$timeout_passed) { $data = PMA_importGetNextChunk(); - if ($data === FALSE) { + if ($data === false) { // subtract data we didn't handle yet and stop processing $offset -= strlen($buffer); break; - } elseif ($data === TRUE) { + } elseif ($data === true) { // Handle rest of buffer } else { // Append new data to buffer $buffer .= $data; unset($data); // Do not parse string when we're not at the end and don't have new line inside - if (($csv_new_line == 'auto' && strpos($buffer, "\r") === FALSE && strpos($buffer, "\n") === FALSE) - || ($csv_new_line != 'auto' && strpos($buffer, $csv_new_line) === FALSE)) { + if (($csv_new_line == 'auto' && strpos($buffer, "\r") === false && strpos($buffer, "\n") === false) + || ($csv_new_line != 'auto' && strpos($buffer, $csv_new_line) === false)) { continue; } } @@ -188,7 +188,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { if ($lasti == $i && $lastlen == $len) { $message = PMA_Message::error(__('Invalid format of CSV input on line %d.')); $message->addParam($line); - $error = TRUE; + $error = true; break; } $lasti = $i; @@ -213,13 +213,13 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { if ($i == $len - 1) { break; } - $need_end = TRUE; + $need_end = true; $i++; $ch = $buffer[$i]; } else { - $need_end = FALSE; + $need_end = false; } - $fail = FALSE; + $fail = false; $value = ''; while (($need_end && $ch != $csv_enclosed) || (!$need_end && !($ch == $csv_terminated @@ -227,7 +227,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { && ($ch == "\r" || $ch == "\n"))))) { if ($ch == $csv_escaped) { if ($i == $len - 1) { - $fail = TRUE; + $fail = true; break; } $i++; @@ -236,7 +236,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { $value .= $ch; if ($i == $len - 1) { if (!$finished) { - $fail = TRUE; + $fail = true; } break; } @@ -269,7 +269,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { } // Are we at the end? if ($ch == $csv_new_line || ($csv_new_line == 'auto' && ($ch == "\r" || $ch == "\n")) || ($finished && $i == $len - 1)) { - $csv_finish = TRUE; + $csv_finish = true; } // Go to next char if ($ch == $csv_terminated) { @@ -323,12 +323,12 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { } else { $message = PMA_Message::error(__('Invalid column count in CSV input on line %d.')); $message->addParam($line); - $error = TRUE; + $error = true; break; } } - $first = TRUE; + $first = true; $sql = $sql_template; foreach ($values as $key => $val) { if (!$first) { @@ -340,7 +340,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { $sql .= '\'' . addslashes($val) . '\''; } - $first = FALSE; + $first = false; } $sql .= ')'; @@ -351,7 +351,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { } $line++; - $csv_finish = FALSE; + $csv_finish = false; $values = array(); $buffer = substr($buffer, $i + 1); $len = strlen($buffer); @@ -435,6 +435,6 @@ PMA_importRunQuery(); if (count($values) != 0 && !$error) { $message = PMA_Message::error(__('Invalid format of CSV input on line %d.')); $message->addParam($line); - $error = TRUE; + $error = true; } ?> diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php index a64a094..f032e95 100644 --- a/libraries/import/docsql.php +++ b/libraries/import/docsql.php @@ -42,10 +42,10 @@ $buffer = ''; /* Read whole buffer, we except it is small enough */ while (!$finished && !$error && !$timeout_passed) { $data = PMA_importGetNextChunk(); - if ($data === FALSE) { + if ($data === false) { // subtract data we didn't handle yet and stop processing break; - } elseif ($data === TRUE) { + } elseif ($data === true) { // nothing to read break; } else { @@ -54,7 +54,7 @@ while (!$finished && !$error && !$timeout_passed) { } } // End of import loop /* Process the data */ -if ($data === TRUE && !$error && !$timeout_passed) { +if ($data === true && !$error && !$timeout_passed) { $buffer = str_replace("\r\n", "\n", $buffer); $buffer = str_replace("\r", "\n", $buffer); $lines = explode("\n", $buffer); diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index e6eb56d..979013d 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -18,13 +18,13 @@ if ($plugin_param !== 'table') { if (isset($plugin_list)) { if ($GLOBALS['cfg']['Import']['ldi_local_option'] == 'auto') { - $GLOBALS['cfg']['Import']['ldi_local_option'] = FALSE; + $GLOBALS['cfg']['Import']['ldi_local_option'] = false; $result = PMA_DBI_try_query('SHOW VARIABLES LIKE \'local\\_infile\';'); - if ($result != FALSE && PMA_DBI_num_rows($result) > 0) { + if ($result != false && PMA_DBI_num_rows($result) > 0) { $tmp = PMA_DBI_fetch_row($result); if ($tmp[1] == 'ON') { - $GLOBALS['cfg']['Import']['ldi_local_option'] = TRUE; + $GLOBALS['cfg']['Import']['ldi_local_option'] = true; } } PMA_DBI_free_result($result); @@ -54,7 +54,7 @@ if (isset($plugin_list)) { if ($import_file == 'none' || $compression != 'none' || $charset_conversion) { // We handle only some kind of data! $message = PMA_Message::error(__('This plugin does not support compressed imports!')); - $error = TRUE; + $error = true; return; } @@ -105,5 +105,5 @@ if (strlen($ldi_columns) > 0) { PMA_importRunQuery($sql, $sql); PMA_importRunQuery(); -$finished = TRUE; +$finished = true; ?> diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 4bf5200..9d41bb4 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -48,11 +48,11 @@ $buffer = ""; */ while (! ($finished && $i >= $len) && ! $error && ! $timeout_passed) { $data = PMA_importGetNextChunk(); - if ($data === FALSE) { + if ($data === false) { /* subtract data we didn't handle yet and stop processing */ $offset -= strlen($buffer); break; - } elseif ($data === TRUE) { + } elseif ($data === true) { /* Handle rest of buffer */ } else { /* Append new data to buffer */ @@ -74,11 +74,11 @@ $xml = simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT); unset($buffer); -if ($xml === FALSE) { +if ($xml === false) { $sheets = array(); /* TODO: this message should be improved later, used existing because of string freeze */ $message = PMA_Message::error(__('Error in Processing Request')); - $error = TRUE; + $error = true; } else { $sheets = $xml->children('office', true)->{'body'}->{'spreadsheet'}->children('table', true); } diff --git a/libraries/import/sql.php b/libraries/import/sql.php index 0e61080..4bb65d6 100644 --- a/libraries/import/sql.php +++ b/libraries/import/sql.php @@ -93,11 +93,11 @@ $GLOBALS['finished'] = false; while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) { $data = PMA_importGetNextChunk(); - if ($data === FALSE) { + if ($data === false) { // subtract data we didn't handle yet and stop processing $offset -= strlen($buffer); break; - } elseif ($data === TRUE) { + } elseif ($data === true) { // Handle rest of buffer } else { // Append new data to buffer @@ -105,7 +105,7 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) { // free memory unset($data); // Do not parse string when we're not at the end and don't have ; inside - if ((strpos($buffer, $sql_delimiter, $i) === FALSE) && !$GLOBALS['finished']) { + if ((strpos($buffer, $sql_delimiter, $i) === false) && !$GLOBALS['finished']) { continue; } } @@ -132,7 +132,7 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) { */ // the cost of doing this one with preg_match() would be too high $first_sql_delimiter = strpos($buffer, $sql_delimiter, $i); - if ($first_sql_delimiter === FALSE) { + if ($first_sql_delimiter === false) { $first_sql_delimiter = $big_value; } else { $found_delimiter = true; @@ -162,9 +162,9 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) { $ch = $buffer[$i]; // Quotes - if (strpos('\'"`', $ch) !== FALSE) { + if (strpos('\'"`', $ch) !== false) { $quote = $ch; - $endq = FALSE; + $endq = false; while (!$endq) { // Find next quote $pos = strpos($buffer, $quote, $i + 1); @@ -178,13 +178,13 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) { * * SELECT * FROM `table` */ - if ($pos === FALSE && $quote == '`' && $found_delimiter) { + if ($pos === false && $quote == '`' && $found_delimiter) { $pos = $first_sql_delimiter - 1; // No quote? Too short string - } elseif ($pos === FALSE) { + } elseif ($pos === false) { // We hit end of string => unclosed quote, but we handle it as end of query if ($GLOBALS['finished']) { - $endq = TRUE; + $endq = true; $i = $len - 1; } $found_delimiter = false; @@ -238,7 +238,7 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) { // file might have been produced on a different system $i = strpos($buffer, $ch == '/' ? '*/' : "\n", $i); // didn't we hit end of string? - if ($i === FALSE) { + if ($i === false) { if ($GLOBALS['finished']) { $i = $len - 1; } else { @@ -270,7 +270,7 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) { // (see previous comment about PHP_EOL) $new_line_pos = strpos($buffer, "\n", $i + $length_of_delimiter_keyword); // it might happen that there is no EOL - if (FALSE === $new_line_pos) { + if (false === $new_line_pos) { $new_line_pos = $len; } $sql_delimiter = substr($buffer, $i + $length_of_delimiter_keyword, $new_line_pos - $i - $length_of_delimiter_keyword); @@ -303,8 +303,8 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) { $i = 0; $start_pos = 0; // Any chance we will get a complete query? - //if ((strpos($buffer, ';') === FALSE) && !$GLOBALS['finished']) { - if ((strpos($buffer, $sql_delimiter) === FALSE) && !$GLOBALS['finished']) { + //if ((strpos($buffer, ';') === false) && !$GLOBALS['finished']) { + if ((strpos($buffer, $sql_delimiter) === false) && !$GLOBALS['finished']) { break; } } else { diff --git a/libraries/import/xml.php b/libraries/import/xml.php index 640aac8..d3d17b2 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -41,11 +41,11 @@ $buffer = ""; */ while (! ($finished && $i >= $len) && ! $error && ! $timeout_passed) { $data = PMA_importGetNextChunk(); - if ($data === FALSE) { + if ($data === false) { /* subtract data we didn't handle yet and stop processing */ $offset -= strlen($buffer); break; - } elseif ($data === TRUE) { + } elseif ($data === true) { /* Handle rest of buffer */ } else { /* Append new data to buffer */ @@ -70,7 +70,7 @@ unset($buffer); /** * The XML was malformed */ -if ($xml === FALSE) { +if ($xml === false) { PMA_Message::error(__('The XML file specified was either malformed or incomplete. Please correct the issue and try again.'))->display(); unset($xml); $GLOBALS['finished'] = false; diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php index 67c8b1c..552bd13 100644 --- a/libraries/kanji-encoding.lib.php +++ b/libraries/kanji-encoding.lib.php @@ -35,7 +35,7 @@ function PMA_internal_enc_check() { $enc_list = 'ASCII,SJIS,EUC-JP,JIS'; } - return TRUE; + return true; } // end of the 'PMA_internal_enc_check' function @@ -57,7 +57,7 @@ function PMA_change_enc_order() { $enc_list = 'ASCII,EUC-JP,SJIS,JIS'; } - return TRUE; + return true; } // end of the 'PMA_change_enc_order' function diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 7c8f27c..8038705 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -302,8 +302,8 @@ elseif ($mult_btn == __('Yes')) { $sql_query_views = ''; } $selected_cnt = count($selected); - $run_parts = FALSE; // whether to run query after each pass - $use_sql = FALSE; // whether to include sql.php at the end (to display results) + $run_parts = false; // whether to run query after each pass + $use_sql = false; // whether to include sql.php at the end (to display results) if ($query_type == 'primary_fld') { // Gets table primary key @@ -325,7 +325,7 @@ elseif ($mult_btn == __('Yes')) { switch ($query_type) { case 'row_delete': $a_query = $selected[$i]; - $run_parts = TRUE; + $run_parts = true; break; case 'drop_db': @@ -333,7 +333,7 @@ elseif ($mult_btn == __('Yes')) { $a_query = 'DROP DATABASE ' . PMA_backquote($selected[$i]); $reload = 1; - $run_parts = TRUE; + $run_parts = true; $rebuild_database_list = true; break; @@ -353,31 +353,31 @@ elseif ($mult_btn == __('Yes')) { case 'check_tbl': $sql_query .= (empty($sql_query) ? 'CHECK TABLE ' : ', ') . PMA_backquote($selected[$i]); - $use_sql = TRUE; + $use_sql = true; break; case 'optimize_tbl': $sql_query .= (empty($sql_query) ? 'OPTIMIZE TABLE ' : ', ') . PMA_backquote($selected[$i]); - $use_sql = TRUE; + $use_sql = true; break; case 'analyze_tbl': $sql_query .= (empty($sql_query) ? 'ANALYZE TABLE ' : ', ') . PMA_backquote($selected[$i]); - $use_sql = TRUE; + $use_sql = true; break; case 'repair_tbl': $sql_query .= (empty($sql_query) ? 'REPAIR TABLE ' : ', ') . PMA_backquote($selected[$i]); - $use_sql = TRUE; + $use_sql = true; break; case 'empty_tbl': $a_query = 'TRUNCATE '; $a_query .= PMA_backquote($selected[$i]); - $run_parts = TRUE; + $run_parts = true; break; case 'drop_fld': diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 8d1eb83..c77aee0 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -87,8 +87,8 @@ define('PMA_CSDROPDOWN_COLLATION', 0); define('PMA_CSDROPDOWN_CHARSET', 1); function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION, - $name = null, $id = null, $default = null, $label = TRUE, $indent = 0, - $submitOnChange = FALSE, $displayUnavailable = FALSE) + $name = null, $id = null, $default = null, $label = true, $indent = 0, + $submitOnChange = false, $displayUnavailable = false) { global $mysql_charsets, $mysql_charsets_descriptions, $mysql_charsets_available, $mysql_collations, $mysql_collations_available; @@ -312,7 +312,7 @@ function PMA_getCollationDescr($collation) { $descr = __('Unicode') . ' (' . __('multilingual') . ')'; break; case 'bin': - $is_bin = TRUE; + $is_bin = true; case 'general': switch ($parts[0]) { // Unicode charsets diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index fa5255a..e8db6a2 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -99,7 +99,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { .' alt="' . __('phpMyAdmin documentation') . '" />'; } echo '</a>'; - echo ' ' . PMA_showMySQLDocu('', '', TRUE) . "\n"; + echo ' ' . PMA_showMySQLDocu('', '', true) . "\n"; $params = array('uniqid' => uniqid()); if (!empty($GLOBALS['db'])) { diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 20ddf97..7075cc8 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -1034,18 +1034,18 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte $the_total = PMA_Table::countRecords($foreign_db, $foreign_table); if ($override_total == true || $the_total < $GLOBALS['cfg']['ForeignKeyMaxLimit']) { - // foreign_display can be FALSE if no display field defined: + // foreign_display can be false if no display field defined: $foreign_display = PMA_getDisplayField($foreign_db, $foreign_table); $f_query_main = 'SELECT ' . PMA_backquote($foreign_field) - . (($foreign_display == FALSE) ? '' : ', ' . PMA_backquote($foreign_display)); + . (($foreign_display == false) ? '' : ', ' . PMA_backquote($foreign_display)); $f_query_from = ' FROM ' . PMA_backquote($foreign_db) . '.' . PMA_backquote($foreign_table); $f_query_filter = empty($foreign_filter) ? '' : ' WHERE ' . PMA_backquote($foreign_field) - . ' LIKE "%' . PMA_sqlAddslashes($foreign_filter, TRUE) . '%"' - . (($foreign_display == FALSE) ? '' : ' OR ' . PMA_backquote($foreign_display) - . ' LIKE "%' . PMA_sqlAddslashes($foreign_filter, TRUE) . '%"' + . ' LIKE "%' . PMA_sqlAddslashes($foreign_filter, true) . '%"' + . (($foreign_display == false) ? '' : ' OR ' . PMA_backquote($foreign_display) + . ' LIKE "%' . PMA_sqlAddslashes($foreign_filter, true) . '%"' ); - $f_query_order = ($foreign_display == FALSE) ? '' :' ORDER BY ' . PMA_backquote($foreign_table) . '.' . PMA_backquote($foreign_display); + $f_query_order = ($foreign_display == false) ? '' :' ORDER BY ' . PMA_backquote($foreign_table) . '.' . PMA_backquote($foreign_display); $f_query_limit = isset($foreign_limit) ? $foreign_limit : ''; if (!empty($foreign_filter)) { @@ -1091,7 +1091,7 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte * @uses $GLOBALS['cfgRelation'] * @uses $GLOBALS['db'] * @param string whether to go from master to foreign or vice versa - * @return boolean always TRUE + * @return boolean always true * @global array $tab_left the list of tables that we still couldn't connect * @global array $tab_know the list of allready connected tables * @global string $fromclause @@ -1202,7 +1202,7 @@ function PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option) $ins_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) . ' (db_name, page_descr)' . ' VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($newpage) . '\')'; - PMA_query_as_controluser($ins_query, FALSE, $query_default_option); + PMA_query_as_controluser($ins_query, false, $query_default_option); return PMA_DBI_insert_id(isset($GLOBALS['controllink']) ? $GLOBALS['controllink'] : ''); } ?> diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php index a781307..6cf77e3 100644 --- a/libraries/schema/Dia_Relation_Schema.class.php +++ b/libraries/schema/Dia_Relation_Schema.class.php @@ -41,7 +41,7 @@ class PMA_DIA extends XMLWriter * so output is formatted */ - $this->setIndent(TRUE); + $this->setIndent(true); $this->setIndentString(' '); /* * Create the XML document @@ -694,7 +694,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema /* put the foreign table on the schema only if selected * by the user * (do not use array_search() because we would have to - * to do a === FALSE and this is not PHP3 compatible) + * to do a === false and this is not PHP3 compatible) */ if (in_array($rel['foreign_table'], $alltables)) { $this->_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field'],$this->showKeys); diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index edea703..4f2f8cb 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -777,7 +777,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema /* put the foreign table on the schema only if selected * by the user * (do not use array_search() because we would have to - * to do a === FALSE and this is not PHP3 compatible) + * to do a === false and this is not PHP3 compatible) */ if (in_array($rel['foreign_table'], $alltables)) { $this->_addRelation($one_table,$eps->getFont(),$eps->getFontSize(), $master_field, $rel['foreign_table'], $rel['foreign_field'], $this->tableDimension); diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 39fa62b..41ebf57 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -919,7 +919,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema // put the foreign table on the schema only if selected // by the user // (do not use array_search() because we would have to - // to do a === FALSE and this is not PHP3 compatible) + // to do a === false and this is not PHP3 compatible) if (in_array($rel['foreign_table'], $alltables)) { $this->_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field'], $this->tableDimension); } diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index 0f6b55b..c1ff0f1 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -41,7 +41,7 @@ class PMA_SVG extends XMLWriter * so output is formatted */ - $this->setIndent(TRUE); + $this->setIndent(true); $this->setIndentString(' '); /* * Create the XML document @@ -760,7 +760,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema /* put the foreign table on the schema only if selected * by the user * (do not use array_search() because we would have to - * to do a === FALSE and this is not PHP3 compatible) + * to do a === false and this is not PHP3 compatible) */ if (in_array($rel['foreign_table'], $alltables)) { $this->_addRelation($one_table,$svg->getFont(),$svg->getFontSize(), $master_field, $rel['foreign_table'], $rel['foreign_field'], $this->tableDimension); diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 7e8dbfb..20af01e 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -139,7 +139,7 @@ class PMA_User_Schema global $db,$table,$query_default_option,$cfgRelation; $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''; - $page_rs = PMA_query_as_controluser($page_query, FALSE, $query_default_option); + $page_rs = PMA_query_as_controluser($page_query, false, $query_default_option); if ($page_rs && PMA_DBI_num_rows($page_rs) > 0) { ?> <form method="get" action="schema_edit.php" name="frm_select_page"> @@ -213,7 +213,7 @@ class PMA_User_Schema $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\''; - $page_rs = PMA_query_as_controluser($page_query, FALSE, $query_default_option); + $page_rs = PMA_query_as_controluser($page_query, false, $query_default_option); $array_sh_page = array(); while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) { $array_sh_page[] = $temp_sh_page; @@ -223,7 +223,7 @@ class PMA_User_Schema */ if (! isset($_POST['with_field_names']) && ! isset($_POST['showwysiwyg'])) { - $with_field_names = TRUE; + $with_field_names = true; } $this->_displayScratchboardTables($array_sh_page); ?> @@ -248,7 +248,7 @@ class PMA_User_Schema $odd_row = true; foreach ($array_sh_page as $dummy_sh_page => $sh_page) { $_mtab = $sh_page['table_name']; - $tabExist[$_mtab] = FALSE; + $tabExist[$_mtab] = false; echo "\n" . ' <tr class="noclick '; if ($odd_row) { echo 'odd'; @@ -263,7 +263,7 @@ class PMA_User_Schema echo "\n" . ' <option value="' . htmlspecialchars($value) . '"'; if ($value == $sh_page['table_name']) { echo ' selected="selected"'; - $tabExist[$_mtab] = TRUE; + $tabExist[$_mtab] = true; } echo '>' . htmlspecialchars($value) . '</option>'; } @@ -427,13 +427,13 @@ class PMA_User_Schema { $_strtrans = ''; $_strname = ''; - $shoot = FALSE; + $shoot = false; if (!empty($tabExist) && is_array($tabExist)) { foreach ($tabExist as $key => $value) { if (!$value) { $_strtrans .= '<input type="hidden" name="delrow[]" value="' . htmlspecialchars($key) . '" />' . "\n"; $_strname .= '<li>' . htmlspecialchars($key) . '</li>' . "\n"; - $shoot = TRUE; + $shoot = true; } } if ($shoot) { @@ -548,7 +548,7 @@ class PMA_User_Schema . ' AND table_name = \'' . PMA_sqlAddslashes($current_row) . '\'' . "\n" . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($chpage) . '\''; echo $del_query; - PMA_query_as_controluser($del_query, FALSE, $query_default_option); + PMA_query_as_controluser($del_query, false, $query_default_option); } } @@ -591,7 +591,7 @@ class PMA_User_Schema $query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($choosePage) . '\''; - PMA_query_as_controluser($query, FALSE, $query_default_option); + PMA_query_as_controluser($query, false, $query_default_option); } /** @@ -608,7 +608,7 @@ class PMA_User_Schema $query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND page_nr = \'' . PMA_sqlAddslashes($choosePage) . '\''; - PMA_query_as_controluser($query, FALSE, $query_default_option); + PMA_query_as_controluser($query, false, $query_default_option); } /** @@ -667,7 +667,7 @@ class PMA_User_Schema . ' WHERE master_db = \'' . $db . '\'' . ' GROUP BY master_table' . ' ORDER BY ' . PMA_backquote('COUNT(master_table)') . ' DESC '; - $master_tables_rs = PMA_query_as_controluser($master_tables, FALSE, $query_default_option); + $master_tables_rs = PMA_query_as_controluser($master_tables, false, $query_default_option); if ($master_tables_rs && PMA_DBI_num_rows($master_tables_rs) > 0) { /* first put all the master tables at beginning * of the list, so they are near the center of @@ -739,7 +739,7 @@ class PMA_User_Schema $insert_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' ' . '(db_name, table_name, pdf_page_number, x, y) ' . 'VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($current_table) . '\',' . $pageNumber . ',' . $pos_x . ',' . $pos_y . ')'; - PMA_query_as_controluser($insert_query, FALSE, $query_default_option); + PMA_query_as_controluser($insert_query, false, $query_default_option); /* * compute for the next table @@ -794,7 +794,7 @@ class PMA_User_Schema . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddslashes($arrvalue['name']) . '\'' . ' AND pdf_page_number = \'' . PMA_sqlAddslashes($this->chosenPage) . '\''; - $test_rs = PMA_query_as_controluser($test_query, FALSE, $query_default_option); + $test_rs = PMA_query_as_controluser($test_query, false, $query_default_option); //echo $test_query; if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { if (isset($arrvalue['delete']) && $arrvalue['delete'] == 'y') { @@ -815,7 +815,7 @@ class PMA_User_Schema . 'VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($arrvalue['name']) . '\', \'' . PMA_sqlAddslashes($this->chosenPage) . '\',' . $arrvalue['x'] . ',' . $arrvalue['y'] . ')'; } //echo $ch_query; - PMA_query_as_controluser($ch_query, FALSE, $query_default_option); + PMA_query_as_controluser($ch_query, false, $query_default_option); } // end if } // end for } diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index a9be622..fb43401 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -41,7 +41,7 @@ class PMA_VISIO extends XMLWriter * so output is formatted */ - $this->setIndent(TRUE); + $this->setIndent(true); $this->setIndentString(' '); /* * Create the XML document @@ -519,7 +519,7 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema /* put the foreign table on the schema only if selected * by the user * (do not use array_search() because we would have to - * to do a === FALSE and this is not PHP3 compatible) + * to do a === false and this is not PHP3 compatible) */ if (in_array($rel['foreign_table'], $alltables)) { $this->_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field'],$this->showKeys); diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 15945be..aa3f81d 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -157,7 +157,7 @@ function PMA_langDetect($str, $envType) // $envType = 1 for the 'HTTP_ACCEPT_LANGUAGE' environment variable, // 2 for the 'HTTP_USER_AGENT' one $expr = $value[0]; - if (strpos($expr, '[-_]') === FALSE) { + if (strpos($expr, '[-_]') === false) { $expr = str_replace('|', '([-_][[:alpha:]]{2,3})?|', $expr); } if (($envType == 1 && preg_match('/^(' . addcslashes($expr,'/') . ')(;q=[0-9]\\.[0-9])?$/i', $str)) @@ -347,12 +347,12 @@ function PMA_langList() /* Open the directory */ $handle = @opendir($GLOBALS['lang_path']); /* This can happen if the kit is English-only */ - if ($handle === FALSE) { + if ($handle === false) { return $result; } /* Process all files */ - while (FALSE !== ($file = readdir($handle))) { + while (false !== ($file = readdir($handle))) { if ($file != "." && $file != ".." && file_exists($GLOBALS['lang_path'] . '/' . $file . '/LC_MESSAGES/phpmyadmin.mo')) { $result[$file] = PMA_langDetails($file); } diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 41ec8a8..2c1ac6a 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -14,7 +14,7 @@ if (! defined('PHPMYADMIN')) { require_once './libraries/common.inc.php'; require_once './libraries/server_common.inc.php'; -PMA_checkParameters(array('is_superuser', 'url_query'), TRUE, FALSE); +PMA_checkParameters(array('is_superuser', 'url_query'), true, false); // Don't print all these links if in an Ajax request if (!$GLOBALS['is_ajax_request']) { diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 80ee79e..5dd48d2 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -58,7 +58,7 @@ require_once './libraries/bookmark.lib.php'; // used for file listing * @uses function_exists() * @param boolean|string $query query to display in the textarea * or true to display last executed - * @param boolean|string $display_tab sql|files|history|full|FALSE + * @param boolean|string $display_tab sql|files|history|full|false * what part to display * false if not inside querywindow * @param string $delimiter @@ -495,7 +495,7 @@ function PMA_sqlQueryFormUpload(){ echo PMA_generateHiddenMaxFileSize($GLOBALS['max_upload_size']) . "\n"; echo '</div>'; - if ($files === FALSE) { + if ($files === false) { $errors[] = PMA_Message::error( __('The directory you set for upload work cannot be reached')); } elseif (!empty($files)) { echo '<div class="formelement">'; @@ -514,7 +514,7 @@ function PMA_sqlQueryFormUpload(){ echo '<fieldset id="" class="tblFooters">'; echo __('Character set of the file:') . "\n"; echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_CHARSET, - 'charset_of_file', null, 'utf8', FALSE); + 'charset_of_file', null, 'utf8', false); echo '<input type="submit" name="SQL" value="' . __('Go') .'" />' . "\n"; echo '<div class="clearfloat"></div>' . "\n"; diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 171a4a3..e05d011 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -328,14 +328,14 @@ if (! defined('PMA_MINIMUM_COMMON')) { $startquotepos = $count2; $quotetype = $c; $count2++; - $escaped = FALSE; - $escaped_escaped = FALSE; + $escaped = false; + $escaped_escaped = false; $pos = $count2; $oldpos = 0; do { $oldpos = $pos; $pos = $GLOBALS['PMA_strpos'](' ' . $sql, $quotetype, $oldpos + 1) - 1; - // ($pos === FALSE) + // ($pos === false) if ($pos < 0) { if ($c == '`') { /* @@ -477,7 +477,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $is_digit = !$is_identifier && !$is_sql_variable && $GLOBALS['PMA_STR_isDigit']($c); $is_hex_digit = $is_digit && $c == '0' && $count2 < $len && $GLOBALS['PMA_substr']($sql, $count2, 1) == 'x'; $is_float_digit = $c == '.'; - $is_float_digit_exponent = FALSE; + $is_float_digit_exponent = false; /* DEBUG echo '<pre>2'; @@ -513,7 +513,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if ($is_digit && (!$is_hex_digit) && ($c2 == '.')) { $count2++; if (!$is_float_digit) { - $is_float_digit = TRUE; + $is_float_digit = true; continue; } else { $debugstr = __('Invalid Identifer') . ' @ ' . ($count1+1) . "\n" @@ -524,21 +524,21 @@ if (! defined('PMA_MINIMUM_COMMON')) { } if ($is_digit && (!$is_hex_digit) && (($c2 == 'e') || ($c2 == 'E'))) { if (!$is_float_digit_exponent) { - $is_float_digit_exponent = TRUE; - $is_float_digit = TRUE; + $is_float_digit_exponent = true; + $is_float_digit = true; $count2++; continue; } else { - $is_digit = FALSE; - $is_float_digit = FALSE; + $is_digit = false; + $is_float_digit = false; } } if (($is_hex_digit && PMA_STR_isHexDigit($c2)) || ($is_digit && $GLOBALS['PMA_STR_isDigit']($c2))) { $count2++; continue; } else { - $is_digit = FALSE; - $is_hex_digit = FALSE; + $is_digit = false; + $is_hex_digit = false; } $count2++; @@ -559,7 +559,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } } elseif ($is_user) { $type = 'punct_user'; - } elseif ($is_sql_variable != FALSE) { + } elseif ($is_sql_variable != false) { $type = 'alpha_variable'; } else { $type = 'alpha'; @@ -776,9 +776,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { } // check if present in the list of forbidden words if ($t_suffix == '_reservedWord' && PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_forbidden_word, $PMA_SQPdata_forbidden_word_cnt)) { - $sql_array[$i]['forbidden'] = TRUE; + $sql_array[$i]['forbidden'] = true; } else { - $sql_array[$i]['forbidden'] = FALSE; + $sql_array[$i]['forbidden'] = false; } $sql_array[$i]['type'] .= $t_suffix; } @@ -807,12 +807,12 @@ if (! defined('PMA_MINIMUM_COMMON')) { { $typeSeperator = '_'; if (strcmp($whatWeWant, $toCheck) == 0) { - return TRUE; + return true; } else { - if (strpos($whatWeWant, $typeSeperator) === FALSE) { + if (strpos($whatWeWant, $typeSeperator) === false) { return strncmp($whatWeWant, $toCheck, strpos($toCheck, $typeSeperator)) == 0; } else { - return FALSE; + return false; } } } @@ -853,8 +853,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { 'create_table_fields' => array() ); $subresult_empty = $subresult; - $seek_queryend = FALSE; - $seen_end_of_table_ref = FALSE; + $seek_queryend = false; + $seen_end_of_table_ref = false; $number_of_brackets_in_extract = 0; $number_of_brackets_in_group_concat = 0; @@ -866,10 +866,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { // for SELECT EXTRACT(YEAR_MONTH FROM CURDATE()) // we must not use CURDATE as a table_ref // so we track whether we are in the EXTRACT() - $in_extract = FALSE; + $in_extract = false; // for GROUP_CONCAT(...) - $in_group_concat = FALSE; + $in_group_concat = false; /* Description of analyzer results * @@ -1038,9 +1038,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { //DEBUG echo "Loop1 <strong>" . $arr[$i]['data'] . "</strong> (" . $arr[$i]['type'] . ")<br />"; // High speed seek for locating the end of the current query - if ($seek_queryend == TRUE) { + if ($seek_queryend == true) { if ($arr[$i]['type'] == 'punct_queryend') { - $seek_queryend = FALSE; + $seek_queryend = false; } else { continue; } // end if (type == punct_queryend) @@ -1075,13 +1075,13 @@ if (! defined('PMA_MINIMUM_COMMON')) { if ($in_extract) { $number_of_brackets_in_extract--; if ($number_of_brackets_in_extract == 0) { - $in_extract = FALSE; + $in_extract = false; } } if ($in_group_concat) { $number_of_brackets_in_group_concat--; if ($number_of_brackets_in_group_concat == 0) { - $in_group_concat = FALSE; + $in_group_concat = false; } } } @@ -1101,18 +1101,18 @@ if (! defined('PMA_MINIMUM_COMMON')) { if ($arr[$i]['type'] == 'alpha_functionName') { $upper_data = strtoupper($arr[$i]['data']); if ($upper_data =='EXTRACT') { - $in_extract = TRUE; + $in_extract = true; $number_of_brackets_in_extract = 0; } if ($upper_data =='GROUP_CONCAT') { - $in_group_concat = TRUE; + $in_group_concat = true; $number_of_brackets_in_group_concat = 0; } } // ============================================================== if ($arr[$i]['type'] == 'alpha_reservedWord' -// && $arr[$i]['forbidden'] == FALSE) { +// && $arr[$i]['forbidden'] == false) { ) { // We don't know what type of query yet, so run this if ($subresult['querytype'] == '') { @@ -1122,7 +1122,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { // Check if we support this type of query if (!PMA_STR_binarySearchInArr($subresult['querytype'], $supported_query_types, $supported_query_types_cnt)) { // Skip ahead to the next one if we don't - $seek_queryend = TRUE; + $seek_queryend = true; continue; } // end if (query not supported) @@ -1139,17 +1139,17 @@ if (! defined('PMA_MINIMUM_COMMON')) { // this is a subquery so do not analyze inside it continue; } - $seen_from = FALSE; - $previous_was_identifier = FALSE; + $seen_from = false; + $previous_was_identifier = false; $current_select_expr = -1; - $seen_end_of_table_ref = FALSE; + $seen_end_of_table_ref = false; } // end if (data == SELECT) if ($upper_data =='FROM' && !$in_extract) { $current_table_ref = -1; - $seen_from = TRUE; - $previous_was_identifier = FALSE; - $save_table_ref = TRUE; + $seen_from = true; + $previous_was_identifier = false; + $save_table_ref = true; } // end if (data == FROM) // here, do not 'continue' the loop, as we have more work for @@ -1162,7 +1162,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { || $arr[$i]['type'] == 'quote_single' || $arr[$i]['type'] == 'alpha_identifier' || ($arr[$i]['type'] == 'alpha_reservedWord' - && $arr[$i]['forbidden'] == FALSE)) { + && $arr[$i]['forbidden'] == false)) { switch ($arr[$i]['type']) { case 'alpha_identifier': @@ -1197,7 +1197,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $alias_for_select_expr = $identifier; } else { $chain[] = $identifier; - $previous_was_identifier = TRUE; + $previous_was_identifier = true; } // end if !$previous_was_identifier } else { @@ -1209,7 +1209,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $alias_for_table_ref = $identifier; } else { $chain[] = $identifier; - $previous_was_identifier = TRUE; + $previous_was_identifier = true; } // end if ($previous_was_identifier) } // end if ($save_table_ref &&!$seen_end_of_table_ref) @@ -1220,7 +1220,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { // =================================== if ($arr[$i]['type'] == 'punct_qualifier') { // to be able to detect an identifier following another - $previous_was_identifier = FALSE; + $previous_was_identifier = false; continue; } // end if (punct_qualifier) @@ -1285,7 +1285,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { */ if (($arr[$i]['type'] == 'alpha_reservedWord') && ($upper_data != 'FROM')) { - $previous_was_identifier = TRUE; + $previous_was_identifier = true; } } // end if (save a select expr) @@ -1340,7 +1340,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { .= ' ' . $subresult['table_ref'][$current_table_ref]['table_alias']; unset($chain); - $previous_was_identifier = TRUE; + $previous_was_identifier = true; //continue; } // end if (save a table ref) @@ -1367,29 +1367,29 @@ if (! defined('PMA_MINIMUM_COMMON')) { // e n d i n g l o o p #1 - // set the $previous_was_identifier to FALSE if the current + // set the $previous_was_identifier to false if the current // token is not an identifier if (($arr[$i]['type'] != 'alpha_identifier') && ($arr[$i]['type'] != 'quote_double') && ($arr[$i]['type'] != 'quote_single') && ($arr[$i]['type'] != 'quote_backtick')) { - $previous_was_identifier = FALSE; + $previous_was_identifier = false; } // end if // however, if we are on AS, we must keep the $previous_was_identifier if (($arr[$i]['type'] == 'alpha_reservedWord') && ($upper_data == 'AS')) { - $previous_was_identifier = TRUE; + $previous_was_identifier = true; } if (($arr[$i]['type'] == 'alpha_reservedWord') && ($upper_data =='ON' || $upper_data =='USING')) { - $save_table_ref = FALSE; + $save_table_ref = false; } // end if (data == ON) if (($arr[$i]['type'] == 'alpha_reservedWord') && ($upper_data =='JOIN' || $upper_data =='FROM')) { - $save_table_ref = TRUE; + $save_table_ref = true; } // end if (data == JOIN) /** @@ -1411,19 +1411,19 @@ if (! defined('PMA_MINIMUM_COMMON')) { || ($arr[$i]['type'] == 'alpha_reservedWord' && !$in_group_concat && PMA_STR_binarySearchInArr($upper_data, $words_ending_table_ref, $words_ending_table_ref_cnt))) { - $seen_end_of_table_ref = TRUE; + $seen_end_of_table_ref = true; // to be able to save the last table ref, but do not // set it true if we found a word like "ON" that has // already set it to false - if (isset($save_table_ref) && $save_table_ref != FALSE) { - $save_table_ref = TRUE; + if (isset($save_table_ref) && $save_table_ref != false) { + $save_table_ref = true; } //end if } // end if (check for end of table ref) } //end if (!$seen_end_of_table_ref) if ($seen_end_of_table_ref) { - $save_table_ref = FALSE; + $save_table_ref = false; } // end if } // end for $i (loop #1) @@ -1465,20 +1465,20 @@ if (! defined('PMA_MINIMUM_COMMON')) { $section_before_limit = ''; $section_after_limit = ''; // truly the section after the limit clause - $seen_reserved_word = FALSE; - $seen_group = FALSE; - $seen_order = FALSE; - $seen_order_by = FALSE; - $in_group_by = FALSE; // true when we are inside the GROUP BY clause - $in_order_by = FALSE; // true when we are inside the ORDER BY clause - $in_having = FALSE; // true when we are inside the HAVING clause - $in_select_expr = FALSE; // true when we are inside the select expr clause - $in_where = FALSE; // true when we are inside the WHERE clause - $seen_limit = FALSE; // true if we have seen a LIMIT clause - $in_limit = FALSE; // true when we are inside the LIMIT clause - $after_limit = FALSE; // true when we are after the LIMIT clause - $in_from = FALSE; // true when we are in the FROM clause - $in_group_concat = FALSE; + $seen_reserved_word = false; + $seen_group = false; + $seen_order = false; + $seen_order_by = false; + $in_group_by = false; // true when we are inside the GROUP BY clause + $in_order_by = false; // true when we are inside the ORDER BY clause + $in_having = false; // true when we are inside the HAVING clause + $in_select_expr = false; // true when we are inside the select expr clause + $in_where = false; // true when we are inside the WHERE clause + $seen_limit = false; // true if we have seen a LIMIT clause + $in_limit = false; // true when we are inside the LIMIT clause + $after_limit = false; // true when we are after the LIMIT clause + $in_from = false; // true when we are in the FROM clause + $in_group_concat = false; $first_reserved_word = ''; $current_identifier = ''; $unsorted_query = $arr['raw']; // in case there is no ORDER BY @@ -1521,7 +1521,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (!$seen_reserved_word) { $first_reserved_word = $upper_data; $subresult['querytype'] = $upper_data; - $seen_reserved_word = TRUE; + $seen_reserved_word = true; // if the first reserved word is DROP or DELETE, // we know this is a query that needs to be confirmed @@ -1543,22 +1543,22 @@ if (! defined('PMA_MINIMUM_COMMON')) { if ($upper_data == 'LIMIT' && ! $in_subquery) { $section_before_limit = substr($arr['raw'], 0, $arr[$i]['pos'] - 5); - $in_limit = TRUE; - $seen_limit = TRUE; + $in_limit = true; + $seen_limit = true; $limit_clause = ''; - $in_order_by = FALSE; // @todo maybe others to set FALSE + $in_order_by = false; // @todo maybe others to set false } if ($upper_data == 'PROCEDURE') { $subresult['queryflags']['procedure'] = 1; - $in_limit = FALSE; - $after_limit = TRUE; + $in_limit = false; + $after_limit = true; } /** - * @todo set also to FALSE if we find FOR UPDATE or LOCK IN SHARE MODE + * @todo set also to false if we find FOR UPDATE or LOCK IN SHARE MODE */ if ($upper_data == 'SELECT') { - $in_select_expr = TRUE; + $in_select_expr = true; $select_expr_clause = ''; } if ($upper_data == 'DISTINCT' && !$in_group_concat) { @@ -1579,75 +1579,75 @@ if (! defined('PMA_MINIMUM_COMMON')) { // if this is a real SELECT...FROM if ($upper_data == 'FROM' && isset($subresult['queryflags']['select_from']) && $subresult['queryflags']['select_from'] == 1) { - $in_from = TRUE; + $in_from = true; $from_clause = ''; - $in_select_expr = FALSE; + $in_select_expr = false; } - // (we could have less resetting of variables to FALSE + // (we could have less resetting of variables to false // if we trust that the query respects the standard // MySQL order for clauses) // we use $seen_group and $seen_order because we are looking // for the BY if ($upper_data == 'GROUP') { - $seen_group = TRUE; - $seen_order = FALSE; - $in_having = FALSE; - $in_order_by = FALSE; - $in_where = FALSE; - $in_select_expr = FALSE; - $in_from = FALSE; + $seen_group = true; + $seen_order = false; + $in_having = false; + $in_order_by = false; + $in_where = false; + $in_select_expr = false; + $in_from = false; } if ($upper_data == 'ORDER' && !$in_group_concat) { - $seen_order = TRUE; - $seen_group = FALSE; - $in_having = FALSE; - $in_group_by = FALSE; - $in_where = FALSE; - $in_select_expr = FALSE; - $in_from = FALSE; + $seen_order = true; + $seen_group = false; + $in_having = false; + $in_group_by = false; + $in_where = false; + $in_select_expr = false; + $in_from = false; } if ($upper_data == 'HAVING') { - $in_having = TRUE; + $in_having = true; $having_clause = ''; - $seen_group = FALSE; - $seen_order = FALSE; - $in_group_by = FALSE; - $in_order_by = FALSE; - $in_where = FALSE; - $in_select_expr = FALSE; - $in_from = FALSE; + $seen_group = false; + $seen_order = false; + $in_group_by = false; + $in_order_by = false; + $in_where = false; + $in_select_expr = false; + $in_from = false; } if ($upper_data == 'WHERE') { - $in_where = TRUE; + $in_where = true; $where_clause = ''; $where_clause_identifiers = array(); - $seen_group = FALSE; - $seen_order = FALSE; - $in_group_by = FALSE; - $in_order_by = FALSE; - $in_having = FALSE; - $in_select_expr = FALSE; - $in_from = FALSE; + $seen_group = false; + $seen_order = false; + $in_group_by = false; + $in_order_by = false; + $in_having = false; + $in_select_expr = false; + $in_from = false; } if ($upper_data == 'BY') { if ($seen_group) { - $in_group_by = TRUE; + $in_group_by = true; $group_by_clause = ''; } if ($seen_order) { - $seen_order_by = TRUE; + $seen_order_by = true; // Here we assume that the ORDER BY keywords took // exactly 8 characters. // We use PMA_substr() to be charset-safe; otherwise // if the table name contains accents, the unsorted // query would be missing some characters. $unsorted_query = PMA_substr($arr['raw'], 0, $arr[$i]['pos'] - 8); - $in_order_by = TRUE; + $in_order_by = true; $order_by_clause = ''; } } @@ -1655,12 +1655,12 @@ if (! defined('PMA_MINIMUM_COMMON')) { // if we find one of the words that could end the clause if (PMA_STR_binarySearchInArr($upper_data, $words_ending_clauses, $words_ending_clauses_cnt)) { - $in_group_by = FALSE; - $in_order_by = FALSE; - $in_having = FALSE; - $in_where = FALSE; - $in_select_expr = FALSE; - $in_from = FALSE; + $in_group_by = false; + $in_order_by = false; + $in_having = false; + $in_where = false; + $in_select_expr = false; + $in_from = false; } } // endif (reservedWord) @@ -1676,7 +1676,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $sep=''; $upper_data = strtoupper($arr[$i]['data']); if ($upper_data =='GROUP_CONCAT') { - $in_group_concat = TRUE; + $in_group_concat = true; $number_of_brackets_in_group_concat = 0; } } @@ -1690,7 +1690,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if ($in_group_concat) { $number_of_brackets_in_group_concat--; if ($number_of_brackets_in_group_concat == 0) { - $in_group_concat = FALSE; + $in_group_concat = false; } } } @@ -1781,17 +1781,17 @@ if (! defined('PMA_MINIMUM_COMMON')) { // not a timestamp, it will be useful when logic has been // added for complete field attributes analysis. - $seen_foreign = FALSE; - $seen_references = FALSE; - $seen_constraint = FALSE; + $seen_foreign = false; + $seen_references = false; + $seen_constraint = false; $foreign_key_number = -1; - $seen_create_table = FALSE; - $seen_create = FALSE; - $seen_alter = FALSE; - $in_create_table_fields = FALSE; + $seen_create_table = false; + $seen_create = false; + $seen_alter = false; + $in_create_table_fields = false; $brackets_level = 0; - $in_timestamp_options = FALSE; - $seen_default = FALSE; + $in_timestamp_options = false; + $seen_default = false; for ($i = 0; $i < $size; $i++) { // DEBUG echo "Loop 3 <strong>" . $arr[$i]['data'] . "</strong> " . $arr[$i]['type'] . "<br />"; @@ -1800,46 +1800,46 @@ if (! defined('PMA_MINIMUM_COMMON')) { $upper_data = strtoupper($arr[$i]['data']); if ($upper_data == 'NOT' && $in_timestamp_options) { - $create_table_fields[$current_identifier]['timestamp_not_null'] = TRUE; + $create_table_fields[$current_identifier]['timestamp_not_null'] = true; } if ($upper_data == 'CREATE') { - $seen_create = TRUE; + $seen_create = true; } if ($upper_data == 'ALTER') { - $seen_alter = TRUE; + $seen_alter = true; } if ($upper_data == 'TABLE' && $seen_create) { - $seen_create_table = TRUE; + $seen_create_table = true; $create_table_fields = array(); } if ($upper_data == 'CURRENT_TIMESTAMP') { if ($in_timestamp_options) { if ($seen_default) { - $create_table_fields[$current_identifier]['default_current_timestamp'] = TRUE; + $create_table_fields[$current_identifier]['default_current_timestamp'] = true; } } } if ($upper_data == 'CONSTRAINT') { $foreign_key_number++; - $seen_foreign = FALSE; - $seen_references = FALSE; - $seen_constraint = TRUE; + $seen_foreign = false; + $seen_references = false; + $seen_constraint = true; } if ($upper_data == 'FOREIGN') { - $seen_foreign = TRUE; - $seen_references = FALSE; - $seen_constraint = FALSE; + $seen_foreign = true; + $seen_references = false; + $seen_constraint = false; } if ($upper_data == 'REFERENCES') { - $seen_foreign = FALSE; - $seen_references = TRUE; - $seen_constraint = FALSE; + $seen_foreign = false; + $seen_references = true; + $seen_constraint = false; } @@ -1884,8 +1884,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { } elseif ($third_upper_data == 'CURRENT_TIMESTAMP') { if ($clause == 'on_update' && $in_timestamp_options) { - $create_table_fields[$current_identifier]['on_update_current_timestamp'] = TRUE; - $seen_default = FALSE; + $create_table_fields[$current_identifier]['on_update_current_timestamp'] = true; + $seen_default = false; } } else { @@ -1905,7 +1905,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if ($arr[$i]['type'] == 'punct_bracket_open_round') { $brackets_level++; if ($seen_create_table && $brackets_level == 1) { - $in_create_table_fields = TRUE; + $in_create_table_fields = true; } } @@ -1913,10 +1913,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { if ($arr[$i]['type'] == 'punct_bracket_close_round') { $brackets_level--; if ($seen_references) { - $seen_references = FALSE; + $seen_references = false; } if ($seen_create_table && $brackets_level == 0) { - $in_create_table_fields = FALSE; + $in_create_table_fields = false; } } @@ -1924,7 +1924,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $upper_data = strtoupper($arr[$i]['data']); if ($seen_create_table && $in_create_table_fields) { if ($upper_data == 'DEFAULT') { - $seen_default = TRUE; + $seen_default = true; $create_table_fields[$current_identifier]['default_value'] = $arr[$i + 1]['data']; } } @@ -1939,9 +1939,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { $create_table_fields[$current_identifier]['type'] = $upper_data; if ($upper_data == 'TIMESTAMP') { $arr[$i]['type'] = 'alpha_columnType'; - $in_timestamp_options = TRUE; + $in_timestamp_options = true; } else { - $in_timestamp_options = FALSE; + $in_timestamp_options = false; if ($upper_data == 'CHAR') { $arr[$i]['type'] = 'alpha_columnType'; } @@ -1962,7 +1962,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if ($seen_create_table && $in_create_table_fields) { $current_identifier = $identifier; // we set this one even for non TIMESTAMP type - $create_table_fields[$current_identifier]['timestamp_not_null'] = FALSE; + $create_table_fields[$current_identifier]['timestamp_not_null'] = false; } if ($seen_constraint) { @@ -2103,17 +2103,17 @@ if (! defined('PMA_MINIMUM_COMMON')) { case 'color': $str = '<span class="syntax">'; $html_line_break = '<br />'; - $docu = TRUE; + $docu = true; break; case 'query_only': $str = ''; $html_line_break = "\n"; - $docu = FALSE; + $docu = false; break; case 'text': $str = ''; $html_line_break = '<br />'; - $docu = TRUE; + $docu = true; break; } // end switch // inner_sql is a span that exists for all cases, except query_only @@ -2126,7 +2126,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $indent = 0; $bracketlevel = 0; $functionlevel = 0; - $infunction = FALSE; + $infunction = false; $space_punct_listsep = ' '; $space_punct_listsep_function_name = ' '; // $space_alpha_reserved_word = '<br />'."\n"; @@ -2193,7 +2193,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $typearr[3] = $arr[$start_token]['type']; } - $in_priv_list = FALSE; + $in_priv_list = false; for ($i = $start_token; $i < $arraysize; $i++) { // DEBUG echo "Loop format <strong>" . $arr[$i]['data'] . "</strong> " . $arr[$i]['type'] . "<br />"; $before = ''; @@ -2227,7 +2227,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { break; case 'punct_bracket_open_round': $bracketlevel++; - $infunction = FALSE; + $infunction = false; // Make sure this array is sorted! if (($typearr[1] == 'alpha_functionName') || ($typearr[1] == 'alpha_columnType') || ($typearr[1] == 'punct') || ($typearr[3] == 'digit_integer') || ($typearr[3] == 'digit_hex') || ($typearr[3] == 'digit_float') @@ -2237,7 +2237,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 1]['data']), $keywords_with_brackets_1before, $keywords_with_brackets_1before_cnt)) ) { $functionlevel++; - $infunction = TRUE; + $infunction = true; $after .= ' '; } else { $indent++; @@ -2263,7 +2263,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $after = ''; break; case 'punct_listsep': - if ($infunction == TRUE) { + if ($infunction == true) { $after .= $space_punct_listsep_function_name; } else { $after .= $space_punct_listsep; @@ -2277,7 +2277,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $space_punct_listsep = ' '; $space_punct_listsep_function_name = ' '; $space_alpha_reserved_word = ' '; - $in_priv_list = FALSE; + $in_priv_list = false; break; case 'comment_mysql': case 'comment_ansi': @@ -2300,7 +2300,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { // only close bracket level when it was opened before if ($bracketlevel > 0) { $bracketlevel--; - if ($infunction == TRUE) { + if ($infunction == true) { $functionlevel--; $after .= ' '; $before .= ' '; @@ -2308,7 +2308,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $indent--; $before .= ($mode != 'query_only' ? '</div>' : ' '); } - $infunction = ($functionlevel > 0) ? TRUE : FALSE; + $infunction = ($functionlevel > 0) ? true : false; } break; case 'alpha_columnType': @@ -2430,7 +2430,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { // on first keyword, check if it introduces a // privilege list if (PMA_STR_binarySearchInArr($arr[$i]['data'], $keywords_priv_list, $keywords_priv_list_cnt)) { - $in_priv_list = TRUE; + $in_priv_list = true; } } } else { diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php index 8d1aac6..f7b836a 100644 --- a/libraries/sqlvalidator.class.php +++ b/libraries/sqlvalidator.class.php @@ -34,7 +34,7 @@ if (class_exists('SOAPClient')) { $GLOBALS['sqlvalidator_error'] = false; } else { $GLOBALS['sqlvalidator_soap'] = 'NONE'; - $GLOBALS['sqlvalidator_error'] = TRUE; + $GLOBALS['sqlvalidator_error'] = true; PMA_warnMissingExtension('soap'); } } @@ -84,7 +84,7 @@ if (!$GLOBALS['sqlvalidator_error']) { if ($GLOBALS['sqlvalidator_soap'] == 'PHP') { $obj = new SOAPClient($url); } else { - $obj = new SOAP_Client($url, TRUE); + $obj = new SOAP_Client($url, true); } return $obj; } // end of the "openService()" function @@ -431,7 +431,7 @@ if (!$GLOBALS['sqlvalidator_error']) { //add an extra check to ensure that the class was defined without errors if (!class_exists('PMA_SQLValidator')) { - $GLOBALS['sqlvalidator_error'] = TRUE; + $GLOBALS['sqlvalidator_error'] = true; } } // end else diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php index aaa79c0..a559ccf 100644 --- a/libraries/sqlvalidator.lib.php +++ b/libraries/sqlvalidator.lib.php @@ -38,9 +38,9 @@ if (! defined('PHPMYADMIN')) { * I'm not sure if PEAR was available before this point * For now we actually use a configuration flag */ -if ($cfg['SQLValidator']['use'] == TRUE) { +if ($cfg['SQLValidator']['use'] == true) { require_once './libraries/sqlvalidator.class.php'; -} // if ($cfg['SQLValidator']['use'] == TRUE) +} // if ($cfg['SQLValidator']['use'] == true) /** diff --git a/libraries/zip_extension.lib.php b/libraries/zip_extension.lib.php index 435d319..0527911 100644 --- a/libraries/zip_extension.lib.php +++ b/libraries/zip_extension.lib.php @@ -44,7 +44,7 @@ function PMA_getZipContents($file) * haven't found 'content.xml' or there was a parsing * error that we must display */ - if ($entry === FALSE) { + if ($entry === false) { $error_message = __('Error in ZIP archive:') . ' Could not find "content.xml"'; } else { $error_message = __('Error in ZIP archive:') . ' ' . PMA_getZipError($zip_handle); diff --git a/pmd_pdf.php b/pmd_pdf.php index 89f6b5e..4972ae2 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -43,7 +43,7 @@ if (isset($mode)) { if ('export' == $mode) { $sql = "REPLACE INTO " . $pma_table . " (db_name, table_name, pdf_page_number, x, y) SELECT db_name, table_name, " . $pdf_page_number_q . ", ROUND(x/" . $scale_q . ") , ROUND(y/" . $scale_q . ") y FROM " . $pmd_table . " WHERE db_name = '" . PMA_sqlAddslashes($db) . "'"; - PMA_query_as_controluser($sql,TRUE,PMA_DBI_QUERY_STORE); + PMA_query_as_controluser($sql,true,PMA_DBI_QUERY_STORE); } if ('import' == $mode) { @@ -57,7 +57,7 @@ if (isset($mode)) { ' . $pmd_table . '.`table_name` = ' . $pma_table . '.`table_name` AND ' . $pmd_table . '.`db_name`=\''. PMA_sqlAddslashes($db) .'\' - AND pdf_page_number = ' . $pdf_page_number_q . ';', TRUE, PMA_DBI_QUERY_STORE); + AND pdf_page_number = ' . $pdf_page_number_q . ';', true, PMA_DBI_QUERY_STORE); } } diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index 564395b..6b4b92b 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -50,7 +50,7 @@ if ($try_to_delete_internal_relation) { . ' AND foreign_db = \'' . PMA_sqlAddslashes($DB1) . '\'' . ' AND foreign_table = \'' . PMA_sqlAddslashes($T1) . '\'' . ' AND foreign_field = \'' . PMA_sqlAddslashes($F1) . '\'' - , FALSE, PMA_DBI_QUERY_STORE); + , false, PMA_DBI_QUERY_STORE); } PMD_return_upd(1, __('Relation deleted')); diff --git a/server_privileges.php b/server_privileges.php index 13ee074..0842432 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -184,7 +184,7 @@ function PMA_RangeOfUsers($initial = '') * * @return array */ -function PMA_extractPrivInfo($row = '', $enableHTML = FALSE) +function PMA_extractPrivInfo($row = '', $enableHTML = false) { $grants = array( array('Select_priv', 'SELECT', __('Allows reading data.')), @@ -235,7 +235,7 @@ function PMA_extractPrivInfo($row = '', $enableHTML = FALSE) unset($users_grants); } $privs = array(); - $allPrivileges = TRUE; + $allPrivileges = true; foreach ($grants as $current_grant) { if ((!empty($row) && isset($row[$current_grant[0]])) || (empty($row) && isset($GLOBALS[$current_grant[0]]))) { @@ -261,7 +261,7 @@ function PMA_extractPrivInfo($row = '', $enableHTML = FALSE) } $privs[] = $priv_string . ' (`' . join('`, `', $GLOBALS[$current_grant[0]]) . '`)'; } else { - $allPrivileges = FALSE; + $allPrivileges = false; } } } @@ -326,7 +326,7 @@ function PMA_display_column_privs($columns, $row, $name_for_select, * * @return void */ -function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE) +function PMA_displayPrivTable($db = '*', $table = '*', $submit = true) { global $random_n; @@ -404,10 +404,10 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE) if ($res) { while ($row1 = PMA_DBI_fetch_row($res)) { $columns[$row1[0]] = array( - 'Select' => FALSE, - 'Insert' => FALSE, - 'Update' => FALSE, - 'References' => FALSE + 'Select' => false, + 'Insert' => false, + 'Update' => false, + 'References' => false ); } PMA_DBI_free_result($res); @@ -431,7 +431,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE) while ($row1 = PMA_DBI_fetch_row($res)) { $row1[1] = explode(',', $row1[1]); foreach ($row1[1] as $current) { - $columns[$row1[0]][$current] = TRUE; + $columns[$row1[0]][$current] = true; } } PMA_DBI_free_result($res); @@ -963,7 +963,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { if($GLOBALS['is_ajax_request'] != true) { // this is needed in case tracking is on: $GLOBALS['db'] = $username; - $GLOBALS['reload'] = TRUE; + $GLOBALS['reload'] = true; PMA_reloadNavigation(); } @@ -1232,7 +1232,7 @@ if (isset($_REQUEST['change_pw'])) { $sql_query = 'SET PASSWORD FOR \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\' = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . preg_replace('@.@s', '*', $pma_pw) . '\')'); $local_query = 'SET PASSWORD FOR \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\' = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . PMA_sqlAddslashes($pma_pw) . '\')'); PMA_DBI_try_query($local_query) - or PMA_mysqlDie(PMA_DBI_getError(), $sql_query, FALSE, $err_url); + or PMA_mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url); $message = PMA_Message::success(__('The password for %s was changed successfully.')); $message->addParam('\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\''); } @@ -1258,7 +1258,7 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[ if (isset($_REQUEST['drop_users_db'])) { $queries[] = 'DROP DATABASE IF EXISTS ' . PMA_backquote($this_user) . ';'; - $GLOBALS['reload'] = TRUE; + $GLOBALS['reload'] = true; if($GLOBALS['is_ajax_request'] != true) { PMA_reloadNavigation(); @@ -1554,16 +1554,16 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs if( $GLOBALS['is_ajax_request'] != true && PMA_DBI_num_rows($res) > 20 ) { - // initialize to FALSE the letters A-Z + // initialize to false the letters A-Z for ($letter_counter = 1; $letter_counter < 27; $letter_counter++) { if (! isset($array_initials[chr($letter_counter + 64)])) { - $array_initials[chr($letter_counter + 64)] = FALSE; + $array_initials[chr($letter_counter + 64)] = false; } } $initials = PMA_DBI_try_query('SELECT DISTINCT UPPER(LEFT(`User`,1)) FROM `user` ORDER BY `User` ASC', null, PMA_DBI_QUERY_STORE); while (list($tmp_initial) = PMA_DBI_fetch_row($initials)) { - $array_initials[$tmp_initial] = TRUE; + $array_initials[$tmp_initial] = true; } // Display the initials, which can be any characters, not @@ -1964,7 +1964,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n" . ' <td>' . htmlspecialchars((! isset($dbname)) ? $row['Db'] : $row['Table_name']) . '</td>' . "\n" . ' <td><tt>' . "\n" - . ' ' . join(',' . "\n" . ' ', PMA_extractPrivInfo($row, TRUE)) . "\n" + . ' ' . join(',' . "\n" . ' ', PMA_extractPrivInfo($row, true)) . "\n" . ' </tt></td>' . "\n" . ' <td>' . ((((! isset($dbname)) && $row['Grant_priv'] == 'Y') || (isset($dbname) && in_array('Grant', explode(',', $row['Table_priv'])))) ? __('Yes') : __('No')) . '</td>' . "\n" . ' <td>'; @@ -2133,7 +2133,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs unset($default_choice); echo '</fieldset>' . "\n"; - PMA_displayPrivTable('*', '*', FALSE); + PMA_displayPrivTable('*', '*', false); echo ' <fieldset id="fieldset_add_user_footer" class="tblFooters">' . "\n" . ' <input type="submit" name="adduser_submit" value="' . __('Go') . '" />' . "\n" . ' </fieldset>' . "\n" @@ -2155,7 +2155,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . ' </tr>' . "\n" . '</thead>' . "\n" . '<tbody>' . "\n"; - $odd_row = TRUE; + $odd_row = true; unset($row, $row1, $row2); // now, we build the table... @@ -2222,11 +2222,11 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $res = PMA_DBI_query($sql_query); $row = PMA_DBI_fetch_assoc($res); if ($row) { - $found = TRUE; + $found = true; } if ($found) { - while (TRUE) { + while (true) { // prepare the current user $current_privileges = array(); $current_user = $row['User']; @@ -2261,7 +2261,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . ' </td>' . "\n" . ' <td>' . "\n" . ' <tt>' . "\n" - . ' ' . join(',' . "\n" . ' ', PMA_extractPrivInfo($current, TRUE)) . "\n" + . ' ' . join(',' . "\n" . ' ', PMA_extractPrivInfo($current, true)) . "\n" . ' </tt>' . "\n" . ' </td>' . "\n" . ' <td>' . "\n" diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php index 8b43caf..2965dec 100644 --- a/setup/lib/common.inc.php +++ b/stup/lib/common.inc.phpc.php b/setup/lib/common.inc.php ', PMA_extractPrivInfo($current, true)) . "\n"nt', explode(',', $row['Table_priv'])))) ? __('Yes') : __('No')) . '</td>' . "\n"$pma_pw) . '\')');\')');b_name = '" . PMA_sqlAddslashes($db) . "'";��]�g/+6 ��!�!��@��x��h/+P��"A�g/+^�g/+��@�g/+��i/+�H�g/+�i/+��i/+��i/+�Ćg/+x��h/+P�� ]�g/+�!�!��@��Ƚ�h/+0��"A�g/+^�g/+��@�g/+��[�g/+�p�@��H�g/+�Ćg/+0��]�g/+GHIJKMNOP��@��HuXh/+��"A�g/+^�g/+��0�i/+�H�g/+�h/+��5h/+�i/+��i/+��i/+�Ćg/+HuXh/+��]�g/+8uXh/+��@��]�g/+(uXh/+��p��]�g/+uXh/+��]�g/+ ��i/+�H�g/+��i/+ ��5h/+�G�g/+��i/+@��y�5h/+�G�g/+�i/+p��Z�5h/+�G�g/+ؤ5h/+�h/+��5h/+�i/+��h/+��i/+��i/+�Ćg/+��3h/+��]�g/+#%')*-.035678:<=��@��p+h/+��"A�g/+8�h/+�H�g/+��h/+� �h/+�Ćg/+cfm�g/+@��p+h/+��]�g/+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��g/+��Fii/+Fii/+?U�g/+@��`��m�g/+�G�g/+�T�g/+��Bii/+��g/+@��Bii/+H��]�getup/lib/common.inc.php @@ -10,8 +10,8 @@ * Do not include full common. * @ignore */ -define('PMA_MINIMUM_COMMON', TRUE); -define('PMA_SETUP', TRUE); +define('PMA_MINIMUM_COMMON', true); +define('PMA_SETUP', true); chdir('..'); if (!file_exists('./libraries/common.inc.php')) { diff --git a/sql.php b/sql.php index 1053a9d..61a4668 100644 --- a/sql.php +++ b/sql.php @@ -157,7 +157,7 @@ if(isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) { if (empty($sql_query) && strlen($table) && strlen($db)) { require_once './libraries/bookmark.lib.php'; $book_sql_query = PMA_Bookmark_get($db, '\'' . PMA_sqlAddslashes($table) . '\'', - 'label', FALSE, TRUE); + 'label', false, true); if (! empty($book_sql_query)) { $GLOBALS['using_bookmark_message'] = PMA_message::notice(__('Using bookmark "%s" as default browse query.')); @@ -736,7 +736,7 @@ if (0 == $num_rows || $is_affected) { //if some posted fields need to be transformed, generate them here. $mime_map = PMA_getMIME($db, $table); - if ($mime_map === FALSE) { + if ($mime_map === false) { $mime_map = array(); } diff --git a/tbl_change.php b/tbl_change.php index efdbd3f..4adaf40 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -469,12 +469,12 @@ foreach ($rows as $row_id => $vrow) { <?php } //End if // Prepares the field value - $real_null_value = FALSE; + $real_null_value = false; $special_chars_encoded = ''; if (isset($vrow)) { // (we are editing) if (is_null($vrow[$field['Field']])) { - $real_null_value = TRUE; + $real_null_value = true; $vrow[$field['Field']] = ''; $special_chars = ''; $data = $vrow[$field['Field']]; @@ -500,7 +500,7 @@ foreach ($rows as $row_id => $vrow) { //when copying row, it is useful to empty auto-increment column to prevent duplicate key error if (isset($default_action) && $default_action === 'insert') { - if ($field['Key'] === 'PRI' && strpos($field['Extra'], 'auto_increment') !== FALSE) { + if ($field['Key'] === 'PRI' && strpos($field['Extra'], 'auto_increment') !== false) { $data = $special_chars_encoded = $special_chars = NULL; } } @@ -516,7 +516,7 @@ foreach ($rows as $row_id => $vrow) { // display default values if (! isset($field['Default'])) { $field['Default'] = ''; - $real_null_value = TRUE; + $real_null_value = true; $data = ''; } else { $data = $field['Default']; @@ -574,7 +574,7 @@ foreach ($rows as $row_id => $vrow) { } $dropdown_built = array(); - $op_spacing_needed = FALSE; + $op_spacing_needed = false; // what function defined as default? // for the first timestamp we don't set the default function @@ -611,8 +611,8 @@ foreach ($rows as $row_id => $vrow) { echo ' selected="selected"'; } echo '>' . $each_dropdown . '</option>' . "\n"; - $dropdown_built[$each_dropdown] = 'TRUE'; - $op_spacing_needed = TRUE; + $dropdown_built[$each_dropdown] = 'true'; + $op_spacing_needed = true; } // For compatibility's sake, do not let out all other functions. Instead @@ -620,16 +620,16 @@ 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) ? ' selected="selected"' : ''; - if ($op_spacing_needed == TRUE) { + if ($op_spacing_needed == true) { echo ' '; echo '<option value="">--------</option>' . "\n"; - $op_spacing_needed = FALSE; + $op_spacing_needed = false; } echo ' '; @@ -957,7 +957,7 @@ foreach ($rows as $row_id => $vrow) { if (!empty($cfg['UploadDir'])) { $files = PMA_getFileSelectOptions(PMA_userDir($cfg['UploadDir'])); - if ($files === FALSE) { + if ($files === false) { echo ' <font color="red">' . __('Error') . '</font><br />' . "\n"; echo ' ' . __('The directory you set for upload work cannot be reached') . "\n"; } elseif (!empty($files)) { @@ -978,7 +978,7 @@ foreach ($rows as $row_id => $vrow) { // field size should be at least 4 and max 40 $fieldsize = min(max($field['len'], 4), 40); echo $backup_field . "\n"; - if ($field['is_char'] && ($cfg['CharEditing'] == 'textarea' || strpos($data, "\n") !== FALSE)) { + if ($field['is_char'] && ($cfg['CharEditing'] == 'textarea' || strpos($data, "\n") !== false)) { echo "\n"; ?> <textarea name="fields<?php echo $field_name_appendix; ?>" diff --git a/tbl_relation.php b/tbl_relation.php index 90bd153..6d82cc3 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -31,7 +31,7 @@ require_once './libraries/tbl_info.inc.php'; // Note: in libraries/tbl_links.inc.php we get and display the table comment. // For InnoDB, this comment contains the REFER information but any update // has not been done yet (will be done in tbl_relation.php later). -$avoid_show_comment = TRUE; +$avoid_show_comment = true; /** * Displays top menu links @@ -269,7 +269,7 @@ if (isset($_REQUEST['destination_foreign'])) { } if (substr($tmp_error, 1, 4) == '1216' || substr($tmp_error, 1, 4) == '1452') { - PMA_mysqlDie($tmp_error, $sql_query, FALSE, '', FALSE); + PMA_mysqlDie($tmp_error, $sql_query, false, '', false); echo PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n"; } if (substr($tmp_error, 1, 4) == '1005') { @@ -436,15 +436,15 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { . $existrel[$myfield]['foreign_table'] . '.' . $existrel[$myfield]['foreign_field']; } else { - $foreign_field = FALSE; + $foreign_field = false; } - $seen_key = FALSE; + $seen_key = false; foreach ($selectboxall as $value) { echo ' ' . '<option value="' . htmlspecialchars($value) . '"'; if ($foreign_field && $value == $foreign_field) { echo ' selected="selected"'; - $seen_key = TRUE; + $seen_key = true; } echo '>' . htmlspecialchars($value) . '</option>'. "\n"; } // end while @@ -478,16 +478,16 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { . PMA_backquote($existrel_foreign[$myfield]['foreign_table']) . '.' . PMA_backquote($existrel_foreign[$myfield]['foreign_field']); } else { - $foreign_field = FALSE; + $foreign_field = false; } - $found_foreign_field = FALSE; + $found_foreign_field = false; foreach ($selectboxall_foreign as $value) { echo ' ' . '<option value="' . htmlspecialchars($value) . '"'; if ($foreign_field && $value == $foreign_field) { echo ' selected="selected"'; - $found_foreign_field = TRUE; + $found_foreign_field = true; } echo '>' . htmlspecialchars($value) . '</option>'. "\n"; } // end while diff --git a/tbl_row_action.php b/tbl_row_action.php index b2f28fa..6e9dde1 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -87,7 +87,7 @@ if (!empty($submit_mult)) { case 'row_export': // Needed to allow SQL export - $single_table = TRUE; + $single_table = true; // As we got the rows to be exported from the // 'rows_to_delete' checkbox, we use the index of it as the hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 44b46b11a3ced20bdc712d98524b52477973bfab
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via 44b46b11a3ced20bdc712d98524b52477973bfab (commit) via 09cfcfeb4adde91e64adfcd485d1064fb5ddfc59 (commit) via 945f08cfce927ef03fdbe9801ce4b877cca14416 (commit) via 49ccf818e87fb20eccb363d8abea469da110f142 (commit) via a3bbe87b4a0b889dffcda84589f47c12132661e7 (commit) via 746765be64243ae12410245aceaa2fe4db772f9b (commit) via 73a1240aede4a8ed96c2d2d777de6353a22871fc (commit) via d2006fa9578e56d873b295281ab40e665ff9ebb4 (commit) via 736b28880efbf044e5e3360d84f2b02b516528c8 (commit) via 7888b953241937aeda78df39cf1823c8e130cc43 (commit) via c68da69c633b6bba072f2b4c879ea13a7b2cefb8 (commit) via 96df6076b9721575597a7400a65ecac6dc08d51a (commit) via 0e3a619b1062bc05b67de5216a8bb45172cc1f99 (commit) via 2c59c77eda4953e00a5959999364b3a204038aa7 (commit) via ffb51e79fac0c7b77cb41e07524fed6e0ba12f03 (commit) via 8531b763097ddc88aca6f80cfbd5fcee10477ec5 (commit) via b3ba72367221a3fb86526f89f486c6dc91b20a33 (commit) via 6b202129eee569a12f614b300f565ba319c042a6 (commit) via 1a105b4228f87630cee38565844dca0efb9ae89c (commit) via 782958b106c6bc4c2442c35a1e9396d891c0568f (commit) via 6d153b52499cf3d71b4acfb6c87c7d7614693292 (commit) via 44fc27abaf6122d51cacd8e4632a35f3f7c8e7a3 (commit) via 036530e717c6f320ac3817b92948acc7a9d3a4b8 (commit) via b032de38c21dc6f1a3459ac3c82dec19c4c05d40 (commit) via 227ca6523dd42602df0bcf48cf027aaaabd7f900 (commit) via 2707993a47a004c71667a9c7dd92ed85e7eb4a6a (commit) via 0d9562b675375afc0b5a3e240aca21ddf1083875 (commit) via 1dafb3385f1e448ddb953ea9bdf4cd04caa7a19a (commit) via 1293b031785738f3d2a76719036b0089a9525290 (commit) via ea167246d3580aca8ef28ec46e44f441ad6ca526 (commit) via 0e3543ccd3e6957afb2cd4bb9bf9efd9a098ea46 (commit) via 141bd1da5237601520173135b60bcdeba50ad703 (commit) via 05cd006bf66eb3ca76260bf81b7ff396d86ebc86 (commit) via f001ba512be31412176eee51bff4c8f97a7d57bd (commit) via b0ef5a2839f509da1266dd0c9c233eb64e06bcf7 (commit) via 7cbd6811522136f3de02b8b5ba45bdab661213b7 (commit) via d6ac1ffeb947338607222d756466dc0ba0035784 (commit) via c5aae55dcdb4de001489fbe342d49154d70db0e3 (commit) via ba7156fa546943f0556dcb79efdfe691e3421e1e (commit) via 12596dcb8aed6b1a17bfe87920316967c81638fe (commit) via 93b9206078804405c4dcfc1017edf0e5c8be2c2b (commit) via 238d3bd21841f49cc3281fc07328cdee9adf98ef (commit) via 4dfe70e5f8cac46f79b4079c9c886b8d49d0ade2 (commit) via dba60c0ab9abf02168bf30db5354df099c85c7da (commit) via de67e24274773dd71dc3750a3f66924bc397c379 (commit) via 52542da2821cf990a4458451c00b230c09e6beed (commit) via 3cb85c28703a98f6f3bcc42608f64f699797f654 (commit) via a7342953e2d31c4b744542305d4a2e83d71ad540 (commit) via 062a2418ba8f567dd2d62977a67423870aea56b9 (commit) via 97242b898d4688bb1e7114601fd88ab2835d3945 (commit) via 72864c7fc2033a44a085fc793115e0e6e8b5f2b6 (commit) via cf12810f46eb1f8133a487a4460645afa244d331 (commit) via 58a30c622e60c932a7a4bba1504bac62f041d1b8 (commit) via d3b2cb2c8d290780b671252d7a89fde3c93e7f15 (commit) via ae2e50e9c4d3e028a706c95330fbf04779916954 (commit) via 4795faa6ffd5c343af0c5539782d1d44e370591e (commit) via fb1f6f0bed8a03a6806c63b6f7e01c84eb9a9acd (commit) via b7599041c47d319d85d094fe582ef13d63416a97 (commit) via ab42ce03b0bc400001858d6349c5a7ad50770948 (commit) via deaf79093f3376f8e025f0e830fe289cc602a85d (commit) via 8e7583eed7f18d435ae12019bf6fdca637fdb5b5 (commit) via 0508b792ba159676dd0e07c717d3a135c7f0aebb (commit) via 96c1f8f82657364b7abd13a845205a621ab5e6ea (commit) via 88a2a361de9c5139ae033978ad447677105dd06b (commit) via 3b3601a756e46209462f3bdc258e1f028797cc8f (commit) via db5eb7ecb9103bbbf677fe72be80497830bceb1b (commit) via cf6fcb0f6a132af9c4bd9773741afbede151a692 (commit) via 9afb08203e03b7d0f4b360b3c6563aecacc06b0a (commit) via bfb5f90fadc1a794f74c80cb0e4df2207e99caf0 (commit) via bbde3abeeb78025518d0f543ecc04fe5df398a85 (commit) via 3f1a24696ab62f1ae084a3be72fc02f1126d99aa (commit) via d66a77f51753cc25b18bfb6cf4e94c343ce41db8 (commit) via a0a56e4e1481aa878adef26be66e44e8d5c890fa (commit) via 7bffd468f26a71a791a39da6582e978dde950e78 (commit) via d6fa2edb456091a26dad1675f81bac2a02b82448 (commit) via 062dfa58c6925c857233fedef339c56a4a067a07 (commit) via c292f31fd6a82c144d67bcd1faadfa02b52fe1f6 (commit) via f82911dce4c8fbc6920a6da72f9c462068232e83 (commit) via f9753ad888e65ae0e3fad9e8f329d44673d0fda0 (commit) via 38b85126f2ec02de2e7d6ecf7133b55e82a2dd8a (commit) via d1af221bdd724440beba19c5ac726f7194446b77 (commit) via 44e8698b086a4cb230139bccf27f39cced360888 (commit) via 71cac1c9d16a81f5ef00fc4c1fcd4ecdddfb84a0 (commit) via 74167f742fb4ad513b14833f468eef7cfc73b7ea (commit) via df1f46002268874becdeb124a8b344b2d9734c19 (commit) via 742bb994da6efd4edbb8f011a75a0a9528cdb053 (commit) via e86e15a19409320e2fac808702af7c44173055e7 (commit) via fa4394e8ee929212c1ad0cf18d14d759a2180a90 (commit) via 784ac87b6718f9a2574547d8a640f6f22cd1f06c (commit) via b4ff02f74664234d7d3669339308892cb7a0a0dd (commit) via 47d059784b08c3714bf5ca2df95b809dbe1f2582 (commit) via 817c9de9aa4aa1992e972396e4893d9485622459 (commit) via aae5ece32fef200d51cb7236f0bd6c1ad51384f8 (commit) via 801502d456179299f5495d751bd37b2124765d7c (commit) via 5d7b3942cac20f73750d82abaaca437302c3d99b (commit) via 23f2e0b6bc8b2b99c4dcb768b10f2f346d75317f (commit) via 9c765cf0a6810be2c38184eac0927089c11ced17 (commit) via 39a62484096ec9249c996bd3fd3e5cf0bb3c15bb (commit) via 1523cd0ac6c48dd23dfe03e826b3fc6b071cd2a5 (commit) via c0e9c2291b30e10566deef1a1dbaa03912774e8d (commit) via e51eb5dc1905333030d795f10d415e20450829d8 (commit) via d3f5bc0697daf1003c93e01f3799f80fd1862c8f (commit) via 581810a4f413ccfd0ef802e28baa6ef41a38a5f1 (commit) via 36afa5e2e9e286b72aa4e94d90adea3f3c6ec04e (commit) via 7aed927b6bba01309248a0be6821a942555b0570 (commit) via 3bfa2fdbd0b9a1cbc73331e576b3433e09a8a313 (commit) via 034300020873eee40a23188455c03c78ea5be672 (commit) via c1d7024ebe1d588de3c4a3693c10562c920a9bd6 (commit) via 86bdfcb7b79394588d8be265db09654ee08ac165 (commit) via 9d7b5381168e1cd5b226808aed61cc605ae447bd (commit) via ebf74a5ffb8831c694e1d430c6342956ef7cb135 (commit) via eb32800adaaaaa5ad9a575bbdc02cb7eca47cd78 (commit) via 2fa26745335aa674b90ad334e527e03e5fd3182e (commit) via 6c12e8b823a49181fb72c922dd5d14f334940c44 (commit) via 8b7c3f70d3b0d241e934944cfbe0fb629198eaea (commit) via 55b86cc7b80aeea8dfebcb1e9f98cda04553b801 (commit) via d4f5c81e368e3edc89ad55cd471c1e75ed343dbb (commit) via e15d58f9d791eafd30e95ab3f343f647e0b9506d (commit) via 39c478388cf1fde43d8ab4a3fc5e008d9034356c (commit) via 154ac3d15dd220d5e504ae5409f99d38edeb476a (commit) via 1cae0f265f5aff791bab8788f86d68bfbfc491b3 (commit) via fea8f74dc3a0c6155fe7fed4a278a7c7165162da (commit) via 40d9167a90a5b2266a5ee93d47a1acfae880497c (commit) via 9b0c529e25e94417d88c9839771b81420fe61338 (commit) via 886d4a2ab8af21f4899192f14c9d66047f9ac1f2 (commit) via ece88c894aa7f35f37e4c33c2843ac0574af009b (commit) via 6f66a718559cd48d0dc783c297e02057cb1a45a0 (commit) via 2040ed0a6ae92078e8939e5335be7726f3b51fd7 (commit) via af0ac2559278da3303a84ee71f638b5bba9c5217 (commit) via 3f8fb54b7580c3068acc9972e76aab627157544c (commit) via c641bcbfeb4cd3369557a3e8016505aa8042524a (commit) via 79a7cd772b9704be5bbcf66d12f8a153d4296c62 (commit) via 5f0e72404f7437cc78e551c5c351ad78e866c33f (commit) via e7bd3368a999a5243f22e8d24acc4bf5f9edeca6 (commit) via fb604b69e524e777fff277af08161047ce2064e0 (commit) via 8efab8884aaac0c3a5625d4eae0401b48d996378 (commit) via d2865f3a61c50b8961486afeb488279a5dfc4dda (commit) via 8a0a494a0d935bb3dffc0e5ac677636b3aa313c2 (commit) via 1f5bfc89c923aea539a3f87fa219b559c2f40940 (commit) via e6f883bc44e06c960998d3eed1a83edfaca7e2bf (commit) via 4f1a28d63761a7723993cff4f612d4c6ddcbf2b9 (commit) via e0a9a70c72e590d8eee08a029510a1bfbd99e404 (commit) via e157b7cb4f2e2367775ee2fd9ed41b3faffef743 (commit) via eebd4b9bf0a741db4658283eb18f37f3a98c98fd (commit) via 1020ad7b4440e86bf6d534507875c2b0e87352ca (commit) via 4c64cffcb5b094c97fa72eaac14b13c6273e94b6 (commit) via 4fc717970302bafe6e3fee45170ce1bf8a14ac67 (commit) via 5397900d4553a7474dde79a6f77c4d1acf7930ba (commit) via d06e02eedcf78284d17f12c4556f9b8340e79014 (commit) via db8846d13025b9a74f007d9e3fd1e527de82ee2e (commit) via 8a942a44c68ca6a645da240433d515c7a8fc0d58 (commit) via 1dce32e1c1d71e0e8e0b90aa62fd338ecf60f53a (commit) via 239dfb55f8b75d0a19e9d2b1c41c92836ff0a4f8 (commit) via da3305b5e6131cf670ff04ce00f98f0cf04150cb (commit) via 0bebfee17dffa06b47cceef2550071d1b72b69ca (commit) via 42c6a57f15100e7197621bf36487173867f54644 (commit) via f34ab560fcff864ddb77f765142d457950107599 (commit) via f53179062f488915adc721d87cacc217c7d3e70f (commit) via 835d3e832b46907f5c92c0880d785037565a7dbc (commit) via 8a2452cdcfcf41c5a612feb50d27968b566afd09 (commit) via 5dafd4208a7b135d201f70e01a88e1fe033d2a84 (commit) via c0ab0476d18530fcb1df0de678bbc0667ff3ef0d (commit) via ab06a952d097e3a9cae48bd3a12faf1616f34f82 (commit) via 5bba4c27d3176e4dca17582143d327bce4099a84 (commit) via b2e0cbacf0334091bb96236040af0ba83bfcd466 (commit) via 96c242f8bf8ed50ad269257e153e3594fed6109b (commit) via d4f235571b1baf2f82d48227f2c84fca56593414 (commit) via 65301c95382d0d6a2ab0793452b2a2f57b37aa06 (commit) via 392836b8d6d0a340402d89a9b5071b9f138e9240 (commit) via a9e59cfc2bb47339e039aafed29ffad943d1287f (commit) via 1c235ebcb42df36a2403965b4e5c656a47e8fa5f (commit) via 294a047754678d64c3f5f9fad79a7bb745dccd43 (commit) via 4bc39df761bfaed4197ff6601834ebf83ee07d85 (commit) via cc2a209aed3189e4ace541bcb4049d165ba84b9f (commit) via 55513b86d9161ebccc02e4c0dcd45e1613194a22 (commit) via dc516bb761cd1e963c17c9e0eb2e017ad5bf7bf6 (commit) via 380561a61724a58f68de3a5fd07f82220fec46bd (commit) via 881657d16bea168b993844e1772f13fd55b67df8 (commit) via 166f13c5b6710119dc02c3221288494f8649f86d (commit) via 3e0187d27e7ea6b2938537397dfe8c1eb84eebb4 (commit) via 1921e814ea83bc8956339affda8fd0ad34615c6f (commit) via 1b17570b51176e82dd1211ae209e413636e98ac2 (commit) via d502d44cfe2bbfe32c4382ecd551c971cabd8aea (commit) via 57eccb56dd63b9ce5aea001b6c96bc544fcd3731 (commit) via 9f05b4f284b6eaa1a96b10300645026bf36b1bfa (commit) via f28da4db123da0a6e99c0e933dd04599651fa872 (commit) via 44ad21689f88aef0fa531abe1f67c21a9cda337a (commit) via 5144e7b8aff75228df6b2a62b161edf42f9d8b10 (commit) via c88f735c599e716f82191cc5ae88d697ba4b77b4 (commit) via 2db6120dd0894605e29cc1789197c472dfbb25d4 (commit) via 826f516c1952afa06d652031da443c80a2986d3f (commit) via be5e2eceb9f2730e831cd746c4553772bbfc0556 (commit) via de00672ad40ec09577e1fdc98aaf336b2efcef0b (commit) via 29a25c4657efd897333bf75def07b823af376b36 (commit) via 9d4dbbfff1eda29295539a606c4dd871367c5c00 (commit) via 31ba0a850bc2b91d45b8006737235bacbbdc24b9 (commit) via 36cc1d33cdb82c0eb36ef023f018da32dc2469d5 (commit) via 51b1af7591036f81bdf10283f1dde9a9f6e24ba9 (commit) via dddab76fb92d48c68790eb8730e119cf884bffb8 (commit) via eec6b2f52e75628ac05e43c313ef4285eb93119b (commit) via 798410309614b14ff40c0973d42e359e2001d97c (commit) via d72ee15400084b98d54e3437e988f80b0166985f (commit) via 6afefd5d93d01d67ce13f110bd7be21f3bc90eb3 (commit) via a4c5a1cc99f778f15a8e4cefa1d19d26b28ec291 (commit) via 0ba48bf45377f4d80cce9a7343be620fc654b58b (commit) via a3ec8f472256fa8061e2d889c14f57c98bcd5c75 (commit) via 68652ae8aa2c8412b595c64367ea5a9791feb247 (commit) via d2405cb553557cb5532e7468ac58124f1abda8a8 (commit) via cdaa41ef812c88f2e4add817b94f1cbcbcc5eda7 (commit) via 2d9029098e99dd568c2348b421fc9fce71c5fc38 (commit) via a71fdbd606a2ebfcf0ffbaa6261ac5ecc1885a6b (commit) via 553f133013e36d850331dc9152f7c08a5ef87dcd (commit) via 619aa88ee77904134d617a79c282bb87e5fe9dfc (commit) via 52e2f483276be6df013e9a6d9a5bd76bf176026c (commit) via 1f35ebb3bd1cb71ed035583cd3dda6b09900fe85 (commit) via b1d946885a424df5def3c196a29d069bf2795434 (commit) via 1737da84c873c0ce0c70d79300758f721e09edaa (commit) via 9059ef7c5bc7cda7f4bf779de60a2fbfd9ee61a1 (commit) via 92fe5a7f558ccda5095e004032f3decd5d2b38cd (commit) via 51f1c9b96357d3b1de44ee68e405108dfd8014ac (commit) via 444af5db7a56492ff9fba6453168dfea4fa3f7e8 (commit) via 4ea9e52ad4287d453b82fb3a9901a3da0fd4e461 (commit) via 9661af3ef35a6ab095ac5b2fed1756ca5fa8fc1d (commit) from 6c6647329614a0491a5459055bff1e9d0b75aec6 (commit) - Log ----------------------------------------------------------------- commit 44b46b11a3ced20bdc712d98524b52477973bfab Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:26:19 2011 +0200 Translation update done using Pootle. commit 09cfcfeb4adde91e64adfcd485d1064fb5ddfc59 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:24:46 2011 +0200 Translation update done using Pootle. commit 945f08cfce927ef03fdbe9801ce4b877cca14416 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:24:29 2011 +0200 Translation update done using Pootle. commit 49ccf818e87fb20eccb363d8abea469da110f142 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:23:17 2011 +0200 Translation update done using Pootle. commit a3bbe87b4a0b889dffcda84589f47c12132661e7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:22:31 2011 +0200 Translation update done using Pootle. commit 746765be64243ae12410245aceaa2fe4db772f9b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:22:16 2011 +0200 Translation update done using Pootle. commit 73a1240aede4a8ed96c2d2d777de6353a22871fc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:22:07 2011 +0200 Translation update done using Pootle. commit d2006fa9578e56d873b295281ab40e665ff9ebb4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:21:52 2011 +0200 Translation update done using Pootle. commit 736b28880efbf044e5e3360d84f2b02b516528c8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:21:11 2011 +0200 Translation update done using Pootle. commit 7888b953241937aeda78df39cf1823c8e130cc43 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:20:36 2011 +0200 Translation update done using Pootle. commit c68da69c633b6bba072f2b4c879ea13a7b2cefb8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:20:04 2011 +0200 Translation update done using Pootle. commit 96df6076b9721575597a7400a65ecac6dc08d51a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:19:27 2011 +0200 Translation update done using Pootle. commit 0e3a619b1062bc05b67de5216a8bb45172cc1f99 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:18:28 2011 +0200 Translation update done using Pootle. commit 2c59c77eda4953e00a5959999364b3a204038aa7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:18:15 2011 +0200 Translation update done using Pootle. commit ffb51e79fac0c7b77cb41e07524fed6e0ba12f03 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:17:53 2011 +0200 Translation update done using Pootle. commit 8531b763097ddc88aca6f80cfbd5fcee10477ec5 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:17:36 2011 +0200 Translation update done using Pootle. commit b3ba72367221a3fb86526f89f486c6dc91b20a33 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:16:23 2011 +0200 Translation update done using Pootle. commit 6b202129eee569a12f614b300f565ba319c042a6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:15:43 2011 +0200 Translation update done using Pootle. commit 1a105b4228f87630cee38565844dca0efb9ae89c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:14:47 2011 +0200 Translation update done using Pootle. commit 782958b106c6bc4c2442c35a1e9396d891c0568f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:14:28 2011 +0200 Translation update done using Pootle. commit 6d153b52499cf3d71b4acfb6c87c7d7614693292 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:13:54 2011 +0200 Translation update done using Pootle. commit 44fc27abaf6122d51cacd8e4632a35f3f7c8e7a3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:13:16 2011 +0200 Translation update done using Pootle. commit 036530e717c6f320ac3817b92948acc7a9d3a4b8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:13:07 2011 +0200 Translation update done using Pootle. commit b032de38c21dc6f1a3459ac3c82dec19c4c05d40 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:13:01 2011 +0200 Translation update done using Pootle. commit 227ca6523dd42602df0bcf48cf027aaaabd7f900 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:12:52 2011 +0200 Translation update done using Pootle. commit 2707993a47a004c71667a9c7dd92ed85e7eb4a6a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:12:40 2011 +0200 Translation update done using Pootle. commit 0d9562b675375afc0b5a3e240aca21ddf1083875 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:12:31 2011 +0200 Translation update done using Pootle. commit 1dafb3385f1e448ddb953ea9bdf4cd04caa7a19a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:10:34 2011 +0200 Translation update done using Pootle. commit 1293b031785738f3d2a76719036b0089a9525290 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:10:10 2011 +0200 Translation update done using Pootle. commit ea167246d3580aca8ef28ec46e44f441ad6ca526 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:09:43 2011 +0200 Translation update done using Pootle. commit 0e3543ccd3e6957afb2cd4bb9bf9efd9a098ea46 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:08:46 2011 +0200 Translation update done using Pootle. commit 141bd1da5237601520173135b60bcdeba50ad703 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:07:33 2011 +0200 Translation update done using Pootle. commit 05cd006bf66eb3ca76260bf81b7ff396d86ebc86 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:06:39 2011 +0200 Translation update done using Pootle. commit f001ba512be31412176eee51bff4c8f97a7d57bd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:05:28 2011 +0200 Translation update done using Pootle. commit b0ef5a2839f509da1266dd0c9c233eb64e06bcf7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Mon Jun 6 11:05:05 2011 +0200 Translation update done using Pootle. commit 7cbd6811522136f3de02b8b5ba45bdab661213b7 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:59:47 2011 +0200 Translation update done using Pootle. commit d6ac1ffeb947338607222d756466dc0ba0035784 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:58:54 2011 +0200 Translation update done using Pootle. commit c5aae55dcdb4de001489fbe342d49154d70db0e3 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:58:41 2011 +0200 Translation update done using Pootle. commit ba7156fa546943f0556dcb79efdfe691e3421e1e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:57:18 2011 +0200 Translation update done using Pootle. commit 12596dcb8aed6b1a17bfe87920316967c81638fe Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:56:55 2011 +0200 Translation update done using Pootle. commit 93b9206078804405c4dcfc1017edf0e5c8be2c2b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:56:32 2011 +0200 Translation update done using Pootle. commit 238d3bd21841f49cc3281fc07328cdee9adf98ef Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:54:47 2011 +0200 Translation update done using Pootle. commit 4dfe70e5f8cac46f79b4079c9c886b8d49d0ade2 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:53:16 2011 +0200 Translation update done using Pootle. commit dba60c0ab9abf02168bf30db5354df099c85c7da Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:52:16 2011 +0200 Translation update done using Pootle. commit de67e24274773dd71dc3750a3f66924bc397c379 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:51:40 2011 +0200 Translation update done using Pootle. commit 52542da2821cf990a4458451c00b230c09e6beed Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:51:33 2011 +0200 Translation update done using Pootle. commit 3cb85c28703a98f6f3bcc42608f64f699797f654 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:50:41 2011 +0200 Translation update done using Pootle. commit a7342953e2d31c4b744542305d4a2e83d71ad540 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 6 01:45:53 2011 +0200 Translation update done using Pootle. commit 062a2418ba8f567dd2d62977a67423870aea56b9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:25:28 2011 +0200 Translation update done using Pootle. commit 97242b898d4688bb1e7114601fd88ab2835d3945 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:25:18 2011 +0200 Translation update done using Pootle. commit 72864c7fc2033a44a085fc793115e0e6e8b5f2b6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:24:37 2011 +0200 Translation update done using Pootle. commit cf12810f46eb1f8133a487a4460645afa244d331 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:24:31 2011 +0200 Translation update done using Pootle. commit 58a30c622e60c932a7a4bba1504bac62f041d1b8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:11:17 2011 +0200 Translation update done using Pootle. commit d3b2cb2c8d290780b671252d7a89fde3c93e7f15 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:11:13 2011 +0200 Translation update done using Pootle. commit ae2e50e9c4d3e028a706c95330fbf04779916954 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:11:09 2011 +0200 Translation update done using Pootle. commit 4795faa6ffd5c343af0c5539782d1d44e370591e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:11:05 2011 +0200 Translation update done using Pootle. commit fb1f6f0bed8a03a6806c63b6f7e01c84eb9a9acd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:11:01 2011 +0200 Translation update done using Pootle. commit b7599041c47d319d85d094fe582ef13d63416a97 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:10:56 2011 +0200 Translation update done using Pootle. commit ab42ce03b0bc400001858d6349c5a7ad50770948 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:10:52 2011 +0200 Translation update done using Pootle. commit deaf79093f3376f8e025f0e830fe289cc602a85d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:10:48 2011 +0200 Translation update done using Pootle. commit 8e7583eed7f18d435ae12019bf6fdca637fdb5b5 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:10:44 2011 +0200 Translation update done using Pootle. commit 0508b792ba159676dd0e07c717d3a135c7f0aebb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:10:40 2011 +0200 Translation update done using Pootle. commit 96c1f8f82657364b7abd13a845205a621ab5e6ea Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:10:36 2011 +0200 Translation update done using Pootle. commit 88a2a361de9c5139ae033978ad447677105dd06b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:10:18 2011 +0200 Translation update done using Pootle. commit 3b3601a756e46209462f3bdc258e1f028797cc8f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:10:12 2011 +0200 Translation update done using Pootle. commit db5eb7ecb9103bbbf677fe72be80497830bceb1b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:10:08 2011 +0200 Translation update done using Pootle. commit cf6fcb0f6a132af9c4bd9773741afbede151a692 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:10:04 2011 +0200 Translation update done using Pootle. commit 9afb08203e03b7d0f4b360b3c6563aecacc06b0a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:10:00 2011 +0200 Translation update done using Pootle. commit bfb5f90fadc1a794f74c80cb0e4df2207e99caf0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:09:56 2011 +0200 Translation update done using Pootle. commit bbde3abeeb78025518d0f543ecc04fe5df398a85 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:09:51 2011 +0200 Translation update done using Pootle. commit 3f1a24696ab62f1ae084a3be72fc02f1126d99aa Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:09:43 2011 +0200 Translation update done using Pootle. commit d66a77f51753cc25b18bfb6cf4e94c343ce41db8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:09:37 2011 +0200 Translation update done using Pootle. commit a0a56e4e1481aa878adef26be66e44e8d5c890fa Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:09:32 2011 +0200 Translation update done using Pootle. commit 7bffd468f26a71a791a39da6582e978dde950e78 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:08:58 2011 +0200 Translation update done using Pootle. commit d6fa2edb456091a26dad1675f81bac2a02b82448 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:08:50 2011 +0200 Translation update done using Pootle. commit 062dfa58c6925c857233fedef339c56a4a067a07 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:08:40 2011 +0200 Translation update done using Pootle. commit c292f31fd6a82c144d67bcd1faadfa02b52fe1f6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:08:35 2011 +0200 Translation update done using Pootle. commit f82911dce4c8fbc6920a6da72f9c462068232e83 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:08:31 2011 +0200 Translation update done using Pootle. commit f9753ad888e65ae0e3fad9e8f329d44673d0fda0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:08:27 2011 +0200 Translation update done using Pootle. commit 38b85126f2ec02de2e7d6ecf7133b55e82a2dd8a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:08:22 2011 +0200 Translation update done using Pootle. commit d1af221bdd724440beba19c5ac726f7194446b77 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:08:17 2011 +0200 Translation update done using Pootle. commit 44e8698b086a4cb230139bccf27f39cced360888 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:08:03 2011 +0200 Translation update done using Pootle. commit 71cac1c9d16a81f5ef00fc4c1fcd4ecdddfb84a0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:07:51 2011 +0200 Translation update done using Pootle. commit 74167f742fb4ad513b14833f468eef7cfc73b7ea Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:07:37 2011 +0200 Translation update done using Pootle. commit df1f46002268874becdeb124a8b344b2d9734c19 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:07:25 2011 +0200 Translation update done using Pootle. commit 742bb994da6efd4edbb8f011a75a0a9528cdb053 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:07:20 2011 +0200 Translation update done using Pootle. commit e86e15a19409320e2fac808702af7c44173055e7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:07:16 2011 +0200 Translation update done using Pootle. commit fa4394e8ee929212c1ad0cf18d14d759a2180a90 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:07:08 2011 +0200 Translation update done using Pootle. commit 784ac87b6718f9a2574547d8a640f6f22cd1f06c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:07:03 2011 +0200 Translation update done using Pootle. commit b4ff02f74664234d7d3669339308892cb7a0a0dd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:06:58 2011 +0200 Translation update done using Pootle. commit 47d059784b08c3714bf5ca2df95b809dbe1f2582 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:06:53 2011 +0200 Translation update done using Pootle. commit 817c9de9aa4aa1992e972396e4893d9485622459 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:06:34 2011 +0200 Translation update done using Pootle. commit aae5ece32fef200d51cb7236f0bd6c1ad51384f8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:06:14 2011 +0200 Translation update done using Pootle. commit 801502d456179299f5495d751bd37b2124765d7c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:05:45 2011 +0200 Translation update done using Pootle. commit 5d7b3942cac20f73750d82abaaca437302c3d99b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:05:26 2011 +0200 Translation update done using Pootle. commit 23f2e0b6bc8b2b99c4dcb768b10f2f346d75317f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:05:20 2011 +0200 Translation update done using Pootle. commit 9c765cf0a6810be2c38184eac0927089c11ced17 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:04:43 2011 +0200 Translation update done using Pootle. commit 39a62484096ec9249c996bd3fd3e5cf0bb3c15bb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:04:40 2011 +0200 Translation update done using Pootle. commit 1523cd0ac6c48dd23dfe03e826b3fc6b071cd2a5 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:04:36 2011 +0200 Translation update done using Pootle. commit c0e9c2291b30e10566deef1a1dbaa03912774e8d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:04:31 2011 +0200 Translation update done using Pootle. commit e51eb5dc1905333030d795f10d415e20450829d8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:04:22 2011 +0200 Translation update done using Pootle. commit d3f5bc0697daf1003c93e01f3799f80fd1862c8f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:04:18 2011 +0200 Translation update done using Pootle. commit 581810a4f413ccfd0ef802e28baa6ef41a38a5f1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:04:13 2011 +0200 Translation update done using Pootle. commit 36afa5e2e9e286b72aa4e94d90adea3f3c6ec04e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:04:10 2011 +0200 Translation update done using Pootle. commit 7aed927b6bba01309248a0be6821a942555b0570 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:04:06 2011 +0200 Translation update done using Pootle. commit 3bfa2fdbd0b9a1cbc73331e576b3433e09a8a313 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:04:02 2011 +0200 Translation update done using Pootle. commit 034300020873eee40a23188455c03c78ea5be672 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:58 2011 +0200 Translation update done using Pootle. commit c1d7024ebe1d588de3c4a3693c10562c920a9bd6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:54 2011 +0200 Translation update done using Pootle. commit 86bdfcb7b79394588d8be265db09654ee08ac165 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:50 2011 +0200 Translation update done using Pootle. commit 9d7b5381168e1cd5b226808aed61cc605ae447bd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:45 2011 +0200 Translation update done using Pootle. commit ebf74a5ffb8831c694e1d430c6342956ef7cb135 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:41 2011 +0200 Translation update done using Pootle. commit eb32800adaaaaa5ad9a575bbdc02cb7eca47cd78 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:36 2011 +0200 Translation update done using Pootle. commit 2fa26745335aa674b90ad334e527e03e5fd3182e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:32 2011 +0200 Translation update done using Pootle. commit 6c12e8b823a49181fb72c922dd5d14f334940c44 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:28 2011 +0200 Translation update done using Pootle. commit 8b7c3f70d3b0d241e934944cfbe0fb629198eaea Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:25 2011 +0200 Translation update done using Pootle. commit 55b86cc7b80aeea8dfebcb1e9f98cda04553b801 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:20 2011 +0200 Translation update done using Pootle. commit d4f5c81e368e3edc89ad55cd471c1e75ed343dbb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:16 2011 +0200 Translation update done using Pootle. commit e15d58f9d791eafd30e95ab3f343f647e0b9506d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:12 2011 +0200 Translation update done using Pootle. commit 39c478388cf1fde43d8ab4a3fc5e008d9034356c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:03:07 2011 +0200 Translation update done using Pootle. commit 154ac3d15dd220d5e504ae5409f99d38edeb476a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:02:51 2011 +0200 Translation update done using Pootle. commit 1cae0f265f5aff791bab8788f86d68bfbfc491b3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:02:46 2011 +0200 Translation update done using Pootle. commit fea8f74dc3a0c6155fe7fed4a278a7c7165162da Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:02:41 2011 +0200 Translation update done using Pootle. commit 40d9167a90a5b2266a5ee93d47a1acfae880497c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:02:36 2011 +0200 Translation update done using Pootle. commit 9b0c529e25e94417d88c9839771b81420fe61338 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:02:32 2011 +0200 Translation update done using Pootle. commit 886d4a2ab8af21f4899192f14c9d66047f9ac1f2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:02:28 2011 +0200 Translation update done using Pootle. commit ece88c894aa7f35f37e4c33c2843ac0574af009b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:02:23 2011 +0200 Translation update done using Pootle. commit 6f66a718559cd48d0dc783c297e02057cb1a45a0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:02:17 2011 +0200 Translation update done using Pootle. commit 2040ed0a6ae92078e8939e5335be7726f3b51fd7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:02:11 2011 +0200 Translation update done using Pootle. commit af0ac2559278da3303a84ee71f638b5bba9c5217 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:02:07 2011 +0200 Translation update done using Pootle. commit 3f8fb54b7580c3068acc9972e76aab627157544c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:02:01 2011 +0200 Translation update done using Pootle. commit c641bcbfeb4cd3369557a3e8016505aa8042524a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:01:54 2011 +0200 Translation update done using Pootle. commit 79a7cd772b9704be5bbcf66d12f8a153d4296c62 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:01:49 2011 +0200 Translation update done using Pootle. commit 5f0e72404f7437cc78e551c5c351ad78e866c33f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:01:45 2011 +0200 Translation update done using Pootle. commit e7bd3368a999a5243f22e8d24acc4bf5f9edeca6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:01:39 2011 +0200 Translation update done using Pootle. commit fb604b69e524e777fff277af08161047ce2064e0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:01:35 2011 +0200 Translation update done using Pootle. commit 8efab8884aaac0c3a5625d4eae0401b48d996378 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:01:30 2011 +0200 Translation update done using Pootle. commit d2865f3a61c50b8961486afeb488279a5dfc4dda Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 10:01:24 2011 +0200 Translation update done using Pootle. commit 8a0a494a0d935bb3dffc0e5ac677636b3aa313c2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 09:37:12 2011 +0200 Translation update done using Pootle. commit 1f5bfc89c923aea539a3f87fa219b559c2f40940 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 09:22:21 2011 +0200 Translation update done using Pootle. commit e6f883bc44e06c960998d3eed1a83edfaca7e2bf Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 09:13:22 2011 +0200 Translation update done using Pootle. commit 4f1a28d63761a7723993cff4f612d4c6ddcbf2b9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:58:48 2011 +0200 Translation update done using Pootle. commit e0a9a70c72e590d8eee08a029510a1bfbd99e404 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:53:47 2011 +0200 Translation update done using Pootle. commit e157b7cb4f2e2367775ee2fd9ed41b3faffef743 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:45:49 2011 +0200 Translation update done using Pootle. commit eebd4b9bf0a741db4658283eb18f37f3a98c98fd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:44:53 2011 +0200 Translation update done using Pootle. commit 1020ad7b4440e86bf6d534507875c2b0e87352ca Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:43:16 2011 +0200 Translation update done using Pootle. commit 4c64cffcb5b094c97fa72eaac14b13c6273e94b6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:42:49 2011 +0200 Translation update done using Pootle. commit 4fc717970302bafe6e3fee45170ce1bf8a14ac67 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:42:38 2011 +0200 Translation update done using Pootle. commit 5397900d4553a7474dde79a6f77c4d1acf7930ba Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:42:28 2011 +0200 Translation update done using Pootle. commit d06e02eedcf78284d17f12c4556f9b8340e79014 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:42:16 2011 +0200 Translation update done using Pootle. commit db8846d13025b9a74f007d9e3fd1e527de82ee2e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:42:07 2011 +0200 Translation update done using Pootle. commit 8a942a44c68ca6a645da240433d515c7a8fc0d58 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:41:57 2011 +0200 Translation update done using Pootle. commit 1dce32e1c1d71e0e8e0b90aa62fd338ecf60f53a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:41:45 2011 +0200 Translation update done using Pootle. commit 239dfb55f8b75d0a19e9d2b1c41c92836ff0a4f8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:41:34 2011 +0200 Translation update done using Pootle. commit da3305b5e6131cf670ff04ce00f98f0cf04150cb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:41:21 2011 +0200 Translation update done using Pootle. commit 0bebfee17dffa06b47cceef2550071d1b72b69ca Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:40:52 2011 +0200 Translation update done using Pootle. commit 42c6a57f15100e7197621bf36487173867f54644 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:40:39 2011 +0200 Translation update done using Pootle. commit f34ab560fcff864ddb77f765142d457950107599 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:39:46 2011 +0200 Translation update done using Pootle. commit f53179062f488915adc721d87cacc217c7d3e70f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:39:16 2011 +0200 Translation update done using Pootle. commit 835d3e832b46907f5c92c0880d785037565a7dbc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:37:49 2011 +0200 Translation update done using Pootle. commit 8a2452cdcfcf41c5a612feb50d27968b566afd09 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:37:18 2011 +0200 Translation update done using Pootle. commit 5dafd4208a7b135d201f70e01a88e1fe033d2a84 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:36:43 2011 +0200 Translation update done using Pootle. commit c0ab0476d18530fcb1df0de678bbc0667ff3ef0d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:36:12 2011 +0200 Translation update done using Pootle. commit ab06a952d097e3a9cae48bd3a12faf1616f34f82 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:35:58 2011 +0200 Translation update done using Pootle. commit 5bba4c27d3176e4dca17582143d327bce4099a84 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:35:48 2011 +0200 Translation update done using Pootle. commit b2e0cbacf0334091bb96236040af0ba83bfcd466 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:35:32 2011 +0200 Translation update done using Pootle. commit 96c242f8bf8ed50ad269257e153e3594fed6109b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:35:22 2011 +0200 Translation update done using Pootle. commit d4f235571b1baf2f82d48227f2c84fca56593414 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:35:06 2011 +0200 Translation update done using Pootle. commit 65301c95382d0d6a2ab0793452b2a2f57b37aa06 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:34:39 2011 +0200 Translation update done using Pootle. commit 392836b8d6d0a340402d89a9b5071b9f138e9240 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Jun 5 08:34:29 2011 +0200 Translation update done using Pootle. commit a9e59cfc2bb47339e039aafed29ffad943d1287f Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sat Jun 4 15:20:51 2011 +0200 Translation update done using Pootle. commit 1c235ebcb42df36a2403965b4e5c656a47e8fa5f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 12:00:24 2011 +0200 Translation update done using Pootle. commit 294a047754678d64c3f5f9fad79a7bb745dccd43 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:51:27 2011 +0200 Translation update done using Pootle. commit 4bc39df761bfaed4197ff6601834ebf83ee07d85 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:50:44 2011 +0200 Translation update done using Pootle. commit cc2a209aed3189e4ace541bcb4049d165ba84b9f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:48:43 2011 +0200 Translation update done using Pootle. commit 55513b86d9161ebccc02e4c0dcd45e1613194a22 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:48:23 2011 +0200 Translation update done using Pootle. commit dc516bb761cd1e963c17c9e0eb2e017ad5bf7bf6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:48:13 2011 +0200 Translation update done using Pootle. commit 380561a61724a58f68de3a5fd07f82220fec46bd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:47:37 2011 +0200 Translation update done using Pootle. commit 881657d16bea168b993844e1772f13fd55b67df8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:47:12 2011 +0200 Translation update done using Pootle. commit 166f13c5b6710119dc02c3221288494f8649f86d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:47:00 2011 +0200 Translation update done using Pootle. commit 3e0187d27e7ea6b2938537397dfe8c1eb84eebb4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:46:49 2011 +0200 Translation update done using Pootle. commit 1921e814ea83bc8956339affda8fd0ad34615c6f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:44:52 2011 +0200 Translation update done using Pootle. commit 1b17570b51176e82dd1211ae209e413636e98ac2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:44:43 2011 +0200 Translation update done using Pootle. commit d502d44cfe2bbfe32c4382ecd551c971cabd8aea Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:44:29 2011 +0200 Translation update done using Pootle. commit 57eccb56dd63b9ce5aea001b6c96bc544fcd3731 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:43:34 2011 +0200 Translation update done using Pootle. commit 9f05b4f284b6eaa1a96b10300645026bf36b1bfa Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:43:11 2011 +0200 Translation update done using Pootle. commit f28da4db123da0a6e99c0e933dd04599651fa872 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:42:33 2011 +0200 Translation update done using Pootle. commit 44ad21689f88aef0fa531abe1f67c21a9cda337a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:42:04 2011 +0200 Translation update done using Pootle. commit 5144e7b8aff75228df6b2a62b161edf42f9d8b10 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:40:35 2011 +0200 Translation update done using Pootle. commit c88f735c599e716f82191cc5ae88d697ba4b77b4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:40:03 2011 +0200 Translation update done using Pootle. commit 2db6120dd0894605e29cc1789197c472dfbb25d4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:39:42 2011 +0200 Translation update done using Pootle. commit 826f516c1952afa06d652031da443c80a2986d3f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:39:15 2011 +0200 Translation update done using Pootle. commit be5e2eceb9f2730e831cd746c4553772bbfc0556 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:38:54 2011 +0200 Translation update done using Pootle. commit de00672ad40ec09577e1fdc98aaf336b2efcef0b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:38:23 2011 +0200 Translation update done using Pootle. commit 29a25c4657efd897333bf75def07b823af376b36 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:37:13 2011 +0200 Translation update done using Pootle. commit 9d4dbbfff1eda29295539a606c4dd871367c5c00 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:37:01 2011 +0200 Translation update done using Pootle. commit 31ba0a850bc2b91d45b8006737235bacbbdc24b9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:36:16 2011 +0200 Translation update done using Pootle. commit 36cc1d33cdb82c0eb36ef023f018da32dc2469d5 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:35:49 2011 +0200 Translation update done using Pootle. commit 51b1af7591036f81bdf10283f1dde9a9f6e24ba9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:34:42 2011 +0200 Translation update done using Pootle. commit dddab76fb92d48c68790eb8730e119cf884bffb8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:34:05 2011 +0200 Translation update done using Pootle. commit eec6b2f52e75628ac05e43c313ef4285eb93119b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:33:43 2011 +0200 Translation update done using Pootle. commit 798410309614b14ff40c0973d42e359e2001d97c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:31:47 2011 +0200 Translation update done using Pootle. commit d72ee15400084b98d54e3437e988f80b0166985f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:30:56 2011 +0200 Translation update done using Pootle. commit 6afefd5d93d01d67ce13f110bd7be21f3bc90eb3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:30:28 2011 +0200 Translation update done using Pootle. commit a4c5a1cc99f778f15a8e4cefa1d19d26b28ec291 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:30:17 2011 +0200 Translation update done using Pootle. commit 0ba48bf45377f4d80cce9a7343be620fc654b58b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:30:04 2011 +0200 Translation update done using Pootle. commit a3ec8f472256fa8061e2d889c14f57c98bcd5c75 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:29:44 2011 +0200 Translation update done using Pootle. commit 68652ae8aa2c8412b595c64367ea5a9791feb247 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:29:33 2011 +0200 Translation update done using Pootle. commit d2405cb553557cb5532e7468ac58124f1abda8a8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:29:19 2011 +0200 Translation update done using Pootle. commit cdaa41ef812c88f2e4add817b94f1cbcbcc5eda7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:29:07 2011 +0200 Translation update done using Pootle. commit 2d9029098e99dd568c2348b421fc9fce71c5fc38 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:28:37 2011 +0200 Translation update done using Pootle. commit a71fdbd606a2ebfcf0ffbaa6261ac5ecc1885a6b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:28:18 2011 +0200 Translation update done using Pootle. commit 553f133013e36d850331dc9152f7c08a5ef87dcd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:27:55 2011 +0200 Translation update done using Pootle. commit 619aa88ee77904134d617a79c282bb87e5fe9dfc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:27:18 2011 +0200 Translation update done using Pootle. commit 52e2f483276be6df013e9a6d9a5bd76bf176026c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:26:42 2011 +0200 Translation update done using Pootle. commit 1f35ebb3bd1cb71ed035583cd3dda6b09900fe85 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:26:33 2011 +0200 Translation update done using Pootle. commit b1d946885a424df5def3c196a29d069bf2795434 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:25:53 2011 +0200 Translation update done using Pootle. commit 1737da84c873c0ce0c70d79300758f721e09edaa Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:25:37 2011 +0200 Translation update done using Pootle. commit 9059ef7c5bc7cda7f4bf779de60a2fbfd9ee61a1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:25:19 2011 +0200 Translation update done using Pootle. commit 92fe5a7f558ccda5095e004032f3decd5d2b38cd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:24:47 2011 +0200 Translation update done using Pootle. commit 51f1c9b96357d3b1de44ee68e405108dfd8014ac Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:24:17 2011 +0200 Translation update done using Pootle. commit 444af5db7a56492ff9fba6453168dfea4fa3f7e8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:22:53 2011 +0200 Translation update done using Pootle. commit 4ea9e52ad4287d453b82fb3a9901a3da0fd4e461 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:21:54 2011 +0200 Translation update done using Pootle. commit 9661af3ef35a6ab095ac5b2fed1756ca5fa8fc1d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Jun 4 11:21:21 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/es.po | 53 +++-- po/ja.po | 742 ++++++++++++++++++++++++++++++-------------------------------- po/nl.po | 5 +- 3 files changed, 399 insertions(+), 401 deletions(-) diff --git a/po/es.po b/po/es.po index ce13b46..a6c5d92 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-30 11:21+0300\n" -"PO-Revision-Date: 2011-05-21 21:17+0200\n" +"PO-Revision-Date: 2011-06-06 01:59+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: none\n" "Language: es\n" @@ -2813,12 +2813,10 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1058 -#, fuzzy msgid "" "<span id=\"cfg_Servers_recent\">$cfg['Servers'][$i]['recent']</span> string" msgstr "" -"cadena <span id=\"cfg_Servers_relation\">$cfg['Servers'][$i]['relation']</" -"span>" +"cadena <span id=\"cfg_Servers_recent\">$cfg['Servers'][$i]['recent']</span>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1061 @@ -2832,6 +2830,15 @@ msgid "" "\"#cfg_LeftDefaultTabTable\" class=\"configrule\">$cfg['LeftDefaultTabTable']" "</a>." msgstr "" +"Desde la versión 3.5.0 se pueden mostrar las tablas recientemente utilizadas " +"en el marco de navegación izquierdo. Facilita el saltar entre tablas " +"directamente sin tener que seleccionar la base de datos y luego seleccionar " +"la tabla. Utilizando <a href=\"#cfg_LeftRecentTable\" " +"class=\"configrule\">$cfg['LeftRecentTable']</a> se puede configurar la máxima " +"cantidad de tablas recientes a mostrar. Al seleccionar una tabla de la " +"lista, saltará a la página especificada en <a " +"href=\"#cfg_LeftDefaultTabTable\" " +"class=\"configrule\">$cfg['LeftDefaultTabTable']</a>." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1069 @@ -2839,26 +2846,27 @@ msgid "" "Without configuring the storage, you can still access the recently used " "tables, but it will disappear after you logout." msgstr "" +"Sin configurar el almacenamiento aún se pueden aprovechar las tablas " +"recientemente utilizadas, pero éstas desaparecerán luego de finalizar " +"sesión." #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1076 -#, fuzzy msgid "" "put the table name in <tt>$cfg['Servers'][$i]['recent']</tt> (e.g. " "'pma_recent')" msgstr "" -"defina el nombre de la tabla en <tt>$cfg['Servers'][$i]['tracking']</tt> " -"(por ejemplo: 'pma_tracking')" +"configure el nombre de la tabla <tt>$cfg['Servers'][$i]['recent']</tt> (por " +"ejemplo 'pma_recent')" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1081 -#, fuzzy msgid "" "<span id=\"cfg_Servers_table_uiprefs\">$cfg['Servers'][$i]['table_uiprefs']</" "span> string" msgstr "" -"cadena <span id=\"cfg_Servers_table_info\">$cfg['Servers'][$i]['table_info']" -"</span>" +"cadena <span " +"id=\"cfg_Servers_table_uiprefs\">$cfg['Servers'][$i]['table_uiprefs']</span>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1084 @@ -2869,22 +2877,26 @@ msgid "" "the storage, these features still can be used, but the values will disappear " "after you logout." msgstr "" +"Desde la versión 3.5.0 phpMyAdmin puede configurarse para recordar varias " +"cosas en la visualización de tablas (como el ordenamiento de las mismas <a " +"href=\"#cfg_RememberSorting\" class=\"configrule\">$cfg['RememberSorting']</a>, " +"etc.). Sin configurar el almacenamiento aún se pueden utilizar estas " +"configuraciones pero sus valores desaparecerán al finalizar sesión." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1091 -#, fuzzy msgid "To allow the usage of these functionality persistently:" -msgstr "Para permitir el uso de esta funcionalidad." +msgstr "Para permitir el uso de esta funcionalidad de forma persistente:" #. type: Content of: <html><body><div><dl><dd><ud de forma persistente:"</a>, "2.29.30.126]F��<�*��F�"�R;�*�gS;�*@��F��F��R;�*�dT;�*��s;�*��o<�*��F��<�*��F��F��R;�*6 ��!�!@��F��F�x�o<�*��F�"�R;�*�R;�*@��F��R;�*��F��<�*��R;�*��<�*؄�<�*��<�*�dT;�*x�o<�*��F��F��R;�*�!�!@��F��F��]O<�*��F�"�R;�*�R;�*@��F��R;�*��F�p��F�h��F��s;�*�p��F��R;�*�dT;�*��F�p��F��R;�*GHIJKMNOP@��F��F�H&<�*@��F�"�R;�*�R;�*@��F�0��<�*��R;�*�o<�*�I<�*��<�*؄�<�*��<�*�dT;�*H&<�*@��F��F��R;�*8&<�*@��F��F��R;�*(&<�*@��F��F��R;�*&<�*@��F��F��R;�* ��<�*��R;�*��<�*��F��<�*��R;�*؄�<�*��F�y�<�*��R;�*��<�*��F�Z�<�*��R;�*�D<�*�o<�*�I<�*��<�*ؤo<�*؄�<�*��<�*�dT;�*��<�*`��F�0��F��R;�*#%')*-.035678:<=@��F��F�p��;�*��F�"�R;�*8�o<�*��R;�*ؤo<�*��o<�*�dT;�*cf �;�*��F�p��;�*��F�P��F��R;�*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��;�*��F�F�6=�*F�6=�*?��;�*��F��F�Ћ�F� �;�*��R;�*��s;�*0��F�B�6=�*��F��F��t;�*��F��B�6=�*��F��R;l><li> #: orig-docs/Documentation.html:1095 -#, fuzzy msgid "" "put the table name in <tt>$cfg['Servers'][$i]['table_uiprefs']</tt> (e.g. " "'pma_table_uiprefs')" msgstr "" -"agrega el nombre de la tabla en <tt>$cfg['Servers'][$i]['table_info']</tt> " -"(por ejemplo: 'pma_table_info')" +"agrega el nombre de la tabla en " +"<tt>$cfg['Servers'][$i]['table_uiprefs']</tt> (por ejemplo " +"'pma_table_uiprefs')" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1100 @@ -4122,9 +4134,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1514 -#, fuzzy msgid "$cfg['LeftRecentTable'] integer" -msgstr "entero $cfg['RepeatCells']" +msgstr "entero $cfg['LeftRecentTable']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1515 @@ -4132,6 +4143,9 @@ msgid "" "The maximum number of recently used tables shown in the left navigation " "frame. Set this to 0 (zero) to disable the listing of recent tables." msgstr "" +"El número máximo de tablas utilizadas recientemente a mostrar en el marco de " +"navegación izquierdo. Configure como 0 (cero) para deshabilitar las tablas " +"recientes." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1518 @@ -5558,15 +5572,16 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1956 -#, fuzzy msgid "$cfg['RememberSorting'] boolean" -msgstr "booleano $cfg['ThemePerServer']" +msgstr "booleano $cfg['RememberSorting']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1957 msgid "" "If enabled, when browsing tables, the sorting of each table is remembered." msgstr "" +"Si está habilitado, al navegar por tablas, se recordará el ordenamiento de " +"cada tabla." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1959 diff --git a/po/ja.po b/po/ja.po index 47f5dc9..82ce629 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-30 11:20+0300\n" -"PO-Revision-Date: 2011-06-02 11:56+0200\n" +"PO-Revision-Date: 2011-06-06 11:26+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: Japan <jp(a)li.org>\n" "Language: ja\n" @@ -125,7 +125,7 @@ msgstr "ローカル文書：" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:50 msgid "Version history: <a href=\"changelog.php\">ChangeLog</a>" -msgstr "バージョン履歴: <a href=\"changelog.php\">ChangeLog</a>" +msgstr "バージョン履歴：<a href=\"changelog.php\">変更履歴</a>" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:51 @@ -153,9 +153,8 @@ msgid "" "\"#faq1_31\">see <abbr title=\"Frequently Asked Questions\">FAQ</abbr> 1.31</" "a>) , the Standard PHP Library (SPL) extension and JSON support." msgstr "" -"<tt>セッション</tt>(<a href=\"#faq1_31\"><abbr title=\"よくある質問\">FAQ</" -"abbr> 1.31 参照</a>)、Standard PHP Library (SPL)、JSON をサポートしている " -"PHP 5.2.0 以降が必要です。" +"<tt>セッション</tt> (<a href=\"#faq1_31\"><abbr title=\"よくある質問\">FAQ</abbr> 1.31 " +"参照</a>)、Standard PHP Library (SPL)、JSON をサポートしている PHP 5.2.0 以降が必要です。" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:65 @@ -180,8 +179,8 @@ msgid "" "You need GD2 support in PHP to display inline thumbnails of JPEGs ("" "image/jpeg: inline") with their original aspect ratio" msgstr "" -"JPEG 画像のインラインサムネイル("image/jpeg: inline")を正しいアスペ" -"クト比で表示したい場合は PHP が GD2 をサポートしている必要があります。" +"JPEG 画像のインラインサムネイル ("image/jpeg: inline") を正しいアスペクト比で表示したい場合は PHP " +"が GD2 をサポートしている必要があります。" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:73 @@ -276,8 +275,8 @@ msgid "" "execute, edit and bookmark any <abbr title=\"structured query language" "\">SQL</abbr>-statement, even batch-queries" msgstr "" -"任意の <abbr title=\"structured query language\">SQL</abbr> コマンドの実行、" -"編集、ブックマーク。マルチクエリにも対応。" +"任意の <abbr title=\"structured query language\">SQL</abbr> " +"文の実行、編集、ブックマーク。マルチクエリにも対応。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:110 @@ -436,7 +435,6 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:157 -#, fuzzy msgid "" "<sup>1)</sup> phpMyAdmin can compress (Zip, GZip -RFC 1952- or Bzip2 " "formats) dumps and <abbr title=\"comma separated values\">CSV</abbr> " @@ -444,9 +442,10 @@ msgid "" "support (<tt>--with-bz2</tt>). Proper support may also need changes in " "<tt>php.ini</tt>." msgstr "" -"（*）  phpMyAdmin は、Zlib（<tt>--with-zlib</tt>）／Bzip2（<tt>--with-" -"bz2</tt>）をサポートした PHP4（≧ 4.0.4）を利用すると、ダンプや CSV エクスポー" -"トを（Zip、GZip -RFC 1952-、Bzip2 形式）で圧縮できます。" +"<sup>1)</sup> phpMyAdmin は、Zlib (<tt>--with-zlib</tt>)／Bzip2 (<tt>--with-" +"bz2</tt>) をサポートした PHP を利用すると、ダンプや <abbr title=\"comma separated " +"values\">CSV</abbr> エクスポートを（Zip、GZip -RFC 1952-、Bzip2 " +"形式で）圧縮できます。これらを適切に使用するには、<tt>php.ini</tt> の変更が必要な場合もあります。" #. type: Content of: <html><body><div><h2> #: orig-docs/Documentation.html:164 @@ -486,10 +485,9 @@ msgid "" "the MySQL databases properly. phpMyAdmin's "Privileges" page can " "be used for this." msgstr "" -"phpMyAdmin は MySQL データベースサーバに特別なセキュリティをほどこすものでは" -"ありません。phpMyAdmin を使ったとしても、MySQL データベースに適切なパーミッ" -"ションを付与するのはやはりシステム管理者の仕事です。ただし、その目的で " -"phpMyAdmin の「特権（Privileges）」ページを使うことはできます。" +"phpMyAdmin は MySQL データベースサーバに特別なセキュリティをほどこすものではありません。phpMyAdmin " +"を使ったとしても、MySQL データベースに適切なパーミッションを付与するのはやはりシステム管理者の仕事です。ただし、その目的で phpMyAdmin " +"の「特権」ページを使うことはできます。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:181 @@ -567,11 +565,10 @@ msgid "" "\"#faq1_26\"><abbr title=\"Frequently Asked Questions\">FAQ</abbr> 1.26</a> " "for suggestions." msgstr "" -"必ずすべてのスクリプトのオーナーを適切に設定してください（PHP がセーフモード" -"になっている場合、スクリプトによってオーナーが異なると問題を起こすことになり" -"ます）。設定例については<a href=\"#faq4_2\"> <abbr title=\"よくある質問" -"\">FAQ</abbr> 4.2</a> と <a href=\"#faq1_26\"><abbr title=\"よくある質問" -"\">FAQ</abbr> 1.26</a> をご覧ください。" +"必ずすべてのスクリプトの所有者を適切に設定してください（PHP " +"がセーフモードになっている場合、スクリプトによって所有者が異なると問題を起こすことになります）。設定例については<a href=\"#faq4_2\"> " +"<abbr title=\"よくある質問\">FAQ</abbr> 4.2</a> と <a href=\"#faq1_26\"><abbr " +"title=\"よくある質問\">FAQ</abbr> 1.26</a> をご覧ください。" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:211 @@ -582,12 +579,9 @@ msgid "" "graphical installation. Creating a <tt>config.inc.php</tt> is still a quick " "way to get started and needed for some advanced features." msgstr "" -"まず最初に、インストールを設定する必要があります。やり方は2つあります。1つ" -"は、ユーザーが <tt>config.inc.php</tt> を手動で編集・コピーする伝統的な方法。" -"一方で現在では、グラフィカルなインストールを好む人用にウィザード形式のセット" -"アップスクリプトが提供されています。しかしながら依然として、<tt>config.inc." -"php</tt> を作成するのは、先進的な機能を必要に応じて簡単に使い始められる方法で" -"もあります。" +"まず最初に、インストールを設定する必要があります。やり方は2つあります。1つは、ユーザが <tt>config.inc.php</tt> を手動で編集・" +"コピーする伝統的な方法。一方で現在では、グラフィカルなインストールを好む人用にウィザード形式のセットアップスクリプトが提供されています。しかしながら依然" +"として、<tt>config.inc.php</tt> を作成するのは、先進的な機能を必要に応じて簡単に使い始められる方法でもあります。" #. type: Content of: <html><body><div><ol><li><ul><li> #: orig-docs/Documentation.html:216 @@ -734,6 +728,12 @@ msgid "" "tt> link to save the config file locally and upload (via FTP or some similar " "means) to the proper location." msgstr "" +"次に、ブラウザで <tt><a href=\"setup/\">setup/</a></tt> 開きます。画面の<i>設定</i>領域から<strong>明" +"示的に<tt>保存する</tt>を選択するまで、変更箇所はディスクに保存されていないこと</strong>に注意してください。通常、スクリプトは、<tt" +">config/</tt> ディレクトリに新しい config.inc.php を保存します。しかし、ウェブサーバが適切なパーミッションを持っていない場" +"合、「設定の読み込み・保存が出来ません」というエラーが表示されることがあります。を使用すると、 <tt>config/</tt> ディレクトリが存在して" +"いて適切なパーミッションを持っている確認してください。もしくは、<tt>ダウンロードする</tt>リンクを使用して、設定ファイルをローカルに保存してから" +"、（FTP もしくは類似の手段を介して）適切な場所にアップロードしてください。" #. type: Content of: <html><body><div><ol><li><ul><li> #: orig-docs/Documentation.html:280 @@ -893,10 +893,8 @@ msgid "" "and tables, and that the script may need some tuning, depending on the " "database name." msgstr "" -"phpMyAdmin を使ってテーブル群を作成することもできますが、ご注意ください。デー" -"タベースやテーブルを作成する際には特別な（管理者の）権限が必要になるかもしれ" -"ません。また、データベース名によってはスクリプトに多少の修正を加える必要があ" -"るかもしれません。" +"phpMyAdmin を使ってテーブル群を作成することもできますが、いくつか注意することがあります。データベースやテーブルを作成する際には特別な（管理者" +"の）権限が必要になるかもしれません。また、データベース名によってはスクリプトに多少の修正を加える必要があるかもしれません。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:349 @@ -1029,9 +1027,7 @@ msgstr "" msgid "" "Note: this section is only applicable if your MySQL server is running with " "<tt>--skip-show-database</tt>." -msgstr "" -"注：この項目は、MySQL サーバが <tt>--skip-show-database</tt> を適用して稼動し" -"ている場合のみに使用できます。" +msgstr "注：この項目は、MySQL サーバが <tt>--skip-show-database</tt> を適用して稼動している場合のみ使用できます。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:400 @@ -1072,10 +1068,9 @@ msgid "" "example: use something else in your file!</b> Input these statements from " "the phpMyAdmin SQL Query window or mysql command–line client." msgstr "" -"下記の例では <tt>pma</tt> を管理ユーザ、<tt>pmapass</tt> を管理パスワードと想" -"定していますが、<b>これはあくまでも例です。ご自分のファイルでは設定を変えてく" -"ださい！</b> phpMyAdmin の SQL クエリウィンドウまたは mysql コマンドラインク" -"ライアントからこれらのコマンドを入力します。" +"下記の例では <tt>pma</tt> を管理ユーザ、<tt>pmapass</tt> " +"を管理パスワードと想定していますが、<b>これはあくまでも例です。ご自分のファイルでは設定を変えてください！</b> phpMyAdmin の SQL " +"クエリウィンドウまたは mysql コマンドラインクライアントからこれらのコマンドを入力します。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:417 @@ -1263,9 +1258,7 @@ msgstr "" msgid "" "With this mode, the user can truly log out of phpMyAdmin and log in back " "with the same username." -msgstr "" -"このモードでは、ユーザは phpMyAdmin のログアウトが確実に行え、同じユーザー名" -"でログインし直すことができます。" +msgstr "このモードでは、ユーザは phpMyAdmin のログアウトが確実に行え、同じユーザ名でログインし直すことができます。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:493 @@ -1553,7 +1546,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:604 msgid "$cfg['PmaNoRelation_DisableWarning'] boolean" -msgstr "$cfg['PmaNoRelation_DisableWarning'] boolean" +msgstr "$cfg['PmaNoRelation_DisableWarning'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:605 @@ -1589,7 +1582,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:616 msgid "$cfg['SuhosinDisableWarning'] boolean" -msgstr "$cfg['SuhosinDisableWarning'] boolean" +msgstr "$cfg['SuhosinDisableWarning'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:617 @@ -1603,7 +1596,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:621 msgid "$cfg['McryptDisableWarning'] boolean" -msgstr "$cfg['McryptDisableWarning'] boolean" +msgstr "$cfg['McryptDisableWarning'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:622 @@ -1628,7 +1621,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:630 msgid "$cfg['AllowThirdPartyFraming'] boolean" -msgstr "$cfg['AllowArbitraryServer'] boolean" +msgstr "$cfg['AllowArbitraryServer'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:631 @@ -1739,11 +1732,11 @@ msgid "" "hostname in <a href=\"#cfg_Servers_host\" class=\"configrule\">$cfg" "['Servers'][$i]['host']</a>." msgstr "" -"$i 番目の MySQL サーバのポート番号が入ります。デフォルトは 3306 です（空欄に" -"しておいてください）。ホスト名を「localhost」にすると、MySQL はポート番号を無" -"視してソケット接続しますので、デフォルトとは別のポートで接続したい場合は <a " -"href=\"#cfg_Servers_host\" class=\"configrule\">$cfg['Servers'][$i]['host']</" -"a> に「127.0.0.1」か、本当のホスト名を入れてください。" +"$i 番目の MySQL サーバのポート番号が入ります。デフォルトは 3306 " +"です（空欄にしておいてください）。ホスト名を「localhost」にすると、MySQL " +"はポート番号を無視してソケット接続しますので、デフォルトとは別のポートで接続したい場合は <a href=\"#cfg_Servers_host\" " +"class=\"configrule\">$cfg['Servers'][$i]['host']</a> " +"に「127.0.0.1」か、本来のホスト名を入れてください。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:676 @@ -1771,7 +1764,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:682 msgid "$cfg['Servers'][$i]['ssl'] boolean" -msgstr "$cfg['Servers'][$i]['ssl'] boolean" +msgstr "$cfg['Servers'][$i]['ssl'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:683 @@ -1839,7 +1832,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:708 msgid "$cfg['Servers'][$i]['compress'] boolean" -msgstr "$cfg['Servers'][$i]['compress'] boolean" +msgstr "$cfg['Servers'][$i]['compress'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:709 @@ -1875,7 +1868,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:717 -#, fuzzy msgid "" "This special account is used for 2 distinct purposes: to make possible all " "relational features (see <a href=\"#pmadb\" class=\"configrule\">$cfg" @@ -1883,10 +1875,10 @@ msgid "" "skip-show-database</tt>, to enable a multi-user installation (<abbr title=" "\"HyperText Transfer Protocol\">HTTP</abbr> or cookie authentication mode)." msgstr "" -"この特別なアカウントはふたつの異なった目的で使われます。リレーション機能全般" -"を利用できるようにするのと（→ <a href=\"#pmadb\">$cfg['Servers'][$i]['pmadb']" -"</a>）、4.1.2 より古い MySQL サーバでマルチユーザインストールを可能にするため" -"です（http／クッキー認証モード）。" +"この特別なアカウントは２つの異なった目的で使われます。リレーション機能全般を利用できるようにするのと（<a href=\"#pmadb\" " +"class=\"configrule\">$cfg['Servers'][$i]['pmadb']</a> 参照）、<tt>--skip-show-" +"database</tt> を適用して稼動している MySQL サーバで、マルチユーザインストールを可能にするためです（<abbr " +"title=\"HyperText Transfer Protocol\">HTTP</abbr>／クッキー認証モード）。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:725 @@ -2086,7 +2078,7 @@ msgid "" "boolean" msgstr "" "<span id=\"cfg_Servers_nopassword\">$cfg['Servers'][$i]['nopassword']</span> " -"boolean" +"論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:807 @@ -2097,11 +2089,9 @@ msgid "" "password for connecting to MySQL. Password login is still tried first, but " "as fallback, no password method is tried." msgstr "" -"パスワードを使用してログインが失敗したときにパスワードなしでログインしようと" -"するとを許可します。これは、HTTP 認証と一緒に使用することができます。MySQL に" -"接続する手段の一つとして、ユーザー名と空のパスワードを使用して認証を行いま" -"す。パスワードログインを行わないというわけではなく、パスワードログインが最初" -"に試され、最後の手段としてパスワード無し方式が試されます。" +"パスワードを使用してログインが失敗したときにパスワードなしでログインしようとするとを許可します。これは、HTTP " +"認証と一緒に使用することができます。MySQL に接続する手段の一つとして、ユーザ名と空のパスワードを使用して認証を行います。パスワードログインを行わな" +"いというわけではなく、パスワードログインが最初に試され、最後の手段としてパスワード無し方式が試されます。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:814 @@ -2434,27 +2424,23 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:931 -#, fuzzy msgid "" "now as normal user open phpMyAdmin and for each one of your tables where you " "want to use this feature, click "Structure/Relation view/" and " "choose foreign columns." msgstr "" -"通常ユーザとして phpMyAdmin を開き、この機能を使いたいテーブルひとつひとつに" -"対して、「構造／リレーションを表示（Structure/Relation view）」をクリックし" -"て、外部フィールドを選択します。" +"通常ユーザとして phpMyAdmin " +"を開き、この機能を使いたいテーブル一つ々々に対して、「構造⇒リレーションビュー」とクリックして、外部カラムを選択します。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:938 -#, fuzzy msgid "" "Please note that in the current version, <tt>master_db</tt> must be the same " "as <tt>foreign_db</tt>. Those columns have been put in future development of " "the cross-db relations." msgstr "" -"注意してください。現在のバージョンでは、<tt>master_db</tt> は " -"<tt>foreign_db</tt> と一致しなければなりません。これらのフィールドは将来クロ" -"スデータベースリレーションを開発するために用意されています。" +"現在のバージョンでは、<tt>master_db</tt> は <tt>foreign_db</tt> " +"と一致しなければならないことに注意してください。これらのカラムは将来クロスデータベースリレーションを開発するために用意されています。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:944 @@ -2499,10 +2485,7 @@ msgstr "" msgid "" "then for each table where you want to use this feature, click "" "Structure/Relation view/Choose column to display" to choose the column." -msgstr "" -"それから、この機能を利用したいテーブルごとに「構造／リレーションを表示／表示" -"するカラムを選択 (Structure/Relation view/Choose column to display)」をクリッ" -"クして、カラムを選択します。" +msgstr "それから、この機能を利用したいテーブルごとに「構造⇒リレーションビュー⇒表示するカラムの選択」をクリックして、カラムを選択します。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:960 @@ -2529,7 +2512,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:966 -#, fuzzy msgid "" "Since release 2.3.0 you can have phpMyAdmin create <abbr title=\"Portable " "Document Format\">PDF</abbr> pages showing the relations between your " @@ -2539,10 +2521,11 @@ msgid "" "each table will be placed on a <abbr title=\"Portable Document Format\">PDF</" "abbr> schema output)." msgstr "" -"リリース 2.3.0 以降、phpMyAdmin はテーブル間のリレーションを表示する PDF ペー" -"ジを作成できるようになりました。このためには「pdf_pages」（作成する PDF ペー" -"ジの情報の保管用）と「table_coords」（PDF スキーマ出力の際に各テーブルが配置" -"される座標の保管用）というふたつのテーブルが必要となります。" +"リリース 2.3.0 以降、phpMyAdmin はテーブル間のリレーションを表示する <abbr title=\"Portable Document " +"Format\">PDF</abbr> ページを作成できるようになりました。このためには「pdf_pages」（作成する <abbr " +"title=\"Portable Document Format\">PDF</abbr> ページの情報の保管用）と「table_coords」（<abbr " +"title=\"Portable Document Format\">PDF</abbr> " +"スキーマ出力の際に各テーブルが配置される座標の保管用）という２つのテーブルが必要となります。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:975 @@ -2710,12 +2693,9 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1058 -#, fuzzy msgid "" "<span id=\"cfg_Servers_recent\">$cfg['Servers'][$i]['recent']</span> string" -msgstr "" -"<span id=\"cfg_Servers_relation\">$cfg['Servers'][$i]['relation']</span> 文字" -"列" +msgstr "<span id=\"cfg_Servers_recent\">$cfg['Servers'][$i]['recent']</span> 文字列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1061 @@ -2729,32 +2709,35 @@ msgid "" "\"#cfg_LeftDefaultTabTable\" class=\"configrule\">$cfg['LeftDefaultTabTable']" "</a>." msgstr "" +"リリース 3.5.0 以降、左側のナビゲーションフレームで最近使用されたテーブルを表示することができます。データベースを選択することなく、直接テーブルへ" +"移動することができます。<a href=\"#cfg_LeftRecentTable\" " +"class=\"configrule\">$cfg['LeftRecentTable']</a> " +"で最近使用したテーブルの表示できる最大数が設定できます。リストからテーブルを選択すると、指定されたページに <a " +"href=\"#cfg_LeftDefaultTabTable\" " +"class=\"configrule\">$cfg['LeftDefaultTabTable']</a> 内において移動が行われます。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1069 msgid "" "Without configuring the storage, you can still access the recently used " "tables, but it will disappear after you logout." -msgstr "" +msgstr "設定保存場所がなくても、最近使用されたテーブルにアクセスすることができますが、ログアウトすると失われてしまいます。" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1076 -#, fuzzy msgid "" "put the table name in <tt>$cfg['Servers'][$i]['recent']</tt> (e.g. " "'pma_recent')" -msgstr "" -"テーブル名を <tt>$cfg['Servers'][$i]['tracking']</tt> に入れます。" -"（例：'pma_tracking'）" +msgstr "<tt>$cfg['Servers'][$i]['recent']</tt> にテーブル名を入れます。（例：'pma_recent'）" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1081 -#, fuzzy msgid "" "<span id=\"cfg_Servers_table_uiprefs\">$cfg['Servers'][$i]['table_uiprefs']</" "span> string" msgstr "" -"<span id=\"cfg_Servers_table_info\">$cfg['Servers'][$i]['table_info']</span> " +"<span " +"id=\"cfg_Servers_table_uiprefs\">$cfg['Servers'][$i]['table_uiprefs']</span> " "文字列" #. type: Content of: <html><body><div><dl><dd> @@ -2766,22 +2749,23 @@ msgid "" "the storage, these features still can be used, but the values will disappear " "after you logout." msgstr "" +"リリース 3.5.0 以降、表示しているテーブルのさまざまな設定（テーブルのソート <a href=\"#cfg_RememberSorting\" " +"class=\"configrule\">$cfg['RememberSorting']</a> " +"など）を覚えておくことができます。設定保存場所がなくても、これらの機能は使用することができますが、ログアウトすると値は失われてしまいます。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1091 -#, fuzzy msgid "To allow the usage of these functionality persistently:" -msgstr "この機能を利用できるようにするには、" +msgstr "これらの機能を永続的に利用できるようにするには、" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1095 -#, fuzzy msgid "" "put the table name in <tt>$cfg['Servers'][$i]['table_uiprefs']</tt> (e.g. " "'pma_table_uiprefs')" msgstr "" -"テーブル名を <tt>$cfg['Servers'][$i]['table_info']</tt> に入れます。" -"（例：'pma_table_info'）" +"<tt>$cfg['Servers'][$i]['table_uiprefs']</tt> " +"にテーブル名を入れます。（例：'pma_table_uiprefs'）" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1100 @@ -2801,11 +2785,9 @@ msgid "" "manipulation and data definition statements. After enabling it you can " "create versions of tables." msgstr "" -"リリース 3.3.x 以降、コマンド追跡機能が利用できます。これは、phpMyAdmin に" -"よって実行されたすべての <abbr title=\"structured query language\">SQL</" -"abbr> コマンドの追跡に役立ちます。データ操作およびデータ定義コマンドのログへ" -"の記録をサポートしています。有効にすると、テーブルのバージョンを作成すること" -"ができます。" +"リリース 3.3.x 以降、コマンド追跡機能が利用できます。これは、phpMyAdmin によって実行されたすべての <abbr " +"title=\"structured query language\">SQL</abbr> " +"文の追跡に役立ちます。データ操作およびデータ定義コマンドのログへの記録をサポートしています。有効にすると、テーブルのバージョンを作成することができます。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1108 @@ -2837,12 +2819,9 @@ msgid "" "a list of names separated by ','. In addition you can export the (filtered) " "report to a file or to a temporary database." msgstr "" -"もちろん、変更履歴を表示することもできます。「コマンド追跡」ページに全ての" -"バージョンに対しての詳細なレポートがあります。レポートではフィルタを使用する" -"ことができ、例えば、日付範囲内のコマンドリストを取得などが行えます。ユーザ名" -"をフィルタする場合は、すべての名前が対象であれば「*」を入力、名前のリストに対" -"しては「,」で区切って入力してください。更に、（フィルタした）レポートをファイ" -"ルまたは一時的なデータベースへエクスポートすることができます。" +"もちろん、変更履歴を表示することもできます。「コマンド追跡」ページに全てのバージョンに対しての詳細なレポートがあります。レポートではフィルタを使用する" +"ことができ、例えば、日付範囲内のコマンドリストを取得などが行えます。ユーザ名をフィルタする場合は、すべての名前が対象であれば「*」を入力、名前のリストに" +"対しては「,」で区切って入力してください。更に、（フィルタした）レポートをファイルまたは一時的なデータベースへエクスポートすることができます。" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1125 @@ -2859,8 +2838,8 @@ msgid "" "<span id=\"cfg_Servers_tracking_version_auto_create\">$cfg['Servers'][$i]" "['tracking_version_auto_create']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_tracking_version_auto_create\">$cfg['Servers'][$i]" -"['tracking_version_auto_create']</span> boolean" +"<span id=\"cfg_Servers_tracking_version_auto_create\">$cfg['Servers'][$i]['tra" +"cking_version_auto_create']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1133 @@ -2909,9 +2888,7 @@ msgstr "" msgid "" "Defines the list of statements the auto-creation uses for new versions. " "Default value is" -msgstr "" -"新しいバージョンに対して自動生成が使用するコマンドリストの定義します。デフォ" -"ルト値は以下の通りです。" +msgstr "新しいバージョンに対して自動生成が使用するコマンドリストの定義します。デフォルト値は以下の通りです。" #. type: Content of: <html><body><div><dl><dd><pre> #: orig-docs/Documentation.html:1153 @@ -2935,17 +2912,15 @@ msgid "" "<span id=\"cfg_Servers_tracking_add_drop_view\">$cfg['Servers'][$i]" "['tracking_add_drop_view']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_tracking_add_drop_view\">$cfg['Servers'][$i]" -"['tracking_add_drop_view']</span> boolean" +"<span id=\"cfg_Servers_tracking_add_drop_view\">$cfg['Servers'][$i]['tracking_" +"add_drop_view']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1164 msgid "" "Whether a DROP VIEW IF EXISTS statement will be added as first line to the " "log when creating a view. Default value is true." -msgstr "" -"ビューを作成するときに、ログに最初の行に DROP VIEW IF EXISTS コマンドを追加す" -"るかどうか。デフォルト値は true です。" +msgstr "ビューを作成するときに、ログに最初の行に DROP VIEW IF EXISTS 文を追加するかどうか。デフォルト値は true です。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1170 @@ -2953,17 +2928,15 @@ msgid "" "<span id=\"cfg_Servers_tracking_add_drop_table\">$cfg['Servers'][$i]" "['tracking_add_drop_table']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_tracking_add_drop_table\">$cfg['Servers'][$i]" -"['tracking_add_drop_table']</span> boolean" +"<span id=\"cfg_Servers_tracking_add_drop_table\">$cfg['Servers'][$i]['tracking" +"_add_drop_table']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1173 msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table. Default value is true." -msgstr "" -"テーブルを作成するときに、ログに最初の行に DROP TABLE IF EXISTS コマンドを追" -"加するかどうか。デフォルト値は true です。" +msgstr "テーブルを作成するときに、ログに最初の行に DROP TABLE IF EXISTS 文を追加するかどうか。デフォルト値は true です。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1178 @@ -2971,8 +2944,8 @@ msgid "" "<span id=\"cfg_Servers_tracking_add_drop_database\">$cfg['Servers'][$i]" "['tracking_add_drop_database']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_tracking_add_drop_database\">$cfg['Servers'][$i]" -"['tracking_add_drop_database']</span> boolean" +"<span id=\"cfg_Servers_tracking_add_drop_database\">$cfg['Servers'][$i]['track" +"ing_add_drop_database']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1181 @@ -2980,8 +2953,7 @@ msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database. Default value is true." msgstr "" -"データベースを作成するときに、ログに最初の行に DROP DATABASE IF EXISTS コマン" -"ドを追加するかどうか。デフォルト値は true です。" +"データベースを作成するときに、ログに最初の行に DROP DATABASE IF EXISTS 文を追加するかどうか。デフォルト値は true です。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1186 @@ -3051,8 +3023,9 @@ msgid "" "<span id=\"cfg_Servers_verbose_check\">$cfg['Servers'][$i]['verbose_check']</" "span> boolean" msgstr "" -"<span id=\"cfg_Servers_verbose_check\">$cfg['Servers'][$i]['verbose_check']</" -"span> boolean" +"<span " +"id=\"cfg_Servers_verbose_check\">$cfg['Servers'][$i]['verbose_check']</span> " +"論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1224 @@ -3092,8 +3065,7 @@ msgid "" "<span id=\"cfg_Servers_AllowRoot\">$cfg['Servers'][$i]['AllowRoot']</span> " "boolean" msgstr "" -"<span id=\"cfg_Servers_AllowRoot\">$cfg['Servers'][$i]['AllowRoot']</span> " -"boolean" +"<span id=\"cfg_Servers_AllowRoot\">$cfg['Servers'][$i]['AllowRoot']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1237 @@ -3110,8 +3082,8 @@ msgid "" "<span id=\"cfg_Servers_AllowNoPassword\">$cfg['Servers'][$i]" "['AllowNoPassword']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_AllowNoPassword\">$cfg['Servers'][$i]" -"['AllowNoPassword']</span> boolean" +"<span id=\"cfg_Servers_AllowNoPassword\">$cfg['Servers'][$i]['AllowNoPassword'" +"]</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1241 @@ -3325,8 +3297,7 @@ msgid "" "<span id=\"cfg_Servers_DisableIS\">$cfg['Servers'][$i]['DisableIS']</span> " "boolean" msgstr "" -"<span id=\"cfg_Servers_DisableIS\">$cfg['Servers'][$i]['DisableIS']</span> " -"boolean" +"<span id=\"cfg_Servers_DisableIS\">$cfg['Servers'][$i]['DisableIS']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1312 @@ -3360,8 +3331,8 @@ msgid "" "<span id=\"cfg_Servers_CountTables\">$cfg['Servers'][$i]['CountTables']</" "span> boolean" msgstr "" -"<span id=\"cfg_Servers_CountTables\">$cfg['Servers'][$i]['CountTables']</" -"span> boolean" +"<span id=\"cfg_Servers_CountTables\">$cfg['Servers'][$i]['CountTables']</span> " +"論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1321 @@ -3450,7 +3421,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1343 msgid "$cfg['AjaxEnable'] boolean" -msgstr "$cfg['AjaxEnable'] boolean" +msgstr "$cfg['AjaxEnable'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1344 @@ -3463,7 +3434,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1349 msgid "$cfg['VersionCheck'] boolean" -msgstr "$cfg['VersionCheck'] boolean" +msgstr "$cfg['VersionCheck'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1350 @@ -3520,7 +3491,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1369 msgid "$cfg['OBGzip'] string/boolean" -msgstr "$cfg['OBGzip'] 文字列/boolean" +msgstr "$cfg['OBGzip'] 文字列／論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1370 @@ -3548,7 +3519,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1377 msgid "$cfg['PersistentConnections'] boolean" -msgstr "$cfg['PersistentConnections'] boolean" +msgstr "$cfg['PersistentConnections'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1378 @@ -3561,7 +3532,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1381 msgid "$cfg['ForceSSL'] boolean" -msgstr "$cfg['ForceSSL'] boolean" +msgstr "$cfg['ForceSSL'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1382 @@ -3642,7 +3613,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1403 msgid "$cfg['SkipLockedTables'] boolean" -msgstr "$cfg['SkipLockedTables'] boolean" +msgstr "$cfg['SkipLockedTables'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1404 @@ -3656,7 +3627,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1407 msgid "$cfg['ShowSQL'] boolean" -msgstr "$cfg['ShowSQL'] boolean" +msgstr "$cfg['ShowSQL'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1408 @@ -3670,7 +3641,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1411 msgid "$cfg['AllowUserDropDatabase'] boolean" -msgstr "$cfg['AllowUserDropDatabase'] boolean" +msgstr "$cfg['AllowUserDropDatabase'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1412 @@ -3703,7 +3674,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1424 msgid "$cfg['Confirm'] boolean" -msgstr "$cfg['Confirm'] boolean" +msgstr "$cfg['Confirm'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1425 @@ -3717,7 +3688,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1428 msgid "$cfg['LoginCookieRecall'] boolean" -msgstr "$cfg['LoginCookieRecall'] boolean" +msgstr "$cfg['LoginCookieRecall'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1429 @@ -3778,7 +3749,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1448 msgid "$cfg['LoginCookieDeleteAll'] boolean" -msgstr "$cfg['LoginCookieDeleteAll'] boolean" +msgstr "$cfg['LoginCookieDeleteAll'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1449 @@ -3795,7 +3766,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1454 msgid "$cfg['UseDbSearch'] boolean" -msgstr "$cfg['UseDbSearch'] boolean" +msgstr "$cfg['UseDbSearch'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1455 @@ -3805,7 +3776,7 @@ msgstr "「データベース内の検索」を有効にするかどうかを定 #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1457 msgid "$cfg['IgnoreMultiSubmitErrors'] boolean" -msgstr "$cfg['IgnoreMultiSubmitErrors'] boolean" +msgstr "$cfg['IgnoreMultiSubmitErrors'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1458 @@ -3819,7 +3790,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1461 msgid "$cfg['VerboseMultiSubmit'] boolean" -msgstr "$cfg['VerboseMultiSubmit'] boolean" +msgstr "$cfg['VerboseMultiSubmit'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1462 @@ -3838,16 +3809,14 @@ msgid "" "<span id=\"cfg_AllowArbitraryServer\">$cfg['AllowArbitraryServer']</span> " "boolean" msgstr "" -"<span id=\"cfg_AllowArbitraryServer\">$cfg['AllowArbitraryServer']</span> " -"boolean" +"<span id=\"cfg_AllowArbitraryServer\">$cfg['AllowArbitraryServer']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1468 -#, fuzzy msgid "" "If enabled, allows you to log in to arbitrary servers using cookie auth and " "permits to specify servers of your choice in the Synchronize dialog." -msgstr "有効にすると、クッキー認証を利用して任意のサーバにログインできます。" +msgstr "有効にすると、クッキー認証を利用して任意のサーバにログインでき、同期ダイアログで選択したサーバを指定することができます。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1471 @@ -3863,7 +3832,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1476 msgid "$cfg['Error_Handler']['display'] boolean" -msgstr "$cfg['Error_Handler']['display'] boolean" +msgstr "$cfg['Error_Handler']['display'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1477 @@ -3873,7 +3842,7 @@ msgstr "PHP からのエラーを表示するかどうか。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1479 msgid "$cfg['Error_Handler']['gather'] boolean" -msgstr "$cfg['Error_Handler']['gather'] boolean" +msgstr "$cfg['Error_Handler']['gather'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1480 @@ -3883,11 +3852,10 @@ msgstr "PHP からのエラーを収集するかどうか。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1482 msgid "$cfg['LeftFrameLight'] boolean" -msgstr "$cfg['LeftFrameLight'] boolean" +msgstr "$cfg['LeftFrameLight'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1483 -#, fuzzy msgid "" "Defines whether to use a select-based menu and display only the current " "tables in the left frame (smaller page). Only in Non-Lightmode you can use " @@ -3895,15 +3863,15 @@ msgid "" "\"#cfg_LeftFrameTableSeparator\" class=\"configrule\">$cfg" "['LeftFrameTableSeparator']</a>" msgstr "" -"select ベースのメニューを利用して現在利用できるテーブルのみを左フレーム（小さ" -"い方のページ）に表示するかどうかを定義します。$cfg" -"['LeftFrameTableSeparator'] を利用したフォルダのネスト表示はライトモードでは" -"ない場合のみ利用できます。" +"select ベースのメニューを利用して現在利用できるテーブルのみを左フレーム（小さい方のページ）に表示するかどうかを定義します。<a " +"href=\"#cfg_LeftFrameTableSeparator\" " +"class=\"configrule\">$cfg['LeftFrameTableSeparator']</a> " +"を利用したフォルダの入れ子表示は、軽快モードではない場合のみ利用できます。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1489 msgid "$cfg['LeftFrameDBTree'] boolean" -msgstr "$cfg['LeftFrameDBTree'] boolean" +msgstr "$cfg['LeftFrameDBTree'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1490 @@ -3969,21 +3937,20 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1514 -#, fuzzy msgid "$cfg['LeftRecentTable'] integer" -msgstr "$cfg['RepeatCells'] 整数" +msgstr "$cfg['LeftRecentTable'] 整数" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1515 msgid "" "The maximum number of recently used tables shown in the left navigation " "frame. Set this to 0 (zero) to disable the listing of recent tables." -msgstr "" +msgstr "左側のナビゲーションフレームで表示される最近使用したテーブルの最大数。この値を 0 に設定すると最近使用したテーブルのリストは無効になります。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1518 msgid "$cfg['ShowTooltip'] boolean" -msgstr "$cfg['ShowTooltip'] boolean" +msgstr "$cfg['ShowTooltip'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1519 @@ -3996,7 +3963,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1522 msgid "$cfg['ShowTooltipAliasDB'] boolean" -msgstr "$cfg['ShowTooltipAliasDB'] boolean" +msgstr "$cfg['ShowTooltipAliasDB'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1523 @@ -4016,7 +3983,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1529 msgid "$cfg['ShowTooltipAliasTB'] boolean/string" -msgstr "$cfg['ShowTooltipAliasTB'] boolean/文字列" +msgstr "$cfg['ShowTooltipAliasTB'] 論理型／文字列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1530 @@ -4040,7 +4007,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1538 msgid "$cfg['LeftDisplayLogo'] boolean" -msgstr "$cfg['LeftDisplayLogo'] boolean" +msgstr "$cfg['LeftDisplayLogo'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1539 @@ -4102,7 +4069,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1558 msgid "$cfg['LeftDisplayServers'] boolean" -msgstr "$cfg['LeftDisplayServers'] boolean" +msgstr "$cfg['LeftDisplayServers'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1559 @@ -4116,7 +4083,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1561 msgid "$cfg['DisplayServersList'] boolean" -msgstr "$cfg['DisplayServersList'] boolean" +msgstr "$cfg['DisplayServersList'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1562 @@ -4130,7 +4097,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1564 msgid "$cfg['DisplayDatabasesList'] boolean or text" -msgstr "$cfg['DisplayDatabasesList'] boolean または text" +msgstr "$cfg['DisplayDatabasesList'] 論理型または text" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1565 @@ -4164,7 +4131,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1576 msgid "$cfg['ShowStats'] boolean" -msgstr "$cfg['ShowStats'] boolean" +msgstr "$cfg['ShowStats'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1577 @@ -4186,7 +4153,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1582 msgid "<span id=\"cfg_ShowServerInfo\">$cfg['ShowServerInfo'] </span>boolean" -msgstr "<span id=\"cfg_ShowServerInfo\">$cfg['ShowServerInfo'] </span>boolean" +msgstr "<span id=\"cfg_ShowServerInfo\">$cfg['ShowServerInfo']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1583 @@ -4202,18 +4169,17 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1588 msgid "<span id=\"cfg_ShowPhpInfo\">$cfg['ShowPhpInfo'] </span>boolean" -msgstr "<span id=\"cfg_ShowPhpInfo\">$cfg['ShowPhpInfo'] </span>boolean" +msgstr "<span id=\"cfg_ShowPhpInfo\">$cfg['ShowPhpInfo']</span> 論理型" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1589 msgid "<span id=\"cfg_ShowChgPassword\">$cfg['ShowChgPassword'] </span>boolean" -msgstr "" -"<span id=\"cfg_ShowChgPassword\">$cfg['ShowChgPassword'] </span>boolean" +msgstr "<span id=\"cfg_ShowChgPassword\">$cfg['ShowChgPassword']</span> 論理型" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1590 msgid "<span id=\"cfg_ShowCreateDb\">$cfg['ShowCreateDb'] </span>boolean" -msgstr "<span id=\"cfg_ShowCreateDb\">$cfg['ShowCreateDb'] </span>boolean" +msgstr "<span id=\"cfg_ShowCreateDb\">$cfg['ShowCreateDb']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1592 @@ -4257,7 +4223,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1607 msgid "$cfg['SuggestDBName'] boolean" -msgstr "$cfg['SuggestDBName'] boolean" +msgstr "$cfg['SuggestDBName'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1608 @@ -4287,7 +4253,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1616 msgid "$cfg['ShowAll'] boolean" -msgstr "$cfg['ShowAll'] boolean" +msgstr "$cfg['ShowAll'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1617 @@ -4334,7 +4300,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1630 msgid "$cfg['DisplayBinaryAsHex'] boolean" -msgstr "$cfg['DisplayBinaryAsHex'] boolean" +msgstr "$cfg['DisplayBinaryAsHex'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1631 @@ -4348,7 +4314,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1634 msgid "$cfg['ProtectBinary'] boolean or string" -msgstr "$cfg['ProtectBinary'] boolean または文字列" +msgstr "$cfg['ProtectBinary'] 論理型または文字列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1635 @@ -4382,7 +4348,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1644 msgid "$cfg['ShowFunctionFields'] boolean" -msgstr "$cfg['ShowFunctionFields'] boolean" +msgstr "$cfg['ShowFunctionFields'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1645 @@ -4398,7 +4364,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1650 msgid "$cfg['ShowFieldTypesInDataEditView'] boolean" -msgstr "$cfg['ShowFieldTypesInDataEditView'] boolean" +msgstr "$cfg['ShowFieldTypesInDataEditView'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1651 @@ -4462,16 +4428,15 @@ msgstr "$cfg['ForeignKeyMaxLimit'] 整数" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1670 -#, fuzzy msgid "" "If there are fewer items than this in the set of foreign keys, then a drop-" "down box of foreign keys is presented, in the style described by the <a href=" "\"#cfg_ForeignKeyDropdownOrder\" class=\"configrule\">$cfg" "['ForeignKeyDropdownOrder']</a> setting." msgstr "" -"外部キーに指定された項目がこの値より少ない場合は、<b>$cfg" -"['ForeignKeyDropdownOrder']</b> の設定にあわせたスタイルで外部キーのドロップ" -"ダウンボックスが表示されます。" +"外部キーに指定された項目がこの値より少ない場合は、<a href=\"#cfg_ForeignKeyDropdownOrder\" " +"class=\"configrule\">$cfg['ForeignKeyDropdownOrder']</a> " +"の設定にあわせたスタイルで外部キーのドロップダウンボックスが表示されます。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1675 @@ -4493,17 +4458,17 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1681 msgid "<span id=\"cfg_ZipDump\">$cfg['ZipDump'] </span>boolean" -msgstr "<span id=\"cfg_ZipDump\">$cfg['ZipDump'] </span>boolean" +msgstr "<span id=\"cfg_ZipDump\">$cfg['ZipDump']</span> 論理型" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1682 msgid "<span id=\"cfg_GZipDump\">$cfg['GZipDump'] </span>boolean" -msgstr "<span id=\"cfg_GZipDump\">$cfg['GZipDump'] </span>boolean" +msgstr "<span id=\"cfg_GZipDump\">$cfg['GZipDump']</span> 論理型" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1683 msgid "<span id=\"cfg_BZipDump\">$cfg['BZipDump'] </span>boolean" -msgstr "<span id=\"cfg_BZipDump\">$cfg['BZipDump'] </span>boolean" +msgstr "<span id=\"cfg_BZipDump\">$cfg['BZipDump']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1685 @@ -4517,11 +4482,10 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1688 msgid "<span id=\"cfg_CompressOnFly\">$cfg['CompressOnFly'] </span>boolean" -msgstr "<span id=\"cfg_CompressOnFly\">$cfg['CompressOnFly'] </span>boolean" +msgstr "<span id=\"cfg_CompressOnFly\">$cfg['CompressOnFly']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1690 -#, fuzzy msgid "" "Defines whether to allow on the fly compression for GZip/BZip2 compressed " "exports. This doesn't affect smaller dumps and allows users to create larger " @@ -4529,17 +4493,15 @@ msgid "" "files contain more GZip/BZip2 headers, but all normal programs handle this " "correctly." msgstr "" -"GZip/BZip2 でエクスポートを圧縮する際、オン・ザ・フライ（実行中）圧縮を許可す" -"るかどうかを定義します。比較的小さなダンプの場合は関係ありませんが、許可する" -"と、圧縮しない限り php のメモリ制限にひっかかるような大きなダンプも作成できる" -"ようになります。こうして生成したファイルはオン・ザ・フライ圧縮をしなかったと" -"きより GZip/BZip2 ヘッダの数が多くなりますが、まともなプログラムならどれでも" -"正しく処理してくれます。" +"GZip/BZip2 " +"でエクスポートを圧縮する際、逐次圧縮を許可するかどうかを定義します。比較的小さなダンプの場合は関係ありませんが、許可すると、圧縮しない限り PHP " +"のメモリ制限にひっかかるような大きなダンプも作成できるようになります。こうして生成したファイルは GZip/BZip2 " +"ヘッダが多くなってしまいますが、まともなプログラムならどれでも正しく処理してくれます。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1696 msgid "$cfg['LightTabs'] boolean" -msgstr "$cfg['LightTabs'] boolean" +msgstr "$cfg['LightTabs'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1697 @@ -4728,7 +4690,7 @@ msgstr "" msgid "" "The corresponding language file needs to be in locale/<i>code</i>/" "LC_MESSAGES/phpmyadmin.mo." -msgstr "" +msgstr "対応する言語ファイルは、locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo に存在する必要があります。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1756 @@ -4773,9 +4735,8 @@ msgid "" "expression. For example if you want only Czech and English, you should set " "filter to <code>'^(cs|en)'</code>." msgstr "" -"利用可能な言語の一覧を与えられた正規表現にマッチするものに限定します。たとえ" -"ば、チェコ語と英語のみに限定したければ、フィルターを <code>'^(cs|en)'</code> " -"のように設定します。" +"利用可能な言語の一覧を与えられた正規表現にマッチするものに限定します。例えば、チェコ語と英語のみに限定したければ、フィルタを " +"<code>'^(cs|en)'</code> のように設定します。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1773 @@ -4880,6 +4841,9 @@ msgid "" "empty, you need to fill in some trusted proxy servers if you want to use " "rules for IP addresses behind proxy." msgstr "" +"<a href=\"#servers_allowdeny_order\">IP の許可／拒否</a>について信頼されているプロキシおよび HTTP " +"ヘッダのリスト。このリストはデフォルトでは空です。プロキシを通して IP " +"アドレスの規則を使用したい場合には、信頼されたプロキシサーバで埋める必要があります。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1808 @@ -4888,6 +4852,8 @@ msgid "" "HTTP_X_FORWARDED_FOR (<tt>X-Forwarded-For</tt>) header coming from the proxy " "1.2.3.4:" msgstr "" +"次の例は、phpMyAdmin はプロキシ 1.2.3.4 からきた HTTP_X_FORWARDED_FOR (<tt>X-Forwarded-" +"For</tt>) ヘッダを信頼するように指定しています。" #. type: Content of: <html><body><div><dl><dd><pre> #: orig-docs/Documentation.html:1811 @@ -4896,14 +4862,17 @@ msgid "" "$cfg['TrustedProxies'] =\n" " array('1.2.3.4' => 'HTTP_X_FORWARDED_FOR');\n" msgstr "" +"$cfg['TrustedProxies'] =\n" +" array('1.2.3.4' => 'HTTP_X_FORWARDED_FOR');\n" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1814 -#, fuzzy msgid "" "The $cfg['Servers'][$i]['AllowDeny']['rules'] directive uses the client's IP " "address as usual." -msgstr "<b>$cfg['Servers'][$i]['AllowDeny']['rules']</b> string の array" +msgstr "" +"$cfg['Servers'][$i]['AllowDeny']['rules'] のディレクティブは、通常通りクライアントの IP " +"アドレスを使用しています。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1818 @@ -4947,7 +4916,7 @@ msgstr "no - GD 2 関数は利用できません。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1831 msgid "$cfg['CheckConfigurationPermissions'] boolean" -msgstr "$cfg['CheckConfigurationPermissions'] boolean" +msgstr "$cfg['CheckConfigurationPermissions'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1833 @@ -4991,8 +4960,7 @@ msgid "" "<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> string [CSS " "color for background]" msgstr "" -"<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> string [背景用" -"の CSS 色]" +"<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> 文字列 [背景用の CSS 色]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1853 @@ -5000,8 +4968,7 @@ msgid "" "<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> string [CSS " "color for background]" msgstr "" -"<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> string [背景用" -"の CSS 色]" +"<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> 文字列 [背景用の CSS 色]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1855 @@ -5015,7 +4982,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1858 msgid "$cfg['NaviPointerBackground'] string [CSS color for background]" -msgstr "$cfg['NaviPointerBackground'] string [背景用の CSS 色]" +msgstr "$cfg['NaviPointerBackground'] 文字列 [背景用の CSS 色]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1859 @@ -5023,8 +4990,7 @@ msgid "" "<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> string " "[CSS color]" msgstr "" -"<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> string " -"[CSS 色]" +"<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> 文字列 [CSS 色]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1860 @@ -5038,7 +5004,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1863 msgid "$cfg['LeftPointerEnable'] boolean" -msgstr "$cfg['LeftPointerEnable'] boolean" +msgstr "$cfg['LeftPointerEnable'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1864 @@ -5200,7 +5166,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1907 msgid "$cfg['BrowsePointerEnable'] boolean" -msgstr "$cfg['BrowsePointerEnable'] boolean" +msgstr "$cfg['BrowsePointerEnable'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1908 @@ -5210,7 +5176,7 @@ msgstr "表示ポインタを有効にするかどうか。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1910 msgid "$cfg['BrowseMarkerEnable'] boolean" -msgstr "$cfg['BrowseMarkerEnable'] boolean" +msgstr "$cfg['BrowseMarkerEnable'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1911 @@ -5271,8 +5237,8 @@ msgid "" "<span id=\"cfg_LongtextDoubleTextarea\">$cfg['LongtextDoubleTextarea'] </" "span>boolean" msgstr "" -"<span id=\"cfg_LongtextDoubleTextarea\">$cfg['LongtextDoubleTextarea'] </" -"span>boolean" +"<span id=\"cfg_LongtextDoubleTextarea\">$cfg['LongtextDoubleTextarea']</span> " +"論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1926 @@ -5285,8 +5251,7 @@ msgstr "" #: orig-docs/Documentation.html:1928 msgid "" "<span id=\"cfg_TextareaAutoSelect\">$cfg['TextareaAutoSelect'] </span>boolean" -msgstr "" -"<span id=\"cfg_TextareaAutoSelect\">$cfg['TextareaAutoSelect'] </span>boolean" +msgstr "<span id=\"cfg_TextareaAutoSelect\">$cfg['TextareaAutoSelect']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1930 @@ -5318,9 +5283,8 @@ msgid "" "span>boolean <span id=\"cfg_ModifyDeleteAtRight\">$cfg" "['ModifyDeleteAtRight'] </span>boolean" msgstr "" -"<span id=\"cfg_ModifyDeleteAtLeft\">$cfg['ModifyDeleteAtLeft'] </" -"span>boolean <span id=\"cfg_ModifyDeleteAtRight\">$cfg" -"['ModifyDeleteAtRight'] </span>boolean" +"<span id=\"cfg_ModifyDeleteAtLeft\">$cfg['ModifyDeleteAtLeft']</span> 論理型 " +"<span id=\"cfg_ModifyDeleteAtRight\">$cfg['ModifyDeleteAtRight']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1940 @@ -5356,13 +5320,13 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1956 msgid "$cfg['RememberSorting'] boolean" -msgstr "$cfg['RememberSorting'] boolean" +msgstr "$cfg['RememberSorting'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1957 msgid "" "If enabled, when browsing tables, the sorting of each table is remembered." -msgstr "" +msgstr "有効にすると、表示している各テーブルのソートが記憶されます。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1959 @@ -5414,7 +5378,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1982 msgid "$cfg['ShowBrowseComments'] boolean" -msgstr "$cfg['ShowBrowseComments'] boolean" +msgstr "$cfg['ShowBrowseComments'] 論理型" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1983 @@ -5422,8 +5386,7 @@ msgid "" "<span id=\"cfg_ShowPropertyComments\">$cfg['ShowPropertyComments'] </" "span>boolean" msgstr "" -"<span id=\"cfg_ShowPropertyComments\">$cfg['ShowPropertyComments'] </" -"span>boolean" +"<span id=\"cfg_ShowPropertyComments\">$cfg['ShowPropertyComments']</span> 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1985 @@ -5441,7 +5404,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1992 msgid "$cfg['SQLQuery']['Edit'] boolean" -msgstr "$cfg['SQLQuery']['Edit'] boolean" +msgstr "$cfg['SQLQuery']['Edit'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1993 @@ -5451,7 +5414,7 @@ msgstr "SQL クエリボックスにクエリを変更する編集リンクを #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1995 msgid "$cfg['SQLQuery']['Explain'] boolean" -msgstr "$cfg['SQLQuery']['Explain'] boolean" +msgstr "$cfg['SQLQuery']['Explain'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1996 @@ -5463,7 +5426,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1998 msgid "$cfg['SQLQuery']['ShowAsPHP'] boolean" -msgstr "$cfg['SQLQuery']['ShowAsPHP'] boolean" +msgstr "$cfg['SQLQuery']['ShowAsPHP'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1999 @@ -5475,7 +5438,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2001 msgid "$cfg['SQLQuery']['Validate'] boolean" -msgstr "$cfg['SQLQuery']['Validate'] boolean" +msgstr "$cfg['SQLQuery']['Validate'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2002 @@ -5489,7 +5452,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2005 msgid "$cfg['SQLQuery']['Refresh'] boolean" -msgstr "$cfg['SQLQuery']['Refresh'] boolean" +msgstr "$cfg['SQLQuery']['Refresh'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2006 @@ -5548,8 +5511,8 @@ msgid "" "Please note that if PHP is running in safe mode, this directory must be " "owned by the same user as the owner of the phpMyAdmin scripts." msgstr "" -"また、このディレクトリのオーナに注意してください。PHP がセーフモードになっている場合、phpMyAdmin " -"スクリプトのオーナと同じユーザがオーナになっていなければなりません。" +"また、このディレクトリの所有者に注意してください。PHP がセーフモードになっている場合、phpMyAdmin " +"スクリプトの所有者と同じユーザが所有者になっていなければなりません。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2032 @@ -5706,12 +5669,12 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:2110 msgid "<tt>quick</tt> to display the minimum number of options to configure" -msgstr "<tt>簡易</tt>は、設定に必要な最小限のオプションを表示します。" +msgstr "<tt>quick</tt> は、設定に必要な最小限のオプションを表示します。" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:2111 msgid "<tt>custom</tt> to display every available option to configure" -msgstr "<tt>詳細</tt>は、設定できる全てのオプションを表示します。" +msgstr "<tt>custom</tt> は、設定できる全てのオプションを表示します。" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:2112 @@ -5719,8 +5682,8 @@ msgid "" "<tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the " "option of using quick export" msgstr "" -"<tt>詳細（選択なし）</tt>は、<tt>詳細</tt>と同じですが、簡易エクスポートのオ" -"プションは表示されません。" +"<tt>custom-no-form</tt> は、<tt>custom</tt> と同じですが、<tt>quick</tt> " +"エクスポートのオプションは表示されません。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2116 @@ -5751,7 +5714,7 @@ msgstr "X セルごとにヘッダを挿入します。0 の場合は繰り返 #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2128 msgid "$cfg['EditInWindow'] boolean" -msgstr "$cfg['EditInWindow'] boolean" +msgstr "$cfg['EditInWindow'] 論理型" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2129 @@ -5769,7 +5732,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2131 msgid "<span id=\"cfg_QueryHistoryDB\">$cfg['QueryHistoryDB'] </span>boolean" -msgstr "<span id=\"cfg_QueryHistoryDB\">$cfg['QueryHistoryDB'] </span>boolean" +msgstr "<span id=\"cfg_QueryHistoryDB\">$cfg['QueryHistoryDB']</span> 論理型" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2132 @@ -5901,7 +5864,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2186 msgid "$cfg['BrowseMIME'] boolean" -msgstr "$cfg['BrowseMIME'] boolean" +msgstr "$cfg['BrowseMIME'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2187 @@ -5943,7 +5906,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2204 msgid "$cfg['NaturalOrder'] boolean" -msgstr "$cfg['NaturalOrder'] boolean" +msgstr "$cfg['NaturalOrder'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2205 @@ -6014,7 +5977,7 @@ msgstr "ウィンドウのタイトルバーを指定することができます #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2227 msgid "$cfg['ErrorIconic'] boolean" -msgstr "$cfg['ErrorIconic'] boolean" +msgstr "$cfg['ErrorIconic'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2228 @@ -6024,7 +5987,7 @@ msgstr "警告やエラー、通知を表示する際にアイコンを利用し #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2230 msgid "$cfg['MainPageIconic'] boolean" -msgstr "$cfg['MainPageIconic'] boolean" +msgstr "$cfg['MainPageIconic'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2231 @@ -6034,7 +5997,7 @@ msgstr "メインページのリストやメニュータブにアイコンを利 #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2233 msgid "$cfg['ReplaceHelpImg'] boolean" -msgstr "$cfg['ReplaceHelpImg'] boolean" +msgstr "$cfg['ReplaceHelpImg'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2234 @@ -6060,7 +6023,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2241 msgid "$cfg['ThemeManager'] boolean" -msgstr "$cfg['ThemeManager'] boolean" +msgstr "$cfg['ThemeManager'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2242 @@ -6086,7 +6049,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2248 msgid "$cfg['ThemePerServer'] boolean" -msgstr "$cfg['ThemePerServer'] boolean" +msgstr "$cfg['ThemePerServer'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2249 @@ -6341,12 +6304,12 @@ msgstr "<b>quote_backtick</b> 逆クォート <tt>`</tt>" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2311 msgid "$cfg['SQLValidator'] boolean" -msgstr "$cfg['SQLValidator'] boolean" +msgstr "$cfg['SQLValidator'] 論理型" #. type: Content of: <html><body><div><dl><dd><dl><dt> #: orig-docs/Documentation.html:2312 msgid "$cfg['SQLValidator']['use'] boolean" -msgstr "$cfg['SQLValidator']['use'] boolean" +msgstr "$cfg['SQLValidator']['use'] 論理型" #. type: Content of: <html><body><div><dl><dd><dl><dd> #: orig-docs/Documentation.html:2313 @@ -6410,7 +6373,7 @@ msgstr "<b>開発者限定！</b>" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2333 msgid "$cfg['DBG']['sql'] boolean" -msgstr "$cfg['DBG']['sql'] boolean" +msgstr "$cfg['DBG']['sql'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2335 @@ -7032,7 +6995,7 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2579 msgid "A transform function always gets passed three variables:" -msgstr "変換関数には常に 3 つの変数が渡されます：" +msgstr "変換関数には常に 3 つの変数が渡されます。" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2581 @@ -7302,10 +7265,10 @@ msgid "" "<i>libraries/header_printview.inc.php</i>, <i>index.php</i>, <i>navigation." "php</i> and <i>libraries/common.lib.php</i>." msgstr "" -"PWS のバグのようです。Filippo Simoncini が次に述べる回避策を見つけています（現時点ではこれ以上の対応策はありません）。<i>lib" -"raries/header.inc.php</i>、<i>libraries/header_printview.inc.php</i>、<i>index" -".php</i>、<i>navigation.php</i>、<i>libraries/common.lib.php</i> の " -"<tt>DOCTYPE</tt> 宣言（2 行）を削除するかコメントにしてください。" +"PWS のバグのようです。Filippo Simoncini が次に述べる回避策を見つけています（現時点ではこれ以上の対応策はありません）。『<i>li" +"braries/header.inc.php</i>、<i>libraries/header_printview.inc.php</i>、<i>inde" +"x.php</i>、<i>navigation.php</i>、<i>libraries/common.lib.php</i> の " +"<tt>DOCTYPE</tt> 宣言（2 行）を削除するかコメントにしてください。』" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2686 @@ -7369,9 +7332,7 @@ msgstr "アップロード用のディレクトリを別に作ります： <tt>m msgid "" "give ownership to the Apache server's user.group: <tt>chown apache.apache /" "tmp/php</tt>" -msgstr "" -"Apache サーバのユーザ／グループをオーナーします： <tt>chown apache.apache /" -"tmp/php</tt>" +msgstr "Apache サーバのユーザ／グループを所有者します： <tt>chown apache.apache /tmp/php</tt>" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:2708 @@ -7568,10 +7529,9 @@ msgid "" "BigDump</a>) to split the files before uploading. We cannot support this or " "any third party applications, but are aware of users having success with it." msgstr "" -"（<a href=\"http://www.ozerov.de/bigdump.php\">BigDump</a>のような）ユーティ" -"リティを利用してアップロードの前にファイルを分割する方法もあります。このユー" -"ティリティはもとより、サードパーティ製のアプリケーションは一切サポートできま" -"せんが、そういったものを利用して成功したユーザがいることは承知しています。" +"（<a href=\"http://www.ozerov.de/bigdump.php\">BigDump</a> のような）ユーティリティを利用してアップ" +"ロードの前にファイルを分割する方法もあります。このユーティリティはもとより、サードパーティ製のアプリケーションは一切サポートできませんが、そういったもの" +"を利用して成功したユーザがいることは承知しています。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:2788 @@ -8049,8 +8009,7 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2975 msgid "<a href=\"#faq1_31\">1.31 Does phpMyAdmin support php5?</a>" -msgstr "" -"<a href=\"#faq1_31\">1.31 phpMyAdmin は php5 をサポートしているのですか。</a>" +msgstr "<a href=\"#faq1_31\">1.31 phpMyAdmin は PHP5 をサポートしているのですか？</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2977 @@ -8073,9 +8032,9 @@ msgid "" "\">HTTP</abbr> authentication with <abbr title=\"Internet Information " "Services\">IIS</abbr>?</a>" msgstr "" -"<a href=\"#faq1_32\"><abbr title=\"Internet Information Services\">IIS</" -"abbr> でも <abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> 認証を利用" -"できますか？</a>" +"<a href=\"#faq1_32\">1.32 <abbr title=\"Internet Information " +"Services\">IIS</abbr> でも <abbr title=\"HyperText Transfer " +"Protocol\">HTTP</abbr> 認証を利用できますか？</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2986 @@ -8268,13 +8227,11 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3061 -#, fuzzy msgid "" "<a href=\"#faq1_38\">1.38 Can I use phpMyAdmin on a server on which Suhosin " "is enabled?</a>" msgstr "" -"[<a href=\"#faq1_6\">1.6</a>] PWS 上で phpMyAdmin を使えません。何も表示され" -"ません！" +"<a href=\"#faq1_38\">1.38 Suhosin が有効になっているサーバ上で phpMyAdmin を使うことはできますか？</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3063 @@ -8283,6 +8240,9 @@ msgid "" "problems with some operations, for example editing a table with many columns " "and no primary key or with textual primary key." msgstr "" +"はい。ただし、Suhosin " +"のデフォルトの設定値は、いくつかの操作で問題があることが知られています。例えば、多くのカラムを持っていて主キーがないテーブルや、TEXT " +"をそのまま主キーとしたテーブルの編集などです。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3068 @@ -8296,6 +8256,12 @@ msgid "" "error logs which limit did cause dropping of variable, so you can diagnose " "the problem and adjust matching configuration variable." msgstr "" +"Suhosin の設定はいくつかのケースでは誤動作につながる可能性があります。phpMyAdmin は１回の HTTP " +"リクエスト内で多量のカラムを転送を必要とするアプリケーションであり、Suhosin は HTTP " +"リクエストに対して何らかの防止しようとするものであるため、この問題を完全に回避することはできません。一般的に、すべての <code>suhosin.re" +"quest.*</code>、<code>suhosin.post.*</code>、<code>suhosin.get.*</code> " +"ディレクティブは、phpMyAdmin の使用に対して悪影響を与えます。Suhosin " +"によって削られた変数が発生したかをエラーログで確認できるので、この問題を診断して設定がうまく合うように調整することができます。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3079 @@ -8303,6 +8269,8 @@ msgid "" "The default values for most Suhosin configuration options will work in most " "scenarios, however you might want to adjust at least following parameters:" msgstr "" +"ほとんどの Suhosin " +"の設定オプションのデフォルト値は、大抵の状況で動作するでしょう。しかしながら、少なくとも以下のパラメータは調整したほうがよろしいです。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3084 @@ -8311,6 +8279,8 @@ msgid "" "request.max_vars\">suhosin.request.max_vars</a> should be increased (eg. " "2048)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.requ" +"est.max_vars\">suhosin.request.max_vars</a> を増加 (例：2048)" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3085 @@ -8318,6 +8288,8 @@ msgid "" "<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin." "post.max_vars\">suhosin.post.max_vars</a> should be increased (eg. 2048)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.post" +".max_vars\">suhosin.post.max_vars</a> を増加 (例：2048)" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3086 @@ -8326,6 +8298,9 @@ msgid "" "request.max_array_index_length\">suhosin.request.max_array_index_length</a> " "should be increased (eg. 256)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.requ" +"est.max_array_index_length\">suhosin.request.max_array_index_length</a> を増加 " +"(例：256)" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3087 @@ -8334,6 +8309,8 @@ msgid "" "post.max_array_index_length\">suhosin.post.max_array_index_length</a> should " "be increased (eg. 256)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.post" +".max_array_index_length\">suhosin.post.max_array_index_length</a> を増加 (例：256)" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3088 @@ -8342,6 +8319,9 @@ msgid "" "request.max_totalname_length\">suhosin.request.max_totalname_length</a> " "should be increased (eg. 8192)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.requ" +"est.max_totalname_length\">suhosin.request.max_totalname_length</a> を増加 " +"(例：8192)" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3089 @@ -8350,6 +8330,8 @@ msgid "" "post.max_totalname_length\">suhosin.post.max_totalname_length</a> should be " "increased (eg. 8192)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.post" +".max_totalname_length\">suhosin.post.max_totalname_length</a> を増加 (例：8192)" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3090 @@ -8358,6 +8340,8 @@ msgid "" "bailout_on_error\">suhosin.sql.bailout_on_error</a> needs to be disabled " "(the default)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.sql." +"bailout_on_error\">suhosin.sql.bailout_on_error</a> を無効 (デフォルトです)" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3091 @@ -8366,6 +8350,9 @@ msgid "" "html#logging_configuration\">suhosin.log.*</a> should not include SQL, " "otherwise you get big slowdown" msgstr "" +"<a href=\"http://www.hardened-" +"php.net/suhosin/configuration.html#logging_configuration\">suhosin.log.*</a> " +"に SQL を含めない。含めるととても遅くなります。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3095 @@ -8373,6 +8360,8 @@ msgid "" "You can also disable the warning using the <a href=" "\"#cfg_SuhosinDisableWarning\"> <tt>SuhosinDisableWarning</tt> directive</a>." msgstr "" +"また、<a href=\"#cfg_SuhosinDisableWarning\"><tt>SuhosinDisableWarning</tt> " +"ディレクティブ</a>を使用して警告を無効にすることができます。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3100 @@ -8395,7 +8384,7 @@ msgstr "" "Apache の設定で <tt>SSLOptions</tt> と <tt>StdEnvVars</tt> " "が有効になっていることを確認してください。<a href=\"http://httpd.apache.org/docs/2.0/mod/mod_ssl.h" "tml#ssloptions\">http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions" -"</a>を参照してください。" +"</a> を参照してください。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3108 @@ -8507,12 +8496,10 @@ msgid "" "kit: the file <tt>libraries/Config.class.php</tt> contained an end-of-line " "character (hex 0A) at the end; removing this character cleared his errors." msgstr "" -"<i>config.inc.php</i> ファイルを修正して、先頭の <tt><?php</tt> タグの前や" -"末尾の <tt>?></tt> の後には何も入れない（改行やスペース、文字などがない）" -"ようにしてください。また、zip形式の配布キットを使用しているIISでユーザーから" -"以下の報告を受けています。「ファイル <tt>libraries/Config.class.php</tt> の末" -"尾に改行コード (0x0A) が含まれていたので、この文字を削除したらエラーがなくな" -"りました。」と。" +"<i>config.inc.php</i> ファイルを修正して、先頭の <tt><?php</tt> タグの前や末尾の " +"<tt>?></tt> の後には何も入れない（改行やスペース、文字などがない）ようにしてください。また、zip形式の配布キットを使用しているIIS" +"でユーザから以下の報告を受けています。「ファイル <tt>libraries/Config.class.php</tt> の末尾に改行コード " +"(0x0A) が含まれていたので、この文字を削除したらエラーがなくなりました。」と。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3157 @@ -8551,9 +8538,7 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3169 msgid "For RedHat users, Harald Legner suggests this on the mailing list:" -msgstr "" -"RedHat ユーザの場合、Harald Legner がメーリングリストで次のような提案をしてい" -"ます：" +msgstr "RedHat ユーザの場合、Harald Legner がメーリングリストで次のような提案をしています。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3171 @@ -9170,9 +9155,8 @@ msgid "" "to browse table I get series of errors like "Warning: unable to parse " "url". How can this be fixed?</a>" msgstr "" -"<a href=\"#faq3_7\">3.7 フィールド数の多い（100+）テーブルがあるのですが、こ" -"のテーブルを表示しようとすると「Warning: unable to parse url（警告：urlを解析" -"できません）」というエラーがたくさん出ます。どうすれば直るのでしょうか。</a>" +"<a href=\"#faq3_7\">3.7 カラム数の多い（100 以上）テーブルがあるのですが、このテーブルを表示しようとすると「Warning: " +"unable to parse url（警告：url を解析できません）」というエラーがたくさん出ます。どうすれば直るのでしょうか？</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3409 @@ -9181,9 +9165,9 @@ msgid "" "long expression to identify this row. This causes problems to parse_url " "function. The workaround is to create a primary or unique key." msgstr "" -"テーブルにプライマリキーやユニークなキーがない場合、行を特定するために長い " -"SQL を使う必要があるのですが、それが parse_url 関数で問題を起こしているので" -"す。解決策は、プライマリキーやユニークキーを作成することです。" +"テーブルに主キーやユニークなキーがない場合、行を特定するために長い <abbr title=\"Uniform Resource " +"Locator\">URL</abbr> を使う必要があるのですが、それが parse_url " +"関数で問題を起こしているのです。解決策は、主キーやユニークキーを作成することです。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3416 @@ -9258,20 +9242,17 @@ msgid "" ""Smith" values are displayed), if I click Edit I cannot be sure " "that I am editing the intended row.</a>" msgstr "" -"<a href=\"#faq3_10\">3.10 プライマリキーがないのにつづりが同じ語がある場合：" -"SELECT の結果、同じ値を持つカラムが複数表示された場合（たとえば <tt>SELECT " -"lastname from employees where firstname like 'A%'</tt> の結果「Smith」という" -"値が 2 つ表示された場合）、修正（Edit）をクリックしても意図した通りの行を修正" -"しているのかわかりません。</a>" +"<a href=\"#faq3_10\">3.10 主キーがないのにつづりが同じ語がある場合：SELECT " +"の結果、同じ値を持つカラムが複数表示された場合（例えば <tt>SELECT lastname from employees where " +"firstname like 'A%'</tt> の結果「Smith」という値が 2 " +"つ表示された場合）、修正をクリックしても意図した通りの行を修正しているのか分かりません。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3453 msgid "" "Please make sure that your table has a primary key, so that phpMyAdmin can " "use it for the Edit and Delete links." -msgstr "" -"テーブルにプライマリキーを設定するようにしてください。そうすると phpMyAdmin " -"は修正／削除のリンクにプライマリキーを利用するようになります。" +msgstr "テーブルに主キーを設定するようにしてください。そうすると phpMyAdmin は修正／削除のリンクに主キーを利用するようになります。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3457 @@ -9342,6 +9323,8 @@ msgid "" "<a href=\"#faq3_15\">3.15 When I import an Excel spreadsheet, some cells " "with calculations do not display correctly.</a>" msgstr "" +"<a href=\"#faq3_15\">3.15 Excel " +"スプレッドシートをインポートすると、計算を伴ったいくつかのセルが正しく表示されません。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3489 @@ -9351,13 +9334,16 @@ msgid "" "limitations that are listed on their page regarding Excel calculations will " "also apply here." msgstr "" +"phpMyAdmin には、Excel の XLS／XLSX スプレッドシートを解析するために <a " +"href=\"http://www.codeplex.com/PHPExcel/\">PHPExcel</a> " +"ライブラリを使用しています。したがって、それらのページに記載されているものは何らかの制限を受け、Excel の計算についても影響を与えます。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3492 msgid "" "PHPExcel will be kept up to date so as to make all improvements available to " "phpMyAdmin users." -msgstr "" +msgstr "PHPExcel は最新の状態に保たれており、phpMyAdmin ユーザは全ての改良を利用することができます。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3496 @@ -9365,6 +9351,8 @@ msgid "" "<a href=\"#faq3_16\">3.16 When I compress (gzip, bzip2, zip) an Excel " "workbook and attempt to import it, nothing happens.</a>" msgstr "" +"<a href=\"#faq3_16\">3.16 Excel ワークブックを圧縮 (gzip、bzip2、zip) " +"して、それをインポートしようとしましたが、何も起こりません。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3498 @@ -9373,6 +9361,8 @@ msgid "" "a small benefit from compressing them yet again. Support for compressed " "Excel XLSX and XLS workbooks may be added in the future." msgstr "" +"Excel の XLSX ワークブックは既に圧縮されています。それらを再度圧縮することでまだ僅かな効果があることもあります。圧縮された Excel の " +"XLSX／XLS ワークブックに対してのサポートは、将来追加されるかもしれません。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3503 @@ -9380,6 +9370,8 @@ msgid "" "<a href=\"#faq3_17\">3.17 When I import an Excel spreadsheet, my custom cell " "types are not represented as they are in Excel.</a>" msgstr "" +"<a href=\"#faq3_17\">3.17 Excel スプレッドシートをインポートすると、Excel " +"内にあるカスタムセル型が表示されません。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3505 @@ -9388,6 +9380,8 @@ msgid "" "(especially in Excel 97-2003 binary XLS files). If possible, consider using " "a built-in type. These are almost always guarenteed to import correctly." msgstr "" +"カスタムセル型の Excel の内部表現は、むしろややこしいものです（特に Excel 97-2003 バイナリ XLS " +"ファイル）。可能であれば、組み込み型の使用を検討してください。これらは、ほとんどの場合、正常にインポートすることが保証されます。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3513 @@ -9395,13 +9389,15 @@ msgid "" "<a href=\"#faq3_18\">3.18 When I import a CSV file that contains multiple " "tables, they are lumped together into a single table.</a>" msgstr "" +"<a href=\"#faq3_18\">3.18 複数のテーブルを含む CSV " +"ファイルをインポートすると、それらが単一のテーブルにまとめられてしまいます。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3515 msgid "" "There is no reliable way to differetiate tables in CSV format. For the time " "being, you will have to break apart CSV files containing multiple tables." -msgstr "" +msgstr "CSV 形式でテーブルを区別する確実な方法はありません。当分の間は、複数のテーブルを含む CSV ファイルを分割する必要があります。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3522 @@ -9410,6 +9406,8 @@ msgid "" "the appropriate data structure it only uses int, decimal, and varchar types." "</a>" msgstr "" +"<a href=\"#faq3_19\">3.19 ファイルをインポートしただけで、phpMyAdmin は INT、DECIMAL、VARCHAR " +"型を使用してデータ構造を定めてしまいました。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3524 @@ -9418,6 +9416,8 @@ msgid "" "types to columns. In future, more will likely be added but for the time " "being you will have to edit the structure to your liking post-import." msgstr "" +"現在、インポートの型検出システムは、カラムに MySQL の型だけを割り当てることができます。将来的には、より多く追加される可能性が高いですが、当分の間" +"は、インポートしたものに対して構造を編集する必要があります。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3527 @@ -9428,6 +9428,8 @@ msgid "" "should manually adjust the column sizes accordingly. This is done for the " "sake of efficiency." msgstr "" +"また、phpMyAdmin は適切な型のカラムのサイズとして、カラム内の最大サイズのものを使用することに注意するようにしてください。そのカラムにより大き" +"なサイズのものを追加することが分かっている場合は、手動でそれに応じたカラムのサイズに調整する必要があります。これは、効率のために行われます。" #. type: Content of: <html><body><div><h3> #: orig-docs/Documentation.html:3533 @@ -9445,10 +9447,9 @@ msgid "" "\">ISP</abbr>. Can I setup one central copy of phpMyAdmin or do I need to " "install it for each customer. </a>" msgstr "" -"<a href=\"#faq4_1\">4.1 当方は <abbr title=\"インターネット・サービス・プロバ" -"イダ\">ISP</abbr> なのですが、phpMyAdmin はセントラルコピーをひとつセットアッ" -"プすればよいのでしょうか。それともお客様ひとりひとりにインストールする必要が" -"あるのでしょうか。</a>" +"<a href=\"#faq4_1\">4.1 当方は <abbr title=\"インターネット・サービス・プロバイダ\">ISP</abbr> " +"なのですが、phpMyAdmin " +"はセントラルコピーを一つセットアップすればよいのでしょうか。それともお客様一人々々にインストールする必要があるのでしょうか。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3540 @@ -9473,9 +9474,7 @@ msgstr "" msgid "" "<a href=\"#faq4_2\">4.2 What's the preferred way of making phpMyAdmin secure " "against evil access. </a>" -msgstr "" -"<a href=\"#faq4_2\">4.2 phpMyAdmin を不正アクセスから守るにはどうすればよいの" -"でしょう。</a>" +msgstr "<a href=\"#faq4_2\">4.2 phpMyAdmin を不正アクセスから守るにはどうすればよいのでしょうか？</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3553 @@ -9689,9 +9688,7 @@ msgstr "" msgid "" "<a href=\"#faq4_7\">4.7 Authentication window is displayed more than once, " "why?</a>" -msgstr "" -"<a href=\"#faq4_7\">4.7 認証ウインドウが複数回表示されます。なぜでしょう。</" -"a>" +msgstr "<a href=\"#faq4_7\">4.7 認証ウインドウが複数回表示されます。なぜでしょうか？</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3644 @@ -9882,30 +9879,24 @@ msgid "" "example. The workaround is to create a primary or unique key, or use another " "browser." msgstr "" -"テーブルにプライマリキーやユニークキーがないと、行を識別するために長い <abbr " -"title=\"Uniform Resource Locator\">URL</abbr> を使うことになってしまうのです" -"が、これらのブラウザには <abbr title=\"Uniform Resource Locator\">URL</abbr> " -"の長さに制限があるため、その問題が起こります。この問題は、たとえば Netscape " -"では起こりません。回避するには、プライマリキーやユニークキーを作成するか、別" -"のブラウザを使ってください。" +"テーブルに主キーやユニークキーがないと、行を識別するために長い <abbr title=\"Uniform Resource " +"Locator\">URL</abbr> を使うことになってしまうのですが、これらのブラウザには <abbr title=\"Uniform " +"Resource Locator\">URL</abbr> の長さに制限があるため、その問題が起こります。この問題は、たとえば Netscape " +"では起こりません。回避するには、主キーやユニークキーを作成するか、別のブラウザを使ってください。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3722 msgid "" "<a href=\"#faq5_7\">5.7 I refresh (reload) my browser, and come back to the " "welcome page. </a>" -msgstr "" -"<a href=\"#faq5_7\">5.7 ブラウザで再読込（リロード）すると、入り口ページに" -"戻ってしまいます。</a>" +msgstr "<a href=\"#faq5_7\">5.7 ブラウザで再読み込み（リロード）すると、入り口ページに戻ってしまいます。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3726 msgid "" "Some browsers support right-clicking into the frame you want to refresh, " "just do this in the right frame." -msgstr "" -"ブラウザによっては再読込したいフレームのなかで右クリックできますので、右フ" -"レームのなかで右クリックして再読込してください。" +msgstr "ブラウザによっては再読み込みしたいフレームのなかで右クリックできますので、右フレームのなかで右クリックして再読込してください。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3731 @@ -9921,9 +9912,7 @@ msgstr "" msgid "" "Looks like a Mozilla bug: 0.9.6 was OK. We will keep an eye on future " "Mozilla versions." -msgstr "" -"Mozilla のバグのようです：0.9.6 では OK でした。Mozilla の将来のバージョンで" -"も注意していきます。" +msgstr "Mozilla のバグのようです。0.9.6 では OK でした。Mozilla の将来のバージョンでも注意していきます。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3740 @@ -9963,9 +9952,9 @@ msgid "" "data in octet-stream mode. Since we can't detect the specific Netscape " "version, we cannot workaround this bug." msgstr "" -"これは Netscape 4.75 の既知のバグです：octet-stream モードでデータをエクス" -"ポートする際にラインフィードを追加してしまうのです。このバージョンの " -"Netscape を検知することはできませんので、このバグは回避できません。" +"これは Netscape 4.75 の既知のバグです。octet-stream " +"モードでデータをエクスポートする際にラインフィードを追加してしまうのです。このバージョンの Netscape " +"を検知することはできませんので、このバグは回避できません。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3759 @@ -9984,9 +9973,8 @@ msgid "" "Alternatively, you can try the auto detection mode that is supported by the " "recent versions of the most browsers." msgstr "" -"ブラウザの文字セットが phpMyAdmin のスタートページで選択した言語ファイルの文" -"字セットとあっているかご確認ください。また、最近のブラウザならたいていサポー" -"トしている自動検知モードを試してみる手もあります。" +"ブラウザの文字セットが phpMyAdmin のスタートページで選択した言語ファイルの文字セットと合っているかご確認ください。また、最近のブラウザならた" +"いていサポートしている自動検知モードを試してみる手もあります。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3768 @@ -10101,9 +10089,9 @@ msgid "" "MySQL port (usually 3306) in the "in" and "out" " "directions." msgstr "" -"Windows Firewall が Apache と MySQL をブロックしているのでは？　「in」「out」" -"双方で <abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> ポート（80ない" -"し443）と MySQL ポート（通常は 3306）が開いている必要があります。" +"Windows Firewall が Apache と MySQL をブロックしているのでは？　「in」、「out」双方で <abbr " +"title=\"HyperText Transfer Protocol\">HTTP</abbr> ポート (80 ないし 443) と MySQL ポート " +"(通常は 3306) が開いている必要があります。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3811 @@ -10119,9 +10107,7 @@ msgstr "" msgid "" "Many users have confirmed that the Tabbrowser Extensions plugin they " "installed in their Firefox is causing the problem." -msgstr "" -"多くのユーザが、Firefox にインストールしたタブブラウザエクステンションが問題" -"を起こしていることを確認しています。" +msgstr "多くのユーザが、Firefox にインストールしたタブブラウザ拡張が問題を起こしていることを確認しています。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3816 @@ -10129,6 +10115,8 @@ msgid "" "<a href=\"#faq5_18\">5.18 With Konqueror 4.2.x an invalid <tt>LIMIT</tt> " "clause is generated when I browse a table.</a>" msgstr "" +"<a href=\"#faq5_18\">5.18 Konqueror 4.2.x でテーブルを表示するとき、無効な <tt>LIMIT</tt> " +"句が生成されます。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3818 @@ -10138,6 +10126,8 @@ msgid "" "tt> on the server. It seems to be a browser-specific problem; meanwhile use " "the <tt>cookie</tt> authentication mode." msgstr "" +"<tt>http</tt> 認証モードを使用しており、サーバ上で <tt>register_globals</tt> が <tt>On</tt> " +"に設定されている場合にのみ発生します。これはブラウザ固有の問題と思われますので、<tt>クッキー</tt>認証モードを使用するようにしてください。" #. type: Content of: <html><body><div><h3> #: orig-docs/Documentation.html:3823 @@ -10573,7 +10563,7 @@ msgstr "左フレームのデータベース名を選択します。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3985 msgid "Choose "Operations" in the navigation bar at the top." -msgstr "上部のナビゲーションバーで「操作（Operations）」を選択します。" +msgstr "上部のナビゲーションバーで「操作」を選択します。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3986 @@ -10683,16 +10673,15 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4026 -#, fuzzy msgid "" "If you do not put a backslash before the underscore, this is a wildcard " "grant, and the underscore means "any character". So, if the " "database name is "john_db", the user would get rights to john1db, " "john2db ..." msgstr "" -"アンダースコアの前にバックスラッシュをつけない場合は「なにか 1 文字」をあらわ" -"すワイルドカードになります。データベース名が「john_db」なら、そのユーザは " -"john1db、john2db …への特権を得ることになります。" +"アンダースコアの前にバックスラッシュをつけない場合は、「なにか 1 " +"文字」を表すワイルドカードになります。データベース名が「john_db」なら、そのユーザは john1db、john2db " +"…への特権を得ることになります。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4031 @@ -10826,11 +10815,9 @@ msgid "" "html\">MySQL manual</a>, but basically with this selected, invalid values " "are adjusted and inserted rather than causing the entire statement to fail." msgstr "" -"「『INSERT IGNORE』を使用する（Ignore inserts）」は、エラーを警告扱いにしてし" -"まいます。これまた詳しくは <a href=\"http://dev.mysql.com/doc/mysql/ja/" -"insert.html\">MySQL マニュアル</a>に書いてありますが、基本的にこれを選択する" -"と、無効な値があってもそれを調整して挿入するため、ステートメントがまるごと失" -"敗することはなくなります。" +"「『INSERT IGNORE』を使用する（Ignore inserts）」は、エラーを警告扱いにしてしまいます。これまた詳しくは <a " +"href=\"http://dev.mysql.com/doc/mysql/ja/insert.html\">MySQL マニュアル</a>に書いてあります" +"が、基本的にこれを選択すると、無効な値があってもそれを調整して挿入するため、コマンドがまるごと失敗することはなくなります。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4079 @@ -10861,11 +10848,10 @@ msgid "" "\"structured query language\">SQL</abbr> Validator?</a>" msgstr "" "<a href=\"#faqsqlvalidator\">6.14 どうすれば <abbr title=\"structured query " -"language\">SQL</abbr> Validator をセットアップできますか。</a>" +"language\">SQL</abbr> 検証をセットアップできますか。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4092 -#, fuzzy msgid "" "To use SQL Validator, you need PHP with <abbr title=\"Extensible Markup " "Language\">XML</abbr>, <abbr title=\"Perl Compatible Regular Expressions" @@ -10874,15 +10860,14 @@ msgid "" "Access Protocol\">SOAP</abbr> support, either as a PHP extension or as a " "PEAR SOAP module." msgstr "" -"これを利用するには非常にバージョンの新しい PHP が必要です。4.3.0 がおすすめで" -"す。また、 XML、PCRE、PEAR をサポートしている必要があります。お使いのシステム" -"のコマンドラインで、<tt>「pear install Net_Socket Net_URL HTTP_Request " -"Mail_Mime Net_DIME SOAP」</tt> を実行して、必要な PEAR モジュールを入手してお" -"いてください。" +"<abbr title=\"structured query language\">SQL</abbr> 検証を利用するには、PHP が <abbr " +"title=\"Extensible Markup Language\">XML</abbr>、<abbr title=\"Perl Compatible " +"Regular Expressions\">PCRE</abbr>、<abbr title=\"PHP Extension and Application " +"Repository\">PEAR</abbr> をサポートしている必要があります。加えて、PHP 拡張モジュールもしくは PEAR " +"モジュールとして、<abbr title=\"Simple Object Access Protocol\">SOAP</abbr> のサポートが必要です。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4102 -#, fuzzy msgid "" "To install <abbr title=\"PHP Extension and Application Repository\">PEAR</" "abbr> <abbr title=\"Simple Object Access Protocol\">SOAP</abbr> module, run " @@ -10890,15 +10875,14 @@ msgid "" "\"</tt> to get the necessary <abbr title=\"PHP Extension and Application " "Repository\">PEAR</abbr> modules for usage." msgstr "" -"これを利用するには非常にバージョンの新しい PHP が必要です。4.3.0 がおすすめで" -"す。また、 XML、PCRE、PEAR をサポートしている必要があります。お使いのシステム" -"のコマンドラインで、<tt>「pear install Net_Socket Net_URL HTTP_Request " -"Mail_Mime Net_DIME SOAP」</tt> を実行して、必要な PEAR モジュールを入手してお" -"いてください。" +"<abbr title=\"PHP Extension and Application Repository\">PEAR</abbr> の <abbr " +"title=\"Simple Object Access Protocol\">SOAP</abbr> モジュールをインストールするには、<tt>「pear " +"install Net_Socket Net_URL HTTP_Request Mail_Mime Net_DIME SOAP」</tt> " +"を実行して、使用するために必要な <abbr title=\"PHP Extension and Application " +"Repository\">PEAR</abbr> を入手してください。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4111 -#, fuzzy msgid "" "If you use the Validator, you should be aware that any <abbr title=" "\"structured query language\">SQL</abbr> statement you submit will be stored " @@ -10907,10 +10891,11 @@ msgid "" "abbr> Validator itself, is © 2001 Upright Database Technology. We " "utilize it as free SOAP service." msgstr "" -"Validator を使う際にはご注意ください。SQL 文はいずれも匿名の状態で保管されて" -"います（データベース／テーブル／カラム名や文字列、数値は、汎用的な値で置き換" -"えられます）。Mimer SQL Validator そのものは © 2001 Upright Database " -"Technology です。私たちはフリーの SOAP サービスとして利用しています。" +"<abbr title=\"structured query language\">SQL</abbr> 検証を使う際にはご注意ください。<abbr " +"title=\"structured query language\">SQL</abbr> " +"文はいずれも匿名の状態で保管されています（データベース／テーブル／カラム名や文字列、数値は、汎用的な値で置き換えられます）。Mimer SQL " +"Validator そのものは © 2001 Upright Database Technology です。私達はフリーの SOAP " +"サービスとして利用しています。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4121 @@ -12098,7 +12083,7 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4593 msgid "If you want to be really helpful, write an entry for the ChangeLog." -msgstr "さらにお願いしてもよければ、ChangeLog にエントリを書いてください。" +msgstr "さらにお願いしてもよければ、変更履歴 (ChangeLog) にエントリを書いてください。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4595 @@ -12835,7 +12820,7 @@ msgstr "Lori Lee (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4883 msgid "User interface improvements" -msgstr "ユーザーインターフェイスの改善" +msgstr "ユーザインターフェイスの改善" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4884 @@ -12955,11 +12940,10 @@ msgid "" "1.1.1 he contributed the ldi_*.php3-set (Import text-files) as well as a bug-" "report. Plus many smaller improvements." msgstr "" -"Amalesh Kempf <ak-lsml_at_living-source.com>。テーブルやデータベースを" -"削除するときのチェックコードを提供してくださいました。また、tbl_create.php3 " -"にプライマリキーを指定できるようにしたらどうかと薦めてくださったのも彼です。" -"バージョン 1.1.1 にはバグレポートだけでなくldi_*.php3-set（テキストファイルの" -"��ージョン 1.1.1 にはバグレポートだけでなくldi_*.php3-set（テキストファイルの"す。"�列、数値は、汎用的な値で置き換えられます）。Mimer SQL "��""。"�"��たもの"o<�*��F��<�*��F��F��R;�*6 ��!�!@��F��F�x�o<�*��F�"�R;�*�R;�*@��F��R;�*��F��<�*��R;�*��<�*؄�<�*��<�*�dT;�*x�o<�*��F��F��R;�*�!�!@��F��F��]O<�*��F�"�R;�*�R;�*@��F��R;�*��F�p��F�h��F��s;�*�p��F��R;�*�dT;�*��F�p��F��R;�*GHIJKMNOP@��F��F�H&<�*@��F�"�R;�*�R;�*@��F�0��<�*��R;�*�o<�*�I<�*��<�*؄�<�*��<�*�dT;�*H&<�*@��F��F��R;�*8&<�*@��F��F��R;�*(&<�*@��F��F��R;�*&<�*@��F��F��R;�* ��<�*��R;�*��<�*��F��<�*��R;�*؄�<�*��F�y�<�*��R;�*��<�*��F�Z�<�*��R;�*�D<�*�o<�*�I<�*��<�*ؤo<�*؄�<�*��<�*�dT;�*��<�*`��F�0��F��R;�*#%')*-.035678:<=@��F��F�p��;�*��F�"�R;�*8�o<�*��R;�*ؤo<�*��o<�*�dT;�*cf �;�*��F�p��;�*��F�P��F��R;�*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��;�*��F�F�6=�*F�6=�*?��;�*��F��F�Ћ�F� �;�*��R;�*��s;�*0��F�B�6=�*��F��F��t;�*��F��B�6=�*��F��R;インポート）も提供してくださいました。小さな改善も多数いただいています。" +"Amalesh Kempf <ak-lsml_at_living-" +"source.com>。テーブルやデータベースを削除するときのチェックコードを提供してくださいました。また、tbl_create.php3 " +"に主キーを指定できるようにしたらどうかと薦めてくださったのも彼です。バージョン 1.1.1 " +"にはバグレポートだけでなくldi_*.php3-set（テキストファイルのインポート）も提供してくださいました。小さな改善も多数いただいています。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4949 @@ -13462,10 +13446,10 @@ msgid "" "multi-user, SQL (Structured Query Language) Database Management System " "(DBMS)." msgstr "" -"<a href=\"http://ja.wikipedia.org/wiki/MySQL\">MySQL</a> - マルチスレッド、マ" -"ルチユーザー、<abbr title=\"structured query language\">SQL</abbr>が使える" -"データベース管理システム (<abbr title=\"Database Management System\">DBMS</" -"abbr>)" +"<a href=\"http://ja.wikipedia.org/wiki/MySQL\">MySQL</a> - " +"マルチスレッド、マルチユーザ、<abbr title=\"structured query " +"language\">SQL</abbr>が使えるデータベース管理システム (<abbr title=\"Database Management " +"System\">DBMS</abbr>)" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5092 @@ -13814,17 +13798,17 @@ msgstr "<!--" #. type: Plain text #: addendum/comment.html:4 msgid "This file is generated using po4a, do not edit!" -msgstr "" +msgstr "このファイルは po4a を使用して生成されていますので、編集してはいけません！" #. type: Plain text #: addendum/comment.html:6 msgid "You can edit po files to change the translation." -msgstr "" +msgstr "po ファイルを編集することで、翻訳を変更することができます。" #. type: Plain text #: addendum/comment.html:8 msgid "Or you can edit them online at https://l10n.cihar.com/projects/pmadoc/." -msgstr "" +msgstr "もしくは、https://l10n.cihar.com/projects/pmadoc/ にてオンライン編集を行うこともできます。" #. type: Plain text #: addendum/comment.html:9 diff --git a/po/nl.po b/po/nl.po index eeb956f..d37dc0b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-30 11:20+0300\n" -"PO-Revision-Date: 2011-05-13 15:21+0200\n" -"Last-Translator: <anthonyvdgent(a)gmail.com>\n" +"PO-Revision-Date: 2011-06-04 15:20+0200\n" +"Last-Translator: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>\n" "Language-Team: none\n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -59,7 +59,6 @@ msgstr "<a href=\"Documentation.html#setup_script\">Installatiescript</a>" #. type: Content of: <html><body><ul><li> #: orig-docs/Documentation.html:32 -#, fuzzy msgid "<a href=\"Documentation.html#config\">Configuration</a>" msgstr "<a href=\"Documentation.html#config\">Configuratie</a>" hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3150-gacd7d29
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via acd7d29f7eb13c04ab8dc09b026822b0863580f8 (commit) via 2a22d7dae71e2560e667431541a4c7bbf854905c (commit) from 754cc88c39c6cb3c5041c1e6a19651e265de9abb (commit) - Log ----------------------------------------------------------------- commit acd7d29f7eb13c04ab8dc09b026822b0863580f8 Merge: 754cc88c39c6cb3c5041c1e6a19651e265de9abb 2a22d7dae71e2560e667431541a4c7bbf854905c Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 11:34:32 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-3148-g754cc88
by Michal Čihař 06 Jun '11

06 Jun '11

The branch, master has been updated via 754cc88c39c6cb3c5041c1e6a19651e265de9abb (commit) from 6a5a82fc82662de96c1e40f5101dbdb5f8a4eb6b (commit) - Log ----------------------------------------------------------------- commit 754cc88c39c6cb3c5041c1e6a19651e265de9abb Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 6 11:31:27 2011 +0200 Wrap a bit long lines ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 237 +++++++++++++++++++++++++++++++++------------ 1 files changed, 174 insertions(+), 63 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 3ed1c57..1530c53 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -29,28 +29,55 @@ if (isset($plugin_list)) { $plugin_list['sql']['options'][] = array('type' => 'begin_group', 'name' => 'general_opts'); /* comments */ - $plugin_list['sql']['options'][] = - array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'bool', 'name' => 'include_comments', 'text' => __('Display comments <i>(includes info such as export timestamp, PHP version, and server version)</i>'))); - $plugin_list['sql']['options'][] = - array('type' => 'text', 'name' => 'header_comment', 'text' => __('Additional custom header comment (\n splits lines):')); - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'dates', 'text' => __('Include a timestamp of when databases were created, last updated, and last checked')); + $plugin_list['sql']['options'][] = array( + 'type' => 'begin_subgroup', + 'subgroup_header' => array( + 'type' => 'bool', + 'name' => 'include_comments', + 'text' => __('Display comments <i>(includes info such as export timestamp, PHP version, and server version)</i>') + )); + $plugin_list['sql']['options'][] = array( + 'type' => 'text', + 'name' => 'header_comment', + 'text' => __('Additional custom header comment (\n splits lines):') + ); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'dates', + 'text' => __('Include a timestamp of when databases were created, last updated, and last checked') + ); if (!empty($GLOBALS['cfgRelation']['relation'])) { - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'relation', 'text' => __('Display foreign key relationships')); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'relation', + 'text' => __('Display foreign key relationships') + ); } if (!empty($GLOBALS['cfgRelation']['mimework'])) { - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'mime', 'text' => __('Display MIME types')); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'mime', + 'text' => __('Display MIME types') + ); } $plugin_list['sql']['options'][] = array('type' => 'end_subgroup'); /* end comments */ /* enclose in a transaction */ - $plugin_list['sql']['options'][] = array('type' => 'bool', 'name' => 'use_transaction', 'text' => __('Enclose export in a transaction'), 'doc' => array('programs', 'mysqldump', 'option_mysqldump_single-transaction')); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'use_transaction', + 'text' => __('Enclose export in a transaction'), + 'doc' => array('programs', 'mysqldump', 'option_mysqldump_single-transaction') + ); /* disable foreign key checks */ - $plugin_list['sql']['options'][] = array('type' => 'bool', 'name' => 'disable_fk', 'text' => __('Disable foreign key checks'), 'doc' => array('manual_MySQL_Database_Administration', 'server-system-variables', 'sysvar_foreign_key_checks')); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'disable_fk', + 'text' => __('Disable foreign key checks'), + 'doc' => array('manual_MySQL_Database_Administration', 'server-system-variables', 'sysvar_foreign_key_checks') + ); $plugin_list['sql']['options_text'] = __('Options'); @@ -61,34 +88,61 @@ if (isset($plugin_list)) { foreach($compats as $val) { $values[$val] = $val; } - $plugin_list['sql']['options'][] = - array('type' => 'select', 'name' => 'compatibility', 'text' => __('Database system or older MySQL server to maximize output compatibility with:'), 'values' => $values, 'doc' => array('manual_MySQL_Database_Administration', 'Server_SQL_mode')); + $plugin_list['sql']['options'][] = array( + 'type' => 'select', + 'name' => 'compatibility', + 'text' => __('Database system or older MySQL server to maximize output compatibility with:'), + 'values' => $values, + 'doc' => array('manual_MySQL_Database_Administration', 'Server_SQL_mode') + ); unset($values); } /* server export options */ if ($plugin_param['export_type'] == 'server') { - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'drop_database', 'text' => sprintf(__('Add %s statement'), '<code>DROP DATABASE</code>')); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'drop_database', + 'text' => sprintf(__('Add %s statement'), '<code>DROP DATABASE</code>') + ); } /* what to dump (structure/data/both) */ - $plugin_list['sql']['options'][] = - array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'text' => __('Dump table'))); - $plugin_list['sql']['options'][] = - array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data'))); + $plugin_list['sql']['options'][] = array( + 'type' => 'begin_subgroup', + 'subgroup_header' => array( + 'type' => 'message_only', + 'text' => __('Dump table') + )); + $plugin_list['sql']['options'][] = array( + 'type' => 'radio', + 'name' => 'structure_or_data', + 'values' => array( + 'structure' => __('structure'), + 'data' => __('data'), + 'structure_and_data' => __('structure and data') + )); $plugin_list['sql']['options'][] = array('type' => 'end_subgroup'); $plugin_list['sql']['options'][] = array('type' => 'end_group'); /* begin Structure options */ if (!$hide_structure) { - $plugin_list['sql']['options'][] = - array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options'), 'force' => 'data'); + $plugin_list['sql']['options'][] = array( + 'type' => 'begin_group', + 'name' => 'structure', + 'text' => __('Object creation options'), + 'force' => 'data' + ); /* begin SQL Statements */ - $plugin_list['sql']['options'][] = - array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'name' => 'add_statements', 'text' => __('Add statements:'))); + $plugin_list['sql']['options'][] = array( + 'type' => 'begin_subgroup', + 'subgroup_header' => array( + 'type' => 'message_only', + 'name' => 'add_statements', + 'text' => __('Add statements:') + )); if ($plugin_param['export_type'] == 'table') { if (PMA_Table::isView($GLOBALS['db'], $GLOBALS['table'])) { $drop_clause = '<code>DROP VIEW</code>'; @@ -101,74 +155,131 @@ if (isset($plugin_list)) { $drop_clause .= '<code> / EVENT</code>'; } } - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'drop_table', 'text' => sprintf(__('Add %s statement'), $drop_clause)); - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'procedure_function', 'text' => sprintf(__('Add %s statement'), '<code>CREATE PROCEDURE / FUNCTION' . (PMA_MYSQL_INT_VERSION > 50100 ? ' / EVENT</code>' : '</code>'))); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'drop_table', + 'text' => sprintf(__('Add %s statement'), $drop_clause) + ); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'procedure_function', + 'text' => sprintf(__('Add %s statement'), '<code>CREATE PROCEDURE / FUNCTION' . (PMA_MYSQL_INT_VERSION > 50100 ? ' / EVENT</code>' : '</code>')) + ); /* begin CREATE TABLE statements*/ - $plugin_list['sql']['options'][] = - array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'bool', 'name' => 'create_table_statements', 'text' => __('<code>CREATE TABLE</code> options:'))); - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'if_not_exists', 'text' => '<code>IF NOT EXISTS</code>'); - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'auto_increment', 'text' => '<code>AUTO_INCREMENT</code>'); + $plugin_list['sql']['options'][] = array( + 'type' => 'begin_subgroup', + 'subgroup_header' => array( + 'type' => 'bool', + 'name' => 'create_table_statements', + 'text' => __('<code>CREATE TABLE</code> options:') + )); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'if_not_exists', + 'text' => '<code>IF NOT EXISTS</code>' + ); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'auto_increment', + 'text' => '<code>AUTO_INCREMENT</code>' + ); $plugin_list['sql']['options'][] = array('type' => 'end_subgroup'); /* end CREATE TABLE statements */ $plugin_list['sql']['options'][] = array('type' => 'end_subgroup'); /* end SQL statements */ - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'backquotes', 'text' => __('Enclose table and field names with backquotes <i>(Protects field and table names formed with special characters or keywords)</i>')); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'backquotes', + 'text' => __('Enclose table and field names with backquotes <i>(Protects field and table names formed with special characters or keywords)</i>') + ); - $plugin_list['sql']['options'][] = - array('type' => 'end_group'); + $plugin_list['sql']['options'][] = array('type' => 'end_group'); } /* end Structure options */ /* begin Data options */ - $plugin_list['sql']['options'][] = - array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'), 'force' => 'structure'); + $plugin_list['sql']['options'][] = array( + 'type' => 'begin_group', + 'name' => 'data', + 'text' => __('Data dump options'), + 'force' => 'structure' + ); /* begin SQL statements */ - $plugin_list['sql']['options'][] = - array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'text' => __('Instead of <code>INSERT</code> statements, use:'))); - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'delayed', 'text' => __('<code>INSERT DELAYED</code> statements'), 'doc' => array('manual_MySQL_Database_Administration', 'insert_delayed')); - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'ignore', 'text' => __('<code>INSERT IGNORE</code> statements'), 'doc' => array('manual_MySQL_Database_Administration', 'insert')); - $plugin_list['sql']['options'][] = - array('type' => 'end_subgroup'); + $plugin_list['sql']['options'][] = array( + 'type' => 'begin_subgroup', + 'subgroup_header' => array( + 'type' => 'message_only', + 'text' => __('Instead of <code>INSERT</code> statements, use:') + )); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'delayed', + 'text' => __('<code>INSERT DELAYED</code> statements'), + 'doc' => array('manual_MySQL_Database_Administration', 'insert_delayed') + ); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'ignore', + 'text' => __('<code>INSERT IGNORE</code> statements'), + 'doc' => array('manual_MySQL_Database_Administration', 'insert') + ); + $plugin_list['sql']['options'][] = array('type' => 'end_subgroup'); /* end SQL statements */ /* Function to use when dumping data */ - $plugin_list['sql']['options'][] = - array('type' => 'select', 'name' => 'type', 'text' => __('Function to use when dumping data:'), 'values' => array('INSERT' => 'INSERT', 'UPDATE' => 'UPDATE', 'REPLACE' => 'REPLACE')); + $plugin_list['sql']['options'][] = array( + 'type' => 'select', + 'name' => 'type', + 'text' => __('Function to use when dumping data:'), + 'values' => array( + 'INSERT' => 'INSERT', + 'UPDATE' => 'UPDATE', + 'REPLACE' => 'REPLACE' + ) + ); /* Syntax to use when inserting data */ - $plugin_list['sql']['options'][] = - array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'text' => __('Syntax to use when inserting data:'))); - $plugin_list['sql']['options'][] = - array('type' => 'radio', 'name' => 'insert_syntax', 'values' => array( + $plugin_list['sql']['options'][] = array( + 'type' => 'begin_subgroup', + 'subgroup_header' => array( + 'type' => 'message_only', + 'text' => __('Syntax to use when inserting data:') + )); + $plugin_list['sql']['options'][] = array( + 'type' => 'radio', + 'name' => 'insert_syntax', + 'values' => array( 'complete' => __('include column names in every <code>INSERT</code> statement <br />       Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES (1,2,3)</code>'), 'extended' => __('insert multiple rows in every <code>INSERT</code> statement<br />       Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)</code>'), 'both' => __('both of the above<br />       Example: <code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>'), - 'none' => __('neither of the above<br />       Example: <code>INSERT INTO tbl_name VALUES (1,2,3)</code>'))); - $plugin_list['sql']['options'][] = - array('type' => 'end_subgroup'); + 'none' => __('neither of the above<br />       Example: <code>INSERT INTO tbl_name VALUES (1,2,3)</code>') + )); + $plugin_list['sql']['options'][] = array('type' => 'end_subgroup'); /* Max length of query */ - $plugin_list['sql']['options'][] = - array('type' => 'text', 'name' => 'max_query_size', 'text' => __('Maximal length of created query')); + $plugin_list['sql']['options'][] = array( + 'type' => 'text', + 'name' => 'max_query_size', + 'text' => __('Maximal length of created query') + ); /* Dump binary columns in hexadecimal */ - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'hex_for_blob', 'text' => __('Dump binary columns in hexadecimal notation <i>(for example, "abc" becomes 0x616263)</i>')); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'hex_for_blob', + 'text' => __('Dump binary columns in hexadecimal notation <i>(for example, "abc" becomes 0x616263)</i>') + ); /* Dump time in UTC */ - $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'utc_time', 'text' => __('Dump TIMESTAMP columns in UTC <i>(enables TIMESTAMP columns to be dumped and reloaded between servers in different time zones)</i>')); + $plugin_list['sql']['options'][] = array( + 'type' => 'bool', + 'name' => 'utc_time', + 'text' => __('Dump TIMESTAMP columns in UTC <i>(enables TIMESTAMP columns to be dumped and reloaded between servers in different time zones)</i>') + ); $plugin_list['sql']['options'][] = array('type' => 'end_group'); /* end Data options */ hooks/post-receive -- phpMyAdmin

1 0