- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24500-g84b8281
by Madhura Jayaratne 11 Dec '11

11 Dec '11

The branch, master has been updated via 84b8281c1a9cb83d721859101c993eb4635116a0 (commit) from e7e5f058b1b3ead3f94728800e5e1bc36a7b1d09 (commit) - Log ----------------------------------------------------------------- commit 84b8281c1a9cb83d721859101c993eb4635116a0 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Dec 11 14:58:35 2011 +0530 Coding style improvements ----------------------------------------------------------------------- Summary of changes: libraries/StorageEngine.class.php | 113 ++++++++------- libraries/database_interface.lib.php | 259 ++++++++++++++++++++-------------- server_status.php | 29 +++-- 3 files changed, 229 insertions(+), 172 deletions(-) diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index b325935..e41f7be 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -82,12 +82,12 @@ class PMA_StorageEngine /** * returns HTML code for storage engine select box * + * @param string $name The name of the select form element + * @param string $id The ID of the form field + * @param string $selected The selected engine + * @param boolean $offerUnavailableEngines Should unavailable storage engines be offered? + * * @static - * @param string $name The name of the select form element - * @param string $id The ID of the form field - * @param string $selected The selected engine - * @param boolean $offerUnavailableEngines - * Should unavailable storage engines be offered? * @return string html selectbox */ static public function getHtmlSelect($name = 'engine', $id = null, @@ -100,10 +100,12 @@ class PMA_StorageEngine foreach (PMA_StorageEngine::getStorageEngines() as $key => $details) { // Don't show PERFORMANCE_SCHEMA engine (MySQL 5.5) // Don't show MyISAM for Drizzle (allowed only for temporary tables) - if (!$offerUnavailableEngines - && ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED' - || $details['Engine'] == 'PERFORMANCE_SCHEMA') - || (PMA_DRIZZLE && $details['Engine'] == 'MyISAM')) { + if (! $offerUnavailableEngines + && ($details['Support'] == 'NO' + || $details['Support'] == 'DISABLED' + || $details['Engine'] == 'PERFORMANCE_SCHEMA') + || (PMA_DRIZZLE && $details['Engine'] == 'MyISAM') + ) { continue; } @@ -124,7 +126,8 @@ class PMA_StorageEngine * * Loads the corresponding engine plugin, if available. * - * @param string $engine The engine ID + * @param string $engine The engine ID + * * @return object The engine plugin */ static public function getEngine($engine) @@ -132,7 +135,8 @@ class PMA_StorageEngine $engine = str_replace('/', '', str_replace('.', '', $engine)); $engine_lowercase_filename = strtolower($engine); if (file_exists('./libraries/engines/' . $engine_lowercase_filename . '.lib.php') - && include_once './libraries/engines/' . $engine_lowercase_filename . '.lib.php') { + && include_once './libraries/engines/' . $engine_lowercase_filename . '.lib.php' + ) { $class_name = 'PMA_StorageEngine_' . $engine; $engine_object = new $class_name($engine); } else { @@ -144,8 +148,9 @@ class PMA_StorageEngine /** * return true if given engine name is supported/valid, otherwise false * + * @param string $engine name of engine + * * @static - * @param string $engine name of engine * @return boolean whether $engine is valid or not */ static public function isValid($engine) @@ -160,7 +165,7 @@ class PMA_StorageEngine /** * returns as HTML table of the engine's server variables * - * @return string The table that was generated based on the retrieved information + * @return string The table that was generated based on the retrieved information */ function getHtmlVariables() { @@ -170,27 +175,27 @@ class PMA_StorageEngine foreach ($this->getVariablesStatus() as $details) { $ret .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n" . ' <td>' . "\n"; - if (!empty($details['desc'])) { + if (! empty($details['desc'])) { $ret .= ' ' . PMA_showHint($details['desc']) . "\n"; } $ret .= ' </td>' . "\n" . ' <th>' . htmlspecialchars($details['title']) . '</th>' . "\n" . ' <td class="value">'; switch ($details['type']) { - case PMA_ENGINE_DETAILS_TYPE_SIZE: - $parsed_size = $this->resolveTypeSize($details['value']); - $ret .= $parsed_size[0] . ' ' . $parsed_size[1]; - unset($parsed_size); + case PMA_ENGINE_DETAILS_TYPE_SIZE: + $parsed_size = $this->resolveTypeSize($details['value']); + $ret .= $parsed_size[0] . ' ' . $parsed_size[1]; + unset($parsed_size); break; - case PMA_ENGINE_DETAILS_TYPE_NUMERIC: - $ret .= PMA_formatNumber($details['value']) . ' '; + case PMA_ENGINE_DETAILS_TYPE_NUMERIC: + $ret .= PMA_formatNumber($details['value']) . ' '; break; - default: - $ret .= htmlspecialchars($details['value']) . ' '; + default: + $ret .= htmlspecialchars($details['value']) . ' '; } $ret .= '</td>' . "\n" . '</tr>' . "\n"; - $odd_row = !$odd_row; + $odd_row = ! $odd_row; } if (! $ret) { @@ -266,12 +271,12 @@ class PMA_StorageEngine /** * Constructor * - * @param string $engine The engine ID + * @param string $engine The engine ID */ function __construct($engine) { $storage_engines = PMA_StorageEngine::getStorageEngines(); - if (!empty($storage_engines[$engine])) { + if (! empty($storage_engines[$engine])) { $this->engine = $engine; $this->title = $storage_engines[$engine]['Engine']; $this->comment @@ -279,18 +284,18 @@ class PMA_StorageEngine ? $storage_engines[$engine]['Comment'] : ''); switch ($storage_engines[$engine]['Support']) { - case 'DEFAULT': - $this->support = PMA_ENGINE_SUPPORT_DEFAULT; - break; - case 'YES': - $this->support = PMA_ENGINE_SUPPORT_YES; - break; - case 'DISABLED': - $this->support = PMA_ENGINE_SUPPORT_DISABLED; - break; - case 'NO': - default: - $this->support = PMA_ENGINE_SUPPORT_NO; + case 'DEFAULT': + $this->support = PMA_ENGINE_SUPPORT_DEFAULT; + break; + case 'YES': + $this->support = PMA_ENGINE_SUPPORT_YES; + break; + case 'DISABLED': + $this->support = PMA_ENGINE_SUPPORT_DISABLED; + break; + case 'NO': + default: + $this->support = PMA_ENGINE_SUPPORT_NO; } } else { $this->engine_init(); @@ -301,7 +306,8 @@ class PMA_StorageEngine * public String getTitle() * * Reveals the engine's title - * @return string The title + * + * @return string The title */ function getTitle() { @@ -312,7 +318,8 @@ class PMA_StorageEngine * public String getComment() * * Fetches the server's comment about this engine - * @return string The comment + * + * @return string The comment */ function getComment() { @@ -327,18 +334,18 @@ class PMA_StorageEngine function getSupportInformationMessage() { switch ($this->support) { - case PMA_ENGINE_SUPPORT_DEFAULT: - $message = __('%s is the default storage engine on this MySQL server.'); - break; - case PMA_ENGINE_SUPPORT_YES: - $message = __('%s is available on this MySQL server.'); - break; - case PMA_ENGINE_SUPPORT_DISABLED: - $message = __('%s has been disabled for this MySQL server.'); - break; - case PMA_ENGINE_SUPPORT_NO: - default: - $message = __('This MySQL server does not support the %s storage engine.'); + case PMA_ENGINE_SUPPORT_DEFAULT: + $message = __('%s is the default storage engine on this MySQL server.'); + break; + case PMA_ENGINE_SUPPORT_YES: + $message = __('%s is available on this MySQL server.'); + break; + case PMA_ENGINE_SUPPORT_DISABLED: + $message = __('%s has been disabled for this MySQL server.'); + break; + case PMA_ENGINE_SUPPORT_NO: + default: + $message = __('This MySQL server does not support the %s storage engine.'); } return sprintf($message, htmlspecialchars($this->title)); } @@ -398,9 +405,9 @@ class PMA_StorageEngine * * Generates the requested information page * - * @abstract - * @param string $id The page ID + * @param string $id The page ID * + * @abstract * @return string The page * boolean or false on error. */ diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index a142249..ebbe124 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -29,7 +29,8 @@ define('PMA_DBI_GETVAR_GLOBAL', 2); /** * Checks whether database extension is loaded * - * @param string $extension mysql extension to check + * @param string $extension mysql extension to check + * * @return bool */ function PMA_DBI_checkDbExtension($extension = 'mysql') @@ -59,7 +60,7 @@ if (! PMA_DBI_checkDbExtension($GLOBALS['cfg']['Server']['extension'])) { $GLOBALS['cfg']['Server']['extension'], false, PMA_showDocu('faqmysql') - ); + ); if ($GLOBALS['cfg']['Server']['extension'] === 'mysql') { $alternativ_extension = 'mysqli'; @@ -73,7 +74,7 @@ if (! PMA_DBI_checkDbExtension($GLOBALS['cfg']['Server']['extension'])) { $GLOBALS['cfg']['Server']['extension'], true, PMA_showDocu('faqmysql') - ); + ); } $GLOBALS['cfg']['Server']['extension'] = $alternativ_extension; @@ -93,6 +94,7 @@ require_once './libraries/dbi/' * @param mixed $link optional database link to use * @param int $options optional query options * @param bool $cache_affected_rows whether to cache affected rows + * * @return mixed */ function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows = true) @@ -105,10 +107,11 @@ 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 - * @param bool $cache_affected_rows + * @param string $query query to run + * @param resource $link mysql link resource + * @param integer $options query options + * @param bool $cache_affected_rows whether to cache affected row + * * @return mixed */ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) @@ -128,7 +131,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r $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); + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); } if ($GLOBALS['cfg']['DBG']['sql']) { @@ -176,7 +179,8 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r * uses language to charset mapping from mysql/share/errmsg.txt * and charset names to ISO charset from information_schema.CHARACTER_SETS * - * @param string $message + * @param string $message the message + * * @return string $message */ function PMA_DBI_convert_message($message) @@ -218,24 +222,38 @@ function PMA_DBI_convert_message($message) if (! empty($server_language) && isset($encodings[$server_language])) { if (function_exists('iconv')) { - if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) { + if ((@stristr(PHP_OS, 'AIX')) + && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) + && (@strcasecmp(ICONV_VERSION, 'unknown') == 0) + ) { include_once './libraries/iconv_wrapper.lib.php'; - $message = PMA_aix_iconv_wrapper($encodings[$server_language], - 'utf-8' . $GLOBALS['cfg']['IconvExtraParams'], $message); + $message = PMA_aix_iconv_wrapper( + $encodings[$server_language], + 'utf-8' . $GLOBALS['cfg']['IconvExtraParams'], + $message + ); } else { - $message = iconv($encodings[$server_language], - 'utf-8' . $GLOBALS['cfg']['IconvExtraParams'], $message); + $message = iconv( + $encodings[$server_language], + 'utf-8' . $GLOBALS['cfg']['IconvExtraParams'], + $message + ); } } elseif (function_exists('recode_string')) { - $message = recode_string($encodings[$server_language] . '..' . 'utf-8', - $message); + $message = recode_string( + $encodings[$server_language] . '..' . 'utf-8', + $message + ); } elseif (function_exists('libiconv')) { $message = libiconv($encodings[$server_language], 'utf-8', $message); } elseif (function_exists('mb_convert_encoding')) { // do not try unsupported charsets if (! in_array($server_language, array('ukrainian', 'greek', 'serbian'))) { - $message = mb_convert_encoding($message, 'utf-8', - $encodings[$server_language]); + $message = mb_convert_encoding( + $message, + 'utf-8', + $encodings[$server_language] + ); } } } else { @@ -250,21 +268,27 @@ function PMA_DBI_convert_message($message) /** * returns array with table names for given db * - * @param string $database name of database - * @param mixed $link mysql link resource|object + * @param string $database name of database + * @param mixed $link mysql link resource|object + * * @return array tables names */ function PMA_DBI_get_tables($database, $link = null) { - return PMA_DBI_fetch_result('SHOW TABLES FROM ' . PMA_backquote($database) . ';', - null, 0, $link, PMA_DBI_QUERY_STORE); + return PMA_DBI_fetch_result( + 'SHOW TABLES FROM ' . PMA_backquote($database) . ';', + null, + 0, + $link, + PMA_DBI_QUERY_STORE + ); } /** * usort comparison callback * - * @param string $a first argument to sort - * @param string $b second argument to sort + * @param string $a first argument to sort + * @param string $b second argument to sort * * @return integer a value representing whether $a should be before $b in the * sorted array or not @@ -303,15 +327,17 @@ function PMA_usort_comparison_callback($a, $b) * PMA_DBI_get_tables_full('my_database', 'my_tables_', 'comment')); * </code> * + * @param string $database database + * @param string|bool $table table or false + * @param boolean|string $tbl_is_group $table is a table group + * @param mixed $link mysql link + * @param integer $limit_offset zero-based offset for the count + * @param boolean|integer $limit_count number of tables to return + * @param string $sort_by table attribute to sort by + * @param string $sort_order direction to sort (ASC or DESC) + * * @todo move into PMA_Table - * @param string $database database - * @param string|bool $table table or false - * @param boolean|string $tbl_is_group $table is a table group - * @param mixed $link mysql link - * @param integer $limit_offset zero-based offset for the count - * @param boolean|integer $limit_count number of tables to return - * @param string $sort_by table attribute to sort by - * @param string $sort_order direction to sort (ASC or DESC) + * * @return array list of tables in given db(s) */ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = false, $link = null, @@ -357,7 +383,9 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals if (PMA_DRIZZLE) { $engine_info = PMA_cacheGet('drizzle_engines', true); $stats_join = "LEFT JOIN (SELECT 0 NUM_ROWS) AS stat ON false"; - if (isset($engine_info['InnoDB']) && $engine_info['InnoDB']['module_library'] == 'innobase') { + if (isset($engine_info['InnoDB']) + && $engine_info['InnoDB']['module_library'] == 'innobase' + ) { $stats_join = "LEFT JOIN data_dictionary.INNODB_SYS_TABLESTATS stat ON (t.ENGINE = 'InnoDB' AND stat.NAME = (t.TABLE_SCHEMA || '/') || t.TABLE_NAME)"; } @@ -431,8 +459,9 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals $sql .= ' LIMIT ' . $limit_count . ' OFFSET ' . $limit_offset; } - $tables = PMA_DBI_fetch_result($sql, array('TABLE_SCHEMA', 'TABLE_NAME'), - null, $link); + $tables = PMA_DBI_fetch_result( + $sql, array('TABLE_SCHEMA', 'TABLE_NAME'), null, $link + ); unset($sql_where_table, $sql); if (PMA_DRIZZLE) { @@ -515,7 +544,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals foreach ($each_tables as $table_name => $each_table) { if ('comment' === $tbl_is_group - && 0 === strpos($each_table['Comment'], $table) + && 0 === strpos($each_table['Comment'], $table) ) { // remove table from list unset($each_tables[$table_name]); @@ -523,7 +552,8 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals } if (! isset($each_tables[$table_name]['Type']) - && isset($each_tables[$table_name]['Engine'])) { + && isset($each_tables[$table_name]['Engine']) + ) { // pma BC, same parts of PMA still uses 'Type' $each_tables[$table_name]['Type'] =& $each_tables[$table_name]['Engine']; @@ -557,7 +587,8 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals $each_tables[$table_name]['TABLE_COMMENT'] =& $each_tables[$table_name]['Comment']; if (strtoupper($each_tables[$table_name]['Comment']) === 'VIEW' - && $each_tables[$table_name]['Engine'] == null) { + && $each_tables[$table_name]['Engine'] == null + ) { $each_tables[$table_name]['TABLE_TYPE'] = 'VIEW'; } else { /** @@ -618,8 +649,6 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals /** * returns array with databases containing extended infos about them * - * @todo move into PMA_List_Database? - * * @param string $database database * @param boolean $force_stats retrieve stats also for MySQL < 5 * @param resource $link mysql link @@ -628,6 +657,8 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals * @param integer $limit_offset starting offset for LIMIT * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList'] * + * @todo move into PMA_List_Database? + * * @return array $databases */ function PMA_DBI_get_databases_full($database = null, $force_stats = false, @@ -817,10 +848,10 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false, * returns detailed array with all columns for given table in database, * or all tables/databases * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of specific column - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of specific column + * @param mixed $link mysql link resource * * @return array */ @@ -902,15 +933,17 @@ function PMA_DBI_get_columns_full($database = null, $table = null, } else { if (null === $database) { foreach ($GLOBALS['pma']->databases as $database) { - $columns[$database] = PMA_DBI_get_columns_full($database, null, - null, $link); + $columns[$database] = PMA_DBI_get_columns_full( + $database, null, null, $link + ); } return $columns; } elseif (null === $table) { $tables = PMA_DBI_get_tables($database); foreach ($tables as $table) { $columns[$table] = PMA_DBI_get_columns_full( - $database, $table, null, $link); + $database, $table, null, $link + ); } return $columns; } @@ -982,11 +1015,12 @@ function PMA_DBI_get_columns_full($database = null, $table = null, * The 'Key' column is not calculated properly, use PMA_DBI_get_columns() to get * correct values. * + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of column, null to show all columns + * @param boolean $full whether to return full info or only column names + * * @see PMA_DBI_get_columns() - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of column, null to show all columns - * @param boolean $full whether to return full info or only column names * * @return string */ @@ -1044,12 +1078,14 @@ function PMA_DBI_get_columns_sql($database, $table, $column = null, $full = fals /** * Returns descriptions of columns in given table (all or given by $column) * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of column, null to show all columns - * @param boolean $full whether to return full info or only column names - * @param mixed $link mysql link resource - * @return false|array array indexed by column names or, if $column is given, flat array description + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of column, null to show all columns + * @param boolean $full whether to return full info or only column names + * @param mixed $link mysql link resource + * + * @return false|array array indexed by column names or, + * if $column is given, flat array description */ function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $link = null) { @@ -1094,9 +1130,10 @@ function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $ /** * Returns SQL for fetching information on table indexes (SHOW INDEXES) * -* @param string $database name of database -* @param string $table name of the table whose indexes are to be retreived -* @param string $where additional conditions for WHERE +* @param string $database name of database +* @param string $table name of the table whose indexes are to be retreived +* @param string $where additional conditions for WHERE +* * @return array $indexes */ function PMA_DBI_get_table_indexes_sql($database, $table, $where = null) @@ -1135,9 +1172,10 @@ function PMA_DBI_get_table_indexes_sql($database, $table, $where = null) /** * Returns indexes of a table * -* @param string $database name of database -* @param string $table name of the table whose indexes are to be retrieved -* @param mixed $link mysql link resource +* @param string $database name of database +* @param string $table name of the table whose indexes are to be retrieved +* @param mixed $link mysql link resource +* * @return array $indexes */ function PMA_DBI_get_table_indexes($database, $table, $link = null) @@ -1154,9 +1192,10 @@ function PMA_DBI_get_table_indexes($database, $table, $link = null) /** * returns value of given mysql server variable * - * @param string $var mysql server variable name - * @param int $type PMA_DBI_GETVAR_SESSION|PMA_DBI_GETVAR_GLOBAL - * @param mixed $link mysql link resource|object + * @param string $var mysql server variable name + * @param int $type PMA_DBI_GETVAR_SESSION|PMA_DBI_GETVAR_GLOBAL + * @param mixed $link mysql link resource|object + * * @return mixed value for mysql server variable */ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null) @@ -1170,17 +1209,18 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null } switch ($type) { - case PMA_DBI_GETVAR_SESSION: - $modifier = ' SESSION'; - break; - case PMA_DBI_GETVAR_GLOBAL: - $modifier = ' GLOBAL'; - break; - default: - $modifier = ''; + case PMA_DBI_GETVAR_SESSION: + $modifier = ' SESSION'; + break; + case PMA_DBI_GETVAR_GLOBAL: + $modifier = ' GLOBAL'; + break; + default: + $modifier = ''; } return PMA_DBI_fetch_value( - 'SHOW' . $modifier . ' VARIABLES LIKE \'' . $var . '\';', 0, 1, $link); + 'SHOW' . $modifier . ' VARIABLES LIKE \'' . $var . '\';', 0, 1, $link + ); } /** @@ -1198,32 +1238,33 @@ function PMA_DBI_postConnect($link, $is_controluser = false) define( 'PMA_MYSQL_INT_VERSION', PMA_cacheGet('PMA_MYSQL_INT_VERSION', true) - ); + ); define( 'PMA_MYSQL_MAJOR_VERSION', PMA_cacheGet('PMA_MYSQL_MAJOR_VERSION', true) - ); + ); define( 'PMA_MYSQL_STR_VERSION', PMA_cacheGet('PMA_MYSQL_STR_VERSION', true) - ); + ); define( 'PMA_MYSQL_VERSION_COMMENT', PMA_cacheGet('PMA_MYSQL_VERSION_COMMENT', true) - ); + ); } else { $version = PMA_DBI_fetch_single_row( 'SELECT @@version, @@version_comment', 'ASSOC', $link - ); + ); if ($version) { $match = explode('.', $version['@@version']); define('PMA_MYSQL_MAJOR_VERSION', (int)$match[0]); - define('PMA_MYSQL_INT_VERSION', - (int) sprintf('%d%02d%02d', $match[0], $match[1], - intval($match[2]))); + define( + 'PMA_MYSQL_INT_VERSION', + (int) sprintf('%d%02d%02d', $match[0], $match[1], intval($match[2])) + ); define('PMA_MYSQL_STR_VERSION', $version['@@version']); define('PMA_MYSQL_VERSION_COMMENT', $version['@@version_comment']); } else { @@ -1236,22 +1277,22 @@ function PMA_DBI_postConnect($link, $is_controluser = false) 'PMA_MYSQL_INT_VERSION', PMA_MYSQL_INT_VERSION, true - ); + ); PMA_cacheSet( 'PMA_MYSQL_MAJOR_VERSION', PMA_MYSQL_MAJOR_VERSION, true - ); + ); PMA_cacheSet( 'PMA_MYSQL_STR_VERSION', PMA_MYSQL_STR_VERSION, true - ); + ); PMA_cacheSet( 'PMA_MYSQL_VERSION_COMMENT', PMA_MYSQL_VERSION_COMMENT, true - ); + ); } // detect Drizzle by version number: // <year>.<month>.<build number>(.<patch rev) @@ -1266,13 +1307,13 @@ function PMA_DBI_postConnect($link, $is_controluser = false) "SET collation_connection = '" . PMA_sqlAddSlashes($GLOBALS['collation_connection']) . "';", $link, PMA_DBI_QUERY_STORE - ); + ); } else { PMA_DBI_query( "SET NAMES 'utf8' COLLATE 'utf8_general_ci';", $link, PMA_DBI_QUERY_STORE - ); + ); } } @@ -1301,14 +1342,15 @@ function PMA_DBI_postConnect($link, $is_controluser = false) * // $user_name = 'John Doe' * </code> * - * @param string|mysql_result $result query or mysql result + * @param string|mysql_result $result query or mysql result * @param integer $row_number row to fetch the value from, - * starting at 0, with 0 beeing default - * @param integer|string $field field to fetch the value from, - * starting at 0, with 0 beeing default - * @param resource $link mysql link - * @return mixed value of first field in first row from result - * or false if not found + * starting at 0, with 0 beeing default + * @param integer|string $field field to fetch the value from, + * starting at 0, with 0 beeing default + * @param resource $link mysql link + * + * @return mixed value of first field in first row from result + * or false if not found */ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null) { @@ -1377,16 +1419,16 @@ function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null) } switch ($type) { - case 'NUM' : - $fetch_function = 'PMA_DBI_fetch_row'; - break; - case 'ASSOC' : - $fetch_function = 'PMA_DBI_fetch_assoc'; - break; - case 'BOTH' : - default : - $fetch_function = 'PMA_DBI_fetch_array'; - break; + case 'NUM' : + $fetch_function = 'PMA_DBI_fetch_row'; + break; + case 'ASSOC' : + $fetch_function = 'PMA_DBI_fetch_assoc'; + break; + case 'BOTH' : + default : + $fetch_function = 'PMA_DBI_fetch_array'; + break; } $row = $fetch_function($result); @@ -1562,7 +1604,7 @@ function PMA_DBI_getCompatibilities() /** * returns warnings for last query * - * @param resource $link mysql link resource + * @param resource $link mysql link resource * * @return array warnings */ @@ -1606,7 +1648,7 @@ function PMA_isSuperuser() 'SELECT COUNT(*) FROM mysql.user', $GLOBALS['userlink'], PMA_DBI_QUERY_STORE - ); + ); } PMA_cacheSet('is_superuser', $r, true); } else { @@ -1799,6 +1841,7 @@ function PMA_DBI_formatError($error_number, $error_message) * @param string $schema_name Name of schema (database) to test * @param bool $test_for_mysql_schema Whether 'mysql' schema should * be treated the same as IS and DD + * * @return bool */ function PMA_is_system_schema($schema_name, $test_for_mysql_schema = false) diff --git a/server_status.php b/server_status.php index 536c215..6037038 100644 --- a/server_status.php +++ b/server_status.php @@ -169,7 +169,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { if (count($statusVars)) { $statusVarValues = PMA_DBI_fetch_result( "SHOW GLOBAL STATUS - WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1); + WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1 + ); } else { $statusVarValues = array(); } @@ -178,7 +179,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { if (count($serverVars)) { $serverVarValues = PMA_DBI_fetch_result( "SHOW GLOBAL VARIABLES - WHERE Variable_name='" . implode("' OR Variable_name='", $serverVars) . "'", 0, 1); + WHERE Variable_name='" . implode("' OR Variable_name='", $serverVars) . "'", 0, 1 + ); } else { $serverVarValues = array(); } @@ -317,7 +319,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } break; - default: break; + default: + break; } $return['rows'][] = $row; @@ -484,8 +487,9 @@ cleanDeprecated($server_status); */ // Key_buffer_fraction if (isset($server_status['Key_blocks_unused']) - && isset($server_variables['key_cache_block_size']) - && isset($server_variables['key_buffer_size'])) { + && isset($server_variables['key_cache_block_size']) + && isset($server_variables['key_buffer_size']) +) { $server_status['Key_buffer_fraction_%'] = 100 - $server_status['Key_blocks_unused'] @@ -498,25 +502,28 @@ if (isset($server_status['Key_blocks_unused']) = $server_status['Key_blocks_used'] * 1024 / $server_variables['key_buffer_size']; - } +} // Ratio for key read/write if (isset($server_status['Key_writes']) - && isset($server_status['Key_write_requests']) - && $server_status['Key_write_requests'] > 0) { + && isset($server_status['Key_write_requests']) + && $server_status['Key_write_requests'] > 0 +) { $server_status['Key_write_ratio_%'] = 100 * $server_status['Key_writes'] / $server_status['Key_write_requests']; } if (isset($server_status['Key_reads']) - && isset($server_status['Key_read_requests']) - && $server_status['Key_read_requests'] > 0) { + && isset($server_status['Key_read_requests']) + && $server_status['Key_read_requests'] > 0 +) { $server_status['Key_read_ratio_%'] = 100 * $server_status['Key_reads'] / $server_status['Key_read_requests']; } // Threads_cache_hitrate if (isset($server_status['Threads_created']) && isset($server_status['Connections']) - && $server_status['Connections'] > 0) { + && $server_status['Connections'] > 0 +) { $server_status['Threads_cache_hitrate_%'] = 100 - $server_status['Threads_created'] / $server_status['Connections'] * 100; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24499-ge7e5f05
by Madhura Jayaratne 11 Dec '11

11 Dec '11

The branch, master has been updated via e7e5f058b1b3ead3f94728800e5e1bc36a7b1d09 (commit) from 8fa0b5b57fda035d77382ba96079468486c5df56 (commit) - Log ----------------------------------------------------------------- commit e7e5f058b1b3ead3f94728800e5e1bc36a7b1d09 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Dec 11 14:54:14 2011 +0530 Better AJAX functionality for Tracking page in Database view ----------------------------------------------------------------------- Summary of changes: db_tracking.php | 2 + js/db_structure.js | 63 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/db_tracking.php b/db_tracking.php index 1078fa2..a448647 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -76,6 +76,7 @@ $all_tables_result = PMA_query_as_controluser($all_tables_query); // If a HEAD version exists if (PMA_DBI_num_rows($all_tables_result) > 0) { ?> + <div id="tracked_tables"> <h3><?php echo __('Tracked tables');?></h3> <table id="versions" class="data"> @@ -146,6 +147,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) { ?> </tbody> </table> + </div> <?php } diff --git a/js/db_structure.js b/js/db_structure.js index bb1e38e..70a5932 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -366,7 +366,7 @@ $(document).ready(function() { /** * @var curr_tracking_row Object containing reference to the current tracked table's row */ - var curr_tracking_row = $anchor.parents('tr'); + var $curr_tracking_row = $anchor.parents('tr'); /** * @var question String containing the question to be asked for confirmation */ @@ -378,15 +378,64 @@ $(document).ready(function() { $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { if(data.success == true) { + var $tracked_table = $curr_tracking_row.parents('table'); + var table_name = $curr_tracking_row.find('td:nth-child(2)').text(); + + // Check how many rows will be left after we remove + if ($tracked_table.find('tbody tr').length === 1) { + // We are removing the only row it has + $('#tracked_tables').hide("slow").remove(); + } else { + // There are more rows left after the deletion + $curr_tracking_row.hide("slow", function () { + $(this).remove(); + // Maybe some row classes are wrong now. Iterate and correct. + var ct = 0; + var rowclass = ''; + $tracked_table.find('tbody tr').each(function () { + rowclass = (ct % 2 === 0) ? 'odd' : 'even'; + $(this).removeClass().addClass(rowclass); + ct++; + }); + }); + } + + // Make the removed table visible in the list of 'Untracked tables'. + $untracked_table = $('table#noversions'); + $untracked_table.find('tbody tr').each(function () { + var $row = $(this); + var tmp_tbl_name = $row.find('td:nth-child(1)').text(); + if (tmp_tbl_name > table_name) { + var $cloned = $row.clone(); + // Change the table name of the cloned row. + $cloned.find('td:first-child').text(table_name); + // Change the link of the cloned row. + var new_url = $cloned + .find('td:nth-child(2) a') + .attr('href') + .replace('table=' + tmp_tbl_name, 'table=' + table_name); + $cloned.find('td:nth-child(2) a').attr('href', new_url); + $cloned.insertBefore($row); + return false; + } + }); + + // Maybe some row classes are wrong now. Iterate and correct. + var ct = 0; + var rowclass = ''; + $untracked_table.find('tbody tr').each(function () { + rowclass = (ct % 2 === 0) ? 'odd' : 'even'; + $(this).removeClass().addClass(rowclass); + ct++; + }); + PMA_ajaxShowMessage(data.message); - $(curr_tracking_row).hide("medium").remove(); - } - else { + } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); } - }) // end $.get() - }) // end $.PMA_confirm() - }) //end Drop Tracking + }); // end $.get() + }); // end $.PMA_confirm() + }); //end Drop Tracking //Calculate Real End for InnoDB /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24497-g85344d2
by Marc Delisle 10 Dec '11

10 Dec '11

The branch, master has been updated via 85344d2bfe7444b7b6c91c86b006a31524cbee0d (commit) from 75aa1aae8936e9ade5efbd7ab045292a41fd754f (commit) - Log ----------------------------------------------------------------- commit 85344d2bfe7444b7b6c91c86b006a31524cbee0d Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 10 07:52:47 2011 -0500 rfe #3438266 [designer] Toggle for relation lines ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/pmd/move.js | 10 ++++++++++ pmd_general.php | 10 +++++----- themes/original/img/pmd/toggle_lines.png | Bin 0 -> 630 bytes themes/pmahomme/img/pmd/toggle_lines.png | Bin 0 -> 630 bytes 5 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 themes/original/img/pmd/toggle_lines.png create mode 100644 themes/pmahomme/img/pmd/toggle_lines.png diff --git a/ChangeLog b/ChangeLog index 220da9c..fb00e58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ phpMyAdmin - ChangeLog + [interface] Improved index editor + View editing via a generated ALTER VIEW - bug #3408377 [interface] Deleting table from the DB does not change the table counter ++ rfe #3438266 [designer] Toggle for relation lines 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/js/pmd/move.js b/js/pmd/move.js index df692fd..10a6cf6 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -10,6 +10,7 @@ var _change = 0; // variable to track any change in designer layout. var _staying = 0; // variable to check if the user stayed after seeing the confirmation prompt. + var show_relation_lines = true; // Below is the function to bind onbeforeunload events with the content_frame as well as the top window. @@ -344,6 +345,9 @@ function Line(x1, y1, x2, y2, color_line) */ function Line0(x1, y1, x2, y2, color_line) { + if (! show_relation_lines) { + return; + } Circle(x1, y1, 3, 3, color_line); Rect(x2 - 1, y2 - 2, 4, 4, color_line); @@ -636,6 +640,12 @@ function Small_tab_invert() // invert max/min all tables Re_load(); } +function Relation_lines_invert() +{ + show_relation_lines = ! show_relation_lines; + Re_load(); +} + function Small_tab_refresh() { for (key in j_tabs) { diff --git a/pmd_general.php b/pmd_general.php index aafc5fd..f6f16e2 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -94,11 +94,11 @@ echo $script_tabs . $script_contr . $script_display_field; onclick="Small_tab_all(document.getElementById('key_SB_all')); return false" class="M_butt" target="_self" ><img id='key_SB_all' title="<?php echo __('Small/Big All'); ?>" alt="v" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png" - /></a><a href="#" onclick="Small_tab_invert(); return false" - class="M_butt" target="_self" - ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png" - /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" - /><a href="#" onclick="PDF_save(); return false" + /></a> +<a href="#" onclick="Small_tab_invert(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png" /></a> +<a href="#" onclick="Relation_lines_invert(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Toggle relation lines'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/toggle_lines.png" /></a> +<img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" /> +<a href="#" onclick="PDF_save(); return false" class="M_butt" target="_self" ><img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/pdf.png" alt="key" width="20" height="20" title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a diff --git a/themes/original/img/pmd/toggle_lines.png b/themes/original/img/pmd/toggle_lines.png new file mode 100644 index 0000000..9ab3764 Binary files /dev/null and b/themes/original/img/pmd/toggle_lines.png differ diff --git a/themes/pmahomme/img/pmd/toggle_lines.png b/themes/pmahomme/img/pmd/toggle_lines.png new file mode 100644 index 0000000..9ab3764 Binary files /dev/null and b/themes/pmahomme/img/pmd/toggle_lines.png differ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. e4068511fd4ae095f6d4ba0b1f789e86149fd5fd
by Michal Čihař 08 Dec '11

08 Dec '11

The branch, master has been updated via e4068511fd4ae095f6d4ba0b1f789e86149fd5fd (commit) via f9b5bf57d286cd2938b467ca5ad862a016a54e06 (commit) via 6c7f079181bd6bf02bec403bf18be2616abedaa0 (commit) via 2342e9832184482ad83fa3a21ce1be459abbaf96 (commit) via 6101237e0fd3077f26959b5f6fb103a1063488de (commit) via bff0fe4a4373be5b1026271263e707dac2f369cb (commit) via 6eb0cce86d697d8cf7abc2f8ff76f4d129888772 (commit) via e104a80d020bb8b0618192a60381ffc250cdc579 (commit) via 395e40d259b02d257967d0dd6efd44918dd32576 (commit) via db65f6d79e06f009b1ebabc14ddd717a70b463c9 (commit) via d07df0bcc58f2a4f90f531f5b3e66300f774753d (commit) via d7c9e16ebd6845ca36a22445deca9671f414534d (commit) via 96dfd6af86f3787834a9e6fb8ee2c6eca8f713ef (commit) via 9147cd78311fca59c2d02b5e84a42484c731fe26 (commit) via 5de8f222e48cffef42136771d9e39934048d0fc8 (commit) via 1b3a37d48f2ce8716538c32f1fea7c28386a2831 (commit) via 533f12984f894ae3951b459f2526ea2976348af4 (commit) via e10f80329ec985c6f585e7f48444d1b9a52d9957 (commit) from aeccddc55439e4b6f8365add0f43841d08c3ee5c (commit) - Log ----------------------------------------------------------------- commit e4068511fd4ae095f6d4ba0b1f789e86149fd5fd Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Dec 8 15:39:58 2011 +0100 Update generated docs commit f9b5bf57d286cd2938b467ca5ad862a016a54e06 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:14:50 2011 +0200 Translation update done using Pootle. commit 6c7f079181bd6bf02bec403bf18be2616abedaa0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:13:50 2011 +0200 Translation update done using Pootle. commit 2342e9832184482ad83fa3a21ce1be459abbaf96 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:13:40 2011 +0200 Translation update done using Pootle. commit 6101237e0fd3077f26959b5f6fb103a1063488de Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:13:18 2011 +0200 Translation update done using Pootle. commit bff0fe4a4373be5b1026271263e707dac2f369cb Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:11:44 2011 +0200 Translation update done using Pootle. commit 6eb0cce86d697d8cf7abc2f8ff76f4d129888772 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:05:20 2011 +0200 Translation update done using Pootle. commit e104a80d020bb8b0618192a60381ffc250cdc579 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:00:48 2011 +0200 Translation update done using Pootle. commit 395e40d259b02d257967d0dd6efd44918dd32576 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 23:13:17 2011 +0200 Translation update done using Pootle. commit db65f6d79e06f009b1ebabc14ddd717a70b463c9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 23:12:59 2011 +0200 Translation update done using Pootle. commit d07df0bcc58f2a4f90f531f5b3e66300f774753d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 23:11:08 2011 +0200 Translation update done using Pootle. commit d7c9e16ebd6845ca36a22445deca9671f414534d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 22:46:20 2011 +0200 Translation update done using Pootle. commit 96dfd6af86f3787834a9e6fb8ee2c6eca8f713ef Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 22:46:00 2011 +0200 Translation update done using Pootle. commit 9147cd78311fca59c2d02b5e84a42484c731fe26 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 22:45:39 2011 +0200 Translation update done using Pootle. commit 5de8f222e48cffef42136771d9e39934048d0fc8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 22:45:08 2011 +0200 Translation update done using Pootle. commit 1b3a37d48f2ce8716538c32f1fea7c28386a2831 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 22:44:08 2011 +0200 Translation update done using Pootle. commit 533f12984f894ae3951b459f2526ea2976348af4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 15:29:26 2011 +0200 Translation update done using Pootle. commit e10f80329ec985c6f585e7f48444d1b9a52d9957 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 15:28:57 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/tr/Documentation.html | 50 +++++++++++++++++++++--------------------- po/tr.po | 37 +++++++++++++++++++----------- 2 files changed, 48 insertions(+), 39 deletions(-) diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html index a276710..a66f519 100644 --- a/output/tr/Documentation.html +++ b/output/tr/Documentation.html @@ -2448,7 +2448,7 @@ title="Sıkça Sorulan Sorular">SSS</abbr> 2.7</a>'ye bakın.</dd> <dt id="cfg_ThemePerServer">$cfg['ThemePerServer'] boolean</dt> <dd>Her sunucu için farklı temaya izin vermek gerekirse.</dd> - <dt id="cfg_DefaultQueryTable">$cfg['DefaultQueryTable'] string<br /> + <dt id="cfg_DefaultQueryTable">$cfg['DefaultQueryTable'] dizgi<br /> <span id="cfg_DefaultQueryDatabase">$cfg['DefaultQueryDatabase']</span> dizgi </dt> @@ -2689,7 +2689,7 @@ sağlar.</p> <p> 5 dosya adı olasılığı vardır:</p> -<ol><li>Mime türü+alt tür dönüşüm:<br /><br /> +<ol><li>Mime türü+alt tür dönüşümü:<br /><br /> <tt>[mimetype]_[subtype]__[transform].inc.php</tt><br /><br /> @@ -2701,7 +2701,7 @@ olmayacak karakterlerin yanısıra PHP işlevi adlandırma kuralını içerebili '<tt>PMA_transform_[mimetype]_[subtype]__[transform]()</tt>' olarak adlandırılacaktır.<br /><br /> - <b>Example:</b><br /><br /> + <b>Örnek:</b><br /><br /> <tt>text_html__formatted.inc.php</tt><br /> <tt>PMA_transform_text_html__formatted()</tt></li> @@ -2717,12 +2717,12 @@ işlevi adlandırma kuralını içerebilir.<br /><br /> Dönüştürme işlevi '<tt>PMA_transform_[mimetype]__[transform]()</tt>' olarak adlandırılacaktır.<br /><br /> - <b>Example:</b><br /><br /> + <b>Örnek:</b><br /><br /> <tt>text__formatted.inc.php</tt><br /> <tt>PMA_transform_text__formatted()</tt></li> - <li>Belirli dönüştürme işlevsiz mime türü+alt tür<br /><br /> + <li>Belirli dönüştürme işlevsiz, mime türü+alt tür<br /><br /> <tt>[mimetype]_[subtype].inc.php</tt><br /><br /> @@ -2731,12 +2731,12 @@ sistemiyle sorunlara sebep olan özel karakterler kullanmayın.<br /><br /> Dosyada kendiliğinden tanımlanan dönüşüm işlevi yok.<br /><br /> - <b>Example:</b><br /><br /> + <b>Örnek:</b><br /><br /> <tt>text_plain.inc.php</tt><br /> - (İşlev yok)</li> + (İşlevi yok)</li> - <li>Belirli dönüştürme işlevsiz mime türü (alt tür ile/ile değil)<br /><br /> + <li>Belirli dönüştürme işlevsiz, mime türü (alt tür ile/ile değil)<br /><br /> <tt>[mimetype].inc.php</tt><br /><br /> @@ -2746,10 +2746,10 @@ sistemiyle sorunlara sebep olan özel karakterler kullanmayın. Dosyada kendiliğinden tanımlanan dönüşüm işlevi yok.<br /><br /> - <b>Example:</b><br /><br /> + <b>Örnek:</b><br /><br /> <tt>text.inc.php</tt><br /> - (İşlev yok)</li> + (İşlevi yok)</li> <li>Belirli mime türü olmayan genel dönüştürme işlevi<br /><br /> @@ -2758,7 +2758,7 @@ sistemiyle sorunlara sebep olan özel karakterler kullanmayın. Dönüştürme işlevi '<tt>PMA_transform_global__[transform]()</tt>' olarak adlandırılacaktır.<br /><br /> - <b>Example:</b><br /><br /> + <b>Örnek:</b><br /><br /> <tt>global__formatted</tt><br /> <tt>PMA_transform_global__formatted()</tt></li> @@ -2805,7 +2805,7 @@ etmez ve dönüştürme hakkında bilgiyle dizilimi geri döndürür. Şimdilik aşağıdaki anahtarlar kullanılabilir: </p> <dl> - <dt><code>bilgi</code></dt> + <dt><code>info</code></dt> <dd>Uzun dönüşüm açıklaması.</dd> </dl> @@ -2914,31 +2914,31 @@ kaydedilir.<br /> dosyaların gönderilmesini oldukça güvenli yaparak etkinleştirmek için:</p> <ul><li>göndermeler için ayrı dizin oluşturun: <tt>mkdir /tmp/php</tt></li> - <li>give ownership to the Apache server's user.group: <tt>chown apache.apache + <li>Apache sunucusunun kullanıcı grubuna sahiplik verin: <tt>chown apache.apache /tmp/php</tt></li> - <li>give proper permission: <tt>chmod 600 /tmp/php</tt></li> - <li>put <tt>upload_tmp_dir = /tmp/php</tt> in <i>php.ini</i></li> - <li>restart Apache</li> + <li>tam izin verin: <tt>chmod 600 /tmp/php</tt></li> + <li><i>php.ini</i> içine <tt>upload_tmp_dir = /tmp/php</tt> koyun</li> + <li>Apache'yi yeniden başlatın</li> </ul> <h4 id="faq1_9"> - <a href="#faq1_9">1.9 (withdrawn).</a></h4> + <a href="#faq1_9">1.9 (kaldırıldı).</a></h4> <h4 id="faq1_10"> - <a href="#faq1_10">1.10 I'm having troubles when uploading files with -phpMyAdmin running on a secure server. My browser is Internet Explorer and -I'm using the Apache server.</a></h4> + <a href="#faq1_10">1.10 Güvenli bir sunucu üzerinde çalışan phpMyAdmin ile +dosyaları gönderirken sorun yaşıyorum. Tarayıcım Internet Explorer ve Apache +sunucusu kullanıyorum.</a></h4> -<p> As suggested by "Rob M" in the phpWizard forum, add this line to -your <i>httpd.conf</i>:</p> +<p> phpWizard forumunda "Rob M"'in önerdiğine göre bu satırı +<i>httpd.conf</i> dosyanızın içine ekleyin:</p> <pre>SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown</pre> -<p> It seems to clear up many problems between Internet Explorer and SSL.</p> +<p> Internet Explorer ve SSL arasındaki çoğu sorunu hallettiği görünüyor.</p> <h4 id="faq1_11"> - <a href="#faq1_11">1.11 I get an 'open_basedir restriction' while uploading -a file from the query box.</a></h4> + <a href="#faq1_11">1.11 Sorgu kutusundan bir dosya gönderirken bir +'open_basedir kısıtlaması' alıyorum.</a></h4> <p> Since version 2.2.4, phpMyAdmin supports servers with open_basedir restrictions. However you need to create temporary directory and configure diff --git a/po/tr.po b/po/tr.po index 38711bb..fec18c5 100644 --- a/po/tr.po +++ b/po/tr.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-11-22 13:50+0100\n" -"PO-Revision-Date: 2011-12-05 23:57+0200\n" +"PO-Revision-Date: 2011-12-07 15:13+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -6496,7 +6496,7 @@ msgstr "Her sunucu için farklı temaya izin vermek gerekirse." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2306 msgid "$cfg['DefaultQueryTable'] string" -msgstr "" +msgstr "$cfg['DefaultQueryTable'] dizgi" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2307 @@ -7194,7 +7194,7 @@ msgstr "5 dosya adı olasılığı vardır:" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2525 msgid "A mimetype+subtype transform:" -msgstr "Mime türü+alt tür dönüşüm:" +msgstr "Mime türü+alt tür dönüşümü:" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2527 @@ -7228,7 +7228,7 @@ msgstr "" #: orig-docs/Documentation.html:2569 orig-docs/Documentation.html:2584 #: orig-docs/Documentation.html:2596 msgid "<b>Example:</b>" -msgstr "" +msgstr "<b>Örnek:</b>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2539 @@ -7283,7 +7283,7 @@ msgstr "<tt>PMA_transform_text__formatted()</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2559 msgid "A mimetype+subtype without specific transform function" -msgstr "Belirli dönüştürme işlevsiz mime türü+alt tür" +msgstr "Belirli dönüştürme işlevsiz, mime türü+alt tür" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2561 @@ -7312,12 +7312,12 @@ msgstr "<tt>text_plain.inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2572 orig-docs/Documentation.html:2587 msgid "(No function)" -msgstr "(İşlev yok)" +msgstr "(İşlevi yok)" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2574 msgid "A mimetype (w/o subtype) without specific transform function" -msgstr "Belirli dönüştürme işlevsiz mime türü (alt tür ile/ile değil)" +msgstr "Belirli dönüştürme işlevsiz, mime türü (alt tür ile/ile değil)" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2576 @@ -7478,7 +7478,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2642 msgid "<code>info</code>" -msgstr "<code>bilgi</code>" +msgstr "<code>info</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2643 @@ -7759,26 +7759,28 @@ msgid "" "give ownership to the Apache server's user.group: <tt>chown apache.apache /" "tmp/php</tt>" msgstr "" +"Apache sunucusunun kullanıcı grubuna sahiplik verin: <tt>chown apache.apache " +"/tmp/php</tt>" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:2746 msgid "give proper permission: <tt>chmod 600 /tmp/php</tt>" -msgstr "" +msgstr "tam izin verin: <tt>chmod 600 /tmp/php</tt>" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:2747 msgid "put <tt>upload_tmp_dir = /tmp/php</tt> in <i>php.ini</i>" -msgstr "" +msgstr "<i>php.ini</i> içine <tt>upload_tmp_dir = /tmp/php</tt> koyun" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:2748 msgid "restart Apache" -msgstr "" +msgstr "Apache'yi yeniden başlatın" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2752 msgid "<a href=\"#faq1_9\">1.9 (withdrawn).</a>" -msgstr "" +msgstr "<a href=\"#faq1_9\">1.9 (kaldırıldı).</a>" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2755 @@ -7787,6 +7789,9 @@ msgid "" "phpMyAdmin running on a secure server. My browser is Internet Explorer and " "I'm using the Apache server.</a>" msgstr "" +"<a href=\"#faq1_10\">1.10 Güvenli bir sunucu üzerinde çalışan phpMyAdmin ile " +"dosyaları gönderirken sorun yaşıyorum. Tarayıcım Internet Explorer ve Apache " +"sunucusu kullanıyorum.</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2759 @@ -7794,17 +7799,19 @@ msgid "" "As suggested by "Rob M" in the phpWizard forum, add this line to " "your <i>httpd.conf</i>:" msgstr "" +"phpWizard forumunda "Rob M"'in önerdiğine göre bu satırı " +"<i>httpd.conf</i> dosyanızın içine ekleyin:" #. type: Content of: <html><body><div><pre> #: orig-docs/Documentation.html:2762 #, no-wrap msgid "SetEnvIf User-Agent \".*MSIE.*\" nokeepalive ssl-unclean-shutdown" -msgstr "" +msgstr "SetEnvIf User-Agent \".*MSIE.*\" nokeepalive ssl-unclean-shutdown" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2764 msgid "It seems to clear up many problems between Internet Explorer and SSL." -msgstr "" +msgstr "Internet Explorer ve SSL arasındaki çoğu sorunu hallettiği görünüyor." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2767 @@ -7812,6 +7819,8 @@ msgid "" "<a href=\"#faq1_11\">1.11 I get an 'open_basedir restriction' while " "uploading a file from the query box.</a>" msgstr "" +"<a href=\"#faq1_11\">1.11 Sorgu kutusundan bir dosya gönderirken bir " +"'open_basedir kısıtlaması' alıyorum.</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2770 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24496-g75aa1aa
by Michal Čihař 08 Dec '11

08 Dec '11

The branch, master has been updated via 75aa1aae8936e9ade5efbd7ab045292a41fd754f (commit) via 629c5cbc3458ff6190bcada0080f1d065bb124ca (commit) from 7c3c2e9250764f6746b49cbdc79983e7b8a82c28 (commit) - Log ----------------------------------------------------------------- commit 75aa1aae8936e9ade5efbd7ab045292a41fd754f Merge: 7c3c2e9 629c5cb Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Dec 8 15:18:09 2011 +0100 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-14-g629c5cb
by Michal Čihař 08 Dec '11

08 Dec '11

The branch, QA_3_4 has been updated via 629c5cbc3458ff6190bcada0080f1d065bb124ca (commit) from 2f342d7231e9c907c026aea5edbf33966594d30e (commit) - Log ----------------------------------------------------------------- commit 629c5cbc3458ff6190bcada0080f1d065bb124ca Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Dec 8 15:13:49 2011 +0100 Update translations from master ----------------------------------------------------------------------- Summary of changes: po/pl.po | 17 +++- po/uk.po | 269 ++++++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 169 insertions(+), 117 deletions(-) diff --git a/po/pl.po b/po/pl.po index 09396ec..afbf51a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2220,7 +2220,7 @@ msgstr "Pełna - wyświetl wszystkie opcje konfiguracyjne" #: libraries/config.values.php:101 msgid "Custom - like above, but without the quick/custom choice" -msgstr "" +msgstr "Pełna - jak wyżej, ale bez wyboru Szybki/Pełny" #: libraries/config.values.php:119 #, fuzzy @@ -2545,7 +2545,7 @@ msgstr "Wyświetl serwery w postaci listy" #: libraries/config/messages.inc.php:60 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "Edycja zapytań SQL w oknie popup" #: libraries/config/messages.inc.php:61 #, fuzzy @@ -2567,7 +2567,7 @@ msgstr "Ignoruj błędy" #: libraries/config/messages.inc.php:64 msgid "Show icons for warning, error and information messages" -msgstr "" +msgstr "Pokaż ikony ostrzeżenia, komunikaty o błędach i komunikaty" #: libraries/config/messages.inc.php:65 msgid "Iconic errors" @@ -2874,7 +2874,7 @@ msgstr "Ogólne" #: libraries/config/messages.inc.php:167 msgid "Set some commonly used options" -msgstr "" +msgstr "Zestaw najczęściej używane opcje" #: libraries/config/messages.inc.php:168 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -3041,6 +3041,8 @@ msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" +"Śledzenie zmian w bazie danych. Wymaga przechowywania konfiguracji " +"phpMyAdmin." #: libraries/config/messages.inc.php:206 msgid "Customize export options" @@ -3558,6 +3560,9 @@ msgid "" "Structure page if any of the required tables for the phpMyAdmin " "configuration storage could not be found" msgstr "" +"Wyłącz ostrzeżenie domyślnie wyświetlane w szczegółach bazy danych struktury " +"strony, jeśli którejkolwiek z tabel do przechowywania konfiguracji " +"phpMyAdmin nie można znaleźć" #: libraries/config/messages.inc.php:329 msgid "Missing phpMyAdmin configuration storage tables" @@ -3638,7 +3643,7 @@ msgstr "Liczba wątków naprawiających" #: libraries/config/messages.inc.php:349 msgid "Show help button instead of Documentation text" -msgstr "" +msgstr "Pokaż przycisk pomocy zamiast tekstu Dokumentacji" #: libraries/config/messages.inc.php:350 msgid "Show help button" @@ -4025,6 +4030,7 @@ msgstr "Dodaj DROP VIEW" #: libraries/config/messages.inc.php:425 msgid "Defines the list of statements the auto-creation uses for new versions." msgstr "" +"Definiuje listę instrukcji automatycznego tworzenia używa nowych wersji." #: libraries/config/messages.inc.php:426 #, fuzzy @@ -4047,6 +4053,7 @@ msgid "" "Whether the tracking mechanism creates versions for tables and views " "automatically." msgstr "" +"Nawet mechanizm śledzenia tworzy wersje dla tabel i widoków automatycznie." #: libraries/config/messages.inc.php:430 #, fuzzy diff --git a/po/uk.po b/po/uk.po index 550bc1c..901ed87 100644 --- a/po/uk.po +++ b/po/uk.po @@ -615,17 +615,19 @@ msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." msgstr "" +"Вигляд має щонайменше цю кількість рядків. Будь-ласка звернітся до " +"%sдокументації%s." #: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:137 #: libraries/tbl_info.inc.php:60 tbl_structure.php:206 test/theme.php:73 msgid "View" -msgstr "" +msgstr "Вигляд" #: db_structure.php:444 libraries/db_structure.lib.php:40 #: libraries/server_links.inc.php:90 server_replication.php:31 #: server_replication.php:163 server_status.php:383 msgid "Replication" -msgstr "" +msgstr "Реплікація" #: db_structure.php:448 msgid "Sum" @@ -634,7 +636,7 @@ msgstr "Всього" #: db_structure.php:455 libraries/StorageEngine.class.php:351 #, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "" +msgstr "%s механізм зберігання за замовчуванням на цьому MySQL сервері." #: db_structure.php:483 db_structure.php:500 db_structure.php:501 #: libraries/display_tbl.lib.php:2217 libraries/display_tbl.lib.php:2222 @@ -658,7 +660,7 @@ msgstr "Зняти усі відмітки" #: db_structure.php:495 msgid "Check tables having overhead" -msgstr "" +msgstr "Перевірити чи мають таблиці накладні витрати" #: db_structure.php:503 libraries/config/messages.inc.php:162 #: libraries/db_links.inc.php:56 libraries/display_tbl.lib.php:2230 @@ -709,7 +711,7 @@ msgstr "Словник даних" #: db_tracking.php:79 msgid "Tracked tables" -msgstr "" +msgstr "Відслідковувані таблиці" #: db_tracking.php:84 libraries/config/messages.inc.php:482 #: libraries/export/htmlword.php:89 libraries/export/latex.php:162 @@ -751,36 +753,38 @@ msgstr "Дія" #: db_tracking.php:101 js/messages.php:34 msgid "Delete tracking data for this table" -msgstr "" +msgstr "Видалити дані спостереження для цієї таблиці" +# активна #: db_tracking.php:119 tbl_tracking.php:543 tbl_tracking.php:601 msgid "active" -msgstr "" +msgstr "активний" +# не активна #: db_tracking.php:121 tbl_tracking.php:545 tbl_tracking.php:603 msgid "not active" -msgstr "" +msgstr "не активний" #: db_tracking.php:134 msgid "Versions" -msgstr "" +msgstr "Версії" #: db_tracking.php:135 tbl_tracking.php:374 tbl_tracking.php:621 msgid "Tracking report" -msgstr "" +msgstr "Звіт трекінгу (відстеження)" #: db_tracking.php:136 tbl_tracking.php:246 tbl_tracking.php:623 msgid "Structure snapshot" -msgstr "" +msgstr "Знімок структури" #: db_tracking.php:181 msgid "Untracked tables" -msgstr "" +msgstr "Невідслідковувані таблиці" #: db_tracking.php:201 db_tracking.php:203 tbl_structure.php:626 #: tbl_structure.php:628 msgid "Track table" -msgstr "" +msgstr "Відслідковувати таблицю" #: db_tracking.php:229 msgid "Database Log" @@ -801,15 +805,15 @@ msgstr "" #: enum_editor.php:67 msgid "Output" -msgstr "" +msgstr "Вивід" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "Скопіювати та вставити об'єднанні значення в \"Довжина/Значення\" поле" #: export.php:73 msgid "Selected export type has to be saved in file!" -msgstr "" +msgstr "Обранний тип експорту збережений в файл!" #: export.php:164 export.php:189 export.php:670 #, php-format @@ -840,6 +844,9 @@ msgid "" "You probably tried to upload too large file. Please refer to %sdocumentation" "%s for ways to workaround this limit." msgstr "" +"Ви напевно намагаєтесь завантажити занадто великий файл. Будь ласка " +"зверніться до %sдокументації%s для знаходження шляхів вирішення цієї " +"проблеми." #: import.php:278 import.php:331 libraries/File.class.php:501 #: libraries/File.class.php:611 @@ -854,6 +861,8 @@ msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." msgstr "" +"Ви намагаєтесь завантажитит файл з непідтрумуваною компресією (%s). " +"Підтримка якої не здійснюється або вимкнена у вашій конфігурації." #: import.php:336 msgid "" @@ -861,10 +870,15 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." msgstr "" +"Даних для імпорту небуло отримано. Назви файлу не було вказано або розмір " +"файлу перевищив допустимий максимум для вашої PHP конфігурації. Дивіться " +"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." #: import.php:371 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" msgstr "" +"Неможливо завантажити імпортовані плагіни, будь ласка перевірте ваше " +"інсталювання!" #: import.php:396 msgid "The bookmark has been deleted." @@ -872,29 +886,34 @@ msgstr "Закладку було видалено." #: import.php:400 msgid "Showing bookmark" -msgstr "" +msgstr "Показані закладки" #: import.php:402 sql.php:885 #, php-format msgid "Bookmark %s created" -msgstr "" +msgstr "Закладка %s створена" #: import.php:408 import.php:414 #, php-format msgid "Import has been successfully finished, %d queries executed." -msgstr "" +msgstr "Імпорт завершився успішно, %d запитів виконано." #: import.php:423 msgid "" "Script timeout passed, if you want to finish import, please resubmit same " "file and import will resume." msgstr "" +"Досягнуто часове обмеження віконання скрипту, якщо Ви бажаєте закінчити " +"імпорт, необхідно повторно відправити той самий файл." #: import.php:425 msgid "" "However on last run no data has been parsed, this usually means phpMyAdmin " "won't be able to finish this import unless you increase php time limits." msgstr "" +"На останньому запиті не було розібрано даних, зазвичай це означає що " +"phpMyAdmin не зможе закінчити цей імпорт якщо Ви на збільшите час виконання " +"PHP скриптів." #: import.php:453 libraries/Message.class.php:185 #: libraries/display_tbl.lib.php:2113 libraries/sql_query_form.lib.php:139 @@ -933,7 +952,7 @@ msgstr "Ви насправді хочете " #: js/messages.php:31 libraries/mult_submits.inc.php:242 sql.php:278 msgid "You are about to DESTROY a complete database!" -msgstr "" +msgstr "Ви збираєтесь здійснити ЗНИЩЕННЯ БД!" #: js/messages.php:32 msgid "Dropping Event" @@ -949,7 +968,7 @@ msgstr "Видалення даних трекінгу" #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "Знищення Головного Ключа/Індексу" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" @@ -957,12 +976,12 @@ msgstr "Ця операція може зайняти багато часу. П #: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "" +msgstr "Ви збираєтесь здійснити ВИМКНЕННЯ BLOB-репозиторію!" #: js/messages.php:41 #, php-format msgid "Are you sure you want to disable all BLOB references for database %s?" -msgstr "" +msgstr "Ви впевненні що хочете вимкнути всі BLOB посилання для БД %s?" #: js/messages.php:44 msgid "Missing value in the form!" @@ -1029,11 +1048,11 @@ msgstr "Помилка при обробці запиту" #: js/messages.php:66 msgid "Dropping Column" -msgstr "" +msgstr "Видалення стовпчика" #: js/messages.php:67 msgid "Adding Primary Key" -msgstr "" +msgstr "Додавання Головного Ключа" #: js/messages.php:68 libraries/relation.lib.php:87 pmd_general.php:386 #: pmd_general.php:543 pmd_general.php:591 pmd_general.php:667 @@ -1118,15 +1137,15 @@ msgstr "Ігнорувати" #: js/messages.php:101 msgid "Select referenced key" -msgstr "" +msgstr "Обрати ключі посилання" #: js/messages.php:102 msgid "Select Foreign Key" -msgstr "" +msgstr "Обрати зовнішній ключ" #: js/messages.php:103 msgid "Please select the primary key or a unique key" -msgstr "" +msgstr "Будь ласка, оберіть первинний ключ або унікальний ключ" #: js/messages.php:104 pmd_general.php:87 tbl_relation.php:538 msgid "Choose column to display" @@ -1134,7 +1153,7 @@ msgstr "Виберіть колонку для відображення" #: js/messages.php:107 msgid "Add an option for column " -msgstr "" +msgstr "Додати опцію для колонки" #: js/messages.php:110 msgid "Generate password" @@ -1158,11 +1177,13 @@ msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." msgstr "" +"Доступна новіша версія PhpMyAdmin, вам необхідно подумати про оновлення. " +"Найновіша версія% s., випущена % s." #. l10n: Latest available phpMyAdmin version #: js/messages.php:120 msgid ", latest stable version:" -msgstr "" +msgstr ", остання стабільна версія:" #. l10n: Display text for calendar close link #: js/messages.php:138 @@ -1397,11 +1418,11 @@ msgstr "Сб" #. l10n: Column header for week of the year in calendar #: js/messages.php:227 msgid "Wk" -msgstr "" +msgstr "Тж" #: js/messages.php:229 msgid "Hour" -msgstr "" +msgstr "Година" #: js/messages.php:230 msgid "Minute" @@ -1417,21 +1438,23 @@ msgstr "Розмір шрифту" #: libraries/File.class.php:310 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." -msgstr "" +msgstr "Завантажуваний файл перевищує директиву upload_max_filesize в php.ini." #: libraries/File.class.php:313 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" +"Завантажуваний файл перевищує MAX_FILE_SIZE директиву, яка була вказана в " +"HTML формі." #: libraries/File.class.php:316 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "Завантажуваний файл був завантажений лише частково." #: libraries/File.class.php:319 msgid "Missing a temporary folder." -msgstr "" +msgstr "Відсутня тимчасова дирикторія." #: libraries/File.class.php:322 msgid "Failed to write file to disk." @@ -1439,7 +1462,7 @@ msgstr "Неможливо записати файл на диск." #: libraries/File.class.php:325 msgid "File upload stopped by extension." -msgstr "" +msgstr "Завантаження зупинено розширенням." #: libraries/File.class.php:328 msgid "Unknown error in file upload." @@ -1450,6 +1473,8 @@ msgid "" "Error moving the uploaded file, see [a@./Documentation." "html#faq1_11@Documentation]FAQ 1.11[/a]" msgstr "" +"Помилка прі переммщенні файлу, a@./Documentation.html#faq1_11@Documentation]" +"FAQ 1.11[/a]" #: libraries/Index.class.php:427 tbl_relation.php:519 msgid "No index defined!" @@ -1468,7 +1493,7 @@ msgstr "Унікальне" #: libraries/Index.class.php:444 tbl_tracking.php:318 msgid "Packed" -msgstr "" +msgstr "Запакований" #: libraries/Index.class.php:446 tbl_tracking.php:320 msgid "Cardinality" @@ -1493,6 +1518,8 @@ msgid "" "The indexes %1$s and %2$s seem to be equal and one of them could possibly be " "removed." msgstr "" +"Схоже що індекси %1$s та %2$s ідентичні, тому напевне один із них може бути " +"вилученим." #: libraries/List_Database.class.php:430 libraries/config/messages.inc.php:175 #: libraries/server_links.inc.php:42 server_databases.php:100 @@ -1531,26 +1558,26 @@ msgstr[1] "" #: libraries/StorageEngine.class.php:194 msgid "" "There is no detailed status information available for this storage engine." -msgstr "" +msgstr "Для цього механізму зберігання нама дельної інформації про статус." #: libraries/StorageEngine.class.php:354 #, php-format msgid "%s is available on this MySQL server." -msgstr "" +msgstr "%s доступне на цьому MySQL сервері." #: libraries/StorageEngine.class.php:357 #, php-format msgid "%s has been disabled for this MySQL server." -msgstr "" +msgstr "%s було вимкнене для цього MySQL серверу." #: libraries/StorageEngine.class.php:361 #, php-format msgid "This MySQL server does not support the %s storage engine." -msgstr "" +msgstr "Цей MySQL сервер не підтримує %s кодування." #: libraries/Table.class.php:1017 msgid "Invalid database" -msgstr "" +msgstr "Поламана БД" #: libraries/Table.class.php:1031 tbl_get_field.php:25 msgid "Invalid table name" @@ -1559,7 +1586,7 @@ msgstr "Неправильна назва таблиці" #: libraries/Table.class.php:1046 #, php-format msgid "Error renaming table %1$s to %2$s" -msgstr "" +msgstr "Помилка зміни назви %1$s на %2$s" #: libraries/Table.class.php:1129 #, php-format @@ -1569,30 +1596,30 @@ msgstr "Таблицю %s було перейменовано в %s" #: libraries/Theme.class.php:160 #, php-format msgid "No valid image path for theme %s found!" -msgstr "" +msgstr "Не знайдено правильного шляху до зображення для теми %s!" #: libraries/Theme.class.php:380 msgid "No preview available." -msgstr "" +msgstr "Намає доступного перегляду." #: libraries/Theme.class.php:383 msgid "take it" -msgstr "" +msgstr "прийняти його" #: libraries/Theme_Manager.class.php:109 #, php-format msgid "Default theme %s not found!" -msgstr "" +msgstr "Тема за замовчуванням %s не знайдена!" #: libraries/Theme_Manager.class.php:147 #, php-format msgid "Theme %s not found!" -msgstr "" +msgstr "Тема %s не знайдена!" #: libraries/Theme_Manager.class.php:215 #, php-format msgid "Theme path not found for theme %s!" -msgstr "" +msgstr "Шлях теми не знайдений для теми %s!" #: libraries/Theme_Manager.class.php:295 test/theme.php:160 themes.php:20 #: themes.php:40 @@ -1601,7 +1628,7 @@ msgstr "" #: libraries/auth/config.auth.lib.php:76 msgid "Cannot connect: invalid settings." -msgstr "" +msgstr "З'єднання неможливе: невірні налаштування." #: libraries/auth/config.auth.lib.php:91 #: libraries/auth/cookie.auth.lib.php:205 libraries/auth/http.auth.lib.php:64 @@ -1616,6 +1643,8 @@ msgid "" "You probably did not create a configuration file. You might want to use the " "%1$ssetup script%2$s to create one." msgstr "" +"Ви, напевно, не створили файл конфігурації. Для його створення Ви можете " +"використати %1$ssetup script%2$s." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -1644,7 +1673,7 @@ msgstr "Документація по phpMyAdmin" #: libraries/auth/cookie.auth.lib.php:244 #: libraries/auth/cookie.auth.lib.php:245 msgid "You can enter hostname/IP address and port separated by space." -msgstr "" +msgstr "Ви можете ввести ім'я хоста / IP-адресу та порт через пробіл." #: libraries/auth/cookie.auth.lib.php:244 msgid "Server:" @@ -1676,7 +1705,7 @@ msgstr "Авторизація без паролю заборонена в на #: libraries/auth/signon.auth.lib.php:226 #, php-format msgid "No activity within %s seconds; please log in again" -msgstr "" +msgstr "Відсутня діяльність протягом %s секунд; будь ласка, увійдіть знову" #: libraries/auth/cookie.auth.lib.php:658 #: libraries/auth/cookie.auth.lib.php:660 @@ -1688,19 +1717,20 @@ msgstr "Не можу зареєструватися на MySQL сервері" msgid "Wrong username/password. Access denied." msgstr "Невірний логін/пароль. Доступ не дозволено." +# Файл %s не містить id ключа #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format msgid "File %s does not contain any key id" -msgstr "" +msgstr "Файл %s не містить ідентифікатора (id) ключа" #: libraries/auth/swekey/swekey.auth.lib.php:159 #: libraries/auth/swekey/swekey.auth.lib.php:182 msgid "Hardware authentication failed" -msgstr "" +msgstr "Апаратна аутентифікація не вдалася" #: libraries/auth/swekey/swekey.auth.lib.php:168 msgid "No valid authentication key plugged" -msgstr "" +msgstr "Не підключений валідний ключ аутентифікації" #: libraries/auth/swekey/swekey.auth.lib.php:204 msgid "Authenticating..." @@ -1708,15 +1738,15 @@ msgstr "Авторизуємося..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "PBMS помилка" #: libraries/blobstreaming.lib.php:267 msgid "PBMS connection failed:" -msgstr "" +msgstr "PBMS підключення не вдалося:" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "PBMS get BLOB info не вдалося:" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" @@ -1724,28 +1754,28 @@ msgstr "" #: libraries/blobstreaming.lib.php:347 msgid "View image" -msgstr "" +msgstr "Переглянути картинку" #: libraries/blobstreaming.lib.php:351 msgid "Play audio" -msgstr "" +msgstr "Програти аудіо" #: libraries/blobstreaming.lib.php:356 msgid "View video" -msgstr "" +msgstr "Програти відео" #: libraries/blobstreaming.lib.php:360 msgid "Download file" -msgstr "" +msgstr "Завантажити файл" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "Не вдається відкрити файл: %s" #: libraries/bookmark.lib.php:83 msgid "shared" -msgstr "" +msgstr "загальні" #: libraries/build_html_for_db.lib.php:25 #: libraries/config/messages.inc.php:181 libraries/export/xml.php:36 @@ -1783,11 +1813,11 @@ msgstr "Перейти до бази даних" #: libraries/build_html_for_db.lib.php:130 msgid "Not replicated" -msgstr "" +msgstr "Не репліковані" #: libraries/build_html_for_db.lib.php:136 msgid "Replicated" -msgstr "" +msgstr "Репліковані" #: libraries/build_html_for_db.lib.php:150 #, php-format @@ -1842,7 +1872,7 @@ msgstr "" #: libraries/common.inc.php:585 #, php-format msgid "Could not load default configuration from: %1$s" -msgstr "" +msgstr "Неможливо завантажити стандартну функціональність із: %1$s" #: libraries/common.inc.php:590 msgid "" @@ -1855,12 +1885,14 @@ msgstr "" #: libraries/common.inc.php:620 #, php-format msgid "Invalid server index: %s" -msgstr "" +msgstr "Не вірний індекс сервера: %s" #: libraries/common.inc.php:627 #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" +"Не вірна назва хоста для сервера %1$s. Будь ласка перевірте Вашу " +"конфігурацію." #: libraries/common.inc.php:636 libraries/config/messages.inc.php:486 #: libraries/header.inc.php:115 main.php:163 server_synchronize.php:1175 @@ -1870,17 +1902,17 @@ msgstr "Сервер" #: libraries/common.inc.php:819 msgid "Invalid authentication method set in configuration:" -msgstr "" +msgstr "Невірний метод аутентифікації встановленний в налаштуваннях:" #: libraries/common.inc.php:922 #, php-format msgid "You should upgrade to %s %s or later." -msgstr "" +msgstr "Вам необхідно оновити до %s %s або пізнішої." #: libraries/common.lib.php:142 #, php-format msgid "Max: %s%s" -msgstr "" +msgstr "Максимум: %s%s" #. l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:404 @@ -1923,7 +1955,7 @@ msgstr "Відповідь MySQL: " #: libraries/common.lib.php:1098 msgid "Failed to connect to SQL validator!" -msgstr "" +msgstr "Не вдалося пид'єднатися до SQL валідатора!" #: libraries/common.lib.php:1139 libraries/config/messages.inc.php:463 msgid "Explain SQL" @@ -1956,7 +1988,7 @@ msgstr "Перевірити SQL" #: libraries/common.lib.php:1265 msgid "Inline edit of this query" -msgstr "" +msgstr "Рядкове редагування цього запиту" #: libraries/common.lib.php:1267 msgid "Inline" @@ -1964,7 +1996,7 @@ msgstr "" #: libraries/common.lib.php:1334 libraries/common.lib.php:1350 msgid "Profiling" -msgstr "" +msgstr "Профілювання" #: libraries/common.lib.php:1355 libraries/tbl_triggers.lib.php:27 #: server_processlist.php:70 @@ -2045,7 +2077,7 @@ msgstr "Перейти до бази даних "%s"." #: libraries/common.lib.php:2466 #, php-format msgid "The %s functionality is affected by a known bug, see %s" -msgstr "" +msgstr "На функціональність %s впливає відома помилка, див. %s" #: libraries/common.lib.php:2826 libraries/common.lib.php:2833 #: libraries/common.lib.php:3018 libraries/config/setup.forms.php:285 @@ -2082,7 +2114,7 @@ msgstr "Операцій" #: libraries/common.lib.php:2966 msgid "Browse your computer:" -msgstr "" +msgstr "Переглянути Ваш комп'ютер:" #: libraries/common.lib.php:2979 #, php-format @@ -2096,15 +2128,15 @@ msgstr "Встановлений Вами каталог для завантаж #: libraries/common.lib.php:2999 msgid "There are no files to upload" -msgstr "" +msgstr "Немає файлів для завантаження" #: libraries/config.values.php:45 libraries/config.values.php:50 msgid "Both" -msgstr "" +msgstr "Обидва" #: libraries/config.values.php:74 msgid "Open" -msgstr "" +msgstr "Відкрити" #: libraries/config.values.php:74 #, fuzzy @@ -2117,13 +2149,13 @@ msgstr "Не закриті лапки" #: libraries/export/sql.php:79 libraries/export/texytext.php:23 #: libraries/import.lib.php:1172 msgid "structure" -msgstr "" +msgstr "структура" #: libraries/config.values.php:96 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "дані" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -2133,15 +2165,15 @@ msgstr "структура і дані" #: libraries/config.values.php:99 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "Швидко - відображати лише мінімальну кількість параметрів налаштування" #: libraries/config.values.php:100 msgid "Custom - display all possible options to configure" -msgstr "" +msgstr "Кастомно - відобразити всі можливі параметри налаштування" #: libraries/config.values.php:101 msgid "Custom - like above, but without the quick/custom choice" -msgstr "" +msgstr "Кастомний - як попередній але без варіантів швидко/кастомно" #: libraries/config.values.php:119 msgid "complete inserts" @@ -2153,26 +2185,26 @@ msgstr "розширені вставки" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "обидва попередні" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "жоден з попередніх " #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:422 msgid "Not a positive number" -msgstr "" +msgstr "Не додатнє число" #: libraries/config/FormDisplay.class.php:84 #: libraries/config/validate.lib.php:435 msgid "Not a non-negative number" -msgstr "" +msgstr "Не від'ємне число" #: libraries/config/FormDisplay.class.php:85 #: libraries/config/validate.lib.php:409 msgid "Not a valid port number" -msgstr "" +msgstr "Невірний номер порту" #: libraries/config/FormDisplay.class.php:86 #: libraries/config/FormDisplay.class.php:574 @@ -2184,12 +2216,12 @@ msgstr "Некоректне значення" #: libraries/config/validate.lib.php:464 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "Значення має дорівнювати або бути меншим аніж %s" #: libraries/config/FormDisplay.class.php:538 #, php-format msgid "Missing data for %s" -msgstr "" +msgstr "Пропущені дані для %s" #: libraries/config/FormDisplay.class.php:736 #: libraries/config/FormDisplay.class.php:740 @@ -2200,21 +2232,21 @@ msgstr "недоступний" #: libraries/config/FormDisplay.class.php:741 #, php-format msgid "\"%s\" requires %s extension" -msgstr "" +msgstr "\"%s\" потребує додаток %s" #: libraries/config/FormDisplay.class.php:755 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "імпорт не буде працювати, відсутня функція (%s)" #: libraries/config/FormDisplay.class.php:759 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "експорт не буде працювати, відсутня функція (%s)" #: libraries/config/FormDisplay.class.php:766 msgid "SQL Validator is disabled" -msgstr "" +msgstr "SQL Валідатор вимкнений" #: libraries/config/FormDisplay.class.php:773 msgid "SOAP extension not found" @@ -2223,11 +2255,12 @@ msgstr "SOA розширення не знайдено" #: libraries/config/FormDisplay.class.php:781 #, php-format msgid "maximum %s" -msgstr "" +msgstr "максимум %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" msgstr "" +"Цей параметр відключений, він не буде застосовуватися до вашої конфігурації" #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:89 #: libraries/relation.lib.php:96 pmd_relation_new.php:68 @@ -2237,16 +2270,16 @@ msgstr "заблоковано" #: libraries/config/FormDisplay.tpl.php:248 #, php-format msgid "Set value: %s" -msgstr "" +msgstr "Встановити значення: %s" #: libraries/config/FormDisplay.tpl.php:253 #: libraries/config/messages.inc.php:351 msgid "Restore default value" -msgstr "" +msgstr "Відновити значення за замовчуванням" #: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "Дозволити користувачам налаштовувати це значення" #: libraries/config/FormDisplay.tpl.php:333 #: libraries/schema/User_Schema.class.php:470 prefs_manage.php:320 @@ -2256,7 +2289,7 @@ msgstr "Перевстановити" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "Підвищує ефективність оновлення екрану" #: libraries/config/messages.inc.php:18 #, fuzzy @@ -2268,10 +2301,12 @@ msgstr "дозволено" msgid "" "If enabled user can enter any MySQL server in login form for cookie auth" msgstr "" +"Якщо включений користувач може ввести будь-який сервер MySQL у формі Увійти " +"для кукі аутентифікації" #: libraries/config/messages.inc.php:20 msgid "Allow login to any MySQL server" -msgstr "" +msgstr "Дозволити Увійти в будь-який сервер MySQL" #: libraries/config/messages.inc.php:21 msgid "" @@ -2279,46 +2314,53 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" +"Включення цьго дозволяє сторінці, розташованої на іншому домені викликати " +"PhpMyAdmin всередині фрейму, і це потенціальна [сильне] дірка в безпеці [/ " +"сильний] що дозволяє крос-фреймові сценарії атак" #: libraries/config/messages.inc.php:22 msgid "Allow third party framing" -msgstr "" +msgstr "Дозволити фреймінг для третіх сторін" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" -msgstr "" +msgstr "Показувати "Знищити БД" звичайним користувачам" #: libraries/config/messages.inc.php:24 msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" msgstr "" +"Секретна фраза використовується для шифрування кукі в [kbd]cookie[/kbd] " +"аутентифікації" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" -msgstr "" +msgstr "Blowfish секрет" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "Виділити обрані рядки" #: libraries/config/messages.inc.php:27 msgid "Row marker" -msgstr "" +msgstr "Маркер рядка" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "Виділяти радок курсором миші" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" -msgstr "" +msgstr "Покажчик виділення" #: libraries/config/messages.inc.php:30 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " "import and export operations" msgstr "" +"Вімкнути [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] компресію для " +"операцій імпорту та експорту" #: libraries/config/messages.inc.php:31 msgid "Bzip2" @@ -2330,10 +2372,13 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"Визначає, який тип редагування контролю повинен бути використаний для CHAR і " +"VARCHAR стовпців; [kbd]input[/kbd] - довжина тексту, [kbd]textarea[/kbd] - " +"дозволена кількість рядків в стовпцях" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "CHAR редагування стовпців" #: libraries/config/messages.inc.php:34 msgid "Number of columns for CHAR/VARCHAR textareas" @@ -4647,7 +4692,7 @@ msgstr "Перетворення МІМЕ-типу бровзером" #: libraries/display_tbl.lib.php:1218 msgid "Copy" -msgstr "" +msgstr "Копіювати" #: libraries/display_tbl.lib.php:1233 libraries/display_tbl.lib.php:1245 msgid "The row has been deleted" @@ -6640,7 +6685,7 @@ msgstr "Показати інформацію про PHP" #: main.php:215 msgid "Wiki" -msgstr "" +msgstr "Вікі" #: main.php:218 msgid "Official Homepage" @@ -6752,7 +6797,7 @@ msgstr "БД відсутні" #: navigation.php:277 msgid "Filter" -msgstr "" +msgstr "Фільтр" #: navigation.php:277 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24494-g7c3c2e9
by Michal Čihař 08 Dec '11

08 Dec '11

The branch, master has been updated via 7c3c2e9250764f6746b49cbdc79983e7b8a82c28 (commit) via ffd4959edf49c8b423b04c66493ca3e93e96003e (commit) via ca8e36611a8b1d1675ed69119e530bd47fae5511 (commit) via dd6861ac0ec8f366bac70d4ab63ae782a599a6dd (commit) via edfa505d8b917a28148947d3f7738e8274d7541a (commit) via b0df69659ec66dc7f1bb98cf92ad888bca3f73d8 (commit) via d6dc2bf1ae5bfbcf51151862ad1fdf194f9150b6 (commit) via bdc5e5fa71ea806fa979db5f90752137ced463a2 (commit) via ce33f19be472929f5a141ee4859a579a1b69d445 (commit) via fb65975d37beace4787b4f7f89fb45e38046544f (commit) via d740606f3449ac4b482bf5084a0c8e89fe1a6c30 (commit) via d2b46e6c8309f63cddad55b07bff56e8055e78c4 (commit) via 450f2012f67aa1b70bd44f0e9d6941723e7c4c74 (commit) via 17c4b342909a56efb06b8967d055c47dfd86a6f0 (commit) via 7c69c704c00ee10a9f364e39fd068c99f71e8a00 (commit) via 814cf9fadcb8049bb8ba1afcf5ffb9bdb020d3f3 (commit) via 23d3ec90aa2753d8d3c181a0e36b3e0e019e52ce (commit) via 920ea09097b027ac2256386e3cbd9ebe11723d06 (commit) via 6118f87d4853a3f69841ebbc0999e7efde6c185a (commit) via 9c177ca4a0f4fffa356f4fabc444aa27c664d676 (commit) via cba2d0f1e1886941b509b8bba6827082162bc64e (commit) via 708448401e6ab3a34ee774ffa82de301458bec32 (commit) from 173e5926a01c1dd421150e0b47408dd24e89523b (commit) - Log ----------------------------------------------------------------- commit 7c3c2e9250764f6746b49cbdc79983e7b8a82c28 Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Thu Dec 8 14:19:31 2011 +0200 Translation update done using Pootle. commit ffd4959edf49c8b423b04c66493ca3e93e96003e Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Thu Dec 8 14:18:18 2011 +0200 Translation update done using Pootle. commit ca8e36611a8b1d1675ed69119e530bd47fae5511 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:46:46 2011 +0200 Translation update done using Pootle. commit dd6861ac0ec8f366bac70d4ab63ae782a599a6dd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:45:36 2011 +0200 Translation update done using Pootle. commit edfa505d8b917a28148947d3f7738e8274d7541a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:41:01 2011 +0200 Translation update done using Pootle. commit b0df69659ec66dc7f1bb98cf92ad888bca3f73d8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:40:30 2011 +0200 Translation update done using Pootle. commit d6dc2bf1ae5bfbcf51151862ad1fdf194f9150b6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:39:53 2011 +0200 Translation update done using Pootle. commit bdc5e5fa71ea806fa979db5f90752137ced463a2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:39:24 2011 +0200 Translation update done using Pootle. commit ce33f19be472929f5a141ee4859a579a1b69d445 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:38:56 2011 +0200 Translation update done using Pootle. commit fb65975d37beace4787b4f7f89fb45e38046544f Merge: d740606 173e592 Author: Pootle server <pootle(a)cihar.com> Date: Wed Dec 7 20:40:13 2011 +0100 Merge remote-tracking branch 'origin/master' commit d740606f3449ac4b482bf5084a0c8e89fe1a6c30 Merge: d2b46e6 03436f6 Author: Pootle server <pootle(a)cihar.com> Date: Wed Dec 7 14:43:11 2011 +0100 Merge remote-tracking branch 'origin/master' commit d2b46e6c8309f63cddad55b07bff56e8055e78c4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:06:34 2011 +0200 Translation update done using Pootle. commit 450f2012f67aa1b70bd44f0e9d6941723e7c4c74 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:06:07 2011 +0200 Translation update done using Pootle. commit 17c4b342909a56efb06b8967d055c47dfd86a6f0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:05:52 2011 +0200 Translation update done using Pootle. commit 7c69c704c00ee10a9f364e39fd068c99f71e8a00 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:05:47 2011 +0200 Translation update done using Pootle. commit 814cf9fadcb8049bb8ba1afcf5ffb9bdb020d3f3 Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:57:01 2011 +0200 Translation update done using Pootle. commit 23d3ec90aa2753d8d3c181a0e36b3e0e019e52ce Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:55:56 2011 +0200 Translation update done using Pootle. commit 920ea09097b027ac2256386e3cbd9ebe11723d06 Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:55:11 2011 +0200 Translation update done using Pootle. commit 6118f87d4853a3f69841ebbc0999e7efde6c185a Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:53:34 2011 +0200 Translation update done using Pootle. commit 9c177ca4a0f4fffa356f4fabc444aa27c664d676 Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:53:08 2011 +0200 Translation update done using Pootle. commit cba2d0f1e1886941b509b8bba6827082162bc64e Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:49:50 2011 +0200 Translation update done using Pootle. commit 708448401e6ab3a34ee774ffa82de301458bec32 Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:48:43 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 24 +++++++++++------------- po/tr.po | 10 +++++----- po/uk.po | 21 ++++++++++++++------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/po/ja.po b/po/ja.po index 8f037eb..53f02d0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-04 10:35+0100\n" -"PO-Revision-Date: 2011-12-05 11:15+0200\n" +"PO-Revision-Date: 2011-12-08 11:45+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -1687,7 +1687,7 @@ msgstr "読み込み中" #: js/messages.php:223 msgid "Processing Request" -msgstr "要求を処理中" +msgstr "要求を処理しています" #: js/messages.php:224 libraries/rte/rte_export.lib.php:39 msgid "Error in Processing Request" @@ -2931,7 +2931,7 @@ msgstr "最後" #: libraries/common.lib.php:2549 #, php-format msgid "Jump to database "%s"." -msgstr ""%s" データベースに移動" +msgstr "データベース「%s」に移動する" #: libraries/common.lib.php:2569 #, php-format @@ -6696,7 +6696,7 @@ msgstr "返り値が空でした(行数0)" #: libraries/import.lib.php:1100 msgid "" "The following structures have either been created or altered. Here you can:" -msgstr "下に示す構成が、作成もしくは変更されました。ここで次のことが行えます。" +msgstr "以下に示す構成が、作成もしくは変更されました。ここで次のことが行えます。" #: libraries/import.lib.php:1101 msgid "View a structure's contents by clicking on its name" @@ -6717,20 +6717,20 @@ msgid "Go to database" msgstr "データベースに移動" #: libraries/import.lib.php:1109 libraries/import.lib.php:1132 -#, fuzzy, php-format +#, php-format #| msgid "Missing data for %s" msgid "Edit settings for %s" -msgstr "%s ためのデータがありません" +msgstr "%s に対する設定の変更を行います" #: libraries/import.lib.php:1127 msgid "Go to table" msgstr "テーブルに移動" #: libraries/import.lib.php:1130 -#, fuzzy, php-format +#, php-format #| msgid "Structure only" msgid "Structure of %s" -msgstr "構造のみ" +msgstr "%s の構造" #: libraries/import.lib.php:1136 msgid "Go to view" @@ -8452,9 +8452,7 @@ msgstr "" #: main.php:308 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." -msgstr "" -"設定ファイルが秘密のパスフレーズ (blowfish_secret) を必要とするようになりまし" -"た" +msgstr "設定ファイルに、暗号化 (blowfish_secret) 用のパスフレーズの設定を必要とするようになりました。" #: main.php:316 msgid "" @@ -12652,8 +12650,8 @@ msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" -"テーブルを開くことは、負荷がかかるディスクへの入出力を必要とします。" -"{table_open_cache} を大きくすることで、これを緩和できることがあります。" +"テーブルを開くというのは、負荷がかかるディスクへの入出力を行うということです。{table_open_cache} " +"を大きくすることで、これを緩和できることがあります。" #: po/advisory_rules.php:183 #, php-format diff --git a/po/tr.po b/po/tr.po index 974a6db..873b50c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-04 10:35+0100\n" -"PO-Revision-Date: 2011-12-06 22:32+0200\n" +"PO-Revision-Date: 2011-12-07 15:06+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -11247,25 +11247,25 @@ msgstr "%s satırla eklemeye devam et" #| msgid "Bar" msgctxt "Chart type" msgid "Bar" -msgstr "" +msgstr "Çubuk" #: tbl_chart.php:89 #| msgid "Column" msgctxt "Chart type" msgid "Column" -msgstr "" +msgstr "Sütun" #: tbl_chart.php:90 #| msgid "Line" msgctxt "Chart type" msgid "Line" -msgstr "" +msgstr "Çizgi" #: tbl_chart.php:91 #| msgid "Spline" msgctxt "Chart type" msgid "Spline" -msgstr "" +msgstr "Şerit" #: tbl_chart.php:92 #| msgid "Pie" diff --git a/po/uk.po b/po/uk.po index e6b4bb4..7a1aa5d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-04 10:35+0100\n" -"PO-Revision-Date: 2011-12-06 17:47+0200\n" +"PO-Revision-Date: 2011-12-08 14:18+0200\n" "Last-Translator: oleg-ilnytskyi <ukraine.oleg(a)gmail.com>\n" "Language-Team: ukrainian <uk(a)li.org>\n" "Language: uk\n" @@ -3299,32 +3299,36 @@ msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" msgstr "" +"Секретна фраза використовується для шифрування кукі в [kbd]cookie[/kbd] " +"аутентифікації" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" -msgstr "" +msgstr "Blowfish секрет" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "Виділити обрані рядки" #: libraries/config/messages.inc.php:27 msgid "Row marker" -msgstr "" +msgstr "Маркер рядка" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "Виділяти радок курсором миші" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" -msgstr "" +msgstr "Покажчик виділення" #: libraries/config/messages.inc.php:30 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " "import and export operations" msgstr "" +"Вімкнути [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] компресію для " +"операцій імпорту та експорту" #: libraries/config/messages.inc.php:31 msgid "Bzip2" @@ -3336,10 +3340,13 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"Визначає, який тип редагування контролю повинен бути використаний для CHAR і " +"VARCHAR стовпців; [kbd]input[/kbd] - довжина тексту, [kbd]textarea[/kbd] - " +"дозволена кількість рядків в стовпцях" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "CHAR редагування стовпців" #: libraries/config/messages.inc.php:34 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 0f8b2603b5a9b1d6765804deee11d056e549404b
by Marc Delisle 08 Dec '11

08 Dec '11

The branch, master has been updated via 0f8b2603b5a9b1d6765804deee11d056e549404b (commit) from 4a0c2d3e09961ce3717d0b2ecb20a1e744c79826 (commit) - Log ----------------------------------------------------------------- commit 0f8b2603b5a9b1d6765804deee11d056e549404b Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 8 05:42:01 2011 -0500 Incorrect tag for commit reference ----------------------------------------------------------------------- Summary of changes: templates/security/PMASA-2011-16 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/security/PMASA-2011-16 b/templates/security/PMASA-2011-16 index d82b828..ae8b644 100644 --- a/templates/security/PMASA-2011-16 +++ b/templates/security/PMASA-2011-16 @@ -44,7 +44,7 @@ Thanks to Jakub Gałczyk (<a href="http://hauntit.blogspot.com">http://hauntit.b <py:def function="announcement_cwe">661 79</py:def> -<py:def function="announcement_commits_3_4"> +<py:def function="announcement_commits"> ca597dc423f3eebcca95ff33b088a03e39109115 1af420e22367ae72ff4091adb1620e59ddad5ba6 </py:def> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24472-g173e592
by Madhura Jayaratne 07 Dec '11

07 Dec '11

The branch, master has been updated via 173e5926a01c1dd421150e0b47408dd24e89523b (commit) via 35b18e57a26331c3f4a124ca21b37f82b006faa6 (commit) via a7c00f719f1ba7725db25aa66741536dceb2ead2 (commit) via 334b268f50d28c5100dc95c0d12d1c0eff49019e (commit) from 03436f6511041f4fd9028ca3c01d95f7a94b14ed (commit) - Log ----------------------------------------------------------------- commit 173e5926a01c1dd421150e0b47408dd24e89523b Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Dec 8 00:01:02 2011 +0530 More coding style improvements commit 35b18e57a26331c3f4a124ca21b37f82b006faa6 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Dec 7 23:28:50 2011 +0530 Coding style improvements - Multiline assignments commit a7c00f719f1ba7725db25aa66741536dceb2ead2 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Dec 7 22:45:13 2011 +0530 Coding style improvements - Control structures commit 334b268f50d28c5100dc95c0d12d1c0eff49019e Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Dec 7 22:16:53 2011 +0530 Coding style improvements - Correct indenting ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 17 +- db_search.php | 4 +- db_structure.php | 4 +- enum_editor.php | 6 +- js/functions.js | 22 ++-- js/tbl_structure.js | 14 +- libraries/Config.class.php | 4 +- libraries/RecentTable.class.php | 16 +- libraries/StorageEngine.class.php | 4 +- libraries/Table.class.php | 4 +- libraries/auth/swekey/swekey.auth.lib.php | 5 +- libraries/auth/swekey/swekey.php | 102 +++++------ libraries/database_interface.lib.php | 18 ++- libraries/export/latex.php | 276 +++++++++++++++++------------ libraries/export/odt.php | 152 +++++++++------- libraries/gis/pma_gis_visualization.php | 4 +- libraries/import/csv.php | 27 ++- libraries/mysql_charsets.lib.php | 8 +- libraries/pmd_common.php | 12 +- libraries/sqlparser.lib.php | 23 ++-- libraries/tbl_properties.inc.php | 4 +- navigation.php | 4 +- server_privileges.php | 12 +- server_status.php | 12 +- tbl_change.php | 10 +- tbl_indexes.php | 4 +- tbl_replace.php | 38 ++-- 27 files changed, 441 insertions(+), 365 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 74e4e99..dd9979b 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -223,22 +223,23 @@ if (is_array($foreignData['disp_row'])) { $val_ordered_current_val = htmlspecialchars($val_ordered_current_val); $val_ordered_current_val_title = ''; } else { - $val_ordered_current_val_title = - htmlspecialchars($val_ordered_current_val); + $val_ordered_current_val_title + = htmlspecialchars($val_ordered_current_val); $val_ordered_current_val = htmlspecialchars( PMA_substr($val_ordered_current_val, 0, $cfg['LimitChars']) . '...' - ); + ); } if (PMA_strlen($key_ordered_current_val) <= $cfg['LimitChars']) { $key_ordered_current_val = htmlspecialchars($key_ordered_current_val); $key_ordered_current_val_title = ''; } else { - $key_ordered_current_val_title = - htmlspecialchars($key_ordered_current_val); - $key_ordered_current_val = - htmlspecialchars(PMA_substr($key_ordered_current_val, 0, - $cfg['LimitChars']) . '...'); + $key_ordered_current_val_title + = htmlspecialchars($key_ordered_current_val); + $key_ordered_current_val + = htmlspecialchars( + PMA_substr($key_ordered_current_val, 0, $cfg['LimitChars']) . '...' + ); } if (! empty($data)) { diff --git a/db_search.php b/db_search.php index 041242f..68cb463 100644 --- a/db_search.php +++ b/db_search.php @@ -314,8 +314,8 @@ foreach ($tables_names_only as $each_table) { } // end while echo ' </select>' . "\n"; -$alter_select = - '<a href="db_search.php' . PMA_generate_common_url(array_merge($url_params, array('selectall' => 1))) . '#db_search"' +$alter_select + = '<a href="db_search.php' . PMA_generate_common_url(array_merge($url_params, array('selectall' => 1))) . '#db_search"' . ' onclick="setSelectOptions(\'db_search\', \'table_select[]\', true); return false;">' . __('Select All') . '</a>' . ' / ' . '<a href="db_search.php' . PMA_generate_common_url(array_merge($url_params, array('unselectall' => 1))) . '#db_search"' diff --git a/db_structure.php b/db_structure.php index aae36e6..3baad46 100644 --- a/db_structure.php +++ b/db_structure.php @@ -496,8 +496,8 @@ foreach ($tables as $keyname => $each_table) { // Show Summary if ($is_show_stats) { list($sum_formatted, $unit) = PMA_formatByteDown($sum_size, 3, 1); - list($overhead_formatted, $overhead_unit) = - PMA_formatByteDown($overhead_size, 3, 1); + list($overhead_formatted, $overhead_unit) + = PMA_formatByteDown($overhead_size, 3, 1); } ?> </tbody> diff --git a/enum_editor.php b/enum_editor.php index 143d3c4..10e0ba3 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -36,13 +36,15 @@ require_once './libraries/header_meta_style.inc.php'; <?php // Get the enum values $values = array(); - if (isset($_GET['values']) && is_array($_GET['values'])) { // If the values are in an array + // If the values are in an array + if (isset($_GET['values']) && is_array($_GET['values'])) { // then this page was called from itself via the "Add a value", "Drop" or "Go" buttons $values = $_GET['values']; foreach ($values as $key => $value) { $values[$key] = htmlentities($value); } - } else if (isset($_GET['values']) && is_string($_GET['values'])){ // If the values are in a string + // If the values are in a string + } elseif (isset($_GET['values']) && is_string($_GET['values'])) { // then this page was called via a link from some external page $values_string = htmlentities($_GET['values']); // There is a JS port of the below parser in functions.js diff --git a/js/functions.js b/js/functions.js index 829ae58..b51ef7c 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2722,17 +2722,17 @@ $(document).ready(function() { }); // slider for choosing how many fields to add $enum_editor_dialog.find(".slider").slider({ - animate: true, - range: "min", - value: 1, - min: 1, - max: 9, - slide: function( event, ui ) { - $(this).closest('table').find('input[type=submit]').val( - PMA_messages['enum_addValue'].replace(/%d/, ui.value) - ); - } - }); + animate: true, + range: "min", + value: 1, + min: 1, + max: 9, + slide: function( event, ui ) { + $(this).closest('table').find('input[type=submit]').val( + PMA_messages['enum_addValue'].replace(/%d/, ui.value) + ); + } + }); // Focus the slider, otherwise it looks nearly transparent $('.ui-slider-handle').addClass('ui-state-focus'); return false; diff --git a/js/tbl_structure.js b/js/tbl_structure.js index c9fd93b..651cab0 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -301,16 +301,16 @@ $(document).ready(function() { PMA_convertFootnotesToTooltips($div); // Add a slider for selecting how many columns to add to the index $div.find('.slider').slider({ - animate: true, - value: 1, - min: 1, - max: 16, - slide: function( event, ui ) { + animate: true, + value: 1, + min: 1, + max: 16, + slide: function( event, ui ) { $(this).closest('fieldset').find('input[type=submit]').val( PMA_messages['strAddToIndex'].replace(/%d/, ui.value) ); - } - }); + } + }); // Focus the slider, otherwise it looks nearly transparent $('.ui-slider-handle').addClass('ui-state-focus'); } diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 2d4b978..8364a65 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -958,8 +958,8 @@ class PMA_Config if (substr($pma_absolute_uri, 0, 7) != 'http://' && substr($pma_absolute_uri, 0, 8) != 'https://' ) { - $pma_absolute_uri = - ($is_https ? 'https' : 'http') + $pma_absolute_uri + = ($is_https ? 'https' : 'http') . ':' . (substr($pma_absolute_uri, 0, 2) == '//' ? '' : '//') . $pma_absolute_uri; } diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index 1e85899..6642acb 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -76,9 +76,9 @@ class PMA_RecentTable public function getFromDb() { // Read from phpMyAdmin database, if recent tables is not in session - $sql_query = - " SELECT `tables` FROM " . $this->pma_table . - " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'"; + $sql_query + = " SELECT `tables` FROM " . $this->pma_table . + " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'"; $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); if (isset($row[0])) { @@ -91,15 +91,15 @@ class PMA_RecentTable /** * Save recent tables into phpMyAdmin database. * - * + * * @return true|PMA_Message */ public function saveToDb() { $username = $GLOBALS['cfg']['Server']['user']; - $sql_query = - " REPLACE INTO " . $this->pma_table . " (`username`, `tables`)" . - " VALUES ('" . $username . "', '" . PMA_sqlAddSlashes(json_encode($this->tables)) . "')"; + $sql_query + = " REPLACE INTO " . $this->pma_table . " (`username`, `tables`)" . + " VALUES ('" . $username . "', '" . PMA_sqlAddSlashes(json_encode($this->tables)) . "')"; $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']); @@ -163,7 +163,7 @@ class PMA_RecentTable $html .= '<select name="selected_recent_table" id="recentTable">'; $html .= $this->getHtmlSelectOption(); $html .= '</select>'; - + return $html; } diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index 4f98a4a..b325935 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -274,8 +274,8 @@ class PMA_StorageEngine if (!empty($storage_engines[$engine])) { $this->engine = $engine; $this->title = $storage_engines[$engine]['Engine']; - $this->comment = - (isset($storage_engines[$engine]['Comment']) + $this->comment + = (isset($storage_engines[$engine]['Comment']) ? $storage_engines[$engine]['Comment'] : ''); switch ($storage_engines[$engine]['Support']) { diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 16ccfc3..a2db8b2 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1391,8 +1391,8 @@ class PMA_Table $max_rows = $GLOBALS['cfg']['Server']['MaxTableUiprefs']; if ($rows_count > $max_rows) { $num_rows_to_delete = $rows_count - $max_rows; - $sql_query = - ' DELETE FROM ' . $pma_table . + $sql_query + = ' DELETE FROM ' . $pma_table . ' ORDER BY last_update ASC' . ' LIMIT ' . $num_rows_to_delete; $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']); diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index f7299d1..78356fa 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -161,12 +161,11 @@ function Swekey_auth_error() } } else { $result = __('No valid authentication key plugged'); - if ($_SESSION['SWEKEY']['CONF_DEBUG']) - { + if ($_SESSION['SWEKEY']['CONF_DEBUG']) { $result .= "<br>" . htmlspecialchars($swekey_id); } unset($_SESSION['SWEKEY']['CONF_LOADED']); // reload the conf file - } + } } } else { unset($_SESSION['SWEKEY']); diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php index 453437e..3c6bd80 100644 --- a/libraries/auth/swekey/swekey.php +++ b/libraries/auth/swekey/swekey.php @@ -187,33 +187,28 @@ function Swekey_HttpGet($url, &$response_code) $gSwekeyLastResult = "<not set>"; // use curl if available - if (function_exists('curl_init')) - { + if (function_exists('curl_init')) { $sess = curl_init($url); - if (substr($url, 0, 8) == "https://") - { + if (substr($url, 0, 8) == "https://") { global $gSwekeyCA; - if (! empty($gSwekeyCA)) - { - if (file_exists($gSwekeyCA)) - { - if (! curl_setopt($sess, CURLOPT_CAINFO, $gSwekeyCA)) + if (! empty($gSwekeyCA)) { + if (file_exists($gSwekeyCA)) { + if (! curl_setopt($sess, CURLOPT_CAINFO, $gSwekeyCA)) { error_log("SWEKEY_ERROR:Could not set CA file : ".curl_error($sess)); - else + } else { $caFileOk = true; - } - else + } + } else { error_log("SWEKEY_ERROR:Could not find CA file $gSwekeyCA getting $url"); + } } curl_setopt($sess, CURLOPT_SSL_VERIFYHOST, '2'); curl_setopt($sess, CURLOPT_SSL_VERIFYPEER, '2'); curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '20'); curl_setopt($sess, CURLOPT_TIMEOUT, '20'); - } - else - { + } else { curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '3'); curl_setopt($sess, CURLOPT_TIMEOUT, '5'); } @@ -224,18 +219,16 @@ function Swekey_HttpGet($url, &$response_code) $curlerr = curl_error($sess); curl_close($sess); - if ($response_code == 200) - { + if ($response_code == 200) { $gSwekeyLastResult = $res; return $res; } - if (! empty($response_code)) - { + if (! empty($response_code)) { $gSwekeyLastError = $response_code; error_log("SWEKEY_ERROR:Error $gSwekeyLastError ($curlerr) getting $url"); return ""; - } + } $response_code = 408; // Request Timeout $gSwekeyLastError = $response_code; @@ -244,28 +237,28 @@ function Swekey_HttpGet($url, &$response_code) } // use pecl_http if available - if (class_exists('HttpRequest')) - { + if (class_exists('HttpRequest')) { // retry if one of the server is down - for ($num=1; $num <= 3; $num++ ) - { + for ($num=1; $num <= 3; $num++ ) { $r = new HttpRequest($url); $options = array('timeout' => '3'); - if (substr($url, 0, 6) == "https:") - { + if (substr($url, 0, 6) == "https:") { $sslOptions = array(); $sslOptions['verifypeer'] = true; $sslOptions['verifyhost'] = true; $capath = __FILE__; $name = strrchr($capath, '/'); - if (empty($name)) // windows + // windows + if (empty($name)) { $name = strrchr($capath, '\\'); + } $capath = substr($capath, 0, strlen($capath) - strlen($name) + 1).'musbe-ca.crt'; - if (! empty($gSwekeyCA)) + if (! empty($gSwekeyCA)) { $sslOptions['cainfo'] = $gSwekeyCA; + } $options['ssl'] = $sslOptions; } @@ -304,8 +297,7 @@ function Swekey_HttpGet($url, &$response_code) global $http_response_header; $res = @file_get_contents($url); $response_code = substr($http_response_header[0], 9, 3); //HTTP/1.0 - if ($response_code == 200) - { + if ($response_code == 200) { $gSwekeyLastResult = $res; return $res; } @@ -355,51 +347,47 @@ function Swekey_GetFastHalfRndToken() $cachefile = ""; // We check if we have a valid RT is the session - if (isset($_SESSION['rnd-token-date'])) - if (time() - $_SESSION['rnd-token-date'] < 30) + if (isset($_SESSION['rnd-token-date'])) { + if (time() - $_SESSION['rnd-token-date'] < 30) { $res = $_SESSION['rnd-token']; + } + } // If not we try to get it from a temp file (PHP >= 5.2.1 only) - if (strlen($res) != 32 && $gSwekeyTokenCacheEnabled) - { - if (function_exists('sys_get_temp_dir')) - { + if (strlen($res) != 32 && $gSwekeyTokenCacheEnabled) { + if (function_exists('sys_get_temp_dir')) { $tempdir = sys_get_temp_dir(); $cachefile = $tempdir."/swekey-rnd-token-".get_current_user(); $modif = filemtime($cachefile); - if ($modif != false) - if (time() - $modif < 30) - { + if ($modif != false) { + if (time() - $modif < 30) { $res = @file_get_contents($cachefile); - if (strlen($res) != 32) - $res = ""; - else - { - $_SESSION['rnd-token'] = $res; - $_SESSION['rnd-token-date'] = $modif; - } + if (strlen($res) != 32) { + $res = ""; + } else { + $_SESSION['rnd-token'] = $res; + $_SESSION['rnd-token-date'] = $modif; + } } + } } - } + } - // If we don't have a valid RT here we have to get it from the server - if (strlen($res) != 32) - { + // If we don't have a valid RT here we have to get it from the server + if (strlen($res) != 32) { $res = substr(Swekey_GetHalfRndToken(), 0, 32); $_SESSION['rnd-token'] = $res; $_SESSION['rnd-token-date'] = time(); - if (! empty($cachefile)) - { + if (! empty($cachefile)) { // we unlink the file so no possible tempfile race attack unlink($cachefile); - $file = fopen($cachefile, "x"); - if ($file != false) - { - @fwrite($file, $res); + $file = fopen($cachefile, "x"); + if ($file != false) { + @fwrite($file, $res); @fclose($file); } } - } + } return $res."00000000000000000000000000000000"; } diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index c356b90..a142249 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -942,9 +942,12 @@ function PMA_DBI_get_columns_full($database = null, $table = null, $columns[$column_name]['TABLE_SCHEMA'] = $database; $columns[$column_name]['TABLE_NAME'] = $table; $columns[$column_name]['ORDINAL_POSITION'] = $ordinal_position; - $columns[$column_name]['DATA_TYPE'] = - substr($columns[$column_name]['COLUMN_TYPE'], 0, - strpos($columns[$column_name]['COLUMN_TYPE'], '(')); + $columns[$column_name]['DATA_TYPE'] + = substr( + $columns[$column_name]['COLUMN_TYPE'], + 0, + strpos($columns[$column_name]['COLUMN_TYPE'], '(') + ); /** * @todo guess CHARACTER_MAXIMUM_LENGTH from COLUMN_TYPE */ @@ -955,9 +958,12 @@ function PMA_DBI_get_columns_full($database = null, $table = null, $columns[$column_name]['CHARACTER_OCTET_LENGTH'] = null; $columns[$column_name]['NUMERIC_PRECISION'] = null; $columns[$column_name]['NUMERIC_SCALE'] = null; - $columns[$column_name]['CHARACTER_SET_NAME'] = - substr($columns[$column_name]['COLLATION_NAME'], 0, - strpos($columns[$column_name]['COLLATION_NAME'], '_')); + $columns[$column_name]['CHARACTER_SET_NAME'] + = substr( + $columns[$column_name]['COLLATION_NAME'], + 0, + strpos($columns[$column_name]['COLLATION_NAME'], '_') + ); $ordinal_position++; } diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 1dbe21a..2792644 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -20,7 +20,7 @@ $GLOBALS['strLatexStructure'] = __('Structure of table @TABLE@'); */ if (isset($plugin_list)) { $hide_structure = false; - if ($plugin_param['export_type'] == 'table' && !$plugin_param['single_table']) { + if ($plugin_param['export_type'] == 'table' && ! $plugin_param['single_table']) { $hide_structure = true; } $plugin_list['latex'] = array( @@ -36,62 +36,63 @@ if (isset($plugin_list)) { ); /* what to dump (structure/data/both) */ - $plugin_list['latex']['options'][] = - array('type' => 'begin_group', 'name' => 'dump_what', 'text' => __('Dump table')); - $plugin_list['latex']['options'][] = - array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data'))); + $plugin_list['latex']['options'][] + = array('type' => 'begin_group', 'name' => 'dump_what', 'text' => __('Dump table')); + $plugin_list['latex']['options'][] + = array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data'))); $plugin_list['latex']['options'][] = array('type' => 'end_group'); /* Structure options */ - if (!$hide_structure) { - $plugin_list['latex']['options'][] = - array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options'), 'force' => 'data'); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'structure_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27'); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => __('Table caption (continued)'), 'doc' => 'faq6_27'); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'structure_label', 'text' => __('Label key'), 'doc' => 'faq6_27'); - if (!empty($GLOBALS['cfgRelation']['relation'])) { - $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'relation', 'text' => __('Display foreign key relationships')); + if (! $hide_structure) { + $plugin_list['latex']['options'][] + = array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options'), 'force' => 'data'); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'structure_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27'); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => __('Table caption (continued)'), 'doc' => 'faq6_27'); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'structure_label', 'text' => __('Label key'), 'doc' => 'faq6_27'); + if (! empty($GLOBALS['cfgRelation']['relation'])) { + $plugin_list['latex']['options'][] + = array('type' => 'bool', 'name' => 'relation', 'text' => __('Display foreign key relationships')); } - $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'comments', 'text' => __('Display comments')); - if (!empty($GLOBALS['cfgRelation']['mimework'])) { - $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'mime', 'text' => __('Display MIME types')); + $plugin_list['latex']['options'][] + = array('type' => 'bool', 'name' => 'comments', 'text' => __('Display comments')); + if (! empty($GLOBALS['cfgRelation']['mimework'])) { + $plugin_list['latex']['options'][] + = array('type' => 'bool', 'name' => 'mime', 'text' => __('Display MIME types')); } - $plugin_list['latex']['options'][] = - array('type' => 'end_group'); + $plugin_list['latex']['options'][] + = array('type' => 'end_group'); } /* Data */ - $plugin_list['latex']['options'][] = - array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'), 'force' => 'structure'); - $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27'); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'data_continued_caption', 'text' => __('Table caption (continued)'), 'doc' => 'faq6_27'); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'data_label', 'text' => __('Label key'), 'doc' => 'faq6_27'); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')); - $plugin_list['latex']['options'][] = - array('type' => 'end_group'); + $plugin_list['latex']['options'][] + = array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'), 'force' => 'structure'); + $plugin_list['latex']['options'][] + = array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27'); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'data_continued_caption', 'text' => __('Table caption (continued)'), 'doc' => 'faq6_27'); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'data_label', 'text' => __('Label key'), 'doc' => 'faq6_27'); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')); + $plugin_list['latex']['options'][] + = array('type' => 'end_group'); } else { /** * Escapes some special characters for use in TeX/LaTeX * - * @param string the string to convert + * @param string $string the string to convert * * @return string the converted string with escape codes * * @access private */ - function PMA_texEscape($string) { + function PMA_texEscape($string) + { $escape = array('$', '%', '{', '}', '&', '#', '_', '^'); $cnt_escape = count($escape); for ($k=0; $k < $cnt_escape; $k++) { @@ -107,18 +108,20 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportFooter() { + function PMA_exportFooter() + { return true; } /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it suceeded * - * @access public + * @access public */ - function PMA_exportHeader() { + function PMA_exportHeader() + { global $crlf; global $cfg; @@ -127,7 +130,7 @@ if (isset($plugin_list)) { . '% http://www.phpmyadmin.net' . $crlf . '%' . $crlf . '% ' . __('Host') . ': ' . $cfg['Server']['host']; - if (!empty($cfg['Server']['port'])) { + if (! empty($cfg['Server']['port'])) { $head .= ':' . $cfg['Server']['port']; } $head .= $crlf @@ -140,12 +143,14 @@ if (isset($plugin_list)) { /** * Outputs database header * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name * - * @access public + * @return bool Whether it suceeded + * + * @access public */ - function PMA_exportDBHeader($db) { + function PMA_exportDBHeader($db) + { global $crlf; $head = '% ' . $crlf . '% ' . __('Database') . ': ' . '\'' . $db . '\'' . $crlf @@ -156,40 +161,46 @@ if (isset($plugin_list)) { /** * Outputs database footer * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name * - * @access public + * @return bool Whether it suceeded + * + * @access public */ - function PMA_exportDBFooter($db) { + function PMA_exportDBFooter($db) + { return true; } /** * Outputs CREATE DATABASE statement * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name * - * @access public + * @return bool Whether it suceeded + * + * @access public */ - function PMA_exportDBCreate($db) { + function PMA_exportDBCreate($db) + { return true; } /** * Outputs the content of a table in LaTeX table/sideways table environment * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * - * @access public + * @return bool Whether it suceeded + * + * @access public */ - function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { + function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) + { $result = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); $columns_cnt = PMA_DBI_num_fields($result); @@ -198,20 +209,31 @@ if (isset($plugin_list)) { } unset($i); - $buffer = $crlf . '%' . $crlf . '% ' . __('Data') . ': ' . $table . $crlf . '%' . $crlf - . ' \\begin{longtable}{|'; + $buffer = $crlf . '%' . $crlf . '% ' . __('Data') . ': ' . $table + . $crlf . '%' . $crlf . ' \\begin{longtable}{|'; - for ($index=0;$index<$columns_cnt;$index++) { - $buffer .= 'l|'; + for ($index = 0; $index < $columns_cnt; $index++) { + $buffer .= 'l|'; } $buffer .= '} ' . $crlf ; $buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf; if (isset($GLOBALS['latex_caption'])) { - $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) - . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], null, array('table' => $table, 'database' => $db)) . '} \\\\'; + $buffer .= ' \\caption{' + . PMA_expandUserString( + $GLOBALS['latex_data_caption'], + 'PMA_texEscape', + array('table' => $table, 'database' => $db) + ) + . '} \\label{' + . PMA_expandUserString( + $GLOBALS['latex_data_label'], + null, + array('table' => $table, 'database' => $db) + ) + . '} \\\\'; } - if (!PMA_exportOutputHandler($buffer)) { + if (! PMA_exportOutputHandler($buffer)) { return false; } @@ -219,21 +241,32 @@ if (isset($plugin_list)) { if (isset($GLOBALS['latex_columns'])) { $buffer = '\\hline '; for ($i = 0; $i < $columns_cnt; $i++) { - $buffer .= '\\multicolumn{1}{|c|}{\\textbf{' . PMA_texEscape(stripslashes($columns[$i])) . '}} & '; - } + $buffer .= '\\multicolumn{1}{|c|}{\\textbf{' + . PMA_texEscape(stripslashes($columns[$i])) . '}} & '; + } $buffer = substr($buffer, 0, -2) . '\\\\ \\hline \hline '; - if (!PMA_exportOutputHandler($buffer . ' \\endfirsthead ' . $crlf)) { + if (! PMA_exportOutputHandler($buffer . ' \\endfirsthead ' . $crlf)) { 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)) { + if (! PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) { return false; } } else { - if (!PMA_exportOutputHandler('\\\\ \hline')) { + if (! PMA_exportOutputHandler('\\\\ \hline')) { return false; } } @@ -245,7 +278,8 @@ if (isset($plugin_list)) { // print each row for ($i = 0; $i < $columns_cnt; $i++) { if (isset($record[$columns[$i]]) - && (! function_exists('is_null') || !is_null($record[$columns[$i]]))) { + && (! function_exists('is_null') || ! is_null($record[$columns[$i]])) + ) { $column_value = PMA_texEscape(stripslashes($record[$columns[$i]])); } else { $column_value = $GLOBALS['latex_null']; @@ -259,13 +293,13 @@ if (isset($plugin_list)) { } } $buffer .= ' \\\\ \\hline ' . $crlf; - if (!PMA_exportOutputHandler($buffer)) { + if (! PMA_exportOutputHandler($buffer)) { return false; } } $buffer = ' \\end{longtable}' . $crlf; - if (!PMA_exportOutputHandler($buffer)) { + if (! PMA_exportOutputHandler($buffer)) { return false; } @@ -277,23 +311,24 @@ if (isset($plugin_list)) { /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments - * as comments in the structure; this is deprecated - * but the parameter is left here because export.php - * calls PMA_exportStructure() also for other export - * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' - * @return bool Whether it suceeded + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments + * as comments in the structure; this is deprecated + * but the parameter is left here because export.php + * calls PMA_exportStructure() also for other export + * types which use this parameter + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * - * @access public + * @return bool Whether it suceeded + * + * @access public */ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type) { @@ -316,7 +351,7 @@ if (isset($plugin_list)) { PMA_DBI_select_db($db); // Check if we can use Relations - if ($do_relation && !empty($cfgRelation['relation'])) { + if ($do_relation && ! empty($cfgRelation['relation'])) { // Find which tables are related with the current one and write it in // an array $res_rel = PMA_getForeigners($db, $table); @@ -333,9 +368,9 @@ if (isset($plugin_list)) { /** * Displays the table structure */ - $buffer = $crlf . '%' . $crlf . '% ' . __('Structure') . ': ' . $table . $crlf . '%' . $crlf - . ' \\begin{longtable}{'; - if (!PMA_exportOutputHandler($buffer)) { + $buffer = $crlf . '%' . $crlf . '% ' . __('Structure') . ': ' . $table + . $crlf . '%' . $crlf . ' \\begin{longtable}{'; + if (! PMA_exportOutputHandler($buffer)) { return false; } @@ -356,7 +391,10 @@ if (isset($plugin_list)) { $buffer = $alignment . '} ' . $crlf ; $header = ' \\hline '; - $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Column') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}'; + $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Column') + . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') + . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') + . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}'; if ($do_relation && $have_rel) { $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Links to') . '}}'; } @@ -371,19 +409,34 @@ if (isset($plugin_list)) { // Table caption for first page and label if (isset($GLOBALS['latex_caption'])) { - $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) - . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], null, array('table' => $table, 'database' => $db)) - . '} \\\\' . $crlf; + $buffer .= ' \\caption{' + . PMA_expandUserString( + $GLOBALS['latex_structure_caption'], + 'PMA_texEscape', + array('table' => $table, 'database' => $db) + ) + . '} \\label{' + . PMA_expandUserString( + $GLOBALS['latex_structure_label'], + null, + array('table' => $table, 'database' => $db) + ) + . '} \\\\' . $crlf; } $buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf; // Table caption on next pages if (isset($GLOBALS['latex_caption'])) { - $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) - . '} \\\\ ' . $crlf; + $buffer .= ' \\caption{' + . PMA_expandUserString( + $GLOBALS['latex_structure_continued_caption'], + 'PMA_texEscape', + array('table' => $table, 'database' => $db) + ) + . '} \\\\ ' . $crlf; } $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf; - if (!PMA_exportOutputHandler($buffer)) { + if (! PMA_exportOutputHandler($buffer)) { return false; } @@ -395,7 +448,7 @@ if (isset($plugin_list)) { $type = ' '; } - if (!isset($row['Default'])) { + if (! isset($row['Default'])) { if ($row['Null'] != 'NO') { $row['Default'] = 'NULL'; } @@ -410,7 +463,8 @@ if (isset($plugin_list)) { if ($do_relation && $have_rel) { $local_buffer .= "\000"; if (isset($res_rel[$field_name])) { - $local_buffer .= $res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')'; + $local_buffer .= $res_rel[$field_name]['foreign_table'] . ' (' + . $res_rel[$field_name]['foreign_field'] . ')'; } } if ($do_comments && $cfgRelation['commwork']) { @@ -437,7 +491,7 @@ if (isset($plugin_list)) { $buffer = str_replace("\000", ' & ', $local_buffer); $buffer .= ' \\\\ \\hline ' . $crlf; - if (!PMA_exportOutputHandler($buffer)) { + if (! PMA_exportOutputHandler($buffer)) { return false; } } // end while diff --git a/libraries/export/odt.php b/libraries/export/odt.php index 94a01fc..7ee3ef7 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -28,38 +28,38 @@ if (isset($plugin_list)) { ); /* what to dump (structure/data/both) */ - $plugin_list['odt']['options'][] = - array('type' => 'begin_group', 'text' => __('Dump table') , 'name' => 'general_opts'); - $plugin_list['odt']['options'][] = - array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data'))); + $plugin_list['odt']['options'][] + = array('type' => 'begin_group', 'text' => __('Dump table') , 'name' => 'general_opts'); + $plugin_list['odt']['options'][] + = array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data'))); $plugin_list['odt']['options'][] = array('type' => 'end_group'); /* Structure options */ if (!$hide_structure) { - $plugin_list['odt']['options'][] = - array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options'), 'force' => 'data'); + $plugin_list['odt']['options'][] + = array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options'), 'force' => 'data'); if (!empty($GLOBALS['cfgRelation']['relation'])) { - $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'relation', 'text' => __('Display foreign key relationships')); + $plugin_list['odt']['options'][] + = array('type' => 'bool', 'name' => 'relation', 'text' => __('Display foreign key relationships')); } - $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'comments', 'text' => __('Display comments')); + $plugin_list['odt']['options'][] + = array('type' => 'bool', 'name' => 'comments', 'text' => __('Display comments')); if (!empty($GLOBALS['cfgRelation']['mimework'])) { - $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'mime', 'text' => __('Display MIME types')); + $plugin_list['odt']['options'][] + = array('type' => 'bool', 'name' => 'mime', 'text' => __('Display MIME types')); } - $plugin_list['odt']['options'][] = - array('type' => 'end_group'); + $plugin_list['odt']['options'][] + = array('type' => 'end_group'); } /* Data */ - $plugin_list['odt']['options'][] = - array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'), 'force' => 'structure'); - $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); - $plugin_list['odt']['options'][] = - array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')); - $plugin_list['odt']['options'][] = - array('type' => 'end_group'); + $plugin_list['odt']['options'][] + = array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'), 'force' => 'structure'); + $plugin_list['odt']['options'][] + = array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); + $plugin_list['odt']['options'][] + = array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')); + $plugin_list['odt']['options'][] + = array('type' => 'end_group'); } else { $GLOBALS['odt_buffer'] = ''; @@ -68,15 +68,16 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it suceeded * - * @access public + * @access public */ - function PMA_exportFooter() { + function PMA_exportFooter() + { $GLOBALS['odt_buffer'] .= '</office:text>' . '</office:body>' . '</office:document-content>'; - if (!PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.text', $GLOBALS['odt_buffer']))) { + if (! PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.text', $GLOBALS['odt_buffer']))) { return false; } return true; @@ -85,11 +86,12 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it suceeded * - * @access public + * @access public */ - function PMA_exportHeader() { + function PMA_exportHeader() + { $GLOBALS['odt_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>' . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">' . '<office:body>' @@ -100,53 +102,62 @@ if (isset($plugin_list)) { /** * Outputs database header * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name + * + * @return bool Whether it suceeded * - * @access public + * @access public */ - function PMA_exportDBHeader($db) { - $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' . __('Database') . ' ' . htmlspecialchars($db) . '</text:h>'; + function PMA_exportDBHeader($db) + { + $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' + . __('Database') . ' ' . htmlspecialchars($db) . '</text:h>'; return true; } /** * Outputs database footer * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name + * + * @return bool Whether it suceeded * - * @access public + * @access public */ - function PMA_exportDBFooter($db) { + function PMA_exportDBFooter($db) + { return true; } /** * Outputs CREATE DATABASE statement * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name * - * @access public + * @return bool Whether it suceeded + * + * @access public */ - function PMA_exportDBCreate($db) { + function PMA_exportDBCreate($db) + { return true; } /** * Outputs the content of a table in ODT format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data + * + * @return bool Whether it suceeded * - * @access public + * @access public */ - function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { + function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) + { global $what; // Gets the data from the database @@ -158,7 +169,8 @@ if (isset($plugin_list)) { $field_flags[$j] = PMA_DBI_field_flags($result, $j); } - $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . __('Dumping data for table') . ' ' . htmlspecialchars($table) . '</text:h>'; + $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' + . __('Dumping data for table') . ' ' . htmlspecialchars($table) . '</text:h>'; $GLOBALS['odt_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '_structure">'; $GLOBALS['odt_buffer'] .= '<table:table-column table:number-columns-repeated="' . $fields_cnt . '"/>'; @@ -209,30 +221,32 @@ if (isset($plugin_list)) { /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments - * as comments in the structure; this is deprecated - * but the parameter is left here because export.php - * calls PMA_exportStructure() also for other export - * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' - * @return bool Whether it suceeded + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments + * as comments in the structure; this is deprecated + * but the parameter is left here because export.php + * calls PMA_exportStructure() also for other export + * types which use this parameter + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' + * + * @return bool Whether it suceeded * - * @access public + * @access public */ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type) { global $cfgRelation; /* Heading */ - $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . __('Table structure for table') . ' ' . htmlspecialchars($table) . '</text:h>'; + $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' + . __('Table structure for table') . ' ' . htmlspecialchars($table) . '</text:h>'; /** * Get the unique keys in the table diff --git a/libraries/gis/pma_gis_visualization.php b/libraries/gis/pma_gis_visualization.php index f69d6d2..32a5728 100644 --- a/libraries/gis/pma_gis_visualization.php +++ b/libraries/gis/pma_gis_visualization.php @@ -254,8 +254,8 @@ class PMA_GIS_Visualization { $this->init(); $scale_data = $this->_scaleDataSet($this->_data); - $output = - 'var options = {' + $output + = 'var options = {' . 'projection: new OpenLayers.Projection("EPSG:900913"),' . 'displayProjection: new OpenLayers.Projection("EPSG:4326"),' . 'units: "m",' diff --git a/libraries/import/csv.php b/libraries/import/csv.php index 9d0e2aa..019412d 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -34,12 +34,12 @@ if (isset($plugin_list)) { ); if ($plugin_param !== 'table') { - $plugin_list['csv']['options'][] = - array('type' => 'bool', 'name' => 'col_names', 'text' => __('The first line of the file contains the table column names <i>(if this is unchecked, the first line will become part of the data)</i>')); + $plugin_list['csv']['options'][] + = array('type' => 'bool', 'name' => 'col_names', 'text' => __('The first line of the file contains the table column names <i>(if this is unchecked, the first line will become part of the data)</i>')); } else { $hint = new PMA_Message(__('If the data in each row of the file is not in the same order as in the database, list the corresponding column names here. Column names must be separated by commas and not enclosed in quotations.')); - $plugin_list['csv']['options'][] = - array('type' => 'text', 'name' => 'columns', 'text' => __('Column names: ') . PMA_showHint($hint)); + $plugin_list['csv']['options'][] + = array('type' => 'text', 'name' => 'columns', 'text' => __('Column names: ') . PMA_showHint($hint)); } $plugin_list['csv']['options'][] = array('type' => 'end_group'); @@ -129,7 +129,7 @@ if (!$analyze) { } } 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 = 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; break; @@ -175,7 +175,8 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { 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)) { + || ($csv_new_line != 'auto' && strpos($buffer, $csv_new_line) === false) + ) { continue; } } @@ -269,7 +270,10 @@ 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)) { + if ($ch == $csv_new_line + || ($csv_new_line == 'auto' && ($ch == "\r" || $ch == "\n")) + || ($finished && $i == $len - 1) + ) { $csv_finish = true; } // Go to next char @@ -287,7 +291,10 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { } // End of line - if ($csv_finish || $ch == $csv_new_line || ($csv_new_line == 'auto' && ($ch == "\r" || $ch == "\n"))) { + if ($csv_finish + || $ch == $csv_new_line + || ($csv_new_line == 'auto' && ($ch == "\r" || $ch == "\n")) + ) { if ($csv_new_line == 'auto' && $ch == "\r") { // Handle "\r\n" if ($i >= ($len - 2) && !$finished) { break; // We need more data to decide new line @@ -377,7 +384,9 @@ if ($analyze) { $col_names = $col_names[0]; } - if ((isset($col_names) && count($col_names) != $max_cols) || !isset($col_names)) { + if ((isset($col_names) && count($col_names) != $max_cols) + || ! isset($col_names) + ) { // Fill out column names for ($i = 0; $i < $max_cols; ++$i) { $col_names[] = 'COL '.($i+1); diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 83d7d77..5af1bf7 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -47,8 +47,8 @@ if (! PMA_cacheExists('mysql_charsets', true)) { } //$mysql_collations_available[$row['Collation']] = ! isset($row['Compiled']) || $row['Compiled'] == 'Yes'; $mysql_collations_available[$row['COLLATION_NAME']] = true; - $mysql_charsets_available[$row['CHARACTER_SET_NAME']] = - !empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']]) + $mysql_charsets_available[$row['CHARACTER_SET_NAME']] + = !empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']]) || !empty($mysql_collations_available[$row['COLLATION_NAME']]); } PMA_DBI_free_result($res); @@ -118,8 +118,8 @@ function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION, if (!$mysql_charsets_available[$current_charset]) { continue; } - $current_cs_descr = - empty($mysql_charsets_descriptions[$current_charset]) + $current_cs_descr + = empty($mysql_charsets_descriptions[$current_charset]) ? $current_charset : $mysql_charsets_descriptions[$current_charset]; diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index 0a09d28..d5f13e2 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -15,8 +15,8 @@ $GLOBALS['PMD']['STYLE'] = 'default'; $cfgRelation = PMA_getRelationsParam(); -$GLOBALS['script_display_field'] = - '<script type="text/javascript">' . "\n" . +$GLOBALS['script_display_field'] + = '<script type="text/javascript">' . "\n" . '// <![CDATA[' . "\n" . 'var display_field = new Array();' . "\n"; @@ -129,8 +129,8 @@ function get_script_contr() } $ti = 0; - $script_contr = - '<script type="text/javascript">' . "\n" . + $script_contr + = '<script type="text/javascript">' . "\n" . '// <![CDATA[' . "\n" . 'var contr = new Array();' . "\n"; for ($i = 0, $cnt = count($con["C_NAME"]); $i < $cnt; $i++) { @@ -199,8 +199,8 @@ function get_all_keys($unique_only = false) */ function get_script_tabs() { - $script_tabs = - '<script type="text/javascript">' . "\n" . + $script_tabs + = '<script type="text/javascript">' . "\n" . '// <![CDATA[' . "\n" . 'var j_tabs = new Array();' . "\n" . 'var h_tabs = new Array();' . "\n" ; diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 6ddcaa5..ca30471 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -1277,16 +1277,16 @@ if (! defined('PMA_MINIMUM_COMMON')) { // we assume for now that this is also the true name $subresult['select_expr'][$current_select_expr]['table_true_name'] = $chain[$size_chain - 2]; $subresult['select_expr'][$current_select_expr]['expr'] - = $subresult['select_expr'][$current_select_expr]['table_name'] - . '.' . $subresult['select_expr'][$current_select_expr]['expr']; + = $subresult['select_expr'][$current_select_expr]['table_name'] + . '.' . $subresult['select_expr'][$current_select_expr]['expr']; } // end if ($size_chain > 1) // maybe a db if ($size_chain > 2) { $subresult['select_expr'][$current_select_expr]['db'] = $chain[$size_chain - 3]; $subresult['select_expr'][$current_select_expr]['expr'] - = $subresult['select_expr'][$current_select_expr]['db'] - . '.' . $subresult['select_expr'][$current_select_expr]['expr']; + = $subresult['select_expr'][$current_select_expr]['db'] + . '.' . $subresult['select_expr'][$current_select_expr]['expr']; } // end if ($size_chain > 2) unset($chain); @@ -1336,13 +1336,13 @@ if (! defined('PMA_MINIMUM_COMMON')) { // we assume for now that this is also the true name $subresult['table_ref'][$current_table_ref]['table_true_name'] = $chain[$size_chain - 1]; $subresult['table_ref'][$current_table_ref]['expr'] - = $subresult['table_ref'][$current_table_ref]['table_name']; + = $subresult['table_ref'][$current_table_ref]['table_name']; // maybe a db if ($size_chain > 1) { $subresult['table_ref'][$current_table_ref]['db'] = $chain[$size_chain - 2]; $subresult['table_ref'][$current_table_ref]['expr'] - = $subresult['table_ref'][$current_table_ref]['db'] - . '.' . $subresult['table_ref'][$current_table_ref]['expr']; + = $subresult['table_ref'][$current_table_ref]['db'] + . '.' . $subresult['table_ref'][$current_table_ref]['expr']; } // end if ($size_chain > 1) // add the table alias into the whole expression @@ -1365,10 +1365,11 @@ if (! defined('PMA_MINIMUM_COMMON')) { $alias = $subresult['table_ref'][$tr]['table_alias']; $truename = $subresult['table_ref'][$tr]['table_true_name']; for ($se=0; $se <= $current_select_expr; $se++) { - if (isset($alias) && strlen($alias) && $subresult['select_expr'][$se]['table_true_name'] - == $alias) { - $subresult['select_expr'][$se]['table_true_name'] - = $truename; + if (isset($alias) + && strlen($alias) + && $subresult['select_expr'][$se]['table_true_name'] == $alias + ) { + $subresult['select_expr'][$se]['table_true_name'] = $truename; } // end if (found the alias) } // end for (select expressions) diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 336545b..fb31287 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -340,8 +340,8 @@ for ($i = 0; $i < $num_fields; $i++) { // old column default if ($is_backup) { - $_form_params['field_default_orig[' . $i . ']'] = - (isset($row['Default']) ? $row['Default'] : ''); + $_form_params['field_default_orig[' . $i . ']'] + = (isset($row['Default']) ? $row['Default'] : ''); } // here we put 'NONE' as the default value of drop-down; otherwise diff --git a/navigation.php b/navigation.php index 4966c73..6127977 100644 --- a/navigation.php +++ b/navigation.php @@ -464,8 +464,8 @@ function PMA_displayDbList($ext_dblist, $offset, $count) } else { $tables = PMA_getTableList($db['name']); } - $child_visible = - (bool) (count($GLOBALS['pma']->databases) === 1 || $db_start == $db['name']); + $child_visible + = (bool) (count($GLOBALS['pma']->databases) === 1 || $db_start == $db['name']); PMA_displayTableList($tables, $child_visible, '', $db['name']); } elseif ($GLOBALS['cfg']['LeftFrameLight']) { // no tables and LeftFrameLight: diff --git a/server_privileges.php b/server_privileges.php index d653efc..46487fd 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1630,8 +1630,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs while ($db_rights_row = PMA_DBI_fetch_assoc($db_rights_result)) { $db_rights_row = array_merge($user_defaults, $db_rights_row); - $db_rights[$db_rights_row['User']][$db_rights_row['Host']] = - $db_rights_row; + $db_rights[$db_rights_row['User']][$db_rights_row['Host']] + = $db_rights_row; } PMA_DBI_free_result($db_rights_result); unset($db_rights_sql, $db_rights_sqls, $db_rights_result, $db_rights_row); @@ -2260,8 +2260,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs unset($row, $row1, $row2); // now, we build the table... - $list_of_privileges = - '`User`, ' + $list_of_privileges + = '`User`, ' . '`Host`, ' . '`Select_priv`, ' . '`Insert_priv`, ' @@ -2281,8 +2281,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . '`Alter_routine_priv`, ' . '`Execute_priv`'; - $list_of_compared_privileges = - '`Select_priv` = \'N\'' + $list_of_compared_privileges + = '`Select_priv` = \'N\'' . ' AND `Insert_priv` = \'N\'' . ' AND `Update_priv` = \'N\'' . ' AND `Delete_priv` = \'N\'' diff --git a/server_status.php b/server_status.php index aced914..536c215 100644 --- a/server_status.php +++ b/server_status.php @@ -486,16 +486,16 @@ cleanDeprecated($server_status); if (isset($server_status['Key_blocks_unused']) && isset($server_variables['key_cache_block_size']) && isset($server_variables['key_buffer_size'])) { - $server_status['Key_buffer_fraction_%'] = - 100 + $server_status['Key_buffer_fraction_%'] + = 100 - $server_status['Key_blocks_unused'] * $server_variables['key_cache_block_size'] / $server_variables['key_buffer_size'] * 100; } elseif (isset($server_status['Key_blocks_used']) && isset($server_variables['key_buffer_size'])) { - $server_status['Key_buffer_fraction_%'] = - $server_status['Key_blocks_used'] + $server_status['Key_buffer_fraction_%'] + = $server_status['Key_blocks_used'] * 1024 / $server_variables['key_buffer_size']; } @@ -518,8 +518,8 @@ if (isset($server_status['Threads_created']) && isset($server_status['Connections']) && $server_status['Connections'] > 0) { - $server_status['Threads_cache_hitrate_%'] = - 100 - $server_status['Threads_created'] / $server_status['Connections'] * 100; + $server_status['Threads_cache_hitrate_%'] + = 100 - $server_status['Threads_created'] / $server_status['Connections'] * 100; } /** diff --git a/tbl_change.php b/tbl_change.php index 660adff..2cffd16 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -376,8 +376,8 @@ foreach ($rows as $row_id => $vrow) { $table_fields[$i]['Default'] = null; } - $table_fields[$i]['len'] = - preg_match('@float|double@', $table_fields[$i]['Type']) ? 100 : -1; + $table_fields[$i]['len'] + = preg_match('@float|double@', $table_fields[$i]['Type']) ? 100 : -1; if (isset($comments_map[$table_fields[$i]['Field']])) { @@ -918,11 +918,11 @@ foreach ($rows as $row_id => $vrow) { $fieldsize = $extracted_fieldspec['spec_in_brackets']; } else { /** - * This case happens for example for INT or DATE columns; - * in these situations, the value returned in $field['len'] + * This case happens for example for INT or DATE columns; + * in these situations, the value returned in $field['len'] * seems appropriate. */ - $fieldsize = $field['len']; + $fieldsize = $field['len']; } $fieldsize = min(max($fieldsize, $cfg['MinSizeForInputField']), $cfg['MaxSizeForInputField']); echo $backup_field . "\n"; diff --git a/tbl_indexes.php b/tbl_indexes.php index bcdc59c..8552783 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -130,8 +130,8 @@ if ($GLOBALS['is_ajax_request'] != true) { if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) { // coming already from form - $add_fields = - count($_REQUEST['index']['columns']['names']) - $index->getColumnCount(); + $add_fields + = count($_REQUEST['index']['columns']['names']) - $index->getColumnCount(); if (isset($_REQUEST['add_fields'])) { $add_fields += $_REQUEST['added_fields']; } diff --git a/tbl_replace.php b/tbl_replace.php index 2505461..60dc7cf 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -185,36 +185,36 @@ foreach ($loop_array as $rownumber => $where_clause) { $query_values = array(); // Map multi-edit keys to single-level arrays, dependent on how we got the fields - $me_fields = - isset($_REQUEST['fields']['multi_edit'][$rownumber]) + $me_fields + = isset($_REQUEST['fields']['multi_edit'][$rownumber]) ? $_REQUEST['fields']['multi_edit'][$rownumber] : array(); - $me_fields_name = - isset($_REQUEST['fields_name']['multi_edit'][$rownumber]) + $me_fields_name + = isset($_REQUEST['fields_name']['multi_edit'][$rownumber]) ? $_REQUEST['fields_name']['multi_edit'][$rownumber] : null; - $me_fields_prev = - isset($_REQUEST['fields_prev']['multi_edit'][$rownumber]) + $me_fields_prev + = isset($_REQUEST['fields_prev']['multi_edit'][$rownumber]) ? $_REQUEST['fields_prev']['multi_edit'][$rownumber] : null; - $me_funcs = - isset($_REQUEST['funcs']['multi_edit'][$rownumber]) + $me_funcs + = isset($_REQUEST['funcs']['multi_edit'][$rownumber]) ? $_REQUEST['funcs']['multi_edit'][$rownumber] : null; - $me_fields_type = - isset($_REQUEST['fields_type']['multi_edit'][$rownumber]) + $me_fields_type + = isset($_REQUEST['fields_type']['multi_edit'][$rownumber]) ? $_REQUEST['fields_type']['multi_edit'][$rownumber] : null; - $me_fields_null = - isset($_REQUEST['fields_null']['multi_edit'][$rownumber]) + $me_fields_null + = isset($_REQUEST['fields_null']['multi_edit'][$rownumber]) ? $_REQUEST['fields_null']['multi_edit'][$rownumber] : null; - $me_fields_null_prev = - isset($_REQUEST['fields_null_prev']['multi_edit'][$rownumber]) + $me_fields_null_prev + = isset($_REQUEST['fields_null_prev']['multi_edit'][$rownumber]) ? $_REQUEST['fields_null_prev']['multi_edit'][$rownumber] : null; - $me_auto_increment = - isset($_REQUEST['auto_increment']['multi_edit'][$rownumber]) + $me_auto_increment + = isset($_REQUEST['auto_increment']['multi_edit'][$rownumber]) ? $_REQUEST['auto_increment']['multi_edit'][$rownumber] : null; @@ -405,8 +405,10 @@ foreach ($query as $single_query) { } // end if foreach (PMA_DBI_get_warnings() as $warning) { - $warning_messages[] = PMA_Message::sanitize($warning['Level'] . ': #' . $warning['Code'] - . ' ' . $warning['Message']); + $warning_messages[] + = PMA_Message::sanitize( + $warning['Level'] . ': #' . $warning['Code'] . ' ' . $warning['Message'] + ); } unset($result); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24468-g03436f6
by Rouslan Placella 07 Dec '11

07 Dec '11

The branch, master has been updated via 03436f6511041f4fd9028ca3c01d95f7a94b14ed (commit) from 9bb001b556f491cf1ffa292e909366bb1ad3f36c (commit) - Log ----------------------------------------------------------------- commit 03436f6511041f4fd9028ca3c01d95f7a94b14ed Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Dec 7 12:59:03 2011 +0000 Patch #3453408 - Fixed text overflow in the toggle switch of the Event Scheduler ----------------------------------------------------------------------- Summary of changes: js/functions.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/js/functions.js b/js/functions.js index 1e2bbad..829ae58 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3137,8 +3137,9 @@ var toggleButton = function ($obj) { var on = $('.toggleOn', $obj).width(); var off = $('.toggleOff', $obj).width(); // Make the "ON" and "OFF" parts of the switch the same size - $('.toggleOn > div', $obj).width(Math.max(on, off)); - $('.toggleOff > div', $obj).width(Math.max(on, off)); + // + 2 pixels to avoid overflowed + $('.toggleOn > div', $obj).width(Math.max(on, off) + 2); + $('.toggleOff > div', $obj).width(Math.max(on, off) + 2); /** * var w Width of the central part of the switch */ hooks/post-receive -- phpMyAdmin

1 0