- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15230-g3e342bc
by Dieter Adriaenssens 16 Aug '11

16 Aug '11

The branch, master has been updated via 3e342bceace595aaa5b34227618c65c5a3651814 (commit) from d6ba069b01d4a9d89ed3d5eb7b76bc388c04938c (commit) - Log ----------------------------------------------------------------- commit 3e342bceace595aaa5b34227618c65c5a3651814 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Tue Aug 16 23:05:22 2011 +0200 fix typo ----------------------------------------------------------------------- Summary of changes: scripts/decode_bug.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php index e5a645b..e376ef8 100644 --- a/scripts/decode_bug.php +++ b/scripts/decode_bug.php @@ -4,7 +4,7 @@ * Parser bug report decoder * * This is the parser bug decoder system - * Throw the bug data in teh query box, and hit submit for output. + * Throw the bug data in the query box, and hit submit for output. * * Copyright 2002 Robin Johnson <robbat2(a)users.sourceforge.net> * hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15229-gd6ba069
by Dieter Adriaenssens 16 Aug '11

16 Aug '11

The branch, master has been updated via d6ba069b01d4a9d89ed3d5eb7b76bc388c04938c (commit) via 35b3595ec0e6833b9199da0cb238243b4c7457fe (commit) from 8c4530e338ba81851cc5f0e2c9b3708293efa4ec (commit) - Log ----------------------------------------------------------------- commit d6ba069b01d4a9d89ed3d5eb7b76bc388c04938c Merge: 35b3595 8c4530e Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Tue Aug 16 22:40:30 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 35b3595ec0e6833b9199da0cb238243b4c7457fe Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Tue Aug 16 22:39:46 2011 +0200 coding style and wrapping long lines ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 72 ++++++++++++++++++++++++++++++---------------- tbl_change.php | 55 ++++++++++++++++++++-------------- 2 files changed, 79 insertions(+), 48 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index eee6035..0b89345 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -94,7 +94,7 @@ function PMA_getIcon($icon, $alternate = '', $force_text = false, $noSprite = fa $button .= '<span class="nowrap">'; if ($include_icon) { - if($noSprite) { + if ($noSprite) { $button .= '<img src="' . $GLOBALS['pmaThemeImage'] . $icon . '"' . ' class="icon" width="16" height="16" />'; } else { @@ -713,8 +713,8 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = // in $group we save the reference to the place in $table_groups // where to store the table info if ($GLOBALS['cfg']['LeftFrameDBTree'] - && $sep && strstr($table_name, $sep)) - { + && $sep && strstr($table_name, $sep) + ) { $parts = explode($sep, $table_name); $group =& $table_groups; @@ -754,7 +754,8 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = if ($GLOBALS['cfg']['ShowTooltipAliasTB'] - && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') { + && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested' + ) { // switch tooltip and name $table['Comment'] = $table['Name']; $table['disp_name'] = $table['Comment']; @@ -935,7 +936,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // @todo what about $GLOBALS['display_query']??? // @todo this is REALLY the wrong place to do this - very unexpected here if (strlen($GLOBALS['table']) - && $GLOBALS['sql_query'] == 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table'])) { + && $GLOBALS['sql_query'] == 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table']) + ) { if (PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], 'Index_length') > 1024) { PMA_DBI_try_query('REPAIR TABLE ' . PMA_backquote($GLOBALS['table'])); } @@ -1029,7 +1031,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view */ if (isset($analyzed_display_query[0]['queryflags']['select_from']) - && isset($GLOBALS['sql_limit_to_append'])) { + && isset($GLOBALS['sql_limit_to_append']) + ) { $query_base = $analyzed_display_query[0]['section_before_limit'] . "\n" . $GLOBALS['sql_limit_to_append'] . $analyzed_display_query[0]['section_after_limit']; @@ -1142,7 +1145,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // Refresh query if (! empty($cfg['SQLQuery']['Refresh']) - && preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query)) { + && preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query) + ) { $refresh_link = 'import.php' . PMA_generate_common_url($url_params); $refresh_link = ' [' . PMA_linkOrButton($refresh_link, __('Refresh')) . ']'; } else { @@ -1150,7 +1154,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view } //show as php if (! empty($cfg['SQLValidator']['use']) - && ! empty($cfg['SQLQuery']['Validate'])) { + && ! empty($cfg['SQLQuery']['Validate']) + ) { $validate_params = $url_params; if (!empty($GLOBALS['validatequery'])) { $validate_message = __('Skip Validate SQL') ; @@ -1251,8 +1256,9 @@ function PMA_profilingSupported() // (avoid a trip to the server for MySQL before 5.0.37) // and do not set a constant as we might be switching servers if (defined('PMA_MYSQL_INT_VERSION') - && PMA_MYSQL_INT_VERSION >= 50037 - && PMA_DBI_fetch_value("SHOW VARIABLES LIKE 'profiling'")) { + && PMA_MYSQL_INT_VERSION >= 50037 + && PMA_DBI_fetch_value("SHOW VARIABLES LIKE 'profiling'") + ) { PMA_cacheSet('profiling_supported', true, true); } else { PMA_cacheSet('profiling_supported', false, true); @@ -1734,7 +1740,10 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $displayed_message = ''; // Add text if not already added - if (stristr($message, '<img') && (!$strip_img || $GLOBALS['cfg']['PropertiesIconic'] === true) && strip_tags($message)==$message) { + if (stristr($message, '<img') + && (!$strip_img || $GLOBALS['cfg']['PropertiesIconic'] === true) + && strip_tags($message)==$message + ) { $displayed_message = '<span>' . htmlspecialchars(preg_replace('/^.*\salt="([^"]*)".*$/si', '\1', $message)) . '</span>'; } @@ -1996,7 +2005,8 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force $meta->orgname = $meta->name; if (isset($GLOBALS['analyzed_sql'][0]['select_expr']) - && is_array($GLOBALS['analyzed_sql'][0]['select_expr'])) { + && is_array($GLOBALS['analyzed_sql'][0]['select_expr']) + ) { foreach ($GLOBALS['analyzed_sql'][0]['select_expr'] as $select_expr) { // need (string) === (string) // '' !== 0 but '' == 0 @@ -2019,7 +2029,10 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force // a view because this view might be updatable. // (The isView() verification should not be costly in most cases // because there is some caching in the function). - if (isset($meta->orgtable) && $meta->table != $meta->orgtable && ! PMA_Table::isView($GLOBALS['db'], $meta->table)) { + if (isset($meta->orgtable) + && $meta->table != $meta->orgtable + && ! PMA_Table::isView($GLOBALS['db'], $meta->table) + ) { $meta->table = $meta->orgtable; } @@ -2042,7 +2055,10 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force } else { // timestamp is numeric on some MySQL 4.1 // for real we use CONCAT above and it should compare to string - if ($meta->numeric && $meta->type != 'timestamp' && $meta->type != 'real') { + if ($meta->numeric + && $meta->type != 'timestamp' + && $meta->type != 'real' + ) { $con_val = '= ' . $row[$i]; } elseif (($meta->type == 'blob' || $meta->type == 'string') // hexify only if this is a true not empty BLOB or a BINARY @@ -2131,10 +2147,13 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, . PMA_getIcon($image, $text) .'</button>' . "\n"; } else { - echo '<input type="image" name="' . $image_name . '" value="' - . htmlspecialchars($value) . '" title="' . htmlspecialchars($text) . '" src="' . $GLOBALS['pmaThemeImage'] - . $image . '" />' - . ($GLOBALS['cfg']['PropertiesIconic'] === 'both' ? ' ' . htmlspecialchars($text) : '') . "\n"; + echo '<input type="image" name="' . $image_name + . '" value="' . htmlspecialchars($value) + . '" title="' . htmlspecialchars($text) + . '" src="' . $GLOBALS['pmaThemeImage']. $image . '" />' + . ($GLOBALS['cfg']['PropertiesIconic'] === 'both' + ? ' ' . htmlspecialchars($text) + : '') . "\n"; } } // end function @@ -2228,7 +2247,8 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, } else { $selected = ''; } - $gotopage .= ' <option ' . $selected . ' value="' . (($i - 1) * $rows) . '">' . $i . '</option>' . "\n"; + $gotopage .= ' <option ' . $selected + . ' value="' . (($i - 1) * $rows) . '">' . $i . '</option>' . "\n"; } $gotopage .= ' </select><noscript><input type="submit" value="' . __('Go') . '" /></noscript>'; @@ -2363,8 +2383,8 @@ function PMA_getDbLink($database = null) } return '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($database) . '"' - .' title="' . sprintf(__('Jump to database "%s".'), htmlspecialchars($database)) . '">' - .htmlspecialchars($database) . '</a>'; + . ' title="' . sprintf(__('Jump to database "%s".'), htmlspecialchars($database)) . '">' + . htmlspecialchars($database) . '</a>'; } /** @@ -3185,7 +3205,8 @@ function PMA_getFunctionsForField($field, $insert_mode) // or something similar. Then directly look up the entry in the RestrictFunctions array, // which will then reveal the available dropdown options if (isset($cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])]) - && isset($cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])]])) { + && isset($cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])]]) + ) { $current_func_type = $cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])]; $dropdown = $cfg['RestrictFunctions'][$current_func_type]; $default_function = $cfg['DefaultFunctions'][$current_func_type]; @@ -3202,9 +3223,10 @@ function PMA_getFunctionsForField($field, $insert_mode) // and the column does not have the // ON UPDATE DEFAULT TIMESTAMP attribute. if ($field['True_Type'] == 'timestamp' - && empty($field['Default']) - && empty($data) - && ! isset($analyzed_sql[0]['create_table_fields'][$field['Field']]['on_update_current_timestamp'])) { + && empty($field['Default']) + && empty($data) + && ! isset($analyzed_sql[0]['create_table_fields'][$field['Field']]['on_update_current_timestamp']) + ) { $default_function = $cfg['DefaultFunctions']['first_timestamp']; } // For primary keys of type char(36) or varchar(36) UUID if the default function diff --git a/tbl_change.php b/tbl_change.php index 8befabb..9148ef3 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -791,26 +791,26 @@ foreach ($rows as $row_id => $vrow) { // We don't want binary data destroyed elseif ($field['is_binary'] || $field['is_blob']) { if (($cfg['ProtectBinary'] && $field['is_blob']) - || ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) { + || ($cfg['ProtectBinary'] == 'all' && $field['is_binary']) + ) { echo "\n"; // for blobstreaming - if (PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type) && PMA_BS_IsPBMSReference($data, $db)) - { - echo '<input type="hidden" name="remove_blob_ref_' . $field['Field_md5'] . $vkey . '" value="' . $data . '" />'; - echo '<input type="checkbox" name="remove_blob_repo_' . $field['Field_md5'] . $vkey . '" /> ' . __('Remove BLOB Repository Reference') . "<br />"; - echo PMA_BS_CreateReferenceLink($data, $db); - echo "<br />"; + if (PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type) + && PMA_BS_IsPBMSReference($data, $db) + ) { + echo '<input type="hidden" name="remove_blob_ref_' . $field['Field_md5'] . $vkey . '" value="' . $data . '" />'; + echo '<input type="checkbox" name="remove_blob_repo_' . $field['Field_md5'] . $vkey . '" /> ' . __('Remove BLOB Repository Reference') . "<br />"; + echo PMA_BS_CreateReferenceLink($data, $db); + echo "<br />"; + } else { + echo __('Binary - do not edit'); + if (isset($data)) { + $data_size = PMA_formatByteDown(strlen(stripslashes($data)), 3, 1); + echo ' ('. $data_size [0] . ' ' . $data_size[1] . ')'; + unset($data_size); } - else - { - echo __('Binary - do not edit'); - if (isset($data)) { - $data_size = PMA_formatByteDown(strlen(stripslashes($data)), 3, 1); - echo ' ('. $data_size [0] . ' ' . $data_size[1] . ')'; - unset($data_size); - } - echo "\n"; - } // end if (PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type) && PMA_BS_IsPBMSReference($data, $db)) + echo "\n"; + } // end if (PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type) && PMA_BS_IsPBMSReference($data, $db)) ?> <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="protected" /> <input type="hidden" name="fields<?php echo $field_name_appendix; ?>" value="" /> @@ -849,7 +849,9 @@ foreach ($rows as $row_id => $vrow) { if ($is_upload && $field['is_blob']) { // check if field type is of longblob and if the table is PBMS enabled. - if (($field['pma_type'] == "longblob") && PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type)) { + if (($field['pma_type'] == "longblob") + && PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type) + ) { echo '<br />'; echo '<input type="checkbox" name="upload_blob_repo' . $vkey . '[' . $field['Field_md5'] . ']" /> ' . __('Upload to BLOB repository'); } @@ -898,12 +900,14 @@ foreach ($rows as $row_id => $vrow) { elseif (in_array($field['pma_type'], $no_support_types)) { // ignore this column to avoid changing it - } - else { + } else { // field size should be at least 4 and max 40 $fieldsize = min(max($field['len'], 4), 40); echo $backup_field . "\n"; - if ($field['is_char'] && ($cfg['CharEditing'] == 'textarea' || strpos($data, "\n") !== false)) { + if ($field['is_char'] + && ($cfg['CharEditing'] == 'textarea' + || strpos($data, "\n") !== false) + ) { echo "\n"; ?> <textarea name="fields<?php echo $field_name_appendix; ?>" @@ -919,7 +923,9 @@ foreach ($rows as $row_id => $vrow) { $the_class = 'textfield'; if ($field['pma_type'] == 'date') { $the_class .= ' datefield'; - } elseif ($field['pma_type'] == 'datetime' || substr($field['pma_type'], 0, 9) == 'timestamp') { + } elseif ($field['pma_type'] == 'datetime' + || substr($field['pma_type'], 0, 9) == 'timestamp' + ) { $the_class .= ' datetimefield'; } ?> @@ -949,7 +955,10 @@ foreach ($rows as $row_id => $vrow) { <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="bit" /> <?php } - if ($field['pma_type'] == 'date' || $field['pma_type'] == 'datetime' || substr($field['pma_type'], 0, 9) == 'timestamp') { + if ($field['pma_type'] == 'date' + || $field['pma_type'] == 'datetime' + || substr($field['pma_type'], 0, 9) == 'timestamp' + ) { // the _3 suffix points to the date field // the _2 suffix points to the corresponding NULL checkbox // in dateFormat, 'yy' means the year with 4 digits hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15227-g8c4530e
by Piotr Przybylski 16 Aug '11

16 Aug '11

The branch, master has been updated via 8c4530e338ba81851cc5f0e2c9b3708293efa4ec (commit) via 6694352f0c5ae67f8b80df29ee319ea538874b39 (commit) via 726594645ccd3906e39c6d8be973b2ac2d4bffd2 (commit) via 701c957f40696a17c1ee5d3804ffb21d6674090e (commit) from 71184688b507f04bc3b5e521cb8d710de682b633 (commit) - Log ----------------------------------------------------------------- commit 8c4530e338ba81851cc5f0e2c9b3708293efa4ec Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 22:19:41 2011 +0200 Simplify code commit 6694352f0c5ae67f8b80df29ee319ea538874b39 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 22:18:08 2011 +0200 Only PMA_DBI_fetch_assoc is needed here commit 726594645ccd3906e39c6d8be973b2ac2d4bffd2 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 22:17:23 2011 +0200 Optimize tracking query, only the first row is needed commit 701c957f40696a17c1ee5d3804ffb21d6674090e Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 20:23:15 2011 +0200 Inline three one-line methods ----------------------------------------------------------------------- Summary of changes: libraries/Tracker.class.php | 53 ++++++------------------------------------ 1 files changed, 8 insertions(+), 45 deletions(-) diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index 8a622aa..de216ab 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -131,39 +131,6 @@ class PMA_Tracker } /** - * Returns a simple DROP TABLE statement. - * - * @param string $tablename - * @return string - */ - static public function getStatementDropTable($tablename) - { - return 'DROP TABLE IF EXISTS ' . $tablename; - } - - /** - * Returns a simple DROP VIEW statement. - * - * @param string $viewname - * @return string - */ - static public function getStatementDropView($viewname) - { - return 'DROP VIEW IF EXISTS ' . $viewname; - } - - /** - * Returns a simple DROP DATABASE statement. - * - * @param string $dbname - * @return string - */ - static public function getStatementDropDatabase($dbname) - { - return 'DROP DATABASE IF EXISTS ' . $dbname; - } - - /** * Parses the name of a table from a SQL statement substring. * * @static @@ -303,13 +270,13 @@ class PMA_Tracker if (self::$add_drop_table == true && $is_view == false) { $create_sql .= self::getLogComment() . - self::getStatementDropTable(PMA_backquote($tablename)) . ";\n"; + 'DROP TABLE IF EXISTS ' . PMA_backquote($tablename) . ";\n"; } if (self::$add_drop_view == true && $is_view == true) { $create_sql .= self::getLogComment() . - self::getStatementDropView(PMA_backquote($tablename)) . ";\n"; + 'DROP VIEW IF EXISTS ' . PMA_backquote($tablename) . ";\n"; } $create_sql .= self::getLogComment() . @@ -399,7 +366,7 @@ class PMA_Tracker if (self::$add_drop_database == true) { $create_sql .= self::getLogComment() . - self::getStatementDropDatabase(PMA_backquote($dbname)) . ";\n"; + 'DROP DATABASE IF EXISTS ' . PMA_backquote($dbname) . ";\n"; } $create_sql .= self::getLogComment() . $query; @@ -564,13 +531,9 @@ class PMA_Tracker $sql_query .= " AND FIND_IN_SET('" . $statement . "',tracking) > 0" ; } $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); - if (isset($row[0])) { - $version = $row[0]; - } - if (! isset($version)) { - $version = -1; - } - return $version; + return isset($row[0]) + ? $row[0] + : -1; } @@ -596,9 +559,9 @@ class PMA_Tracker $sql_query .= " AND `table_name` = '" . PMA_sqlAddSlashes($tablename) ."' "; } $sql_query .= " AND `version` = '" . PMA_sqlAddSlashes($version) ."' ". - " ORDER BY `version` DESC "; + " ORDER BY `version` DESC LIMIT 1"; - $mixed = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); + $mixed = PMA_DBI_fetch_assoc(PMA_query_as_controluser($sql_query)); // Parse log $log_schema_entries = explode('# log ', $mixed['schema_sql']); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15223-g7118468
by Piotr Przybylski 16 Aug '11

16 Aug '11

The branch, master has been updated via 71184688b507f04bc3b5e521cb8d710de682b633 (commit) from 11465727162f945c331f8fa4d7a13dc2c466024e (commit) - Log ----------------------------------------------------------------- commit 71184688b507f04bc3b5e521cb8d710de682b633 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 19:57:23 2011 +0200 We need only associative array here ----------------------------------------------------------------------- Summary of changes: libraries/Tracker.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index bb106a9..8a622aa 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -289,7 +289,7 @@ class PMA_Tracker $indexes = array(); - while($row = PMA_DBI_fetch_array($sql_result)) { + while($row = PMA_DBI_fetch_assoc($sql_result)) { $indexes[] = $row; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15222-g1146572
by Piotr Przybylski 16 Aug '11

16 Aug '11

The branch, master has been updated via 11465727162f945c331f8fa4d7a13dc2c466024e (commit) via 5cd731b232b3e7d4aa9d3d2cc6c276e52e6459f0 (commit) from e3f09710dc121148e8421c8d07e87deba1899f63 (commit) - Log ----------------------------------------------------------------- commit 11465727162f945c331f8fa4d7a13dc2c466024e Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 19:53:11 2011 +0200 Use PMA_DBI_get_columns in Tracker code commit 5cd731b232b3e7d4aa9d3d2cc6c276e52e6459f0 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 19:33:09 2011 +0200 Make this usage of $sql_backquotes less cryptic ----------------------------------------------------------------------- Summary of changes: libraries/Tracker.class.php | 14 ++++++-------- libraries/export/sql.php | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index 5d24b78..bb106a9 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -273,13 +273,13 @@ class PMA_Tracker $date = date('Y-m-d H:i:s'); // Get data definition snapshot of table - $sql_query = ' - SHOW FULL COLUMNS FROM ' . PMA_backquote($dbname) . '.' . PMA_backquote($tablename); - - $sql_result = PMA_DBI_query($sql_query); - while ($row = PMA_DBI_fetch_array($sql_result)) { - $columns[] = $row; + $columns = PMA_DBI_get_columns($dbname, $tablename, true); + // int indices to reduce size + $columns = array_values($columns); + // remove Privileges to reduce size + for ($i = 0; $i < count($columns); $i++) { + unset($columns[$i]['Privileges']); } $sql_query = ' @@ -387,8 +387,6 @@ class PMA_Tracker */ static public function createDatabaseVersion($dbname, $version, $query, $tracking_set = 'CREATE DATABASE,ALTER DATABASE,DROP DATABASE') { - global $sql_backquotes; - $date = date('Y-m-d H:i:s'); if ($tracking_set == '') { diff --git a/libraries/export/sql.php b/libraries/export/sql.php index a561bb6..40efc2b 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -297,8 +297,8 @@ if (isset($plugin_list)) { /** * Avoids undefined variables, use NULL so isset() returns false */ - if (! isset($sql_backquotes)) { - $sql_backquotes = null; + if (! isset($GLOBALS['sql_backquotes'])) { + $GLOBALS['sql_backquotes'] = null; } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15218-g2a48ac6
by Michal Čihař 16 Aug '11

16 Aug '11

The branch, master has been updated via 2a48ac61288c8e9f0dcf49da5883410081a2596e (commit) via 578d2dc33ddbf435abada44e9122f07829995272 (commit) via 5092d728a90da172ff00f2edb6a3b294ef918118 (commit) via 95e01565f0e0196354a8d3be144ce37a79e50e99 (commit) via d1c44c49089678f15f6ae24766fd1e5b3c709fce (commit) via e05ce12e53a67130b5f54ea7e75ae6d2cc583ad8 (commit) via cf14b03298ae48d8d2aaeffaaf6ff36e7928eafa (commit) via caedcb695ca6e31c993af355a8845b2f73c63e19 (commit) via 86badc082dc73484364ec8aaa10bd5e508cf2047 (commit) via 2b04f19b1c824b642eb7ac804422a03685ceb06d (commit) via 750042aadc210972204e5fb48ec5c06fd90f0116 (commit) via 09e3f99c6c83fb90416eaf4d7706595bd933ce9b (commit) via c7e02dad6ab498b048063b93a25a16e1f37412f1 (commit) from 79f746198eeea63e17a85bddacbddb3c48663e7b (commit) - Log ----------------------------------------------------------------- commit 2a48ac61288c8e9f0dcf49da5883410081a2596e Merge: 578d2dc 79f7461 Author: Pootle server <pootle(a)cihar.com> Date: Tue Aug 16 16:40:09 2011 +0200 Merge remote-tracking branch 'origin/master' commit 578d2dc33ddbf435abada44e9122f07829995272 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 16:10:29 2011 +0200 Translation update done using Pootle. commit 5092d728a90da172ff00f2edb6a3b294ef918118 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 16:08:04 2011 +0200 Translation update done using Pootle. commit 95e01565f0e0196354a8d3be144ce37a79e50e99 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 16:06:46 2011 +0200 Translation update done using Pootle. commit d1c44c49089678f15f6ae24766fd1e5b3c709fce Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 16:05:21 2011 +0200 Translation update done using Pootle. commit e05ce12e53a67130b5f54ea7e75ae6d2cc583ad8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 16:03:07 2011 +0200 Translation update done using Pootle. commit cf14b03298ae48d8d2aaeffaaf6ff36e7928eafa Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 15:59:51 2011 +0200 Translation update done using Pootle. commit caedcb695ca6e31c993af355a8845b2f73c63e19 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 15:59:42 2011 +0200 Translation update done using Pootle. commit 86badc082dc73484364ec8aaa10bd5e508cf2047 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 15:55:45 2011 +0200 Translation update done using Pootle. commit 2b04f19b1c824b642eb7ac804422a03685ceb06d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 15:55:38 2011 +0200 Translation update done using Pootle. commit 750042aadc210972204e5fb48ec5c06fd90f0116 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 15:51:26 2011 +0200 Translation update done using Pootle. commit 09e3f99c6c83fb90416eaf4d7706595bd933ce9b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 15:44:24 2011 +0200 Translation update done using Pootle. commit c7e02dad6ab498b048063b93a25a16e1f37412f1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 15:42:44 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 16 +++++++--------- po/tr.po | 17 +++++++++++++---- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/po/ja.po b/po/ja.po index 546d556..2aeefb9 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-08-15 10:09+0200\n" -"PO-Revision-Date: 2011-08-16 11:21+0200\n" +"PO-Revision-Date: 2011-08-16 16:10+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -1497,10 +1497,9 @@ msgid "Analyse Query" msgstr "クエリを更新する" #: js/messages.php:196 -#, fuzzy #| msgid "Apply a divisor" msgid "Advisor system" -msgstr "除数を適用する" +msgstr "アドバイザ・システム" #: js/messages.php:197 msgid "Possible performance issues" @@ -9339,7 +9338,7 @@ msgstr "はじめに" msgid "" "The Advisor system can provide recommendations on server variables by " "analyzing the server status variables." -msgstr "" +msgstr "アドバイザ・システムは、サーバの状態変数を分析することにより、サーバ変数のお勧め設定方法を提供するものです。" #: server_status.php:810 msgid "" @@ -9347,6 +9346,7 @@ msgid "" "calculations and by rule of thumb which may not necessarily apply to your " "system." msgstr "" +"このシステムは、単純な計算を基にして経験則によってお勧め設定を提供するため、お使いのシステムに必ずしも当てはまるものではないことに注意してください。" #: server_status.php:812 msgid "" @@ -11583,9 +11583,7 @@ msgstr "稼働時間が 1 日未満" #: po/advisory_rules.php:6 msgid "Uptime is less than 1 day, performance tuning may not be accurate." -msgstr "" -"稼働時間は 1 日未満です。パフォーマンスチューニングが正確でない可能性がありま" -"す。" +msgstr "稼働時間が 1 日未満です。パフォーマンスチューニングが正確でない可能性があります。" #: po/advisory_rules.php:7 msgid "" @@ -12312,8 +12310,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:178 #, php-format diff --git a/po/tr.po b/po/tr.po index b0ec0df..e954ed1 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-08-15 10:09+0200\n" -"PO-Revision-Date: 2011-08-16 08:21+0200\n" +"PO-Revision-Date: 2011-08-16 16:08+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -9386,6 +9386,8 @@ msgid "" "calculations and by rule of thumb which may not necessarily apply to your " "system." msgstr "" +"Yine de not edin bu sistem basit hesaplamalar üzerine kurulu ve sisteminize " +"zorunlu olarak uygulanamayabilir başlıca kurallara göre öneriler sağlar." #: server_status.php:812 msgid "" @@ -9393,6 +9395,10 @@ msgid "" "changing (by reading the documentation) and how to undo the change. Wrong " "tuning can have a very negative effect on performance." msgstr "" +"Yapılandırmanın herhangi bir yerini değiştirmeden önce, neyi " +"değiştirdiğinizi bildiğinizden (belgeyi okuyarak) ve değişikliği nasıl geri " +"alacağınızdan emin olun. Yanlış ayarlama performansa çok olumsuz etki " +"edebilir." #: server_status.php:814 msgid "" @@ -9400,6 +9406,9 @@ msgid "" "time, observe or benchmark your database, and undo the change if there was " "no clearly measurable improvement." msgstr "" +"Sisteminizi ayarlamanın en iyi yolu bir defada sadece bir değişiklik yapmak, " +"gözlemlemek, veritabanınızı kıyaslamak ve eğer açıkça ölçülebilir bir " +"gelişme olmadıysa, değişikliği geri almak olacaktır." #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:836 @@ -11907,12 +11916,12 @@ msgstr "Sorgu önbelleği verimli çalışmıyor, düşük tavan oranına sahip. #: po/advisory_rules.php:77 msgid "Consider increasing {query_cache_limit}." -msgstr "" +msgstr "Dikkate değer artış {query_cache_limit}." #: po/advisory_rules.php:78 #, php-format msgid "The current query cache hit rate of %s%% is below 20%%" -msgstr "" +msgstr "Şu anki %%%s sorgu önbelleği tavan oranı %%20'nin altında" #: po/advisory_rules.php:80 msgid "Query Cache usage" @@ -11921,7 +11930,7 @@ msgstr "Sorgu Önbelleği kullanımı" #: po/advisory_rules.php:81 #, php-format msgid "Less than 80%% of the query cache is being utilized." -msgstr "" +msgstr "Sorgu önbelleğinin %%80'den azı değerlendirilmekte." #: po/advisory_rules.php:82 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15205-g79f7461
by Rouslan Placella 16 Aug '11

16 Aug '11

The branch, master has been updated via 79f746198eeea63e17a85bddacbddb3c48663e7b (commit) via 8f1aca48180621de54a24472a6c10af412fdd947 (commit) via 4e4456e9b87720ea9e1c426e9efc381356b68c3d (commit) via 39b0f4d34bff1815ff37241ea4c47698e6d4f935 (commit) from f2842a22bf179b93a7eeebd034ed9302fb781e97 (commit) - Log ----------------------------------------------------------------- commit 79f746198eeea63e17a85bddacbddb3c48663e7b Merge: 8f1aca4 f2842a2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 16 14:02:40 2011 +0100 Merge remote-tracking branch 'origin/master' commit 8f1aca48180621de54a24472a6c10af412fdd947 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 16 14:02:16 2011 +0100 MySQL allows a function and a procedure with the same name in the same db. This case was unhandled. commit 4e4456e9b87720ea9e1c426e9efc381356b68c3d Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 16 12:36:38 2011 +0100 Fixed wrong permission check for "Drop Routine" action commit 39b0f4d34bff1815ff37241ea4c47698e6d4f935 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 16 12:35:43 2011 +0100 Fixed wrong destination page on "Drop Routine" action ----------------------------------------------------------------------- Summary of changes: libraries/rte/rte_export.lib.php | 21 +++++++++++---------- libraries/rte/rte_list.lib.php | 10 +++++++--- libraries/rte/rte_routines.lib.php | 20 +++++++++++++------- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/libraries/rte/rte_export.lib.php b/libraries/rte/rte_export.lib.php index d4d8f99..8cac214 100644 --- a/libraries/rte/rte_export.lib.php +++ b/libraries/rte/rte_export.lib.php @@ -70,16 +70,17 @@ function PMA_RTN_handleExport() { global $_GET, $db; - if (! empty($_GET['export_item']) && ! empty($_GET['item_name'])) { - $item_name = $_GET['item_name']; - $type = PMA_DBI_fetch_value( - "SELECT ROUTINE_TYPE " . - "FROM INFORMATION_SCHEMA.ROUTINES " . - "WHERE ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' " . - "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($item_name) . "';" - ); - $export_data = PMA_DBI_get_definition($db, $type, $item_name); - PMA_RTE_handleExport($item_name, $export_data); + if ( ! empty($_GET['export_item']) + && ! empty($_GET['item_name']) + && ! empty($_GET['item_type']) + ) { + if ($_GET['item_type'] == 'FUNCTION' || $_GET['item_type'] == 'PROCEDURE') { + $export_data = PMA_DBI_get_definition( + $db, + $_GET['item_type'], + $_GET['item_name']); + PMA_RTE_handleExport($_GET['item_name'], $export_data); + } } } // end PMA_RTN_handleExport() diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index 3b6177d..19e8e64 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -117,7 +117,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') $sql_drop = sprintf('DROP %s IF EXISTS %s', $routine['ROUTINE_TYPE'], PMA_backquote($routine['SPECIFIC_NAME'])); - + $type_link = "item_type={$routine['ROUTINE_TYPE']}"; $retval = " <tr class='noclick $rowclass'>\n"; $retval .= " <td>\n"; @@ -136,6 +136,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') . $url_query . '&edit_item=1' . '&item_name=' . urlencode($routine['SPECIFIC_NAME']) + . '&' . $type_link . '">' . $titles['Edit'] . "</a>\n"; } else { $retval .= " {$titles['NoEdit']}\n"; @@ -150,6 +151,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') // otherwise we can execute it directly. $routine_details = PMA_RTN_getDataFromName( $routine['SPECIFIC_NAME'], + $routine['ROUTINE_TYPE'], false ); if ($routine !== false) { @@ -168,6 +170,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') . $url_query . '&' . $execute_action . '=1' . '&item_name=' . urlencode($routine['SPECIFIC_NAME']) + . '&' . $type_link . '">' . $titles['Execute'] . "</a>\n"; } } else { @@ -180,15 +183,16 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') . $url_query . '&export_item=1' . '&item_name=' . urlencode($routine['SPECIFIC_NAME']) + . '&' . $type_link . '">' . $titles['Export'] . "</a>\n"; $retval .= " </td>\n"; $retval .= " <td>\n"; - if (PMA_currentUserHasPrivilege('EVENT', $db)) { + if (PMA_currentUserHasPrivilege('ALTER ROUTINE', $db)) { $retval .= ' <a ' . $ajax_class['drop'] . ' href="sql.php?' . $url_query . '&sql_query=' . urlencode($sql_drop) - . '&goto=db_events.php' . urlencode("?db={$db}") + . '&goto=db_routines.php' . urlencode("?db={$db}") . '" >' . $titles['Drop'] . "</a>\n"; } else { $retval .= " {$titles['NoDrop']}\n"; diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 3e63603..8cd0529 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -304,7 +304,9 @@ function PMA_RTN_handleEditor() $extra_data = array(); if ($message->isSuccess()) { $columns = "`SPECIFIC_NAME`, `ROUTINE_NAME`, `ROUTINE_TYPE`, `DTD_IDENTIFIER`, `ROUTINE_DEFINITION`"; - $where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' AND ROUTINE_NAME='" . PMA_sqlAddSlashes($_REQUEST['item_name']) . "'"; + $where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' " + . "AND ROUTINE_NAME='" . PMA_sqlAddSlashes($_REQUEST['item_name']) . "'" + . "AND ROUTINE_TYPE='" . PMA_sqlAddSlashes($_REQUEST['item_type']) . "'"; $routine = PMA_DBI_fetch_single_row("SELECT $columns FROM `INFORMATION_SCHEMA`.`ROUTINES` WHERE $where;"); $extra_data['name'] = htmlspecialchars(strtoupper($_REQUEST['item_name'])); $extra_data['new_row'] = PMA_RTN_getRowForList($routine); @@ -343,7 +345,7 @@ function PMA_RTN_handleEditor() } else if (! empty($_REQUEST['edit_item'])) { $title = __("Edit routine"); if (! $operation && ! empty($_REQUEST['item_name']) && empty($_REQUEST['editor_process_edit'])) { - $routine = PMA_RTN_getDataFromName($_REQUEST['item_name']); + $routine = PMA_RTN_getDataFromName($_REQUEST['item_name'], $_REQUEST['item_type']); if ($routine !== false) { $routine['item_original_name'] = $routine['item_name']; $routine['item_original_type'] = $routine['item_type']; @@ -501,12 +503,13 @@ function PMA_RTN_getDataFromRequest() * the "Edit routine" form given the name of a routine. * * @param string $name The name of the routine. + * @param string $type Type of routine (ROUTINE|PROCEDURE) * @param bool $all Whether to return all data or just * the info about parameters. * * @return array Data necessary to create the routine editor. */ -function PMA_RTN_getDataFromName($name, $all = true) +function PMA_RTN_getDataFromName($name, $type, $all = true) { global $param_directions, $param_sqldataaccess, $db; @@ -517,7 +520,8 @@ function PMA_RTN_getDataFromName($name, $all = true) . "ROUTINE_DEFINITION, IS_DETERMINISTIC, SQL_DATA_ACCESS, " . "ROUTINE_COMMENT, SECURITY_TYPE"; $where = "ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' " - . "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($name) . "'"; + . "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($name) . "'" + . "AND ROUTINE_TYPE='" . PMA_sqlAddSlashes($type) . "'"; $query = "SELECT $fields FROM INFORMATION_SCHEMA.ROUTINES WHERE $where;"; $routine = PMA_DBI_fetch_single_row($query); @@ -1002,7 +1006,7 @@ function PMA_RTN_getQueryFromRequest() $warned_about_dir = false; $warned_about_name = false; $warned_about_length = false; - if (! empty($_REQUEST['item_param_name']) + if ( ! empty($_REQUEST['item_param_name']) && ! empty($_REQUEST['item_param_type']) && ! empty($_REQUEST['item_param_length']) && is_array($_REQUEST['item_param_name']) @@ -1124,7 +1128,7 @@ function PMA_RTN_handleExecute() */ if (! empty($_REQUEST['execute_routine']) && ! empty($_REQUEST['item_name'])) { // Build the queries - $routine = PMA_RTN_getDataFromName($_REQUEST['item_name'], false); + $routine = PMA_RTN_getDataFromName($_REQUEST['item_name'], $_REQUEST['item_type'], false); if ($routine !== false) { $queries = array(); $end_query = array(); @@ -1279,7 +1283,7 @@ function PMA_RTN_handleExecute() /** * Display the execute form for a routine. */ - $routine = PMA_RTN_getDataFromName($_GET['item_name'], false); + $routine = PMA_RTN_getDataFromName($_GET['item_name'], $_GET['item_type'], true); if ($routine !== false) { $form = PMA_RTN_getExecuteForm($routine); if ($GLOBALS['is_ajax_request'] == true) { @@ -1336,6 +1340,8 @@ function PMA_RTN_getExecuteForm($routine) $retval .= "<form action='db_routines.php' method='post' class='rte_form'>\n"; $retval .= "<input type='hidden' name='item_name'\n"; $retval .= " value='{$routine['item_name']}' />\n"; + $retval .= "<input type='hidden' name='item_type'\n"; + $retval .= " value='{$routine['item_type']}' />\n"; $retval .= PMA_generate_common_hidden_inputs($db) . "\n"; $retval .= "<fieldset>\n"; if ($GLOBALS['is_ajax_request'] != true) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15201-gf2842a2
by Piotr Przybylski 16 Aug '11

16 Aug '11

The branch, master has been updated via f2842a22bf179b93a7eeebd034ed9302fb781e97 (commit) via df9b8c2729decf39321771452bc1884b979f31ef (commit) via a9d583e5d5b1ed4c82dbf687b13a3eb964ce63e1 (commit) via 6dca42107e3c16cb886bc470953e71fbe4aa3503 (commit) via 493aa3a6f0912d13a46703469bd0630362db5ee0 (commit) from e16bd0bb796b8ae895a0cac78389491aa5569114 (commit) - Log ----------------------------------------------------------------- commit f2842a22bf179b93a7eeebd034ed9302fb781e97 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 14:35:02 2011 +0200 Fox comment commit df9b8c2729decf39321771452bc1884b979f31ef Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 14:31:52 2011 +0200 Fix comments for functions with missing @return tag commit a9d583e5d5b1ed4c82dbf687b13a3eb964ce63e1 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 14:30:46 2011 +0200 Add some missing @return tags in tests commit 6dca42107e3c16cb886bc470953e71fbe4aa3503 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 14:18:15 2011 +0200 Fix comments in upload progress libs and add make returns consistent commit 493aa3a6f0912d13a46703469bd0630362db5ee0 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 16 14:16:46 2011 +0200 A few fixes for comments in Relation_Schema classes (they still require further work) ----------------------------------------------------------------------- Summary of changes: libraries/Advisor.class.php | 10 ++++++++++ libraries/Config.class.php | 9 +++++++-- libraries/Error_Handler.class.php | 1 + libraries/File.class.php | 5 ++++- libraries/List_Database.class.php | 1 + libraries/PMA.php | 6 ++++++ libraries/Theme.class.php | 2 ++ libraries/Theme_Manager.class.php | 10 +++++++++- libraries/auth/cookie.auth.lib.php | 1 + libraries/blobstreaming.lib.php | 10 ++++++++++ libraries/blowfish.php | 1 + libraries/common.lib.php | 7 +++---- libraries/database_interface.lib.php | 1 + libraries/db_structure.lib.php | 8 ++++---- libraries/file_listing.php | 16 ++++++++-------- libraries/grab_globals.lib.php | 5 +++-- libraries/import/upload/apc.php | 5 ++++- libraries/import/upload/noplugin.php | 5 ++++- libraries/import/upload/uploadprogress.php | 5 ++++- libraries/mime.lib.php | 3 +++ libraries/schema/Pdf_Relation_Schema.class.php | 10 +++++++--- libraries/schema/Svg_Relation_Schema.class.php | 2 +- libraries/schema/Visio_Relation_Schema.class.php | 7 +++---- libraries/select_lang.lib.php | 5 +++++ libraries/sysinfo.lib.php | 3 +++ scripts/signon-script.php | 3 +++ .../libraries/common/PMA_expandUserString_test.php | 2 ++ .../libraries/common/PMA_extractFieldSpec_test.php | 2 ++ .../common/PMA_foreignKeySupported_test.php | 2 ++ .../common/PMA_formatNumberByteDown_test.php | 5 ++++- .../common/PMA_localisedDateTimespan_test.php | 5 ++++- .../common/PMA_printableBitValue_test.php | 3 ++- .../libraries/common/PMA_quoting_slashing_test.php | 6 ++++++ .../libraries/common/PMA_stringOperations_test.php | 12 ++++++++---- 34 files changed, 138 insertions(+), 40 deletions(-) diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php index bf4fd41..26696bd 100644 --- a/libraries/Advisor.class.php +++ b/libraries/Advisor.class.php @@ -85,6 +85,9 @@ class Advisor /** * Escapes percent string to be used in format string. + * + * @param string $str + * @return string */ function escapePercent($str) { @@ -93,6 +96,10 @@ class Advisor /** * Wrapper function for translating. + * + * @param string $str + * @param mixed $param + * @return string */ function translate($str, $param = null) { @@ -109,6 +116,9 @@ class Advisor /** * Splits justification to text and formula. + * + * @param string $rule + * @return array */ function splitJustification($rule) { diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 803e0c0..f390856 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -334,6 +334,7 @@ class PMA_Config * should be called on object creation * * @param string $source config file + * @return bool */ function load($source = null) { @@ -698,6 +699,8 @@ class PMA_Config * $cfg['PmaAbsoluteUri'] is a required directive else cookies won't be * set properly and, depending on browsers, inserting or updating a * record might fail + * + * @return bool */ function checkPmaAbsoluteUri() { @@ -937,7 +940,7 @@ class PMA_Config } /** - * @static + * @return bool */ public function isHttps() { @@ -964,6 +967,8 @@ class PMA_Config * * Please note that this just detects what we see, so * it completely ignores things like reverse proxies. + * + * @return bool */ function detectHttps() { @@ -1012,7 +1017,7 @@ class PMA_Config } /** - * @static + * @return string */ public function getCookiePath() { diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index 1a9cdb0..ac132fa 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -127,6 +127,7 @@ class PMA_Error_Handler * * @todo finish! * @param PMA_Error $error + * @return bool */ protected function _logError($error) { diff --git a/libraries/File.class.php b/libraries/File.class.php index 66a88b8..592127b 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -189,6 +189,7 @@ class PMA_File /** * @access public + * @return bool */ function isUploaded() { @@ -591,7 +592,7 @@ class PMA_File } /** - * + * @return bool */ function open() { @@ -688,6 +689,8 @@ class PMA_File * http://bugs.php.net/bug.php?id=29532 * bzip reads a maximum of 8192 bytes on windows systems * @todo this function is unused + * @param int $max_size + * @return bool|string */ function getNextChunk($max_size = null) { diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index a890773..e9907cf 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -90,6 +90,7 @@ require_once './libraries/List.class.php'; * * @todo we could also search mysql tables if all fail? * @param string $like_db_name usally a db_name containing wildcards + * @return array */ protected function _retrieve($like_db_name = null) { diff --git a/libraries/PMA.php b/libraries/PMA.php index 4f148b7..ea2c27e 100644 --- a/libraries/PMA.php +++ b/libraries/PMA.php @@ -44,6 +44,9 @@ class PMA * magic access to protected/inaccessible members/properties * * @see http://php.net/language.oop5.overloading + * + * @param string $param + * @return mixed */ public function __get($param) { @@ -66,6 +69,9 @@ class PMA * magic access to protected/inaccessible members/properties * * @see http://php.net/language.oop5.overloading + * + * @param string $param + * @param mixed $value */ public function __set($param, $value) { diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index f6b08a0..87f6a3e 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -130,6 +130,7 @@ class PMA_Theme * checks image path for existance - if not found use img from original theme * * @access public + * @return bool */ function checkImgPath() { @@ -282,6 +283,7 @@ class PMA_Theme * * @access public * @param string $type left, right or print + * @return bool */ function loadCss(&$type) { diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 174c031..93f5ecf 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -38,7 +38,7 @@ class PMA_Theme_Manager var $active_theme = ''; /** - * @var object PMA_Theme active theme + * @var PMA_Theme PMA_Theme active theme */ var $theme = null; @@ -193,6 +193,7 @@ class PMA_Theme_Manager /** * save theme in cookie * + * @return bool true */ function setThemeCookie() { @@ -224,6 +225,8 @@ class PMA_Theme_Manager /** * read all themes + * + * @return bool true */ function loadThemes() { @@ -259,6 +262,7 @@ class PMA_Theme_Manager * checks if given theme name is a known theme * * @param string $theme name fo theme to check for + * @return bool */ function checkTheme($theme) { @@ -273,6 +277,7 @@ class PMA_Theme_Manager * returns HTML selectbox, with or without form enclosed * * @param boolean $form whether enclosed by from tags or not + * @return string */ function getHtmlSelectBox($form = true) { @@ -351,6 +356,9 @@ class PMA_Theme_Manager /** * prints css data + * + * @param string $type + * @return bool */ function printCss($type) { diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 4615c55..c2e50c0 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -80,6 +80,7 @@ if (function_exists('mcrypt_encrypt')) { * Returns blowfish secret or generates one if needed. * * @access public + * @return string */ function PMA_get_blowfish_secret() { diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index 5cfae23..d3827f9 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -4,6 +4,11 @@ * @package BLOBStreaming */ +/** + * Initializes PBMS database + * + * @return bool + */ function initPBMSDatabase() { $query = "create database IF NOT EXISTS pbms;"; // If no other choice then try this. @@ -379,6 +384,11 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name) * BLOB streaming on a per table or database basis. So in anticipation of this * PMA_BS_IsTablePBMSEnabled() passes in the table and database name even though * they are not currently needed. + * + * @param string $db_name + * @param string $tbl_name + * @param string $tbl_type + * @return bool */ function PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type) { diff --git a/libraries/blowfish.php b/libraries/blowfish.php index 69abf52..0c04106 100644 --- a/libraries/blowfish.php +++ b/libraries/blowfish.php @@ -321,6 +321,7 @@ class Horde_Cipher_blowfish * Set the key to be used for en/decryption. * * @param string $key The key to use. + * @return bool */ public function setKey($key) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 4850e41..eee6035 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2953,10 +2953,9 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) * function that generates a json output for an ajax request and ends script * execution * - * @param bool $message message string containing the html of the message - * @param bool $success success whether the ajax request was successfull - * @param array $extra_data extra_data optional - any other data as part of the json request - * + * @param PMA_Message|string $message message string containing the html of the message + * @param bool $success success whether the ajax request was successfull + * @param array $extra_data extra_data optional - any other data as part of the json request */ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) { diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 1873ef1..58307fe 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -23,6 +23,7 @@ define('PMA_DBI_GETVAR_GLOBAL', 2); * Checks one of the mysql extensions * * @param string $extension mysql extension to check + * @return bool */ function PMA_DBI_checkMysqlExtension($extension = 'mysql') { diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 179e752..d2702eb 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -65,10 +65,10 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false /** * Creates a clickable column header for table information * - * @param string title to use for the link - * @param string corresponds to sortable data name mapped in libraries/db_info.inc.php - * @param string initial sort order - * @returns string link to be displayed in the table header + * @param string $title title to use for the link + * @param string $sort corresponds to sortable data name mapped in libraries/db_info.inc.php + * @param string $initial_sort_order + * @return string link to be displayed in the table header */ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC') { diff --git a/libraries/file_listing.php b/libraries/file_listing.php index 720ba82..5d9058a 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -10,9 +10,9 @@ /** * Returns array of filtered file names * - * @param string directory to list - * @param string regular expression to match files - * @returns array sorted file list on success, false on failure + * @param string $dir directory to list + * @param string $expression regular expression to match files + * @return array sorted file list on success, false on failure */ function PMA_getDirContent($dir, $expression = '') { @@ -39,10 +39,10 @@ function PMA_getDirContent($dir, $expression = '') /** * Returns options of filtered file names * - * @param string directory to list - * @param string regullar expression to match files - * @param string currently active choice - * @returns array sorted file list on success, false on failure + * @param string $dir directory to list + * @param string $extensions regullar expression to match files + * @param string $active currently active choice + * @return array sorted file list on success, false on failure */ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '') { @@ -64,7 +64,7 @@ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '') /** * Get currently supported decompressions. * - * @returns string | separated list of extensions usable in PMA_getDirContent + * @return string | separated list of extensions usable in PMA_getDirContent */ function PMA_supportedDecompressions() { diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index aafd169..993ca9d 100644 --- a/libraries/grab_globals.lib.php +++ b/libraries/grab_globals.lib.php @@ -16,8 +16,9 @@ if (! defined('PHPMYADMIN')) { * copy values from one array to another, usually from a superglobal into $GLOBALS * * @param array $array values from - * @param array $target values to - * @param boolean $sanitize prevent importing key names in $_import_blacklist + * @param array &$target values to + * @param bool $sanitize prevent importing key names in $_import_blacklist + * @return bool */ function PMA_recursive_extract($array, &$target, $sanitize = true) { diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php index 5250c92..5fe34bb 100644 --- a/libraries/import/upload/apc.php +++ b/libraries/import/upload/apc.php @@ -15,6 +15,9 @@ $ID_KEY = 'APC_UPLOAD_PROGRESS'; * Returns upload status. * * This is implementation for APC extension. + * + * @param string $id + * @return array|null */ function PMA_getUploadStatus($id) { @@ -22,7 +25,7 @@ function PMA_getUploadStatus($id) global $ID_KEY; if (trim($id) == "") { - return; + return null; } if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) { $_SESSION[$SESSION_KEY][$id] = array( diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php index fa7796c..00dcb11 100644 --- a/libraries/import/upload/noplugin.php +++ b/libraries/import/upload/noplugin.php @@ -15,6 +15,9 @@ $ID_KEY = 'noplugin'; * Returns upload status. * * This is implementation when no webserver support exists, so it returns just zeroes. + * + * @param string $id + * @return array|null */ function PMA_getUploadStatus($id) { @@ -22,7 +25,7 @@ function PMA_getUploadStatus($id) global $ID_KEY; if (trim($id) == "") { - return; + return null; } if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) { $_SESSION[$SESSION_KEY][$id] = array( diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php index a3ec60b..d5c361c 100644 --- a/libraries/import/upload/uploadprogress.php +++ b/libraries/import/upload/uploadprogress.php @@ -14,6 +14,9 @@ $ID_KEY = "UPLOAD_IDENTIFIER"; * Returns upload status. * * This is implementation for uploadprogress extension. + * + * @param string $id + * @return array|null */ function PMA_getUploadStatus($id) { @@ -21,7 +24,7 @@ function PMA_getUploadStatus($id) global $ID_KEY; if (trim($id) == "") { - return; + return null; } if (! array_key_exists($id, $_SESSION[$SESSION_KEY])) { diff --git a/libraries/mime.lib.php b/libraries/mime.lib.php index f394b8f..e9eb386 100644 --- a/libraries/mime.lib.php +++ b/libraries/mime.lib.php @@ -9,6 +9,9 @@ /** * Tries to detect MIME type of content. + * + * @param string &$test + * @return string */ function PMA_detectMIME(&$test) { diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 6e7846a..e74c14d 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -144,7 +144,7 @@ class PMA_Schema_PDF extends PMA_PDF /** * Sets the scaled line width * - * @param float width The line width + * @param float $width The line width * @access public * @see TCPDF::SetLineWidth() */ @@ -224,6 +224,10 @@ class PMA_Schema_PDF extends PMA_PDF /** * Compute number of lines used by a multicell of width w + * + * @param int $w + * @param string $txt + * @return int */ function NbLines($w, $txt) { @@ -386,7 +390,7 @@ class Table_Stats * Returns title of the current table, * title can have the dimensions of the table * - * @access private + * @return string */ private function _getTitle() { @@ -401,7 +405,7 @@ class Table_Stats * @access private * @see PMA_Schema_PDF */ - function _setWidth($fontSize) + private function _setWidth($fontSize) { global $pdf; diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index 0593abd..b405b22 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -440,7 +440,7 @@ class Table_Stats * @access private * @see PMA_SVG */ - function _setWidthTable($font,$fontSize) + private function _setWidthTable($font,$fontSize) { global $svg; diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index cfe4424..cf7bab2 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -280,13 +280,12 @@ class Table_Stats /** * Sets the width of the table * - * @param string font The font name - * @param integer fontSize The font size + * @param string $font font name + * @param integer $fontSize font size * @global object The current Visio XML document - * @access private * @see PMA_VISIO */ - function _setWidthTable($font,$fontSize) + private function _setWidthTable($font,$fontSize) { global $visio; diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index f4030ef..62b1ea7 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -11,6 +11,9 @@ if (! defined('PHPMYADMIN')) { /** * Returns language name + * + * @param string $tmplang + * @return string */ function PMA_langName($tmplang) { @@ -182,6 +185,8 @@ function PMA_langDetect($str, $envType) * traditional) must be detected before 'zh' (chinese simplified) for * example. * + * @param string $lang + * @return array */ function PMA_langDetails($lang) { diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php index bc0192f..96ac0e2 100644 --- a/libraries/sysinfo.lib.php +++ b/libraries/sysinfo.lib.php @@ -9,6 +9,9 @@ * @package phpMyAdmin */ +/** + * @return array + */ function getSysInfo() { $supported = array('Linux','WINNT'); diff --git a/scripts/signon-script.php b/scripts/signon-script.php index e57ca1f..201d217 100644 --- a/scripts/signon-script.php +++ b/scripts/signon-script.php @@ -16,6 +16,9 @@ * This function returns username and password. * * It can optionally use configured username as parameter. + * + * @param string $user + * @return array */ function get_login_credentials($user) { diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php index 748ddfe..39cc664 100644 --- a/test/libraries/common/PMA_expandUserString_test.php +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -59,6 +59,8 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase /** * Data provider + * + * @return array */ public function provider() { diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index ab789f4..eeb79c4 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -30,6 +30,8 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase /** * Data provider + * + * @return array */ public function provider() { diff --git a/test/libraries/common/PMA_foreignKeySupported_test.php b/test/libraries/common/PMA_foreignKeySupported_test.php index e0ebd2e..f9c3049 100644 --- a/test/libraries/common/PMA_foreignKeySupported_test.php +++ b/test/libraries/common/PMA_foreignKeySupported_test.php @@ -17,6 +17,8 @@ class PMA_foreignKeySupported_test extends PHPUnit_Framework_TestCase { /** * data provider for foreign key supported test + * + * @return array */ public function foreignkeySupportedDataProvider() { return array( diff --git a/test/libraries/common/PMA_formatNumberByteDown_test.php b/test/libraries/common/PMA_formatNumberByteDown_test.php index f0265c6..18ab8ba 100644 --- a/test/libraries/common/PMA_formatNumberByteDown_test.php +++ b/test/libraries/common/PMA_formatNumberByteDown_test.php @@ -47,8 +47,9 @@ class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase /** * format number data provider + * + * @return array */ - public function formatNumberDataProvider() { return array( array(10, 2, 2, '10 '), @@ -72,6 +73,8 @@ class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase /** * format byte down data provider + * + * @return array */ public function formatByteDownDataProvider() { return array( diff --git a/test/libraries/common/PMA_localisedDateTimespan_test.php b/test/libraries/common/PMA_localisedDateTimespan_test.php index 92f980c..4ed2909 100644 --- a/test/libraries/common/PMA_localisedDateTimespan_test.php +++ b/test/libraries/common/PMA_localisedDateTimespan_test.php @@ -54,6 +54,8 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase /** * data provider for localised date test + * + * @return array */ public function localisedDateDataProvider() { return array( @@ -72,8 +74,9 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase /** * data provider for localised timestamp test + * + * @return array */ - public function timespanFormatDataProvider() { return array( array(1258, '0 days, 0 hours, 20 minutes and 58 seconds'), diff --git a/test/libraries/common/PMA_printableBitValue_test.php b/test/libraries/common/PMA_printableBitValue_test.php index d211981..20d4f4f 100644 --- a/test/libraries/common/PMA_printableBitValue_test.php +++ b/test/libraries/common/PMA_printableBitValue_test.php @@ -18,8 +18,9 @@ class PMA_printableBitValue_test extends PHPUnit_Framework_TestCase /** * data provider for printable bit value test + * + * @return array */ - public function printableBitValueDataProvider() { return array( array('testtest', 64, '0111010001100101011100110111010001110100011001010111001101110100'), diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php index 4ebecc0..d4e7104 100644 --- a/test/libraries/common/PMA_quoting_slashing_test.php +++ b/test/libraries/common/PMA_quoting_slashing_test.php @@ -35,6 +35,8 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase /** * data provider for unQuote test + * + * @return array */ public function unQuoteProvider() { return array( @@ -55,6 +57,8 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase /** * data provider for unQuote test with chosen quote + * + * @return array */ public function unQuoteSelectedProvider() { return array( @@ -75,6 +79,8 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase /** * data provider for backquote test + * + * @return array */ public function backquoteDataProvider() { return array( diff --git a/test/libraries/common/PMA_stringOperations_test.php b/test/libraries/common/PMA_stringOperations_test.php index ca43335..3664b44 100644 --- a/test/libraries/common/PMA_stringOperations_test.php +++ b/test/libraries/common/PMA_stringOperations_test.php @@ -41,8 +41,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase /** * data provider for flipstring test + * + * @return array */ - public function flipStringDataProvider() { return array( array('test', "t<br />\ne<br />\ns<br />\nt"), @@ -61,8 +62,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase /** * data provider for userDir test + * + * @return array */ - public function userDirDataProvider() { return array( array('/var/pma_tmp/%u/', "/var/pma_tmp/root/"), @@ -83,8 +85,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase /** * data provider for replace binary content test + * + * @return array */ - public function replaceBinaryContentsDataProvider() { return array( array("\x000", '\00'), @@ -104,8 +107,9 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase /** * data provider for duplicate first newline test + * + * @return array */ - public function duplicateFirstNewlineDataProvider() { return array( array('test', 'test'), hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15196-ge16bd0b
by Michal Čihař 16 Aug '11

16 Aug '11

The branch, master has been updated via e16bd0bb796b8ae895a0cac78389491aa5569114 (commit) via 28f5ec80f398758ef21746fd8d57aca60efabfc6 (commit) via 8d58e981055372c39b393bc05968da6f59d7afaf (commit) via c7516966519b1190f88a8772f05ed2ac5f35299b (commit) via be80ee7bbaa8d4d2965dd83529fe87cb002527a9 (commit) via 28efbb60e679c11fa7b87872bdfdecbadeedc147 (commit) via 8164ab6f9ed21d029cf4aae59d62bdc69da99a20 (commit) via 3258ea16899891b0387d151904a3398e2e8ab952 (commit) via 11fe8ad53b40ae1014d5595beafbb098f3515021 (commit) via 7bda0bb6128aff85a4d21162c545cfacc50d6a43 (commit) via 412f90c158d9e496d9e48c4bbe0ec9b6332413ec (commit) via 07b347d7c7de1ec5a70cd08c59c6feb3d5ed3dc6 (commit) via e37a6fff77ad4659cbf929458a15afd5dcce6f8c (commit) via 17200698171fc8508d4eca9a558e7a288df5c9a2 (commit) via f6acd4cdbf92406bb2214373a3993f6bc95a0224 (commit) via 50535720d145fbaf552604d157c1cdbc111b73c4 (commit) via bbdd25479fabaf08379a62e08f53ae8195ba4a42 (commit) via 01afe667edcdba14fca063e92d8d28ab71d6d92b (commit) via 497b50a3b062a36a5abe384570b206ef6260318c (commit) via daa97248212fd920ddfcb18127587c3abc94a000 (commit) via 99eccb59a3de686fa8ffcfb06090220e4e888b9f (commit) via 23fc2ed3d1ee938a9710776142cef33f64b152d9 (commit) via 33309958c06651a1970437d1efab4a602edd2576 (commit) via 1dd44c2f752cab5b7f286e20f9a8e0e0d89e55bb (commit) via 7b34965e21408f3189f07cf20eac2d475a952bdd (commit) via af0eee10175f8f4370495bb69182f5384e42c63b (commit) via b0b96cb49ed7ac5475d8e3f3676619d0bf46bf26 (commit) via d06ae900737cc6f471f4eafe2159fd85cc9aab0f (commit) via cf7a73e9d3d265e889868462ab6e595d5e53040f (commit) via b1061a8c9886d5ddb5ee5679376265b1530b1145 (commit) via 6b65e1943b0dabfb6d3b142e5029392d6d728e45 (commit) from 2a54778c3a45b77f0efd72db872c11c2666e70b7 (commit) - Log ----------------------------------------------------------------- commit e16bd0bb796b8ae895a0cac78389491aa5569114 Merge: 28f5ec8 2a54778 Author: Pootle server <pootle(a)cihar.com> Date: Tue Aug 16 12:40:16 2011 +0200 Merge remote-tracking branch 'origin/master' commit 28f5ec80f398758ef21746fd8d57aca60efabfc6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 11:21:53 2011 +0200 Translation update done using Pootle. commit 8d58e981055372c39b393bc05968da6f59d7afaf Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:42:12 2011 +0200 Translation update done using Pootle. commit c7516966519b1190f88a8772f05ed2ac5f35299b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:38:50 2011 +0200 Translation update done using Pootle. commit be80ee7bbaa8d4d2965dd83529fe87cb002527a9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:24:32 2011 +0200 Translation update done using Pootle. commit 28efbb60e679c11fa7b87872bdfdecbadeedc147 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:22:56 2011 +0200 Translation update done using Pootle. commit 8164ab6f9ed21d029cf4aae59d62bdc69da99a20 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:21:50 2011 +0200 Translation update done using Pootle. commit 3258ea16899891b0387d151904a3398e2e8ab952 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:19:29 2011 +0200 Translation update done using Pootle. commit 11fe8ad53b40ae1014d5595beafbb098f3515021 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:12:21 2011 +0200 Translation update done using Pootle. commit 7bda0bb6128aff85a4d21162c545cfacc50d6a43 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:11:06 2011 +0200 Translation update done using Pootle. commit 412f90c158d9e496d9e48c4bbe0ec9b6332413ec Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:08:39 2011 +0200 Translation update done using Pootle. commit 07b347d7c7de1ec5a70cd08c59c6feb3d5ed3dc6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:08:01 2011 +0200 Translation update done using Pootle. commit e37a6fff77ad4659cbf929458a15afd5dcce6f8c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:07:42 2011 +0200 Translation update done using Pootle. commit 17200698171fc8508d4eca9a558e7a288df5c9a2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:06:17 2011 +0200 Translation update done using Pootle. commit f6acd4cdbf92406bb2214373a3993f6bc95a0224 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:03:41 2011 +0200 Translation update done using Pootle. commit 50535720d145fbaf552604d157c1cdbc111b73c4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:03:24 2011 +0200 Translation update done using Pootle. commit bbdd25479fabaf08379a62e08f53ae8195ba4a42 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 10:01:51 2011 +0200 Translation update done using Pootle. commit 01afe667edcdba14fca063e92d8d28ab71d6d92b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 09:55:48 2011 +0200 Translation update done using Pootle. commit 497b50a3b062a36a5abe384570b206ef6260318c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 09:54:44 2011 +0200 Translation update done using Pootle. commit daa97248212fd920ddfcb18127587c3abc94a000 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 09:54:28 2011 +0200 Translation update done using Pootle. commit 99eccb59a3de686fa8ffcfb06090220e4e888b9f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 09:51:23 2011 +0200 Translation update done using Pootle. commit 23fc2ed3d1ee938a9710776142cef33f64b152d9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 09:48:29 2011 +0200 Translation update done using Pootle. commit 33309958c06651a1970437d1efab4a602edd2576 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 09:43:07 2011 +0200 Translation update done using Pootle. commit 1dd44c2f752cab5b7f286e20f9a8e0e0d89e55bb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 09:27:46 2011 +0200 Translation update done using Pootle. commit 7b34965e21408f3189f07cf20eac2d475a952bdd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 09:21:37 2011 +0200 Translation update done using Pootle. commit af0eee10175f8f4370495bb69182f5384e42c63b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 09:04:38 2011 +0200 Translation update done using Pootle. commit b0b96cb49ed7ac5475d8e3f3676619d0bf46bf26 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 16 09:02:40 2011 +0200 Translation update done using Pootle. commit d06ae900737cc6f471f4eafe2159fd85cc9aab0f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 08:21:30 2011 +0200 Translation update done using Pootle. commit cf7a73e9d3d265e889868462ab6e595d5e53040f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 08:19:42 2011 +0200 Translation update done using Pootle. commit b1061a8c9886d5ddb5ee5679376265b1530b1145 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 08:19:16 2011 +0200 Translation update done using Pootle. commit 6b65e1943b0dabfb6d3b142e5029392d6d728e45 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 16 08:14:42 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 61 +++++++++++++++++++++++++++++++------------------------------ po/tr.po | 10 ++++++---- 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/po/ja.po b/po/ja.po index c84ddfa..546d556 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-08-15 10:09+0200\n" -"PO-Revision-Date: 2011-08-13 12:52+0200\n" +"PO-Revision-Date: 2011-08-16 11:21+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -11596,7 +11596,7 @@ msgstr "" #: po/advisory_rules.php:8 #, php-format msgid "The uptime is only %s" -msgstr "" +msgstr "%s しか稼動していません。" #: po/advisory_rules.php:10 msgid "Questions below 1,000" @@ -11614,7 +11614,7 @@ msgstr "" msgid "" "Let the server run for a longer time until it has executed a greater amount " "of queries." -msgstr "" +msgstr "実行されたクエリが十分な量になるまで、長時間サーバを稼動させたほうがいいでしょう。" #: po/advisory_rules.php:13 #, php-format @@ -11650,7 +11650,7 @@ msgstr "遅いクエリの割合" #: po/advisory_rules.php:21 msgid "" "There is a high percentage of slow queries compared to the server uptime." -msgstr "遅いクエリの割合が高い場合は、サーバの稼働時間と比較してあります。" +msgstr "遅いクエリの割合が高いので、サーバの稼働時間と比較してあります。" #: po/advisory_rules.php:23 #, php-format @@ -11699,10 +11699,12 @@ msgid "" "Enable slow query logging by setting {log_slow_queries} to 'ON'. This will " "help troubleshooting badly performing queries." msgstr "" +"{log_slow_queries} " +"を「ON」に設定することで、遅いクエリのログへの記録が有効になります。これは、パフォーマンスの悪いクエリの切り分けに役立つでしょう。" #: po/advisory_rules.php:33 msgid "log_slow_queries is set to 'OFF'" -msgstr "" +msgstr "log_slow_queries が「OFF」に設定されています。" #: po/advisory_rules.php:35 #, fuzzy @@ -11824,7 +11826,7 @@ msgstr "" #: po/advisory_rules.php:68 msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'" -msgstr "" +msgstr "query_cache_size が 0 に設定されているか、query_cache_type が「OFF」に設定されています。" #: po/advisory_rules.php:71 msgid "Suboptimal caching method." @@ -11992,7 +11994,7 @@ msgstr "" #: po/advisory_rules.php:103 msgid "query_cache_limit is set to 1 MiB" -msgstr "" +msgstr "query_cache_limit は 1 MiB に設定されています。" #: po/advisory_rules.php:105 #, fuzzy @@ -12102,11 +12104,11 @@ msgstr "" #: po/advisory_rules.php:130 msgid "Rate of reading fixed position" -msgstr "" +msgstr "決まった位置を読み込む割合" #: po/advisory_rules.php:131 msgid "The rate of reading data from a fixed position is high." -msgstr "" +msgstr "決まった位置のデータを読み込む割合が高いです。" #: po/advisory_rules.php:132 msgid "" @@ -12114,37 +12116,37 @@ msgid "" "scan, including join queries that do not use indexes. Add indexes where " "applicable." msgstr "" +"多くのクエリがインデックスを使用しない結合クエリを含んでいるために、結果のソート、テーブルの全スキャン、のいずれかもしくは両方を必要としていることを示し" +"ています。該当箇所にインデックスを追加してください。" #: po/advisory_rules.php:133 #, php-format msgid "" "Rate of reading fixed position average: %s, this value should be less than 1 " "per hour" -msgstr "" +msgstr "決まった位置を読み込む割合の平均：%s。推奨値は、1 時間当たり 1 未満です。" #: po/advisory_rules.php:135 -#, fuzzy #| msgid "Where to show the table row links" msgid "Rate of reading next table row" -msgstr "テーブルの行リンクを表示する場所" +msgstr "テーブルの次行を読み込む割合" #: po/advisory_rules.php:136 -#, fuzzy #| msgid "Where to show the table row links" msgid "The rate of reading the next table row is high." -msgstr "テーブルの行リンクを表示する場所" +msgstr "テーブルの次行を読み込む割合が高いです。" #: po/advisory_rules.php:137 msgid "" "This indicates that many queries are doing full table scans. Add indexes " "where applicable." -msgstr "" +msgstr "多くのクエリがテーブルの全スキャンを行っていることを示しています。該当箇所にインデックスを追加してください。" #: po/advisory_rules.php:138 #, php-format msgid "" "Rate of reading next table row: %s, this value should be less than 1 per hour" -msgstr "" +msgstr "テーブルの次行を読み込む割合：%s。推奨値は、1 時間当たり 1 未満です。" #: po/advisory_rules.php:140 msgid "tmp_table_size vs. max_heap_table_size" @@ -12240,7 +12242,7 @@ msgstr "" #: po/advisory_rules.php:158 msgid "key_buffer_size is 0" -msgstr "" +msgstr "key_buffer_size は 0 です。" #: po/advisory_rules.php:160 #, fuzzy, php-format @@ -12296,27 +12298,27 @@ msgid "Index reads from memory: %s%%, this value should be above 95%%" msgstr "" #: po/advisory_rules.php:175 -#, fuzzy #| msgid "Create table" msgid "Rate of table open" -msgstr "テーブルを作成" +msgstr "テーブルを開く割合" #: po/advisory_rules.php:176 -#, fuzzy #| msgid "The current number of pending writes." msgid "The rate of opening tables is high." -msgstr "現在保留されている書き込みの数" +msgstr "テーブルを開く割合が高いです。" #: po/advisory_rules.php:177 msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" +"テーブルを開くことは、コストがかかるディスクへの入出力を必要とします。{table_open_cache} " +"大きくすることで、これを緩和できることがあります。" #: po/advisory_rules.php:178 #, php-format msgid "Opened table rate: %s, this value should be less than 10 per hour" -msgstr "" +msgstr "テーブルを開く割合: %s。推奨値は 1 時間当たり 10 未満です。" #: po/advisory_rules.php:180 #, fuzzy @@ -12335,6 +12337,8 @@ msgid "" "Consider increasing {open_files_limit}, and check the error log when " "restarting after changing open_files_limit." msgstr "" +"{open_files_limit} 増やすことを検討してください。open_files_limit " +"を変更して再起動した場合は、エラーログを確認するようにしてください。" #: po/advisory_rules.php:183 #, php-format @@ -12343,21 +12347,19 @@ msgid "" msgstr "" #: po/advisory_rules.php:185 -#, fuzzy #| msgid "Format of imported file" msgid "Rate of open files" -msgstr "インポートするファイルの形式" +msgstr "ファイルを開く割合" #: po/advisory_rules.php:186 -#, fuzzy #| msgid "The number of pending log file fsyncs." msgid "The rate of opening files is high." -msgstr "保留中のログファイルへの fsync 回数" +msgstr "ファイルを開く割合が高いです。" #: po/advisory_rules.php:188 #, php-format msgid "Opened files rate: %s, this value should be less than 5 per hour" -msgstr "" +msgstr "ファイルを開く割合: %s。推奨値は 1 時間当たり 5 未満です。" #: po/advisory_rules.php:190 #, fuzzy, php-format @@ -12390,10 +12392,9 @@ msgid "Table lock wait rate: %s, this value should be less than 1 per hour" msgstr "" #: po/advisory_rules.php:200 -#, fuzzy #| msgid "Key cache" msgid "Thread cache" -msgstr "キーキャッシュ" +msgstr "スレッドキャッシュ" #: po/advisory_rules.php:201 msgid "" @@ -12407,7 +12408,7 @@ msgstr "" #: po/advisory_rules.php:203 msgid "The thread cache is set to 0" -msgstr "" +msgstr "スレッドキャッシュは 0 に設定されています。" #: po/advisory_rules.php:205 #, fuzzy, php-format diff --git a/po/tr.po b/po/tr.po index e566c42..b0ec0df 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-08-15 10:09+0200\n" -"PO-Revision-Date: 2011-08-15 23:56+0200\n" +"PO-Revision-Date: 2011-08-16 08:21+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -9377,6 +9377,8 @@ msgid "" "The Advisor system can provide recommendations on server variables by " "analyzing the server status variables." msgstr "" +"Danışman sistemi sunucu durumu değişkenlerini çözümleyerek sunucu " +"değişkenlerinde öneriler sağlayabilir." #: server_status.php:810 msgid "" @@ -12006,7 +12008,7 @@ msgstr "" #: po/advisory_rules.php:98 #, php-format msgid "Current query cache size: %s" -msgstr "" +msgstr "Şu anki sorgu önbelleği boyutu: %s" #: po/advisory_rules.php:100 msgid "Query cache min result size" @@ -12031,7 +12033,7 @@ msgstr "" #: po/advisory_rules.php:103 msgid "query_cache_limit is set to 1 MiB" -msgstr "" +msgstr "query_cache_limit 1 MiB'a ayarlı" #: po/advisory_rules.php:105 msgid "Percentage of sorts that cause temporary tables" @@ -12070,7 +12072,7 @@ msgstr "Satırları sırala" #: po/advisory_rules.php:116 msgid "There are lots of rows being sorted." -msgstr "" +msgstr "Birçok sıralanmış satır var." #: po/advisory_rules.php:117 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15165-g2a54778
by Michal Čihař 16 Aug '11

16 Aug '11

The branch, master has been updated via 2a54778c3a45b77f0efd72db872c11c2666e70b7 (commit) via 3bcfb2602790fe13204111b0215e53a491b517f7 (commit) via 32724b30773492dba6c1bc5fb3a30589042eca6c (commit) via 63342fdf4a36b1c7282bcf3cc90f31ad61687953 (commit) via 5bef74287dce3e09f072c441112dcc872c73752e (commit) from 7d185b406a7bd3383b8edcd775da22a719ce63e0 (commit) - Log ----------------------------------------------------------------- commit 2a54778c3a45b77f0efd72db872c11c2666e70b7 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 16 12:31:01 2011 +0200 Revert "Replace external advisory urls with url.php?url=sdf&token=..." This reverts commit 32724b30773492dba6c1bc5fb3a30589042eca6c. commit 3bcfb2602790fe13204111b0215e53a491b517f7 Merge: 7d185b4 32724b3 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 16 12:30:24 2011 +0200 Merge remote-tracking branch 'tyron/master' commit 32724b30773492dba6c1bc5fb3a30589042eca6c Author: Tyron Madlener <tyronx(a)gmail.com> Date: Tue Aug 16 13:14:48 2011 +0300 Replace external advisory urls with url.php?url=sdf&token=... commit 63342fdf4a36b1c7282bcf3cc90f31ad61687953 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Tue Aug 16 13:14:17 2011 +0300 Hide js feature elements when js is disabled commit 5bef74287dce3e09f072c441112dcc872c73752e Author: Tyron Madlener <tyronx(a)gmail.com> Date: Tue Aug 16 13:13:43 2011 +0300 Run monitor when tab is focused ----------------------------------------------------------------------- Summary of changes: js/server_status.js | 8 ++++---- js/server_status_monitor.js | 5 +++++ themes/original/css/theme_right.css.php | 3 +++ themes/pmahomme/css/theme_right.css.php | 3 +++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/js/server_status.js b/js/server_status.js index 870f9b1..bcb25b8 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -15,6 +15,9 @@ // Add a tablesorter parser to properly handle thousands seperated numbers and SI prefixes $(function() { + // Show all javascript related parts of the page + $('.jsfeature').show(); + jQuery.tablesorter.addParser({ id: "fancyNumber", is: function(s) { @@ -110,7 +113,7 @@ $(function() { menuResize(); // Load Server status monitor if (ui.tab.hash == '#statustabs_charting' && ! monitorLoaded) { - $('div#statustabs_charting').append( + $('div#statustabs_charting').append( //PMA_messages['strLoadingMonitor'] + ' ' + '<img class="ajaxIcon" id="loadingMonitorIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">' ); @@ -144,9 +147,6 @@ $(function() { tabStatus[$(this).attr('id')] = 'static'; }); - // Display button links - $('div.buttonlinks').show(); - // Handles refresh rate changing $('.buttonlinks select').change(function() { var chart = tabChart[$(this).parents('div.ui-tabs-panel').attr('id')]; diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index f8a179d..7ac2498 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1869,4 +1869,9 @@ $(function() { $('a[href="#clearMonitorConfig"]').show(); } +}); + +// Run the monitor once loaded +$(function() { + $('a[href="#pauseCharts"]').trigger('click'); }); \ No newline at end of file diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 81d01de..83590f9 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1126,6 +1126,9 @@ img.sortableIcon { .buttonlinks { float: <?php echo $right; ?>; white-space: nowrap; +} + +.jsfeature { display: none; /* Made visible with js */ } diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 3cd5dc2..8050419 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1348,6 +1348,9 @@ img.sortableIcon { .buttonlinks { float: <?php echo $right; ?>; white-space: nowrap; +} + +.jsfeature { display: none; /* Made visible with js */ } hooks/post-receive -- phpMyAdmin

1 0