- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19134-g3d3a528
by Madhura Jayaratne 14 Sep '11

14 Sep '11

The branch, master has been updated via 3d3a5283dc334c7fb54160293acc57a984faac1b (commit) via d3bd40b56d619f0672e323844095cc8b36e9e49e (commit) via e27ba519c5265109d6e3ad629297d057b2c53496 (commit) from 6f9f58080e06e795aba963ad169e438e6fae00a2 (commit) - Log ----------------------------------------------------------------- commit 3d3a5283dc334c7fb54160293acc57a984faac1b Merge: 6f9f580 d3bd40b Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 14 22:50:54 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/server_privileges.js | 2 +- server_privileges.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37671bb..1ce49af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ phpMyAdmin - ChangeLog - bug #3404886 [navi] Edit SQL statement after error - bug #3403165 [interface] Collation not displayed for long enum fields - bug #3399951 [export] Config for export compression not used +- bug #3400690 [privileges] DB-specific privileges won't submit 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/js/server_privileges.js b/js/server_privileges.js index c695dab..738d64b 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -385,7 +385,7 @@ $(document).ready(function() { * @memberOf jQuery * @name edit_user_submit */ - $("#edit_user_dialog").find("form").live('submit', function(event) { + $("#edit_user_dialog").find("form:not(#db_or_table_specific_priv)").live('submit', function(event) { /** @lends jQuery */ event.preventDefault(); diff --git a/server_privileges.php b/server_privileges.php index 2735de9..37ef25e 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1875,7 +1875,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs // but only if $dbname contains no wildcards // table header - echo '<form action="server_privileges.php" method="post">' . "\n" + echo '<form action="server_privileges.php" id="db_or_table_specific_priv" method="post">' . "\n" . PMA_generate_common_hidden_inputs('', '') . '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n" . '<input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19131-g6f9f580
by Madhura Jayaratne 14 Sep '11

14 Sep '11

The branch, master has been updated via 6f9f58080e06e795aba963ad169e438e6fae00a2 (commit) via 1f26c2f84181deab4cfcafe3a862520c5ee456e3 (commit) via 5959ae1c5a9fb19e5fbb736f91919684f36b0454 (commit) via 2260e1081463c5e05df12ecd30346c362a9fb91b (commit) from abc1d3c345dfd11ea3d940c5b944d05fc173ec34 (commit) - Log ----------------------------------------------------------------- commit 6f9f58080e06e795aba963ad169e438e6fae00a2 Merge: 1f26c2f abc1d3c Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 14 22:49:09 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 1f26c2f84181deab4cfcafe3a862520c5ee456e3 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 14 15:29:09 2011 +0530 Wrap some long lines commit 5959ae1c5a9fb19e5fbb736f91919684f36b0454 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 14 15:09:48 2011 +0530 Coding style improvements commit 2260e1081463c5e05df12ecd30346c362a9fb91b Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 14 15:02:46 2011 +0530 Proper indentation for switch-case statement ----------------------------------------------------------------------- Summary of changes: db_structure.php | 236 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 142 insertions(+), 94 deletions(-) diff --git a/db_structure.php b/db_structure.php index 8673471..b46fe29 100644 --- a/db_structure.php +++ b/db_structure.php @@ -22,7 +22,8 @@ $GLOBALS['js_include'][] = 'jquery/timepicker.js'; if (empty($is_info)) { // Drops/deletes/etc. multiple tables if required if ((!empty($submit_mult) && isset($selected_tbl)) - || isset($mult_btn)) { + || isset($mult_btn) + ) { $action = 'db_structure.php'; $err_url = 'db_structure.php?'. PMA_generate_common_url($db); @@ -96,7 +97,10 @@ if (isset($_REQUEST['sort_order'])) { $_url_params['sort_order'] = $_REQUEST['sort_order']; } -PMA_listNavigator($total_num_tables, $pos, $_url_params, 'db_structure.php', 'frame_content', $GLOBALS['cfg']['MaxTableList']); +PMA_listNavigator( + $total_num_tables, $pos, $_url_params, 'db_structure.php', + 'frame_content', $GLOBALS['cfg']['MaxTableList'] +); ?> <form method="post" action="db_structure.php" name="tablesForm" id="tablesForm"> @@ -110,7 +114,9 @@ $sum_size = (double) 0; $overhead_size = (double) 0; $overhead_check = ''; $checked = !empty($checkall) ? ' checked="checked"' : ''; -$num_columns = $cfg['PropertiesNumColumns'] > 1 ? ceil($num_tables / $cfg['PropertiesNumColumns']) + 1 : 0; +$num_columns = $cfg['PropertiesNumColumns'] > 1 + ? ceil($num_tables / $cfg['PropertiesNumColumns']) + 1 + : 0; $row_count = 0; @@ -139,83 +145,88 @@ foreach ($tables as $keyname => $each_table) { switch ( $each_table['ENGINE']) { // MyISAM, ISAM or Heap table: Row count, data size and index size // are accurate; data size is accurate for ARCHIVE - case 'MyISAM' : - case 'ISAM' : - case 'HEAP' : - case 'MEMORY' : - case 'ARCHIVE' : - case 'Aria' : - case 'Maria' : - if ($db_is_information_schema) { - $each_table['Rows'] = PMA_Table::countRecords($db, - $each_table['Name']); - } + case 'MyISAM' : + case 'ISAM' : + case 'HEAP' : + case 'MEMORY' : + case 'ARCHIVE' : + case 'Aria' : + case 'Maria' : + if ($db_is_information_schema) { + $each_table['Rows'] = PMA_Table::countRecords( + $db, $each_table['Name'] + ); + } - if ($is_show_stats) { - $tblsize = doubleval($each_table['Data_length']) + doubleval($each_table['Index_length']); - $sum_size += $tblsize; - list($formatted_size, $unit) = PMA_formatByteDown($tblsize, 3, ($tblsize > 0) ? 1 : 0); - if (isset($each_table['Data_free']) && $each_table['Data_free'] > 0) { - list($formatted_overhead, $overhead_unit) = PMA_formatByteDown($each_table['Data_free'], 3, ($each_table['Data_free'] > 0) ? 1 : 0); - $overhead_size += $each_table['Data_free']; - } - } - break; - case 'InnoDB' : - case 'PBMS' : - // InnoDB table: Row count is not accurate but data and index sizes are. - // PBMS table in Drizzle: TABLE_ROWS is taken from table cache, so it may be unavailable - - if (($each_table['ENGINE'] == 'InnoDB' && $each_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCount']) - || !isset($each_table['TABLE_ROWS'])) { - $each_table['COUNTED'] = true; - $each_table['TABLE_ROWS'] = PMA_Table::countRecords($db, - $each_table['TABLE_NAME'], $force_exact = true, - $is_view = false); - } else { - $each_table['COUNTED'] = false; + if ($is_show_stats) { + $tblsize = doubleval($each_table['Data_length']) + doubleval($each_table['Index_length']); + $sum_size += $tblsize; + list($formatted_size, $unit) = PMA_formatByteDown($tblsize, 3, ($tblsize > 0) ? 1 : 0); + if (isset($each_table['Data_free']) && $each_table['Data_free'] > 0) { + list($formatted_overhead, $overhead_unit) = PMA_formatByteDown($each_table['Data_free'], 3, ($each_table['Data_free'] > 0) ? 1 : 0); + $overhead_size += $each_table['Data_free']; } + } + break; + case 'InnoDB' : + case 'PBMS' : + // InnoDB table: Row count is not accurate but data and index sizes are. + // PBMS table in Drizzle: TABLE_ROWS is taken from table cache, so it may be unavailable + + if (($each_table['ENGINE'] == 'InnoDB' + && $each_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCount']) + || !isset($each_table['TABLE_ROWS']) + ) { + $each_table['COUNTED'] = true; + $each_table['TABLE_ROWS'] = PMA_Table::countRecords( + $db, $each_table['TABLE_NAME'], + $force_exact = true, $is_view = false + ); + } else { + $each_table['COUNTED'] = false; + } - // Drizzle doesn't provide data and index length, check for null - if ($is_show_stats && $each_table['Data_length'] !== null) { - $tblsize = $each_table['Data_length'] + $each_table['Index_length']; - $sum_size += $tblsize; - list($formatted_size, $unit) = PMA_formatByteDown($tblsize, 3, ($tblsize > 0) ? 1 : 0); - } - //$display_rows = ' - '; - break; - // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM - // Both are aliases for MERGE - case 'MRG_MyISAM' : - case 'MRG_MYISAM' : - case 'MERGE' : - case 'BerkeleyDB' : - // Merge or BerkleyDB table: Only row count is accurate. - if ($is_show_stats) { - $formatted_size = ' - '; - $unit = ''; - } - break; - // for a view, the ENGINE is sometimes reported as null, - // or on some servers it's reported as "SYSTEM VIEW" - case null : - case 'SYSTEM VIEW' : - case 'FunctionEngine' : - // if table is broken, Engine is reported as null, so one more test - if ($each_table['TABLE_TYPE'] == 'VIEW') { - // countRecords() takes care of $cfg['MaxExactCountViews'] - $each_table['TABLE_ROWS'] = PMA_Table::countRecords($db, - $each_table['TABLE_NAME'], $force_exact = true, - $is_view = true); - $table_is_view = true; - } - break; - default : - // Unknown table type. - if ($is_show_stats) { - $formatted_size = 'unknown'; - $unit = ''; - } + // Drizzle doesn't provide data and index length, check for null + if ($is_show_stats && $each_table['Data_length'] !== null) { + $tblsize = $each_table['Data_length'] + $each_table['Index_length']; + $sum_size += $tblsize; + list($formatted_size, $unit) = PMA_formatByteDown($tblsize, 3, ($tblsize > 0) ? 1 : 0); + } + //$display_rows = ' - '; + break; + // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM + // Both are aliases for MERGE + case 'MRG_MyISAM' : + case 'MRG_MYISAM' : + case 'MERGE' : + case 'BerkeleyDB' : + // Merge or BerkleyDB table: Only row count is accurate. + if ($is_show_stats) { + $formatted_size = ' - '; + $unit = ''; + } + break; + // for a view, the ENGINE is sometimes reported as null, + // or on some servers it's reported as "SYSTEM VIEW" + case null : + case 'SYSTEM VIEW' : + case 'FunctionEngine' : + // if table is broken, Engine is reported as null, so one more test + if ($each_table['TABLE_TYPE'] == 'VIEW') { + // countRecords() takes care of $cfg['MaxExactCountViews'] + $each_table['TABLE_ROWS'] = PMA_Table::countRecords( + $db, $each_table['TABLE_NAME'], + $force_exact = true, $is_view = true + ); + $table_is_view = true; + } + break; + default : + // Unknown table type. + if ($is_show_stats) { + $formatted_size = 'unknown'; + $unit = ''; + } } // end switch if (! PMA_Table::isMerge($db, $each_table['TABLE_NAME'])) { @@ -254,7 +265,8 @@ foreach ($tables as $keyname => $each_table) { $row_count++; if ($table_is_view) { - $hidden_fields[] = '<input type="hidden" name="views[]" value="' . htmlspecialchars($each_table['TABLE_NAME']) . '" />'; + $hidden_fields[] = '<input type="hidden" name="views[]" value="' + . htmlspecialchars($each_table['TABLE_NAME']) . '" />'; } if ($each_table['TABLE_ROWS'] > 0 || $table_is_view) { @@ -287,20 +299,27 @@ foreach ($tables as $keyname => $each_table) { . ' ' . PMA_backquote($each_table['TABLE_NAME']); $drop_message = sprintf( $table_is_view ? __('View %s has been dropped') : __('Table %s has been dropped'), - str_replace(' ', ' ', htmlspecialchars($each_table['TABLE_NAME']))); + str_replace(' ', ' ', htmlspecialchars($each_table['TABLE_NAME'])) + ); } $tracking_icon = ''; if (PMA_Tracker::isActive()) { if (PMA_Tracker::isTracked($GLOBALS["db"], $truename)) { - $tracking_icon = '<a href="tbl_tracking.php?' . $url_query.'&table=' . $truename . '"><img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Tracking is active.') . '" title="' . __('Tracking is active.') . '" /></a>'; + $tracking_icon = '<a href="tbl_tracking.php?' . $url_query + . '&table=' . $truename . '"><img class="icon ic_eye" src="themes/dot.gif" alt="' + . __('Tracking is active.') . '" title="' . __('Tracking is active.') . '" /></a>'; } elseif (PMA_Tracker::getVersion($GLOBALS["db"], $truename) > 0) { - $tracking_icon = '<a href="tbl_tracking.php?' . $url_query . '&table=' . $truename . '"><img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Tracking is not active.') . '" title="' . __('Tracking is not active.') . '" /></a>'; + $tracking_icon = '<a href="tbl_tracking.php?' . $url_query + . '&table=' . $truename . '"><img class="icon ic_eye" src="themes/dot.gif" alt="' + . __('Tracking is not active.') . '" title="' . __('Tracking is not active.') . '" /></a>'; } } - if ($num_columns > 0 && $num_tables > $num_columns - && (($row_count % $num_columns) == 0)) { + if ($num_columns > 0 + && $num_tables > $num_columns + && ($row_count % $num_columns) == 0 + ) { $row_count = 1; $odd_row = true; ?> @@ -325,17 +344,23 @@ foreach ($tables as $keyname => $each_table) { } foreach ($server_slave_Wild_Do_Table as $db_table) { $table_part = PMA_extract_db_or_table($db_table, 'table'); - if (($db == PMA_extract_db_or_table($db_table, 'db')) && (preg_match("@^" . substr($table_part, 0, strlen($table_part) - 1) . "@", $truename))) { + if (($db == PMA_extract_db_or_table($db_table, 'db')) + && (preg_match("@^" . substr($table_part, 0, strlen($table_part) - 1) . "@", $truename)) + ) { $do = true; } } //////////////////////////////////////////////////////////////////// - if ((strlen(array_search($truename, $server_slave_Ignore_Table)) > 0) || (strlen(array_search($db, $server_slave_Ignore_DB)) > 0)) { + if ((strlen(array_search($truename, $server_slave_Ignore_Table)) > 0) + || (strlen(array_search($db, $server_slave_Ignore_DB)) > 0) + ) { $ignored = true; } foreach ($server_slave_Wild_Ignore_Table as $db_table) { $table_part = PMA_extract_db_or_table($db_table, 'table'); - if (($db == PMA_extract_db_or_table($db_table)) && (preg_match("@^" . substr($table_part, 0, strlen($table_part) - 1) . "@", $truename))) { + if (($db == PMA_extract_db_or_table($db_table)) + && (preg_match("@^" . substr($table_part, 0, strlen($table_part) - 1) . "@", $truename)) + ) { $ignored = true; } } @@ -350,7 +375,13 @@ foreach ($tables as $keyname => $each_table) { <th><?php echo $browse_table_label; ?> <?php echo (! empty($tracking_icon) ? $tracking_icon : ''); ?> </th> - <?php if ($server_slave_status) { ?><td align="center"><?php echo $ignored ? ' <img class="icon ic_s_cancel" src="themes/dot.gif" alt="NOT REPLICATED" />' : ''. $do ? ' <img class="icon ic_s_success" src="themes/dot.gif" alt="REPLICATED" />' : ''; ?></td><?php } ?> + <?php if ($server_slave_status) { ?><td align="center"><?php + echo $ignored + ? ' <img class="icon ic_s_cancel" src="themes/dot.gif" alt="NOT REPLICATED" />' + : ''. + $do + ? ' <img class="icon ic_s_success" src="themes/dot.gif" alt="REPLICATED" />' + : ''; ?></td><?php } ?> <td align="center"><?php echo $browse_table; ?></td> <td align="center"> <a href="tbl_structure.php?<?php echo $tbl_url_query; ?>"> @@ -380,10 +411,20 @@ foreach ($tables as $keyname => $each_table) { if ($table_is_view) { // Drizzle views use FunctionEngine, and the only place where they are available are I_S and D_D // schemas, where we do exact counting - if ($each_table['TABLE_ROWS'] >= $GLOBALS['cfg']['MaxExactCountViews'] && $each_table['ENGINE'] != 'FunctionEngine') { + if ($each_table['TABLE_ROWS'] >= $GLOBALS['cfg']['MaxExactCountViews'] + && $each_table['ENGINE'] != 'FunctionEngine' + ) { $row_count_pre = '~'; $sum_row_count_pre = '~'; - $show_superscript = PMA_showHint(PMA_sanitize(sprintf(__('This view has at least this number of rows. Please refer to %sdocumentation%s.'), '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', '[/a]'))); + $show_superscript = PMA_showHint( + PMA_sanitize( + sprintf( + __('This view has at least this number of rows. Please refer to %sdocumentation%s.'), + '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', + '[/a]' + ) + ) + ); } } elseif ($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) { // InnoDB table: we did not get an accurate row count @@ -437,10 +478,13 @@ if ($is_show_stats) { <?php // for blobstreaming - if the number of tables is 0, set tableReductionCount to 0 // (we don't want negative numbers here) - if ($num_tables == 0) + if ($num_tables == 0) { $tableReductionCount = 0; - - echo sprintf(_ngettext('%s table', '%s tables', $num_tables - $tableReductionCount), PMA_formatNumber($num_tables - $tableReductionCount, 0)); + } + echo sprintf( + _ngettext('%s table', '%s tables', $num_tables - $tableReductionCount), + PMA_formatNumber($num_tables - $tableReductionCount, 0) + ); ?> </th> <?php @@ -456,7 +500,8 @@ if (!($cfg['PropertiesNumColumns'] > 1)) { $default_engine = PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'storage_engine\';', 0, 1); echo ' <th align="center">' . "\n" . ' <dfn title="' - . sprintf(__('%s is the default storage engine on this MySQL server.'), $default_engine) . '">' .$default_engine . '</dfn></th>' . "\n"; + . sprintf(__('%s is the default storage engine on this MySQL server.'), $default_engine) + . '">' .$default_engine . '</dfn></th>' . "\n"; // we got a case where $db_collation was empty echo ' <th align="center">' . "\n"; if (! empty($db_collation)) { @@ -545,7 +590,10 @@ if (!$db_is_information_schema && !$cfg['DisableMultiTableMaintenance']) { </form> <?php // display again the table list navigator -PMA_listNavigator($total_num_tables, $pos, $_url_params, 'db_structure.php', 'frame_content', $GLOBALS['cfg']['MaxTableList']); +PMA_listNavigator( + $total_num_tables, $pos, $_url_params, 'db_structure.php', + 'frame_content', $GLOBALS['cfg']['MaxTableList'] +); ?> </div> <hr /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5RC1-11-gd3bd40b
by Madhura Jayaratne 14 Sep '11

14 Sep '11

The branch, QA_3_4 has been updated via d3bd40b56d619f0672e323844095cc8b36e9e49e (commit) from e27ba519c5265109d6e3ad629297d057b2c53496 (commit) - Log ----------------------------------------------------------------- commit d3bd40b56d619f0672e323844095cc8b36e9e49e Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 14 22:43:48 2011 +0530 bug #3400690 [privileges] DB-specific privileges won't submit Db/table specific privileges has not been ajaxified. So skip it for now. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/server_privileges.js | 2 +- server_privileges.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d05c29a..83aa38d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug #3404886 [navi] Edit SQL statement after error - bug #3403165 [interface] Collation not displayed for long enum fields - bug #3399951 [export] Config for export compression not used +- bug #3400690 [privileges] DB-specific privileges won't submit 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/js/server_privileges.js b/js/server_privileges.js index f178c6c..fe0f69f 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -346,7 +346,7 @@ $(document).ready(function() { * @memberOf jQuery * @name edit_user_submit */ - $("#edit_user_dialog").find("form").live('submit', function(event) { + $("#edit_user_dialog").find("form:not(#db_or_table_specific_priv)").live('submit', function(event) { /** @lends jQuery */ event.preventDefault(); diff --git a/server_privileges.php b/server_privileges.php index 81de01f..12fb1db 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1790,7 +1790,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs // but only if $dbname contains no wildcards // table header - echo '<form action="server_privileges.php" method="post">' . "\n" + echo '<form action="server_privileges.php" id="db_or_table_specific_priv" method="post">' . "\n" . PMA_generate_common_hidden_inputs('', '') . '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n" . '<input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19127-gabc1d3c
by Rouslan Placella 14 Sep '11

14 Sep '11

The branch, master has been updated via abc1d3c345dfd11ea3d940c5b944d05fc173ec34 (commit) from 6b09880e1ca37d9e883ecb0d0fe9392c0cbf6146 (commit) - Log ----------------------------------------------------------------- commit abc1d3c345dfd11ea3d940c5b944d05fc173ec34 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Sep 14 15:42:40 2011 +0100 Fixed broken validation and reindexing of some fields in the Routines editor ----------------------------------------------------------------------- Summary of changes: js/rte/routines.js | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/js/rte/routines.js b/js/rte/routines.js index 50c4f00..ac7a291 100644 --- a/js/rte/routines.js +++ b/js/rte/routines.js @@ -58,9 +58,9 @@ RTE.validateCustom = function () { if (isSuccess) { $(this).find(':input').each(function () { inputname = $(this).attr('name'); - if (inputname.substr(0, 17) === 'item_param_dir' || - inputname.substr(0, 18) === 'item_param_name' || - inputname.substr(0, 18) === 'item_param_type') { + if (inputname.substr(0, 14) === 'item_param_dir' || + inputname.substr(0, 15) === 'item_param_name' || + inputname.substr(0, 15) === 'item_param_type') { if ($(this).val() === '') { $(this).focus(); isSuccess = false; @@ -264,18 +264,18 @@ $(document).ready(function () { * the input field being reindexed. */ var inputname = $(this).attr('name'); - if (inputname.substr(0, 17) === 'item_param_dir') { + if (inputname.substr(0, 14) === 'item_param_dir') { + $(this).attr('name', inputname.substr(0, 14) + '[' + index + ']'); + } else if (inputname.substr(0, 15) === 'item_param_name') { + $(this).attr('name', inputname.substr(0, 15) + '[' + index + ']'); + } else if (inputname.substr(0, 15) === 'item_param_type') { + $(this).attr('name', inputname.substr(0, 15) + '[' + index + ']'); + } else if (inputname.substr(0, 17) === 'item_param_length') { $(this).attr('name', inputname.substr(0, 17) + '[' + index + ']'); - } else if (inputname.substr(0, 18) === 'item_param_name') { - $(this).attr('name', inputname.substr(0, 18) + '[' + index + ']'); - } else if (inputname.substr(0, 18) === 'item_param_type') { - $(this).attr('name', inputname.substr(0, 18) + '[' + index + ']'); - } else if (inputname.substr(0, 20) === 'item_param_length') { + } else if (inputname.substr(0, 20) === 'item_param_opts_text') { $(this).attr('name', inputname.substr(0, 20) + '[' + index + ']'); - } else if (inputname.substr(0, 23) === 'item_param_opts_text') { - $(this).attr('name', inputname.substr(0, 23) + '[' + index + ']'); - } else if (inputname.substr(0, 22) === 'item_param_opts_num') { - $(this).attr('name', inputname.substr(0, 22) + '[' + index + ']'); + } else if (inputname.substr(0, 19) === 'item_param_opts_num') { + $(this).attr('name', inputname.substr(0, 19) + '[' + index + ']'); } }); index++; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. bf754acd5c4bd16f0bb3a4a11e108c2c172583b0
by Marc Delisle 14 Sep '11

14 Sep '11

The branch, master has been updated via bf754acd5c4bd16f0bb3a4a11e108c2c172583b0 (commit) via d36188f3ea49e446dc015e7b8266929434cc218a (commit) from 385f0b3a7532f8b384d5990cc0642a20910b61ce (commit) - Log ----------------------------------------------------------------- commit bf754acd5c4bd16f0bb3a4a11e108c2c172583b0 Merge: 385f0b3 d36188f Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 14 08:04:04 2011 -0400 Merge branch 'website-security' commit d36188f3ea49e446dc015e7b8266929434cc218a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 12 13:01:06 2011 -0400 PMASA-2011-14 proposal ----------------------------------------------------------------------- Summary of changes: .../security/{PMASA-2011-11 => PMASA-2011-14} | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) copy templates/security/{PMASA-2011-11 => PMASA-2011-14} (57%) diff --git a/templates/security/PMASA-2011-11 b/templates/security/PMASA-2011-14 similarity index 57% copy from templates/security/PMASA-2011-11 copy to templates/security/PMASA-2011-14 index f6f98fd..570a21d 100644 --- a/templates/security/PMASA-2011-11 +++ b/templates/security/PMASA-2011-14 @@ -3,23 +3,23 @@ <py:def function="announcement_id"> -PMASA-2011-11 +PMASA-2011-14 </py:def> <py:def function="announcement_date"> -2011-07-23 +2011-09-14 </py:def> <py:def function="announcement_summary"> -Local file inclusion vulnerability and code execution. +Multiple XSS. </py:def> <py:def function="announcement_description"> -In the 'relational schema' code a parameter was not sanitized before being used to concatenate a class name. +Firstly, if a row contains javascript code, after inline editing this row and saving, the code is executed. Secondly, missing sanitization on the db, table and column names leads to XSS vulnerabilities. </py:def> <py:def function="announcement_severity"> -We consider this vulnerability to be critical. +We consider these vulnerabilities to be serious. </py:def> <py:def function="announcement_mitigation"> @@ -27,25 +27,25 @@ An attacker must be logged in via phpMyAdmin to exploit this problem. </py:def> <py:def function="announcement_affected"> -Versions 3.4.0 to 3.4.3.1 are affected. +Versions 3.4.0 to 3.4.4 were found vulnerable. </py:def> <py:def function="announcement_solution"> -Upgrade to phpMyAdmin 3.4.3.2 or apply the related patch listed below. +Upgrade to phpMyAdmin 3.4.5 or apply the related patches listed below. </py:def>  <py:def function="announcement_references"> -This issue was found by Norman Hippert from <a href="http://www.the-wildcat.de/">The-Wildcat.de</a> +The first issue was found by Brad Bernard (<a href="http://iunfollow.com">iunfollow.com</a>). The second issue was found by Nils Juenemann (<a href="https://twitter.com/#!/totally_unknown">https://twitter.com/#!/totally_unknown</a>.) </py:def>  -<py:def function="announcement_cve">CVE-2011-2718</py:def> <py:def function="announcement_cwe">661 98</py:def> <py:def function="announcement_commits"> -3ae58f0cd6b89ad4767920f9b214c38d3f6d4393 +bda213c58aec44925be661acb0e76c19483ea170 +2f28ce9c800274190418da0945ce3647d36e1db6 </py:def> <xi:include href="_page.tpl" /> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_5-44-g8cec661
by Marc Delisle 14 Sep '11

14 Sep '11

The branch, TESTING has been updated via 8cec66133fdb06172991e8017e4dda6e445bd8c1 (commit) via b7d09b5bb865816bb357ceb357f6beb52d20afde (commit) from 9ea5d25434fdca3d71eefedf80ac143c799b0bf9 (commit) - Log ----------------------------------------------------------------- commit 8cec66133fdb06172991e8017e4dda6e445bd8c1 Merge: 9ea5d25 b7d09b5 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 14 07:48:45 2011 -0400 Merge branch 'MAINT_3_4_5' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3076156..b307b54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.5.0 (not yet released) +3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing diff --git a/Documentation.html b/Documentation.html index 019939e..bfeeca6 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.5-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.5 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.5-rc1 + 3.4.5 Documentation </h1> </div> diff --git a/README b/README index a836068..0206e1f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.5-rc1 +Version 3.4.5 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 96fd61d..e6c6c26 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.5-rc1'); + $this->set('PMA_VERSION', '3.4.5'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_4_5, created. RELEASE_3_4_5
by Marc Delisle 14 Sep '11

14 Sep '11

The annotated tag, RELEASE_3_4_5 has been created at d0b8b7d92fcc008815ca5713708f22c6c41e2c1b (tag) tagging b7d09b5bb865816bb357ceb357f6beb52d20afde (commit) replaces RELEASE_3_4_5RC1 tagged by Marc Delisle on Wed Sep 14 07:48:44 2011 -0400 - Log ----------------------------------------------------------------- Released 3.4.5 Marc Delisle (1): 3.4.5 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19126-g6b09880
by Marc Delisle 14 Sep '11

14 Sep '11

The branch, master has been updated via 6b09880e1ca37d9e883ecb0d0fe9392c0cbf6146 (commit) from 79183afd771d96f2b6aa9b7238a1ce7ef4e201ea (commit) - Log ----------------------------------------------------------------- commit 6b09880e1ca37d9e883ecb0d0fe9392c0cbf6146 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 14 07:44:30 2011 -0400 3.4.5 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30c3085..37671bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,7 +55,7 @@ phpMyAdmin - ChangeLog - bug #3403165 [interface] Collation not displayed for long enum fields - bug #3399951 [export] Config for export compression not used -3.4.5.0 (not yet released) +3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5RC1-10-ge27ba51
by Marc Delisle 14 Sep '11

14 Sep '11

The branch, QA_3_4 has been updated via e27ba519c5265109d6e3ad629297d057b2c53496 (commit) from 03a75ab9e0049a1f21ace0e6e1ddad63658ae8d7 (commit) - Log ----------------------------------------------------------------- commit e27ba519c5265109d6e3ad629297d057b2c53496 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 14 07:44:09 2011 -0400 3.4.5 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca34332..d05c29a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ phpMyAdmin - ChangeLog - bug #3403165 [interface] Collation not displayed for long enum fields - bug #3399951 [export] Config for export compression not used -3.4.5.0 (not yet released) +3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_5, updated. RELEASE_3_4_5RC1-1-gb7d09b5
by Marc Delisle 14 Sep '11

14 Sep '11

The branch, MAINT_3_4_5 has been updated via b7d09b5bb865816bb357ceb357f6beb52d20afde (commit) from bda213c58aec44925be661acb0e76c19483ea170 (commit) - Log ----------------------------------------------------------------- commit b7d09b5bb865816bb357ceb357f6beb52d20afde Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 14 07:43:33 2011 -0400 3.4.5 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 326c8c0..1344b76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.5.0 (not yet released) +3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing diff --git a/Documentation.html b/Documentation.html index 019939e..bfeeca6 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.5-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.5 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.5-rc1 + 3.4.5 Documentation </h1> </div> diff --git a/README b/README index a836068..0206e1f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.5-rc1 +Version 3.4.5 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 96fd61d..e6c6c26 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.5-rc1'); + $this->set('PMA_VERSION', '3.4.5'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0