Git

git@phpmyadmin.net

19 participants
38304 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-62-g68e21b0
by Madhura Jayaratne 03 Aug '11

03 Aug '11

The branch, QA_3_4 has been updated via 68e21b05e46f144735faa849b80734d83812c7e6 (commit) via 7909da2ea01b15aad44689c9cc59051d747d0381 (commit) from e466dec53b4fca185e03d0a66b434f491355c274 (commit) - Log ----------------------------------------------------------------- commit 68e21b05e46f144735faa849b80734d83812c7e6 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Aug 4 00:04:16 2011 +0530 Changelog entry for bug #3383711. Some formatting commit 7909da2ea01b15aad44689c9cc59051d747d0381 Author: Sven Strickroth <email(a)cs-ware.de> Date: Mon Aug 1 16:05:36 2011 +0200 quick fix for issue #3383711 Signed-off-by: Sven Strickroth <email(a)cs-ware.de> ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbcc2ad..77d630c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - 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 +- bug #3383711 [display] Order by a column in a view doesn't work in some cases 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index c871612..3fa26c1 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -766,8 +766,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ // the orgname member does not exist for all MySQL versions // but if found, it's the one on which to sort $name_to_use_in_sort = $fields_meta[$i]->name; + $is_orgname = false; if (isset($fields_meta[$i]->orgname) && strlen($fields_meta[$i]->orgname)) { $name_to_use_in_sort = $fields_meta[$i]->orgname; + $is_orgname = true; } // $name_to_use_in_sort might contain a space due to // formatting of function expressions like "COUNT(name )" @@ -794,12 +796,15 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ // 2.1.3 Check the field name for a bracket. // If it contains one, it's probably a function column // like 'COUNT(`field`)' - if (strpos($name_to_use_in_sort, '(') !== false) { + // It still might be a column name of a view. See bug #3383711 + // Check is_orgname. + if (strpos($name_to_use_in_sort, '(') !== false && ! $is_orgname) { $sort_order = ' ORDER BY ' . $name_to_use_in_sort . ' '; } else { $sort_order = ' ORDER BY ' . $sort_tbl . PMA_backquote($name_to_use_in_sort) . ' '; } unset($name_to_use_in_sort); + unset($is_orgname); // 2.1.4 Do define the sorting URL if (! $is_in_sort) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12873-gc1f586b
by Madhura Jayaratne 03 Aug '11

03 Aug '11

The branch, master has been updated via c1f586b9fdc399ddc2cf86faa5a5e05194afa2e5 (commit) from 54fbcaa1403e9d97e41fb28c1751f6051037a295 (commit) - Log ----------------------------------------------------------------- commit c1f586b9fdc399ddc2cf86faa5a5e05194afa2e5 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Aug 3 20:48:28 2011 +0530 Bug #3383904 - Column comments are not displayed ----------------------------------------------------------------------- Summary of changes: libraries/relation.lib.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 86d4ab1..3534840 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -277,7 +277,7 @@ function PMA__getRelationsParam() $cfgRelation['displaywork'] = true; } } - + if (isset($cfgRelation['table_coords']) && isset($cfgRelation['pdf_pages'])) { $cfgRelation['pdfwork'] = true; } @@ -513,7 +513,7 @@ function PMA_getComments($db, $table = '') if ($table != '') { // MySQL native column comments - $fields = PMA_DBI_get_columns($db, $table); + $fields = PMA_DBI_get_columns($db, $table, true); if ($fields) { foreach ($fields as $field) { if (! empty($field['Comment'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12872-g54fbcaa
by Piotr Przybylski 02 Aug '11

02 Aug '11

The branch, master has been updated via 54fbcaa1403e9d97e41fb28c1751f6051037a295 (commit) from 0427378a0531e3d568a6ae60266d49318ff2310b (commit) - Log ----------------------------------------------------------------- commit 54fbcaa1403e9d97e41fb28c1751f6051037a295 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 2 23:30:51 2011 +0200 Server synchronize: * change icons to 16x16 * fix tables layout * merge 'Source' and 'Target' tables ----------------------------------------------------------------------- Summary of changes: js/server_synchronize.js | 24 +- libraries/server_synchronize.lib.php | 85 ++++--- server_synchronize.php | 283 ++++++++------------ themes/original/img/new_data.jpg | Bin 1925 -> 0 bytes themes/original/img/new_data.png | Bin 0 -> 1187 bytes themes/original/img/new_data_hovered.jpg | Bin 1558 -> 0 bytes themes/original/img/new_data_hovered.png | Bin 0 -> 1187 bytes themes/original/img/new_data_selected.jpg | Bin 1450 -> 0 bytes themes/original/img/new_data_selected.png | Bin 0 -> 1173 bytes themes/original/img/new_data_selected_hovered.jpg | Bin 1456 -> 0 bytes themes/original/img/new_data_selected_hovered.png | Bin 0 -> 1178 bytes themes/original/img/new_struct.jpg | Bin 1118 -> 0 bytes themes/original/img/new_struct.png | Bin 0 -> 1219 bytes themes/original/img/new_struct_hovered.jpg | Bin 1643 -> 0 bytes themes/original/img/new_struct_hovered.png | Bin 0 -> 1220 bytes themes/original/img/new_struct_selected.jpg | Bin 1431 -> 0 bytes themes/original/img/new_struct_selected.png | Bin 0 -> 1189 bytes .../original/img/new_struct_selected_hovered.jpg | Bin 1463 -> 0 bytes .../original/img/new_struct_selected_hovered.png | Bin 0 -> 1210 bytes themes/pmahomme/img/new_data.jpg | Bin 1925 -> 0 bytes themes/pmahomme/img/new_data.png | Bin 0 -> 1187 bytes themes/pmahomme/img/new_data_hovered.jpg | Bin 1558 -> 0 bytes themes/pmahomme/img/new_data_hovered.png | Bin 0 -> 1187 bytes themes/pmahomme/img/new_data_selected.jpg | Bin 1450 -> 0 bytes themes/pmahomme/img/new_data_selected.png | Bin 0 -> 1173 bytes themes/pmahomme/img/new_data_selected_hovered.jpg | Bin 1456 -> 0 bytes themes/pmahomme/img/new_data_selected_hovered.png | Bin 0 -> 1178 bytes themes/pmahomme/img/new_struct.jpg | Bin 1118 -> 0 bytes themes/pmahomme/img/new_struct.png | Bin 0 -> 1219 bytes themes/pmahomme/img/new_struct_hovered.jpg | Bin 1643 -> 0 bytes themes/pmahomme/img/new_struct_hovered.png | Bin 0 -> 1220 bytes themes/pmahomme/img/new_struct_selected.jpg | Bin 1431 -> 0 bytes themes/pmahomme/img/new_struct_selected.png | Bin 0 -> 1189 bytes .../pmahomme/img/new_struct_selected_hovered.jpg | Bin 1463 -> 0 bytes .../pmahomme/img/new_struct_selected_hovered.png | Bin 0 -> 1210 bytes 35 files changed, 175 insertions(+), 217 deletions(-) delete mode 100644 themes/original/img/new_data.jpg create mode 100644 themes/original/img/new_data.png delete mode 100644 themes/original/img/new_data_hovered.jpg create mode 100644 themes/original/img/new_data_hovered.png delete mode 100644 themes/original/img/new_data_selected.jpg create mode 100644 themes/original/img/new_data_selected.png delete mode 100644 themes/original/img/new_data_selected_hovered.jpg create mode 100644 themes/original/img/new_data_selected_hovered.png delete mode 100644 themes/original/img/new_struct.jpg create mode 100644 themes/original/img/new_struct.png delete mode 100644 themes/original/img/new_struct_hovered.jpg create mode 100644 themes/original/img/new_struct_hovered.png delete mode 100644 themes/original/img/new_struct_selected.jpg create mode 100644 themes/original/img/new_struct_selected.png delete mode 100644 themes/original/img/new_struct_selected_hovered.jpg create mode 100644 themes/original/img/new_struct_selected_hovered.png delete mode 100644 themes/pmahomme/img/new_data.jpg create mode 100644 themes/pmahomme/img/new_data.png delete mode 100644 themes/pmahomme/img/new_data_hovered.jpg create mode 100644 themes/pmahomme/img/new_data_hovered.png delete mode 100644 themes/pmahomme/img/new_data_selected.jpg create mode 100644 themes/pmahomme/img/new_data_selected.png delete mode 100644 themes/pmahomme/img/new_data_selected_hovered.jpg create mode 100644 themes/pmahomme/img/new_data_selected_hovered.png delete mode 100644 themes/pmahomme/img/new_struct.jpg create mode 100644 themes/pmahomme/img/new_struct.png delete mode 100644 themes/pmahomme/img/new_struct_hovered.jpg create mode 100644 themes/pmahomme/img/new_struct_hovered.png delete mode 100644 themes/pmahomme/img/new_struct_selected.jpg create mode 100644 themes/pmahomme/img/new_struct_selected.png delete mode 100644 themes/pmahomme/img/new_struct_selected_hovered.jpg create mode 100644 themes/pmahomme/img/new_struct_selected_hovered.png diff --git a/js/server_synchronize.js b/js/server_synchronize.js index 1dfd3d2..2cc0365 100644 --- a/js/server_synchronize.js +++ b/js/server_synchronize.js @@ -33,17 +33,17 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem // The image source is changed when the showDetails function is called. if ($img.hasClass('selected')) { if ($img.hasClass('struct_img')) { - $img.attr('src', pmaThemeImage + 'new_struct_selected.jpg'); + $img.attr('src', pmaThemeImage + 'new_struct_selected.png'); } if ($img.hasClass('data_img')) { - $img.attr('src', pmaThemeImage + 'new_data_selected.jpg'); + $img.attr('src', pmaThemeImage + 'new_data_selected.png'); } } else { if ($img.hasClass('struct_img')) { - $img.attr('src', pmaThemeImage + 'new_struct.jpg'); + $img.attr('src', pmaThemeImage + 'new_struct.png'); } if ($img.hasClass('data_img')) { - $img.attr('src', pmaThemeImage + 'new_data.jpg'); + $img.attr('src', pmaThemeImage + 'new_data.png'); } } @@ -347,9 +347,9 @@ $(document).ready(function() { var $img = $(this); $img.addClass('hover'); if ($img.hasClass('selected')) { - $img.attr('src', pmaThemeImage + 'new_struct_selected_hovered.jpg'); + $img.attr('src', pmaThemeImage + 'new_struct_selected_hovered.png'); } else { - $img.attr('src', pmaThemeImage + 'new_struct_hovered.jpg'); + $img.attr('src', pmaThemeImage + 'new_struct_hovered.png'); } }, function() { @@ -357,9 +357,9 @@ $(document).ready(function() { var $img = $(this); $img.removeClass('hover'); if ($img.hasClass('selected')) { - $img.attr('src', pmaThemeImage + 'new_struct_selected.jpg'); + $img.attr('src', pmaThemeImage + 'new_struct_selected.png'); } else { - $img.attr('src', pmaThemeImage + 'new_struct.jpg'); + $img.attr('src', pmaThemeImage + 'new_struct.png'); } } ); @@ -370,9 +370,9 @@ $(document).ready(function() { var $img = $(this); $img.addClass('hover'); if ($img.hasClass('selected')) { - $img.attr('src', pmaThemeImage + 'new_data_selected_hovered.jpg'); + $img.attr('src', pmaThemeImage + 'new_data_selected_hovered.png'); } else { - $img.attr('src', pmaThemeImage + 'new_data_hovered.jpg'); + $img.attr('src', pmaThemeImage + 'new_data_hovered.png'); } }, function() { @@ -380,9 +380,9 @@ $(document).ready(function() { var $img = $(this); $img.removeClass('hover'); if ($img.hasClass('selected')) { - $img.attr('src', pmaThemeImage + 'new_data_selected.jpg'); + $img.attr('src', pmaThemeImage + 'new_data_selected.png'); } else { - $img.attr('src', pmaThemeImage + 'new_data.jpg'); + $img.attr('src', pmaThemeImage + 'new_data.png'); } } ); diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 12cea2a..b7b332c 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -1287,66 +1287,75 @@ function PMA_displayQuery($query) { } /** - * PMA_syncDisplayHeaderSource() shows the header for source database + * PMA_syncDisplayHeaderCompare() shows the header for source database * - * @param string $src_db source db name + * @param string $src_db source db name + * @param string $trg_db target db name * @return nothing */ -function PMA_syncDisplayHeaderSource($src_db) { - echo '<div id="serverstatus" style = "overflow: auto; width: 1020px; height: 220px; border-left: 1px gray solid; border-bottom: 1px gray solid; padding:0; margin-bottom: 1em "> '; +function PMA_syncDisplayHeaderCompare($src_db, $trg_db) { + echo '<fieldset style="padding:0"><div style="padding:1.5em; overflow:auto; height:220px">'; - echo '<table id="serverstatusconnections" class="data" width="55%">'; + echo '<table class="data">'; echo '<tr>'; - echo '<th>' . __('Source database') . ': ' . $src_db . '<br />('; + echo '<th>' . __('Source database') . ': ' . htmlspecialchars($src_db) . '<br />('; if ('cur' == $_SESSION['src_type']) { echo __('Current server'); } else { - echo __('Remote server') . ' ' . $_SESSION['src_server']['host']; + echo __('Remote server') . ' ' . htmlspecialchars($_SESSION['src_server']['host']); } echo ')</th>'; echo '<th>' . __('Difference') . '</th>'; - echo '</tr>'; -} - -/** - * PMA_syncDisplayHeaderTargetAndMatchingTables() shows the header for target database and the matching tables - * - * @param string $trg_db target db name - * @param array $matching_tables - * @return boolean $odd_row current value of this toggle - */ -function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) { - echo '<table id="serverstatusconnections" class="data" width="43%">'; - echo '<tr>'; - echo '<th>' . __('Target database') . ': '. $trg_db . '<br />('; + echo '<th>' . __('Target database') . ': '. htmlspecialchars($trg_db) . '<br />('; if ('cur' == $_SESSION['trg_type']) { echo __('Current server'); } else { - echo __('Remote server') . ' ' . $_SESSION['trg_server']['host']; + echo __('Remote server') . ' ' . htmlspecialchars($_SESSION['trg_server']['host']); } echo ')</th>'; echo '</tr>'; - $odd_row = false; - foreach ($matching_tables as $tbl_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td> ' . htmlspecialchars($tbl_name) . '</td>'; - echo '</tr>'; - } - return $odd_row; } /** - * PMA_syncDisplayBeginTableRow() displays the TR tag for alternating colors + * Prints table row + * + * $rows contains following keys: + * - src_table_name - source server table name + * - dst_table_name - target server table name + * - btn_type - 'M' or 'U' + * - btn_structure - null or arguments for showDetails in server_synchronize.js (without img_obj and table_name): + * i, update_size, insert_size, remove_size, insert_index, remove_index * - * @param boolean $odd_row current status of the toggle - * @return boolean $odd_row final status of the toggle + * @param array $rows */ -function PMA_syncDisplayBeginTableRow($odd_row) { - $odd_row = ! $odd_row; - echo '<tr height="32" class=" '; - echo $odd_row ? 'odd' : 'even'; - echo '">'; - return $odd_row; +function PMA_syncDisplayDataCompare($rows) { + global $pmaThemeImage; + + $odd_row = true; + foreach ($rows as $row) { + echo '<tr class=" ' . ($odd_row ? 'odd' : 'even') . '">'; + echo '<td>' . htmlspecialchars($row['src_table_name']) . '</td><td style="text-align:center">'; + if (isset($row['btn_structure']) && $row['btn_structure']) { + // parameters: i, update_size, insert_size, remove_size, insert_index, remove_index + $p = $row['btn_structure']; + $p[0] = $row['btn_type'] . 'S' . $p[0]; + echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.png" width="16" height="16" + alt="Structure" title="' . __('Click to select') . '" style="cursor:pointer" onclick="showDetails(' + . "'" . implode($p, "','") . "'" + . ', this, ' . "'" . PMA_escapeJsString(htmlspecialchars($row['src_table_name'])) . "'" . ')" /> '; + } + if (isset($row['btn_data']) && $row['btn_data']) { + // parameters: i, update_size, insert_size, remove_size, insert_index, remove_index + $p = $row['btn_data']; + $p[0] = $row['btn_type'] . 'D' . $p[0]; + echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.png" width="16" height="16" + alt="Data" title="' . __('Click to select') . '" style="cursor:pointer" onclick="showDetails(' + . "'" . implode($p, "','") . "'" + . ', this, ' . "'" . PMA_escapeJsString(htmlspecialchars($row['src_table_name'])) . "'" . ')" />'; + } + echo '</td><td>' . htmlspecialchars($row['dst_table_name']) . '</td></tr>'; + $odd_row = !$odd_row; + } } /** diff --git a/server_synchronize.php b/server_synchronize.php index 6c23d97..8f79897 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -251,33 +251,32 @@ if ((isset($_REQUEST['submit_connect']))) { /** * Displays the sub-heading and icons showing Structure Synchronization and Data Synchronization */ - echo '<form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php">' - . PMA_generate_common_hidden_inputs('', ''); - echo '<table id="serverstatustraffic" class="data" width = "40%"> + ?> + <form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php"> + <?php PMA_generate_common_hidden_inputs('', ''); ?> + <table width="40%"> <tr> - <td>' - . '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="32"' - . ' height="32" alt="" />' - . __('Structure Synchronization') - .'</td>'; - echo '<td>' - . '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="32"' - . ' height="32" alt="" />' - . __('Data Synchronization') - . '</td>'; - echo '</tr> - </table>'; - + <td> + <img class="icon" src="<?php echo $pmaThemeImage; ?>new_struct.png" width="16" height="16" alt="" /> + <?php echo __('Structure Synchronization'); ?> + </td> + <td> + <img class="icon" src="<?php echo $pmaThemeImage; ?>new_data.png" width="16" height="16" alt="" /> + <?php echo __('Data Synchronization'); ?> + </td> + </tr> + </table> + <?php /** * Displays the tables containing the source tables names, their difference with the target tables and target tables names */ - PMA_syncDisplayHeaderSource($src_db); - $odd_row = false; + PMA_syncDisplayHeaderCompare($src_db, $trg_db); + $rows = array(); /** * Display the matching tables' names and difference, first */ - for($i = 0; $i < count($matching_tables); $i++) { + for ($i = 0; $i < count($matching_tables); $i++) { /** * Calculating the number of updates for each matching table */ @@ -296,12 +295,7 @@ if ((isset($_REQUEST['submit_connect']))) { } else { $num_of_insertions = 0; } - /** - * Displays the name of the matching table - */ - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td>' . htmlspecialchars($matching_tables[$i]) . '</td> - <td align="center">'; + /** * Calculating the number of alter columns, number of columns to be added, number of columns to be removed, * number of index to be added and removed. @@ -331,86 +325,70 @@ if ((isset($_REQUEST['submit_connect']))) { $num_add_index += sizeof($alter_indexes_array[$i]); $num_remove_index += sizeof($alter_indexes_array[$i]); } + + $btn_structure_params = null; + $btn_data_params = null; + /** * Display the red button of structure synchronization if there exists any structure difference or index difference. */ if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) { - - echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'MS" . $i . "','" . $num_alter_cols . "','" .$num_insert_cols . - "','" . $num_remove_cols . "','" . $num_add_index . "','" . $num_remove_index . "'" - . ', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')"/>'; + $btn_structure_params = array($i, $num_alter_cols, $num_insert_cols, + $num_remove_cols, $num_add_index, $num_remove_index); } + /** * Display the green button of data synchronization if there exists any data difference. */ if (isset($update_array[$i]) || isset($insert_array[$i])) { if (isset($update_array[$i][0][$matching_tables_keys[$i][0]]) || isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { - - echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails('. "'MD" . $i . "','" . $num_of_updates . "','" . $num_of_insertions . - "','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')" />'; + $btn_data_params = array($i, $num_of_updates, $num_of_insertions, null, null, null); } } - echo '</td> - </tr>'; + + $rows[] = array( + 'src_table_name' => $matching_tables[$i], + 'dst_table_name' => $matching_tables[$i], + 'btn_type' => 'M', + 'btn_structure' => $btn_structure_params, + 'btn_data' => $btn_data_params + ); } /** * Displays the tables' names present in source but missing from target */ for ($j = 0; $j < count($source_tables_uncommon); $j++) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td> + ' . htmlspecialchars($source_tables_uncommon[$j]) . '</td> '; - - echo '<td align="center"><img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'US" . $j . "','" . null . "','" . null . "','" . null . "','" . null . "','" . null . "'" . ', this ,' - . "'" . htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')"/>'; - - if ($row_count[$j] > 0) - { - echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'UD" . $j . "','" . null . "','" . $row_count[$j] . "','" . null . - "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')" />'; + $row = array( + 'src_table_name' => '+ ' . $source_tables_uncommon[$j], + 'dst_table_name' => $source_tables_uncommon[$j] . ' (' . __('not present') . ')', + 'btn_type' => 'U', + 'btn_structure' => array($j, null, null, null, null, null), + 'btn_data' => null + ); + if ($row_count[$j] > 0) { + $row['btn_data'] = array($j, null, $row_count[$j], null, null, null); } - echo '</td> - </tr>'; + $rows[] = $row; } foreach ($target_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td height="32">      </td><td></td>'; - echo '</tr>'; + $rows[] = array( + 'src_table_name' => '', + 'dst_table_name' => $tbl_nc_name); } /** * Displays the target tables names */ - echo '</table>'; - - $odd_row = PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables); - foreach ($source_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td height="32">' . htmlspecialchars($tbl_nc_name) . ' (' . __('not present') . ')</td> - </tr>'; - } - foreach ($target_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td> - ' . htmlspecialchars($tbl_nc_name) . '</td>'; - echo '</tr>'; - } - echo '</table>'; - echo '</div>'; + PMA_syncDisplayDataCompare($rows); + echo '</table> + </div> + </fieldset>'; /** * This "list" div will contain a table and each row will depict information about structure/data diffrence in tables. * Rows will be generated dynamically as soon as the colored buttons "D" or "S" are clicked. */ - echo '<div id="list" style = "overflow: auto; width: 1020px; height: 140px; - border-left: 1px gray solid; border-bottom: 1px gray solid; - padding:0px; margin: 0px"> + echo '<fieldset style="padding:0"><div id="list" style="overflow:auto; height:140px; padding:1em"> <table> <thead> @@ -433,7 +411,7 @@ if ((isset($_REQUEST['submit_connect']))) { </thead> <tbody></tbody> </table> - </div>'; + </div></fieldset>'; /** * This fieldset displays the checkbox to confirm deletion of previous rows from target tables */ @@ -700,13 +678,9 @@ if (isset($_REQUEST['Table_ids'])) { echo '<form name="applied_difference" id="synchronize_form" method="post" action="server_synchronize.php">' . PMA_generate_common_hidden_inputs('', ''); - PMA_syncDisplayHeaderSource($src_db); - $odd_row = false; + PMA_syncDisplayHeaderCompare($src_db, $trg_db); + $rows = array(); for($i = 0; $i < count($matching_tables); $i++) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td align="center">' . htmlspecialchars($matching_tables[$i]) . '</td> - <td align="center">'; - $num_alter_cols = 0; $num_insert_cols = 0; $num_remove_cols = 0; @@ -729,11 +703,12 @@ if (isset($_REQUEST['Table_ids'])) { $num_remove_index = sizeof($remove_indexes_array[$i]); } + $btn_structure_params = null; + $btn_data_params = null; + if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) { - echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'MS" . $i . "','" . $num_alter_cols . "','" . $num_insert_cols . "','" . $num_remove_cols . "','" . $num_add_index . "','" . $num_remove_index . "'" .', - this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')"/>'; + $btn_structure_params = array($i, $num_alter_cols, $num_insert_cols, + $num_remove_cols, $num_add_index, $num_remove_index); } if (!(in_array($i, $matching_table_data_diff))) { @@ -757,18 +732,20 @@ if (isset($_REQUEST['Table_ids'])) { } if ((isset($matching_tables_keys[$i][0]) && isset($update_array[$i][0][$matching_tables_keys[$i][0]])) - || (isset($matching_tables_keys[$i][0]) && isset($insert_array[$i][0][$matching_tables_keys[$i][0]]))) { - echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'MD" . $i . "','" . $num_of_updates . "','" . $num_of_insertions . - "','" . null . "','" . null . "','" . null . "'" .', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')" />'; + || (isset($matching_tables_keys[$i][0]) && isset($insert_array[$i][0][$matching_tables_keys[$i][0]]))) { + $btn_data_params = array($i, $num_of_updates, $num_of_insertions, + null, null, null); } } else { unset($update_array[$i]); unset($insert_array[$i]); } - echo '</td> - </tr>'; + $rows[] = array( + 'src_table_name' => $matching_tables[$i], + 'btn_type' => 'M', + 'btn_structure' => $btn_structure_params, + 'btn_data' => $btn_data_params + ); } /** * placing updated value of arrays in session @@ -778,37 +755,39 @@ if (isset($_REQUEST['Table_ids'])) { $_SESSION['insert_array'] = $insert_array; for ($j = 0; $j < count($source_tables_uncommon); $j++) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td align="center"> + ' . htmlspecialchars($source_tables_uncommon[$j]) . '</td> - <td align="center">'; + $btn_structure_params = null; + $btn_data_params = null; + /** * Display the difference only when it has not been applied */ if (!(in_array($j, $uncommon_table_structure_diff))) { if (isset($uncommon_tables[$j])) { - echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'US" . $j . "','" . null . "','" . null . "','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')"/>' .' '; + $btn_structure_params = array($j, null, null, null, null, null); } + $dst_table_name = $source_tables_uncommon[$j] . ' (' . __('not present') . ')'; } else { unset($uncommon_tables[$j]); + $dst_table_name = $source_tables_uncommon[$j]; } /** * Display the difference only when it has not been applied */ if (!(in_array($j, $uncommon_table_data_diff))) { - if (isset($row_count[$j]) && ($row_count > 0)) { - echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'UD" . $j . "','" . null ."','" . $row_count[$j] ."','" - . null . "','" . null . "','" . null . "'" . ', this ,' . "'". htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')" />'; + if (isset($row_count[$j]) && ($row_count[$j] > 0)) { + $btn_data_params = array($j, null, $row_count[$j], null, null, null); } } else { unset($row_count[$j]); } - echo '</td> - </tr>'; + $rows[] = array( + 'src_table_name' => $source_tables_uncommon[$j], + 'dst_table_name' => $dst_table_name, + 'btn_type' => 'U', + 'btn_structure' => $btn_structure_params, + 'btn_data' => $btn_data_params + ); } /** * placing the latest values of arrays in session @@ -822,39 +801,21 @@ if (isset($_REQUEST['Table_ids'])) { * Displaying the target database tables */ foreach ($target_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td>      </td><td></td>'; - echo '</tr>'; - } - echo '</table>'; - $odd_row = PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables); - foreach ($source_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - if (in_array($tbl_nc_name, $uncommon_tables)) { - echo '<td>' . htmlspecialchars($tbl_nc_name) . ' (' . __('not present') . ')</td>'; - } else { - echo '<td>' . htmlspecialchars($tbl_nc_name) . '</td>'; - } - echo ' - </tr>'; - } - foreach ($target_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td> - ' . htmlspecialchars($tbl_nc_name) . '</td>'; - echo '</tr>'; + $rows[] = array( + 'src_table_name' => '', + 'dst_table_name' => $tbl_nc_name); } + PMA_syncDisplayDataCompare($rows); echo '</table> - </div>'; + </div> + </fieldset>'; /** * This "list" div will contain a table and each row will depict information about structure/data diffrence in tables. * Rows will be generated dynamically as soon as the colored buttons "D" or "S" are clicked. */ - echo '<div id="list" style = "overflow: auto; width: 1020px; height: 140px; - border-left: 1px gray solid; border-bottom: 1px gray solid; - padding:0px; margin: 0px">'; - + echo '<fieldset style="padding:0"><div id="list" style = "overflow:auto; height:140px; padding:1em">'; echo '<table> <thead> <tr style="width: 100%;"> @@ -876,7 +837,7 @@ if (isset($_REQUEST['Table_ids'])) { </thead> <tbody></tbody> </table> - </div>'; + </div></fieldset>'; /** * This fieldset displays the checkbox to confirm deletion of previous rows from target tables @@ -938,40 +899,28 @@ if (isset($_REQUEST['synchronize_db'])) { /** * Displaying all the tables of source and target database and now no difference is there. */ - PMA_syncDisplayHeaderSource($src_db); - - $odd_row = false; - for($i = 0; $i < count($matching_tables); $i++) - { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td>' . htmlspecialchars($matching_tables[$i]) . '</td> - <td></td> - </tr>'; - } - for ($j = 0; $j < count($source_tables_uncommon); $j++) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td> + ' . htmlspecialchars($source_tables_uncommon[$j]) . '</td> '; - echo '<td></td> - </tr>'; - } - foreach ($target_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td>      </td><td></td>'; - echo '</tr>'; - } - echo '</table>'; - $odd_row = PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables); - foreach ($source_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td>' . htmlspecialchars($tbl_nc_name) . ' </td> - </tr>'; - } - foreach ($target_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td> ' . htmlspecialchars($tbl_nc_name) . '</td>'; - echo '</tr>'; - } - echo '</table> </div>'; + PMA_syncDisplayHeaderCompare($src_db, $trg_db); + $rows = array(); + for ($i = 0; $i < count($matching_tables); $i++) + { + $rows[] = array( + 'src_table_name' => $matching_tables[$i], + 'dst_table_name' => $matching_tables[$i]); + } + foreach ($source_tables_uncommon as $tbl_nc_name) { + $rows[] = array( + 'src_table_name' => '+ ' + $tbl_nc_name, + 'dst_table_name' => $tbl_nc_name); + } + foreach ($target_tables_uncommon as $tbl_nc_name) { + $rows[] = array( + 'src_table_name' => '', + 'dst_table_name' => $tbl_nc_name); + } + PMA_syncDisplayDataCompare($rows); + echo '</table> + </div> + </fieldset>'; /** * connecting the source and target servers @@ -1114,7 +1063,7 @@ if (isset($_REQUEST['synchronize_db'])) { $database_header .= PMA_showHint(PMA_sanitize(sprintf('%sAllowArbitraryServer%s', '[a@./Documentation.html#AllowArbitraryServer@_blank]', '[/a]'))); ?> - <table id="serverconnection_<?php echo $type; ?>_remote" class="data"> + <table id="serverconnection_<?php echo $type; ?>_remote" class="data noclick"> <caption class="tblHeaders"><?php echo $database_header; ?></caption> <tr class="odd"> <td colspan="2" style="text-align: center"> diff --git a/themes/original/img/new_data.jpg b/themes/original/img/new_data.jpg deleted file mode 100644 index 08d30d3..0000000 Binary files a/themes/original/img/new_data.jpg and /dev/null differ diff --git a/themes/original/img/new_data.png b/themes/original/img/new_data.png new file mode 100644 index 0000000..6533571 Binary files /dev/null and b/themes/original/img/new_data.png differ diff --git a/themes/original/img/new_data_hovered.jpg b/themes/original/img/new_data_hovered.jpg deleted file mode 100644 index c385872..0000000 Binary files a/themes/original/img/new_data_hovered.jpg and /dev/null differ diff --git a/themes/original/img/new_data_hovered.png b/themes/original/img/new_data_hovered.png new file mode 100644 index 0000000..b1cbdcd Binary files /dev/null and b/themes/original/img/new_data_hovered.png differ diff --git a/themes/original/img/new_data_selected.jpg b/themes/original/img/new_data_selected.jpg deleted file mode 100644 index caabf67..0000000 Binary files a/themes/original/img/new_data_selected.jpg and /dev/null differ diff --git a/themes/original/img/new_data_selected.png b/themes/original/img/new_data_selected.png new file mode 100644 index 0000000..39aa50f Binary files /dev/null and b/themes/original/img/new_data_selected.png differ diff --git a/themes/original/img/new_data_selected_hovered.jpg b/themes/original/img/new_data_selected_hovered.jpg deleted file mode 100644 index a34ba21..0000000 Binary files a/themes/original/img/new_data_selected_hovered.jpg and /dev/null differ diff --git a/themes/original/img/new_data_selected_hovered.png b/themes/original/img/new_data_selected_hovered.png new file mode 100644 index 0000000..7105a2d Binary files /dev/null and b/themes/original/img/new_data_selected_hovered.png differ diff --git a/themes/original/img/new_struct.jpg b/themes/original/img/new_struct.jpg deleted file mode 100644 index 283a5e9..0000000 Binary files a/themes/original/img/new_struct.jpg and /dev/null differ diff --git a/themes/original/img/new_struct.png b/themes/original/img/new_struct.png new file mode 100644 index 0000000..14f7969 Binary files /dev/null and b/themes/original/img/new_struct.png differ diff --git a/themes/original/img/new_struct_hovered.jpg b/themes/original/img/new_struct_hovered.jpg deleted file mode 100644 index 7a7c704..0000000 Binary files a/themes/original/img/new_struct_hovered.jpg and /dev/null differ diff --git a/themes/original/img/new_struct_hovered.png b/themes/original/img/new_struct_hovered.png new file mode 100644 index 0000000..5746ac1 Binary files /dev/null and b/themes/original/img/new_struct_hovered.png differ diff --git a/themes/original/img/new_struct_selected.jpg b/themes/original/img/new_struct_selected.jpg deleted file mode 100644 index 16b2b8c..0000000 Binary files a/themes/original/img/new_struct_selected.jpg and /dev/null differ diff --git a/themes/original/img/new_struct_selected.png b/themes/original/img/new_struct_selected.png new file mode 100644 index 0000000..618ba81 Binary files /dev/null and b/themes/original/img/new_struct_selected.png differ diff --git a/themes/original/img/new_struct_selected_hovered.jpg b/themes/original/img/new_struct_selected_hovered.jpg deleted file mode 100644 index 77a5371..0000000 Binary files a/themes/original/img/new_struct_selected_hovered.jpg and /dev/null differ diff --git a/themes/original/img/new_struct_selected_hovered.png b/themes/original/img/new_struct_selected_hovered.png new file mode 100644 index 0000000..4e0947e Binary files /dev/null and b/themes/original/img/new_struct_selected_hovered.png differ diff --git a/themes/pmahomme/img/new_data.jpg b/themes/pmahomme/img/new_data.jpg deleted file mode 100644 index 08d30d3..0000000 Binary files a/themes/pmahomme/img/new_data.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_data.png b/themes/pmahomme/img/new_data.png new file mode 100644 index 0000000..6533571 Binary files /dev/null and b/themes/pmahomme/img/new_data.png differ diff --git a/themes/pmahomme/img/new_data_hovered.jpg b/themes/pmahomme/img/new_data_hovered.jpg deleted file mode 100644 index c385872..0000000 Binary files a/themes/pmahomme/img/new_data_hovered.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_data_hovered.png b/themes/pmahomme/img/new_data_hovered.png new file mode 100644 index 0000000..b1cbdcd Binary files /dev/null and b/themes/pmahomme/img/new_data_hovered.png differ diff --git a/themes/pmahomme/img/new_data_selected.jpg b/themes/pmahomme/img/new_data_selected.jpg deleted file mode 100644 index caabf67..0000000 Binary files a/themes/pmahomme/img/new_data_selected.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_data_selected.png b/themes/pmahomme/img/new_data_selected.png new file mode 100644 index 0000000..39aa50f Binary files /dev/null and b/themes/pmahomme/img/new_data_selected.png differ diff --git a/themes/pmahomme/img/new_data_selected_hovered.jpg b/themes/pmahomme/img/new_data_selected_hovered.jpg deleted file mode 100644 index a34ba21..0000000 Binary files a/themes/pmahomme/img/new_data_selected_hovered.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_data_selected_hovered.png b/themes/pmahomme/img/new_data_selected_hovered.png new file mode 100644 index 0000000..7105a2d Binary files /dev/null and b/themes/pmahomme/img/new_data_selected_hovered.png differ diff --git a/themes/pmahomme/img/new_struct.jpg b/themes/pmahomme/img/new_struct.jpg deleted file mode 100644 index 283a5e9..0000000 Binary files a/themes/pmahomme/img/new_struct.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_struct.png b/themes/pmahomme/img/new_struct.png new file mode 100644 index 0000000..14f7969 Binary files /dev/null and b/themes/pmahomme/img/new_struct.png differ diff --git a/themes/pmahomme/img/new_struct_hovered.jpg b/themes/pmahomme/img/new_struct_hovered.jpg deleted file mode 100644 index 7a7c704..0000000 Binary files a/themes/pmahomme/img/new_struct_hovered.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_struct_hovered.png b/themes/pmahomme/img/new_struct_hovered.png new file mode 100644 index 0000000..5746ac1 Binary files /dev/null and b/themes/pmahomme/img/new_struct_hovered.png differ diff --git a/themes/pmahomme/img/new_struct_selected.jpg b/themes/pmahomme/img/new_struct_selected.jpg deleted file mode 100644 index 16b2b8c..0000000 Binary files a/themes/pmahomme/img/new_struct_selected.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_struct_selected.png b/themes/pmahomme/img/new_struct_selected.png new file mode 100644 index 0000000..618ba81 Binary files /dev/null and b/themes/pmahomme/img/new_struct_selected.png differ diff --git a/themes/pmahomme/img/new_struct_selected_hovered.jpg b/themes/pmahomme/img/new_struct_selected_hovered.jpg deleted file mode 100644 index 77a5371..0000000 Binary files a/themes/pmahomme/img/new_struct_selected_hovered.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_struct_selected_hovered.png b/themes/pmahomme/img/new_struct_selected_hovered.png new file mode 100644 index 0000000..4e0947e Binary files /dev/null and b/themes/pmahomme/img/new_struct_selected_hovered.png differ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12871-g0427378
by Piotr Przybylski 02 Aug '11

02 Aug '11

The branch, master has been updated via 0427378a0531e3d568a6ae60266d49318ff2310b (commit) from 663d073e6be9630bd99e3684705d9182c36112b1 (commit) - Log ----------------------------------------------------------------- commit 0427378a0531e3d568a6ae60266d49318ff2310b Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 2 23:13:39 2011 +0200 Allow to use noclick class on table level ----------------------------------------------------------------------- Summary of changes: js/functions.js | 2 +- libraries/display_change_password.lib.php | 6 ++-- libraries/tbl_properties.inc.php | 6 ++-- server_collations.php | 6 ++-- server_engines.php | 6 ++-- server_status.php | 30 ++++++++++++++-------------- server_variables.php | 6 ++-- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/js/functions.js b/js/functions.js index bc94a89..287195d 100644 --- a/js/functions.js +++ b/js/functions.js @@ -597,7 +597,7 @@ $(document).ready(function() { * next pages reached via AJAX); a tr may have the class noclick to remove * this behavior. */ - $('tr.odd:not(.noclick), tr.even:not(.noclick)').live('click',function(e) { + $('table:not(.noclick) tr.odd:not(.noclick), table:not(.noclick) tr.even:not(.noclick)').live('click',function(e) { // do not trigger when clicked on anchor if ($(e.target).is('a, img, a *')) { return; diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php index 4dcb2c9..48444a6 100644 --- a/libraries/display_change_password.lib.php +++ b/libraries/display_change_password.lib.php @@ -27,14 +27,14 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5) }?> <fieldset id="fieldset_change_password"> <legend><?php echo __('Change password'); ?></legend> - <table class="data"> - <tr class="odd noclick"> + <table class="data noclick"> + <tr class="odd"> <td colspan="2"> <input type="radio" name="nopass" value="1" id="nopass_1" onclick="pma_pw.value = ''; pma_pw2.value = ''; this.checked = true" /> <label for="nopass_1"><?php echo __('No Password') . "\n"; ?></label> </td> </tr> - <tr class="even noclick"> + <tr class="even"> <td> <input type="radio" name="nopass" value="0" id="nopass_0" onclick="document.getElementById('text_pma_pw').focus();" checked="checked " /> <label for="nopass_0"><?php echo __('Password'); ?>: </label> diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index f4ade94..7208ea3 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -622,7 +622,7 @@ if (is_array($content_cells) && is_array($header_cells)) { // last row is for javascript insert //$empty_row = array_pop($content_cells); - echo '<table id="table_columns">'; + echo '<table id="table_columns" class="noclick">'; echo '<caption class="tblHeaders">' . __('Structure') . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_TABLE') . '</caption>'; if ($display_type == 'horizontal') { @@ -636,7 +636,7 @@ if (is_array($content_cells) && is_array($header_cells)) { $odd_row = true; foreach ($content_cells as $content_row) { - echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ' noclick">'; + echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'; $odd_row = ! $odd_row; if (is_array($content_row)) { @@ -652,7 +652,7 @@ if (is_array($content_cells) && is_array($header_cells)) { $i = 0; $odd_row = true; foreach ($header_cells as $header_val) { - echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ' noclick">'; + echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'; $odd_row = ! $odd_row; ?> <th><?php echo $header_val; ?></th> diff --git a/server_collations.php b/server_collations.php index ccd41d4..71508be 100644 --- a/server_collations.php +++ b/server_collations.php @@ -49,7 +49,7 @@ require_once './libraries/mysql_charsets.lib.php'; * Outputs the result */ echo '<div id="div_mysql_charset_collations">' . "\n" - . '<table class="data">' . "\n" + . '<table class="data noclick">' . "\n" . '<tr><th>' . __('Collation') . '</th>' . "\n" . ' <th>' . __('Description') . '</th>' . "\n" . '</tr>' . "\n"; @@ -61,7 +61,7 @@ foreach ($mysql_charsets as $current_charset) { if ($i >= $table_row_count / 2) { $i = 0; echo '</table>' . "\n" - . '<table class="data">' . "\n" + . '<table class="data noclick">' . "\n" . '<tr><th>' . __('Collation') . '</th>' . "\n" . ' <th>' . __('Description') . '</th>' . "\n" . '</tr>' . "\n"; @@ -78,7 +78,7 @@ foreach ($mysql_charsets as $current_charset) { $odd_row = true; foreach ($mysql_collations[$current_charset] as $current_collation) { $i++; - echo '<tr class="noclick ' + echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ($mysql_default_collations[$current_charset] == $current_collation ? ' marked' diff --git a/server_engines.php b/server_engines.php index c668777..4e5eeb3 100644 --- a/server_engines.php +++ b/server_engines.php @@ -50,7 +50,7 @@ if (empty($_REQUEST['engine']) /** * Displays the table header */ - echo '<table>' . "\n" + echo '<table class="noclick">' . "\n" . '<thead>' . "\n" . '<tr><th>' . __('Storage Engine') . '</th>' . "\n" . ' <th>' . __('Description') . '</th>' . "\n" @@ -64,7 +64,7 @@ if (empty($_REQUEST['engine']) */ $odd_row = true; foreach (PMA_StorageEngine::getStorageEngines() as $engine => $details) { - echo '<tr class="noclick ' + echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED' ? ' disabled' @@ -82,7 +82,7 @@ if (empty($_REQUEST['engine']) $PMA_Config = $GLOBALS['PMA_Config']; if ($PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST')) { // Special case for PBMS daemon which is not listed as an engine - echo '<tr class="noclick ' + echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n" . ' <td><a href="./server_engines.php' diff --git a/server_status.php b/server_status.php index e5bb06f..877f0a5 100644 --- a/server_status.php +++ b/server_status.php @@ -767,7 +767,7 @@ function printQueryStatistics() { ?> - <table id="serverstatusqueriesdetails" class="data sortable"> + <table id="serverstatusqueriesdetails" class="data sortable noclick"> <col class="namecol" /> <col class="valuecol" span="3" /> <thead> @@ -799,7 +799,7 @@ function printQueryStatistics() { $other_sum += $value; else $chart_json[$name] = $value; ?> - <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>"> + <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>"> <th class="name"><?php echo htmlspecialchars($name); ?></th> <td class="value"><?php echo PMA_formatNumber($value, 5, 0, true); ?></td> <td class="value"><?php echo @@ -888,7 +888,7 @@ function printServerTraffic() { } ?> - <table id="serverstatustraffic" class="data"> + <table id="serverstatustraffic" class="data noclick"> <thead> <tr> <th colspan="2"><?php echo __('Traffic') . ' ' . PMA_showHint(__('On a busy server, the byte counters may overrun, so those statistics as reported by the MySQL server may be incorrect.')); ?></th> @@ -896,7 +896,7 @@ function printServerTraffic() { </tr> </thead> <tbody> - <tr class="noclick odd"> + <tr class="odd"> <th class="name"><?php echo __('Received'); ?></th> <td class="value"><?php echo implode(' ', @@ -906,7 +906,7 @@ function printServerTraffic() { PMA_formatByteDown( $server_status['Bytes_received'] * $hour_factor, 3, 1)); ?></td> </tr> - <tr class="noclick even"> + <tr class="even"> <th class="name"><?php echo __('Sent'); ?></th> <td class="value"><?php echo implode(' ', @@ -916,7 +916,7 @@ function printServerTraffic() { PMA_formatByteDown( $server_status['Bytes_sent'] * $hour_factor, 3, 1)); ?></td> </tr> - <tr class="noclick odd"> + <tr class="odd"> <th class="name"><?php echo __('Total'); ?></th> <td class="value"><?php echo implode(' ', @@ -933,7 +933,7 @@ function printServerTraffic() { </tbody> </table> - <table id="serverstatusconnections" class="data"> + <table id="serverstatusconnections" class="data noclick"> <thead> <tr> <th colspan="2"><?php echo __('Connections'); ?></th> @@ -942,14 +942,14 @@ function printServerTraffic() { </tr> </thead> <tbody> - <tr class="noclick odd"> + <tr class="odd"> <th class="name"><?php echo __('max. concurrent connections'); ?></th> <td class="value"><?php echo PMA_formatNumber($server_status['Max_used_connections'], 0); ?> </td> <td class="value">--- </td> <td class="value">--- </td> </tr> - <tr class="noclick even"> + <tr class="even"> <th class="name"><?php echo __('Failed attempts'); ?></th> <td class="value"><?php echo PMA_formatNumber($server_status['Aborted_connects'], 4, 1, true); ?></td> @@ -963,7 +963,7 @@ function printServerTraffic() { 0, 2, true) . '%' : '--- '; ?></td> </tr> - <tr class="noclick odd"> + <tr class="odd"> <th class="name"><?php echo __('Aborted'); ?></th> <td class="value"><?php echo PMA_formatNumber($server_status['Aborted_clients'], 4, 1, true); ?></td> @@ -977,7 +977,7 @@ function printServerTraffic() { 0, 2, true) . '%' : '--- '; ?></td> </tr> - <tr class="noclick even"> + <tr class="even"> <th class="name"><?php echo __('Total'); ?></th> <td class="value"><?php echo PMA_formatNumber($server_status['Connections'], 4, 0); ?></td> @@ -1007,7 +1007,7 @@ function printServerTraffic() { * Displays the page */ ?> - <table id="tableprocesslist" class="data clearfloat"> + <table id="tableprocesslist" class="data clearfloat noclick"> <thead> <tr> <th><?php echo __('Processes'); ?></th> @@ -1046,7 +1046,7 @@ function printServerTraffic() { $url_params['kill'] = $process['Id']; $kill_process = 'server_status.php' . PMA_generate_common_url($url_params); ?> - <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>"> + <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>"> <td><a href="<?php echo $kill_process ; ?>"><?php echo __('Kill'); ?></a></td> <td class="value"><?php echo $process['Id']; ?></td> <td><?php echo $process['User']; ?></td> @@ -1251,7 +1251,7 @@ function printVariablesTable() { ); ?> -<table class="data sortable" id="serverstatusvariables"> +<table class="data sortable noclick" id="serverstatusvariables"> <col class="namecol" /> <col class="valuecol" /> <col class="descrcol" /> @@ -1269,7 +1269,7 @@ function printVariablesTable() { foreach ($server_status as $name => $value) { $odd_row = !$odd_row; ?> - <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_'.$allocationMap[$name]:''; ?>"> + <tr class="<?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_'.$allocationMap[$name]:''; ?>"> <th class="name"><?php echo htmlspecialchars(str_replace('_',' ',$name)) . PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name); ?> </th> <td class="value"><?php diff --git a/server_variables.php b/server_variables.php index dcbe192..ceced14 100644 --- a/server_variables.php +++ b/server_variables.php @@ -102,7 +102,7 @@ isSuperuser = <?php echo PMA_isSuperuser()?'true':'false'; ?>; <input name="filterText" type="text" id="filterText" style="vertical-align: baseline;" /> </div> </fieldset> -<table id="serverVariables" class="data filteredData"> +<table id="serverVariables" class="data filteredData noclick"> <thead> <tr><th><?php echo __('Variable'); ?></th> <th class="valueHeader"> @@ -118,7 +118,7 @@ echo __('Session value') . ' / ' . __('Global value'); $odd_row = true; foreach ($serverVars as $name => $value) { ?> -<tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>"> +<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>"> <th nowrap="nowrap"><?php echo htmlspecialchars(str_replace('_', ' ', $name)); ?></th> <td class="value"><?php echo formatVariable($name,$value); ?></td> <td class="value"><?php @@ -129,7 +129,7 @@ foreach ($serverVars as $name => $value) { if (isset($serverVarsSession[$name]) && $serverVarsSession[$name] != $value) { ?> </tr> -<tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?> "> +<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> "> <td>(<?php echo __('Session value'); ?>)</td> <td class="value"><?php echo formatVariable($name,$serverVarsSession[$name]); ?></td> <td class="value"></td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12870-g663d073
by Marc Delisle 02 Aug '11

02 Aug '11

The branch, master has been updated via 663d073e6be9630bd99e3684705d9182c36112b1 (commit) via 3f7c35cd69bfe6d353b992fc96f871b525be132a (commit) via 5ee97c77870dc72003e19dc36f4add9cffb8879e (commit) via 18310f6b406644fcb1798a0be4dcf444ffdb0ac6 (commit) via 4796a6ccd05b22ee4a04f907f2bf83d034541cf3 (commit) via 66fbb2da266c19cd6631eef9f80dc38fef4b84dd (commit) via 6bde6363bbaeab88cdb3a026df0c5c1e4183800b (commit) via 278469515403a219f2d4f9dd11544670d5eb68da (commit) from 85d729ac5f9b8769ea791a34fefdd6f7c63e50a9 (commit) - Log ----------------------------------------------------------------- commit 663d073e6be9630bd99e3684705d9182c36112b1 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 2 12:32:51 2011 -0400 ChangeLog entry commit 3f7c35cd69bfe6d353b992fc96f871b525be132a Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Tue Aug 2 21:39:58 2011 +0530 Fixed bug in refresing the navigation after table operations commit 5ee97c77870dc72003e19dc36f4add9cffb8879e Merge: 18310f6b406644fcb1798a0be4dcf444ffdb0ac6 85d729ac5f9b8769ea791a34fefdd6f7c63e50a9 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Tue Aug 2 21:34:28 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 18310f6b406644fcb1798a0be4dcf444ffdb0ac6 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Tue Aug 2 21:33:47 2011 +0530 Fixed bug in refresing the navigation after table operations commit 4796a6ccd05b22ee4a04f907f2bf83d034541cf3 Merge: 66fbb2da266c19cd6631eef9f80dc38fef4b84dd 19178070b652faea2b8091f72f10c700c015a805 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 31 22:55:12 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 66fbb2da266c19cd6631eef9f80dc38fef4b84dd Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 31 22:53:02 2011 +0530 Fixed the bugs in table copy of table operations commit 6bde6363bbaeab88cdb3a026df0c5c1e4183800b Merge: 278469515403a219f2d4f9dd11544670d5eb68da e3b91b7a0bfcb6bc525c9cfb27c8fc7570457b95 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 31 12:21:06 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 278469515403a219f2d4f9dd11544670d5eb68da Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 31 12:20:17 2011 +0530 Ajaxify the table coppy option in table operations ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- tbl_alter.php | 4 ++-- tbl_move_copy.php | 7 +++++++ tbl_operations.php | 6 +++--- 5 files changed, 64 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 151e85f..3cd0d8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ phpMyAdmin - ChangeLog + [interface] Improved support for triggers + [interface] Improved server monitoring + AJAX for table Structure column Add ++ AJAX for table Operations copy table 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/js/functions.js b/js/functions.js index 2094a0a..bc94a89 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1972,6 +1972,9 @@ $(document).ready(function() { if ($("#sqlqueryresults").length != 0) { $("#sqlqueryresults").remove(); } + if ($("#result_query").length != 0) { + $("#result_query").remove(); + } if (data.success == true) { PMA_ajaxShowMessage(data.message); $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer"); @@ -1979,10 +1982,57 @@ $(document).ready(function() { $("#result_query .notice").remove(); $("#result_query").prepend((data.message)); } else { - PMA_ajaxShowMessage(data.error); + $temp_div = $("<div id='temp_div'></div>") + $temp_div.html(data.error); + $error = $temp_div.find("code").addClass("error"); + PMA_ajaxShowMessage($error); } }) // end $.post() });//end of alterTableOrderby ajax submit + + /** + *Ajax action for submitting the "Copy table" + **/ + $("#copyTable.ajax input[name='submit_copy']").live('click', function(event) { + event.preventDefault(); + $form = $("#copyTable"); + if($form.find("input[name='switch_to_new']").attr('checked')) { + $form.append('<input type="hidden" name="submit_copy" value="Go" />'); + $form.removeClass('ajax'); + $form.find("#ajax_request_hidden").remove(); + $form.submit(); + } else { + PMA_prepareForAjaxRequest($form); + /*variables which stores the common attributes*/ + $.post($form.attr('action'), $form.serialize()+"&submit_copy=Go", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } + if ($("#result_query").length != 0) { + $("#result_query").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + $("#result_query .notice").remove(); + $("#result_query").prepend((data.message)); + $("#copyTable").find("select[name='target_db'] option[value="+data.db+"]").attr('selected', 'selected'); + + //Refresh navigation frame when the table is coppied + if (window.parent && window.parent.frame_navigation) { + window.parent.frame_navigation.location.reload(); + } + } else { + $temp_div = $("<div id='temp_div'></div>") + $temp_div.html(data.error); + $error = $temp_div.find("code").addClass("error"); + PMA_ajaxShowMessage($error); + } + }) // end $.post() + } + });//end of copyTable ajax submit + }, 'top.frame_content'); //end $(document).ready for 'Table operations' diff --git a/tbl_alter.php b/tbl_alter.php index 807a39e..6c46c9f 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -130,9 +130,9 @@ if (isset($_REQUEST['do_save_data'])) { } } - if ( $GLOBALS['is_ajax_request'] == true) { + if ( $_REQUEST['ajax_request'] == true) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); - PMA_ajaxResponse($message, $message->isSuccess(),$extra_data); + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); } $active_page = 'tbl_structure.php'; diff --git a/tbl_move_copy.php b/tbl_move_copy.php index 330edcc..58d90f3 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -65,6 +65,13 @@ if (PMA_isValid($_REQUEST['new_name'])) { $db = $_REQUEST['target_db']; $table = $_REQUEST['new_name']; } + + if ( $_REQUEST['ajax_request'] == true) { + $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + $extra_data['db'] = $GLOBALS['db']; + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); + } + $reload = 1; } } else { diff --git a/tbl_operations.php b/tbl_operations.php index 3481fd1..3e9bdeb 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -229,7 +229,7 @@ if (isset($result) && empty($message_to_show)) { $_message = $result ? $message = PMA_Message::success(__('Your SQL query has been executed successfully')) : PMA_Message::error(__('Error')); // $result should exist, regardless of $_message $_type = $result ? 'success' : 'error'; - if ( $GLOBALS['is_ajax_request'] == true) { + if ( $_REQUEST['ajax_request'] == true) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); PMA_ajaxResponse($_message,$_message->isSuccess() ,$extra_data); } @@ -238,7 +238,7 @@ if (isset($result) && empty($message_to_show)) { $_message = new PMA_Message; $_message->addMessages($warning_messages); $_message->isError(true); - if ( $GLOBALS['is_ajax_request'] == true) { + if ( $_REQUEST['ajax_request'] == true) { PMA_ajaxResponse($_message, false); } unset($warning_messages); @@ -532,7 +532,7 @@ if (isset($possible_row_formats[$tbl_type])) {  <div class="operations_half_width"> -<form method="post" action="tbl_operations.php" +<form method="post" action="tbl_operations.php" name="copyTable" id="copyTable" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?> onsubmit="return emptyFormElements(this, 'new_name')"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <input type="hidden" name="reload" value="1" /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12862-g85d729a
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, master has been updated via 85d729ac5f9b8769ea791a34fefdd6f7c63e50a9 (commit) from f4b86a21d0364e57db51a884904df36899a9702b (commit) - Log ----------------------------------------------------------------- commit 85d729ac5f9b8769ea791a34fefdd6f7c63e50a9 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:57:32 2011 +0200 Coding style adjustments ----------------------------------------------------------------------- Summary of changes: setup/lib/index.lib.php | 120 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 91 insertions(+), 29 deletions(-) diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index a7e33a9..334953f 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -115,14 +115,20 @@ function PMA_version_check() $data = curl_exec($ch); curl_close($ch); } else { - messages_set('error', $message_id, __('Version check'), + messages_set( + 'error', + $message_id, + __('Version check'), __('Neither URL wrapper nor CURL is available. Version check is not possible.')); return; } } if (empty($data)) { - messages_set('error', $message_id, __('Version check'), + messages_set( + 'error', + $message_id, + __('Version check'), __('Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.')); return; } @@ -139,14 +145,20 @@ function PMA_version_check() $version_upstream = version_to_int($version); if ($version_upstream === false) { - messages_set('error', $message_id, __('Version check'), + messages_set( + 'error', + $message_id, + __('Version check'), __('Got invalid version string from server')); return; } $version_local = version_to_int($GLOBALS['PMA_Config']->get('PMA_VERSION')); if ($version_local === false) { - messages_set('error', $message_id, __('Version check'), + messages_set( + 'error', + $message_id, + __('Version check'), __('Unparsable version string')); return; } @@ -154,14 +166,23 @@ function PMA_version_check() if ($version_upstream > $version_local) { $version = htmlspecialchars($version); $date = htmlspecialchars($date); - messages_set('notice', $message_id, __('Version check'), + messages_set( + 'notice', + $message_id, + __('Version check'), sprintf(__('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.'), $version, $date)); } else { if ($version_local % 100 == 0) { - messages_set('notice', $message_id, __('Version check'), + messages_set( + 'notice', + $message_id, + __('Version check'), PMA_sanitize(sprintf(__('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.'), $version, $date))); } else { - messages_set('notice', $message_id, __('Version check'), + messages_set( + 'notice', + $message_id, + __('Version check'), __('No newer stable version is available')); } } @@ -197,7 +218,10 @@ function version_to_int($version) $added = 0; break; default: - messages_set('notice', 'version_match', __('Version check'), + messages_set( + 'notice', + 'version_match', + __('Version check'), 'Unknown version part: ' . htmlspecialchars($matches[6])); $added = 0; break; @@ -292,7 +316,10 @@ function perform_config_checks() // if (!$cf->getValue("Servers/$i/ssl")) { $title = PMA_lang(PMA_lang_name('Servers/1/ssl')) . " ($server_name)"; - messages_set('notice', "Servers/$i/ssl", $title, + messages_set( + 'notice', + "Servers/$i/ssl", + $title, __('You should use SSL connections if your web server supports it.')); } @@ -302,7 +329,10 @@ function perform_config_checks() // if ($cf->getValue("Servers/$i/extension") == 'mysql') { $title = PMA_lang(PMA_lang_name('Servers/1/extension')) . " ($server_name)"; - messages_set('notice', "Servers/$i/extension", $title, + messages_set( + 'notice', + "Servers/$i/extension", + $title, __('You should use mysqli for performance reasons.')); } @@ -314,9 +344,12 @@ function perform_config_checks() && $cf->getValue("Servers/$i/user") != '' && $cf->getValue("Servers/$i/password") != '') { $title = PMA_lang(PMA_lang_name('Servers/1/auth_type')) . " ($server_name)"; - messages_set('notice', "Servers/$i/auth_type", $title, - PMA_lang($strServerAuthConfigMsg, $i) . ' ' . - PMA_lang($strSecurityInfoMsg, $i)); + messages_set( + 'notice', + "Servers/$i/auth_type", + $title, + PMA_lang($strServerAuthConfigMsg, $i) . ' ' . + PMA_lang($strSecurityInfoMsg, $i)); } // @@ -327,9 +360,12 @@ function perform_config_checks() if ($cf->getValue("Servers/$i/AllowRoot") && $cf->getValue("Servers/$i/AllowNoPassword")) { $title = PMA_lang(PMA_lang_name('Servers/1/AllowNoPassword')) . " ($server_name)"; - messages_set('notice', "Servers/$i/AllowNoPassword", $title, - __('You allow for connecting to the server without a password.') . ' ' . - PMA_lang($strSecurityInfoMsg, $i)); + messages_set( + 'notice', + "Servers/$i/AllowNoPassword", + $title, + __('You allow for connecting to the server without a password.') . ' ' . + PMA_lang($strSecurityInfoMsg, $i)); } } @@ -340,7 +376,9 @@ function perform_config_checks() if ($cookie_auth_used) { if ($blowfish_secret_set) { // 'cookie' auth used, blowfish_secret was generated - messages_set('notice', 'blowfish_secret_created', + messages_set( + 'notice', + 'blowfish_secret_created', PMA_lang(PMA_lang_name('blowfish_secret')), $strBlowfishSecretMsg); } else { @@ -358,7 +396,9 @@ function perform_config_checks() $blowfish_warnings[] = PMA_lang(__('Key should contain letters, numbers [em]and[/em] special characters.')); } if (!empty($blowfish_warnings)) { - messages_set('error', 'blowfish_warnings' . count($blowfish_warnings), + messages_set( + 'error', + 'blowfish_warnings' . count($blowfish_warnings), PMA_lang(PMA_lang_name('blowfish_secret')), implode('<br />', $blowfish_warnings)); } @@ -370,7 +410,9 @@ function perform_config_checks() // should be enabled if possible // if (!$cf->getValue('ForceSSL')) { - messages_set('notice', 'ForceSSL', + messages_set( + 'notice', + 'ForceSSL', PMA_lang(PMA_lang_name('ForceSSL')), PMA_lang($strForceSSLNotice)); } @@ -380,7 +422,9 @@ function perform_config_checks() // should be disabled // if ($cf->getValue('AllowArbitraryServer')) { - messages_set('notice', 'AllowArbitraryServer', + messages_set( + 'notice', + 'AllowArbitraryServer', PMA_lang(PMA_lang_name('AllowArbitraryServer')), PMA_lang($strAllowArbitraryServerWarning)); } @@ -394,7 +438,9 @@ function perform_config_checks() $message_type = $cf->getValue('LoginCookieValidity') > ini_get('session.gc_maxlifetime') ? 'error' : 'notice'; - messages_set($message_type, 'LoginCookieValidity', + messages_set( + $message_type, + 'LoginCookieValidity', PMA_lang(PMA_lang_name('LoginCookieValidity')), PMA_lang($strLoginCookieValidityWarning)); } @@ -404,7 +450,9 @@ function perform_config_checks() // should be at most 1800 (30 min) // if ($cf->getValue('LoginCookieValidity') > 1800) { - messages_set('notice', 'LoginCookieValidity', + messages_set( + 'notice', + 'LoginCookieValidity', PMA_lang(PMA_lang_name('LoginCookieValidity')), PMA_lang($strLoginCookieValidityWarning2)); } @@ -415,7 +463,9 @@ function perform_config_checks() // LoginCookieValidity must be less or equal to LoginCookieStore // if ($cf->getValue('LoginCookieStore') != 0 && $cf->getValue('LoginCookieValidity') > $cf->getValue('LoginCookieStore')) { - messages_set('error', 'LoginCookieValidity', + messages_set( + 'error', + 'LoginCookieValidity', PMA_lang(PMA_lang_name('LoginCookieValidity')), PMA_lang($strLoginCookieValidityWarning3)); } @@ -425,7 +475,9 @@ function perform_config_checks() // should not be world-accessible // if ($cf->getValue('SaveDir') != '') { - messages_set('notice', 'SaveDir', + messages_set( + 'notice', + 'SaveDir', PMA_lang(PMA_lang_name('SaveDir')), PMA_lang($strDirectoryNotice)); } @@ -435,7 +487,9 @@ function perform_config_checks() // should not be world-accessible // if ($cf->getValue('TempDir') != '') { - messages_set('notice', 'TempDir', + messages_set( + 'notice', + 'TempDir', PMA_lang(PMA_lang_name('TempDir')), PMA_lang($strDirectoryNotice)); } @@ -446,7 +500,9 @@ function perform_config_checks() // if ($cf->getValue('GZipDump') && (@!function_exists('gzopen') || @!function_exists('gzencode'))) { - messages_set('error', 'GZipDump', + messages_set( + 'error', + 'GZipDump', PMA_lang(PMA_lang_name('GZipDump')), PMA_lang($strGZipDumpWarning, 'gzencode')); } @@ -463,7 +519,9 @@ function perform_config_checks() $functions .= @function_exists('bzcompress') ? '' : ($functions ? ', ' : '') . 'bzcompress'; - messages_set('error', 'BZipDump', + messages_set( + 'error', + 'BZipDump', PMA_lang(PMA_lang_name('BZipDump')), PMA_lang($strBZipDumpWarning, $functions)); } @@ -473,7 +531,9 @@ function perform_config_checks() // requires zip_open in import // if ($cf->getValue('ZipDump') && !@function_exists('zip_open')) { - messages_set('error', 'ZipDump_import', + messages_set( + 'error', + 'ZipDump_import', PMA_lang(PMA_lang_name('ZipDump')), PMA_lang($strZipDumpImportWarning, 'zip_open')); } @@ -483,7 +543,9 @@ function perform_config_checks() // requires gzcompress in export // if ($cf->getValue('ZipDump') && !@function_exists('gzcompress')) { - messages_set('error', 'ZipDump_export', + messages_set( + 'error', + 'ZipDump_export', PMA_lang(PMA_lang_name('ZipDump')), PMA_lang($strZipDumpExportWarning, 'gzcompress')); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12861-gf4b86a2
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, master has been updated via f4b86a21d0364e57db51a884904df36899a9702b (commit) via c36df906f0a02512904d1c066f902fc980df3659 (commit) via bbaa465a67f4b17acc6b9cd553ef96e6c2d3b927 (commit) via 2e6421038a300f153e48a8446f0b43f55a0b5e4e (commit) via 1657409d567c68adf9d8e8554e07ff819f001b2c (commit) via c3cd4aba622989f00399bc951bb90259925adfa8 (commit) via 44991badfc02064516b3f2fbe9699ca820e6a6c8 (commit) via 233092543b40e8094c084fe47a5ce0689e948928 (commit) via 2abffe5682209c8e5a75d3330f5980271fd0ad11 (commit) via 43f18b93cf531bf4e1390318cb8a96f153a80ede (commit) via 3c75861e5145b3323b039f7d3a16b8475d63a2c4 (commit) via 9d9c1fc90430cdd330707e973b5d6d729c1e339d (commit) from 8f262140fa95c1ed5d3279d05c9c07acac26423e (commit) - Log ----------------------------------------------------------------- commit f4b86a21d0364e57db51a884904df36899a9702b Merge: 8f262140fa95c1ed5d3279d05c9c07acac26423e c36df906f0a02512904d1c066f902fc980df3659 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:51:07 2011 +0200 Merge remote-tracking branch 'pootle/master' commit c36df906f0a02512904d1c066f902fc980df3659 Merge: bbaa465a67f4b17acc6b9cd553ef96e6c2d3b927 46cec0c8da0e7c1dafe37f9a9384f7666117c7ba Author: Pootle server <pootle(a)cihar.com> Date: Tue Aug 2 16:40:26 2011 +0200 Merge remote-tracking branch 'origin/master' commit bbaa465a67f4b17acc6b9cd553ef96e6c2d3b927 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 16:09:12 2011 +0200 Translation update done using Pootle. commit 2e6421038a300f153e48a8446f0b43f55a0b5e4e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 16:08:30 2011 +0200 Translation update done using Pootle. commit 1657409d567c68adf9d8e8554e07ff819f001b2c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 16:08:01 2011 +0200 Translation update done using Pootle. commit c3cd4aba622989f00399bc951bb90259925adfa8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 16:06:47 2011 +0200 Translation update done using Pootle. commit 44991badfc02064516b3f2fbe9699ca820e6a6c8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 15:55:07 2011 +0200 Translation update done using Pootle. commit 233092543b40e8094c084fe47a5ce0689e948928 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 15:54:54 2011 +0200 Translation update done using Pootle. commit 2abffe5682209c8e5a75d3330f5980271fd0ad11 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 15:47:59 2011 +0200 Translation update done using Pootle. commit 43f18b93cf531bf4e1390318cb8a96f153a80ede Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 15:46:46 2011 +0200 Translation update done using Pootle. commit 3c75861e5145b3323b039f7d3a16b8475d63a2c4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 15:45:17 2011 +0200 Translation update done using Pootle. commit 9d9c1fc90430cdd330707e973b5d6d729c1e339d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 15:43:18 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/po/ja.po b/po/ja.po index 902574b..a6d0479 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-07-30 14:14-0400\n" -"PO-Revision-Date: 2011-08-02 12:41+0200\n" +"PO-Revision-Date: 2011-08-02 16:09+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -1230,11 +1230,13 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" +"slow_query_log は有効になっていますが、サーバは %d " +"秒より長くかかるクエリだけをログに記録します。お使いのシステムによっては、long_query_time を 0～2 秒に設定したほうがいいでしょう。" #: js/messages.php:121 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "long_query_time は %d 秒に設定されています。" #: js/messages.php:122 msgid "" @@ -1267,7 +1269,7 @@ msgstr "%s を無効にする" #: js/messages.php:130 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "long_query_time を %d 秒に設定する" #: js/messages.php:131 msgid "" @@ -9780,10 +9782,9 @@ msgid "Start Monitor" msgstr "モニタ開始" #: server_status.php:1328 -#, fuzzy #| msgid "Introduction" msgid "Instructions/Setup" -msgstr "はじめに" +msgstr "使用方法／セットアップ" #: server_status.php:1332 msgid "Done rearranging/editing charts" @@ -9810,10 +9811,9 @@ msgid "Clear monitor config" msgstr "モニタ設定のクリア" #: server_status.php:1363 -#, fuzzy #| msgid "Introduction" msgid "Monitor Instructions" -msgstr "はじめに" +msgstr "モニタの使用方法" #: server_status.php:1364 #| msgid "" @@ -9833,7 +9833,7 @@ msgid "" msgstr "" "phpMyAdmin モニタは、サーバ構成の最適化を支援し、時間のかかるクエリを追跡することができます。後者の場合には、テーブルに log_output " "を設定し、slow_query_log または general_log のいずれかを有効にする必要があります。なお、general_log " -"を大量のデータを生成し、サーバの負荷を 15% 増加させますので、注意するようにしてください。" +"は大量のデータを生成し、サーバの負荷を 15% 増加させますので、注意するようにしてください。" #: server_status.php:1371 msgid "" @@ -9923,10 +9923,9 @@ msgid "Loading logs" msgstr "ログの読み込み" #: server_status.php:1448 -#, fuzzy #| msgid "Show statistics" msgid "Log statistics" -msgstr "統計を表示する" +msgstr "ログの統計" #: server_status.php:1449 #| msgid "Select page" @@ -9945,7 +9944,7 @@ msgstr "" msgid "" "<p>Choose from which log you want the statistics to be generated from.</p> " "Results are grouped by query text." -msgstr "" +msgstr "<p>ログの統計元を選択することができます。</p>結果はクエリ文でグループ化されます。" #: server_status.php:1465 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12849-g8f26214
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, master has been updated via 8f262140fa95c1ed5d3279d05c9c07acac26423e (commit) from b4a0b3f776505e48c87470d13303f57e5860129a (commit) - Log ----------------------------------------------------------------- commit 8f262140fa95c1ed5d3279d05c9c07acac26423e Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:48:57 2011 +0200 Improve coding style ----------------------------------------------------------------------- Summary of changes: js/functions.js | 48 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 33 insertions(+), 15 deletions(-) diff --git a/js/functions.js b/js/functions.js index f121f65..2094a0a 100644 --- a/js/functions.js +++ b/js/functions.js @@ -212,8 +212,9 @@ function confirmLink(theLink, theSqlQuery) if (is_confirmed) { if ( $(theLink).hasClass('formLinkSubmit') ) { var name = 'is_js_confirmed'; - if($(theLink).attr('href').indexOf('usesubform') != -1) + if ($(theLink).attr('href').indexOf('usesubform') != -1) { name = 'subform[' + $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i)[1] + '][is_js_confirmed]'; + } $(theLink).parents('form').append('<input type="hidden" name="' + name + '" value="1" />'); } else if ( typeof(theLink.href) != 'undefined' ) { @@ -848,10 +849,11 @@ function insertValueQuery() { var chaineAj = ""; var NbSelect = 0; for(var i=0; i<myListBox.options.length; i++) { - if (myListBox.options[i].selected){ + if (myListBox.options[i].selected) { NbSelect++; - if (NbSelect > 1) + if (NbSelect > 1) { chaineAj += ", "; + } chaineAj += myListBox.options[i].value; } } @@ -1139,12 +1141,14 @@ function pdfPaperSize(format, axis) { function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_height) { // if width not specified, use default - if (w_width == undefined) + if (w_width == undefined) { w_width = 640; + } // if height not specified, use default - if (w_height == undefined) + if (w_height == undefined) { w_height = 480; + } // open popup window (for displaying video/playing audio) var mediaWin = window.open('bs_play_media.php?' + url_params + '&bs_reference=' + bs_ref + '&media_type=' + m_type + '&custom_type=' + is_cust_type, 'viewBSMedia', 'width=' + w_width + ', height=' + w_height + ', resizable=1, scrollbars=1, status=0'); @@ -1161,15 +1165,17 @@ function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_heigh function requestMIMETypeChange(db, table, reference, current_mime_type) { // no mime type specified, set to default (nothing) - if (undefined == current_mime_type) + if (undefined == current_mime_type) { current_mime_type = ""; + } // prompt user for new mime type var new_mime_type = prompt("Enter custom MIME type", current_mime_type); // if new mime_type is specified and is not the same as the previous type, request for mime type change - if (new_mime_type && new_mime_type != current_mime_type) + if (new_mime_type && new_mime_type != current_mime_type) { changeMIMEType(db, table, reference, new_mime_type); + } } /** @@ -1470,8 +1476,11 @@ function PMA_createChart(passedSettings) { return; } - if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max; - else diff = parseInt(curValue.x - lastValue.x); + if (lastValue==null) { + diff = curValue.x - thisChart.xAxis[0].getExtremes().max; + } else { + diff = parseInt(curValue.x - lastValue.x); + } thisChart.xAxis[0].setExtremes( thisChart.xAxis[0].getExtremes().min+diff, @@ -1485,7 +1494,9 @@ function PMA_createChart(passedSettings) { numLoadedPoints++; // Timeout has been cleared => don't start a new timeout - if(chart_activeTimeouts[container] == null) return; + if (chart_activeTimeouts[container] == null) { + return; + } chart_activeTimeouts[container] = setTimeout( thisChart.options.realtime.timeoutCallBack, @@ -1537,11 +1548,13 @@ function PMA_createChart(passedSettings) { /* Set/Get realtime chart default values */ if(passedSettings.realtime) { - if(!passedSettings.realtime.refreshRate) + if(!passedSettings.realtime.refreshRate) { passedSettings.realtime.refreshRate = 5000; + } - if(!passedSettings.realtime.numMaxPoints) + if(!passedSettings.realtime.numMaxPoints) { passedSettings.realtime.numMaxPoints = 30; + } // Allow custom POST vars to be added passedSettings.realtime.postData = $.extend(false,{ ajax_request: true, chart_data: 1, type: passedSettings.realtime.type },passedSettings.realtime.postData); @@ -1597,10 +1610,15 @@ function PMA_createProfilingChart(data, options) { // Formats a profiling duration nicely. Used in PMA_createProfilingChart() and server_status.js function PMA_prettyProfilingNum(num, acc) { - if(!acc) acc = 1; + if (!acc) { + acc = 1; + } acc = Math.pow(10,acc); - if(num*1000 < 0.1) num = Math.round(acc*(num*1000*1000))/acc + 'µ' - else if(num < 0.1) num = Math.round(acc*(num*1000))/acc + 'm' + if (num*1000 < 0.1) { + num = Math.round(acc*(num*1000*1000))/acc + 'µ' + } else if (num < 0.1) { + num = Math.round(acc*(num*1000))/acc + 'm' + } return num + 's'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12848-gb4a0b3f
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, master has been updated via b4a0b3f776505e48c87470d13303f57e5860129a (commit) from 46cec0c8da0e7c1dafe37f9a9384f7666117c7ba (commit) - Log ----------------------------------------------------------------- commit b4a0b3f776505e48c87470d13303f57e5860129a Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:45:00 2011 +0200 Remove tabs, remove dead code ----------------------------------------------------------------------- Summary of changes: js/functions.js | 4 +- pmd/scripts/history.js | 150 +++++++++++++++++++++++++----------------------- pmd/scripts/move.js | 52 ++++++++-------- 3 files changed, 106 insertions(+), 100 deletions(-) diff --git a/js/functions.js b/js/functions.js index bbe00b5..f121f65 100644 --- a/js/functions.js +++ b/js/functions.js @@ -211,9 +211,9 @@ function confirmLink(theLink, theSqlQuery) var is_confirmed = confirm(PMA_messages['strDoYouReally'] + ' :\n' + theSqlQuery); if (is_confirmed) { if ( $(theLink).hasClass('formLinkSubmit') ) { - var name = 'is_js_confirmed'; + var name = 'is_js_confirmed'; if($(theLink).attr('href').indexOf('usesubform') != -1) - name = 'subform[' + $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i)[1] + '][is_js_confirmed]'; + name = 'subform[' + $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i)[1] + '][is_js_confirmed]'; $(theLink).parents('form').append('<input type="hidden" name="' + name + '" value="1" />'); } else if ( typeof(theLink.href) != 'undefined' ) { diff --git a/pmd/scripts/history.js b/pmd/scripts/history.js index 478bd82..7caeea9 100644 --- a/pmd/scripts/history.js +++ b/pmd/scripts/history.js @@ -6,7 +6,7 @@ * @requires moves.js * @version $Id$ */ - + var history_array = []; // Global array to store history objects var select_field = []; // Global array to store informaation for columns which are used in select clause var g_index; @@ -14,12 +14,12 @@ var g_index; /** * function for panel, hides and shows toggle_container <div>,which is for history elements uses {@link JQuery}. * - * @param index has value 1 or 0,decides wheter to hide toggle_container on load. + * @param index has value 1 or 0,decides wheter to hide toggle_container on load. **/ function panel(index) { if (!index) { - $(".toggle_container").hide(); + $(".toggle_container").hide(); } $("h2.tiger").click(function(){ $(this).toggleClass("active").next().slideToggle("slow"); @@ -31,18 +31,18 @@ function panel(index) { * clubbing all objects of same tables together * This function is called whenever changes are made in history_array[] * - * @uses and_or() - * @uses history_edit() - * @uses history_delete() - * - * @param {int} init starting index of unsorted array - * @param {int} final last index of unsorted array + * @uses and_or() + * @uses history_edit() + * @uses history_delete() + * + * @param {int} init starting index of unsorted array + * @param {int} final last index of unsorted array * **/ function display(init,final) { var str,i,j,k,sto; - // this part sorts the history array based on table name,this is needed for clubbing all object of same name together. + // this part sorts the history array based on table name,this is needed for clubbing all object of same name together. for (i = init;i < final;i++) { sto = history_array[i]; var temp = history_array[i].get_tab() ;//+ '.' + history_array[i].get_obj_no(); for Self JOINS @@ -60,7 +60,7 @@ function display(init,final) { str =''; // string to store Html code for history tab for ( var i=0; i < history_array.length; i++){ var temp = history_array[i].get_tab(); //+ '.' + history_array[i].get_obj_no(); for Self JOIN - str += '<h2 class="tiger"><a href="#">' + temp + '</a></h2>'; + str += '<h2 class="tiger"><a href="#">' + temp + '</a></h2>'; str += '<div class="toggle_container">\n'; while((history_array[i].get_tab()) == temp) { //+ '.' + history_array[i].get_obj_no()) == temp) { str +='<div class="block"> <table width ="250">'; @@ -76,7 +76,7 @@ function display(init,final) { str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/><td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img class="icon ic_b_drop" src="themes/dot.gif" title="Delete"></td></tr></thead>'; } else { - str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img class="icon ic_b_edit" src="themes/dot.gif" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>'; + str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img class="icon ic_b_edit" src="themes/dot.gif" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>'; } i++; if(i >= history_array.length) { @@ -91,9 +91,9 @@ function display(init,final) { } /** - * To change And/Or relation in history tab - * - * @uses panel() + * To change And/Or relation in history tab + * + * @uses panel() * * @param {int} index of history_array where change is to be made * @@ -113,8 +113,8 @@ function and_or(index) { /** * To display details of obects(where,rename,Having,aggregate,groupby,orderby,having) - * - * @param index index of history_array where change is to be made + * + * @param index index of history_array where change is to be made * **/ @@ -152,16 +152,16 @@ function detail (index) { /** * Deletes entry in history_array * - * @uses panel() - * @uses display() - * @param index index of history_array[] which is to be deleted + * @uses panel() + * @uses display() + * @param index index of history_array[] which is to be deleted * **/ function history_delete(index) { for(var k =0 ;k < from_array.length;k++){ - if(from_array[k] == history_array[index].get_tab()){ - from_array.splice(k,1); + if(from_array[k] == history_array[index].get_tab()){ + from_array.splice(k,1); break; } } @@ -173,8 +173,8 @@ function history_delete(index) { /** * To show where,rename,aggregate,having forms to edit a object - * - * @param{int} index index of history_array where change is to be made + * + * @param{int} index index of history_array where change is to be made * **/ @@ -219,10 +219,10 @@ function history_edit(index) { /** * Make changes in history_array when Edit button is clicked * checks for the type of object and then sets the new value - * @uses panel() - * @uses display() + * @uses panel() + * @uses display() * - * @param index index of history_array where change is to be made + * @param index index of history_array where change is to be made **/ function edit(type) { @@ -261,13 +261,13 @@ function edit(type) { } /** - * history object closure + * history object closure * - * @param ncolumn_name name of the column on which conditions are put - * @param nobj object details(where,rename,orderby,groupby,aggregate) - * @param ntab table name of the column on which conditions are applied - * @param nobj_no object no used for inner join - * @param ntype type of object + * @param ncolumn_name name of the column on which conditions are put + * @param nobj object details(where,rename,orderby,groupby,aggregate) + * @param ntab table name of the column on which conditions are applied + * @param nobj_no object no used for inner join + * @param ntype type of object * **/ @@ -328,8 +328,8 @@ function history(ncolumn_name,nobj,ntab,nobj_no,ntype) { /** * where object closure, makes an object with all information of where * - * @param nrelation_operator type of relation operator to be applied - * @param nquery stores value of value/sub-query + * @param nrelation_operator type of relation operator to be applied + * @param nquery stores value of value/sub-query * **/ @@ -357,8 +357,8 @@ var where = function (nrelation_operator,nquery) { /** * Having object closure, makes an object with all information of where * - * @param nrelation_operator type of relation operator to be applied - * @param nquery stores value of value/sub-query + * @param nrelation_operator type of relation operator to be applied + * @param nquery stores value of value/sub-query * **/ @@ -392,7 +392,7 @@ var having = function (nrelation_operator,nquery,noperator) { /** * rename object closure,makes an object with all information of rename * - * @param nrename_to new name information + * @param nrename_to new name information * **/ @@ -410,7 +410,7 @@ var rename = function(nrename_to) { /** * aggregate object closure * - * @param noperator aggregte operator + * @param noperator aggregte operator * **/ @@ -435,10 +435,10 @@ var aggregate = function(noperator) { function unique(arrayName) { var newArray=new Array(); label:for(var i=0; i<arrayName.length;i++ ) - { + { for(var j=0; j<newArray.length;j++ ) { - if(newArray[j]==arrayName[i]) + if(newArray[j]==arrayName[i]) continue label; } newArray[newArray.length] = arrayName[i]; @@ -453,27 +453,27 @@ function unique(arrayName) { * @param arrayName array * @param value value which is to be searched in the array */ - + function found(arrayName,value) { for(var i=0; i<arrayName.length; i++) { if(arrayName[i] == value) { return 1;} } return -1; } - + /** * This function is the main function for query building. * uses history object details for this. * * @ uses query_where() * @ uses query_groupby() - * @ uses query_having() + * @ uses query_having() * @ uses query_orderby() - * + * * @param formtitle title for the form - * @param fadin + * @param fadin */ - + function build_query(formtitle, fadin) { var q_select = "SELECT "; var temp; @@ -486,19 +486,19 @@ function build_query(formtitle, fadin) { } else { temp = check_rename(select_field[i]); - q_select += select_field[i] + temp +","; + q_select += select_field[i] + temp +","; } } q_select = q_select.substring(0,q_select.length - 1); q_select += " FROM " + query_from(); if(query_where() != "") { q_select +="\n WHERE"; - q_select += query_where(); + q_select += query_where(); } if(query_groupby() != "") { q_select += "\nGROUP BY " + query_groupby(); } if(query_having() != "") { q_select += "\nHAVING " + query_having(); } if(query_orderby() != "") { q_select += "\nORDER BY " + query_orderby(); } - var box = document.getElementById('box'); + var box = document.getElementById('box'); document.getElementById('filter').style.display='block'; var btitle = document.getElementById('boxtitle'); btitle.innerHTML = 'SELECT';//formtitle; @@ -506,21 +506,21 @@ function build_query(formtitle, fadin) { gradient("box", 0); fadein("box"); } - else{ + else{ box.style.display='block'; - } + } document.getElementById('textSqlquery').innerHTML = q_select; } /** * This function builds from clause of query * makes automatic joins. - * + * * @uses unique * @uses add_array * @uses remove_array * */ - + function query_from() { var i =0; @@ -543,12 +543,12 @@ function query_from() { temp = tab_left.shift(); quer = temp; tab_used.push(temp); - // if master table (key2) matches with tab used get all keys and check if tab_left matches - //after this check if master table (key2) matches with tab left then check if any foriegn matches with master . - for( i =0; i<2 ; i++) { + // if master table (key2) matches with tab used get all keys and check if tab_left matches + //after this check if master table (key2) matches with tab left then check if any foriegn matches with master . + for( i =0; i<2 ; i++) { for (K in contr){ for (key in contr[K]){// contr name - for (key2 in contr[K][key]){// table name + for (key2 in contr[K][key]){// table name parts = key2.split("."); if(found(tab_used,parts[1]) > 0) { for (key3 in contr[K][key][key2]) { @@ -564,7 +564,7 @@ function query_from() { } } } - } + } K = 0; t_tab_left = unique (t_tab_left); tab_used = add_array(t_tab_left,tab_used); @@ -574,7 +574,7 @@ function query_from() { for (key in contr[K]) { for (key2 in contr[K][key]){// table name parts = key2.split("."); - if(found(tab_left,parts[1]) > 0){ + if(found(tab_left,parts[1]) > 0){ for (key3 in contr[K][key][key2]){ parts1 = contr[K][key][key2][key3][0].split("."); if(found(tab_used,parts1[1]) > 0) { @@ -601,9 +601,7 @@ function query_from() { from_array = t_array; return query; } - /* document.write(key3+";"); //master_field - document.write(contr[K][key][key2][key3][0]+";"); // foreign_table - document.write(contr[K][key][key2][key3][1]+";"); //forieign_feild */ + /** * This function concatenates two array * @@ -616,7 +614,7 @@ function add_array(add,arr){ } return arr; } - + /* This fucntion removes all elements present in one array from the other. * * @params rem array from which each element is removed from other array. @@ -635,7 +633,7 @@ function remove_array(rem,arr){ * This function builds the groupby clause from history object * */ - + function query_groupby() { var i = 0; var str = ""; @@ -658,7 +656,7 @@ function query_having() { if(history_array[i].get_type() == "Having") { if (history_array[i].get_obj().get_operator() != 'None') { and += history_array[i].get_obj().get_operator() + "(" + history_array[i].get_column_name() + " ) " + history_array[i].get_obj().getrelation_operator(); - and += " " + history_array[i].get_obj().getquery() + ", " ; + and += " " + history_array[i].get_obj().getquery() + ", " ; } else { and += history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ", "; @@ -707,11 +705,19 @@ function query_where(){ } } } - if ( or != "(") { or = or.substring(0,(or.length - 4 )) + ")"; } - else { or = "" ;} - if (and !="(") {and = and.substring(0,(and.length - 5)) + ")"; } - else {and = "" ;} - if ( or != "" ) { and = and + " OR " + or + " )"; } + if ( or != "(") { + or = or.substring(0,(or.length - 4 )) + ")"; + } else { + or = "" ; + } + if (and !="(") { + and = and.substring(0,(and.length - 5)) + ")"; + } else { + and = "" ; + } + if ( or != "" ) { + and = and + " OR " + or + " )"; + } return and; } @@ -749,7 +755,7 @@ function gradient(id, level) } -function fadein(id) +function fadein(id) { var level = 0; while(level <= 1){ diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js index 1ce18a1..71eb037 100644 --- a/pmd/scripts/move.js +++ b/pmd/scripts/move.js @@ -26,20 +26,20 @@ eval (hrefscript); return false; }).attr('href', '#'); -}); +}); // Below is the function to bind onbeforeunload events with the content_frame as well as the top window. $(document).ready(function(){ $(window).bind('beforeunload', function(){ // onbeforeunload for the frame window. - if (_change == 1 && _staying == 0) + if (_change == 1 && _staying == 0) return PMA_messages['strLeavingDesigner']; - else if (_change == 1 && _staying == 1) + else if (_change == 1 && _staying == 1) _staying = 0; }); $(window).unload(function(){ _change = 0; - }); + }); window.top.onbeforeunload = function(){ // onbeforeunload for the browser main window. if (_change == 1 && _staying == 0){ _staying = 1; // Helps if the user stays on the page as there @@ -48,7 +48,7 @@ } }; }); - + function make_zero(){ // Function called if the user stays after seeing the confirmation prompt. _staying = 0; } @@ -1015,7 +1015,7 @@ function getColorByTarget( target ) return color; } -function Click_option(id_this,column_name,table_name) +function Click_option(id_this,column_name,table_name) { var left = Glob_X - (document.getElementById(id_this).offsetWidth>>1); document.getElementById(id_this).style.left = left + 'px'; @@ -1044,10 +1044,10 @@ function Select_all(id_this,owner) parent.elements[i].checked = true; parent.elements[i].disabled = true; var temp = '`' + id_this.substring(owner.length +1) + '`.*'; - } + } else { parent.elements[i].checked = false; - parent.elements[i].disabled = false; + parent.elements[i].disabled = false; } } } @@ -1063,8 +1063,8 @@ function Select_all(id_this,owner) } } for(k =0 ;k < from_array.length;k++){ - if(from_array[k] == id_this){ - from_array.splice(k,1); + if(from_array[k] == id_this){ + from_array.splice(k,1); break; } } @@ -1096,7 +1096,7 @@ function store_column(id_this,owner,col) { var i = 0; var k = 0; if (document.getElementById('select_' + owner + '.' + id_this + '._' + col).checked == true) { - select_field.push('`' + id_this + '`.`' + col +'`'); + select_field.push('`' + id_this + '`.`' + col +'`'); from_array.push(id_this); } else { @@ -1107,9 +1107,9 @@ function store_column(id_this,owner,col) { } } for(k =0 ;k < from_array.length;k++){ - if(from_array[k] == id_this){ - from_array.splice(k,1); - break; + if(from_array[k] == id_this){ + from_array.splice(k,1); + break; } } } @@ -1119,13 +1119,13 @@ function store_column(id_this,owner,col) { * This function builds object and adds them to history_array * first it does a few checks on each object, then makes an object(where,rename,groupby,aggregate,orderby) * then a new history object is made and finally all these history objects are addded to history_array[] - * - * @uses where() - * @uses history() - * @uses aggregate() - * @uses rename() - * @uses panel() - * @uses display() + * + * @uses where() + * @uses history() + * @uses aggregate() + * @uses rename() + * @uses panel() + * @uses display() **/ function add_object() { @@ -1151,18 +1151,18 @@ function add_object() { sum = sum + 1; document.getElementById('new_name').value = "" ; } - if (document.getElementById('operator').value != '---') { + if (document.getElementById('operator').value != '---') { var aggregate_obj = new aggregate(document.getElementById('operator').value) ; history_array.push(new history(col_name,aggregate_obj,tab_name,h_tabs[downer + '.' + tab_name],"Aggregate")); sum = sum + 1; document.getElementById('operator').value = '---'; - //make aggregate operator + //make aggregate operator } if (document.getElementById('groupby').checked == true ) { history_array.push(new history(col_name,'GroupBy',tab_name,h_tabs[downer + '.' +tab_name],"GroupBy")); sum = sum + 1; document.getElementById('groupby').checked = false; - //make groupby + //make groupby } if (document.getElementById('h_rel_opt').value != '--') { if (document.getElementById('having').value == "") { @@ -1182,11 +1182,11 @@ function add_object() { history_array.push(new history(col_name,'OrderBy',tab_name,h_tabs[downer + '.' + tab_name],"OrderBy")); sum = sum + 1; document.getElementById('orderby').checked = false; - //make orderby + //make orderby } document.getElementById('hint').innerHTML = sum + "object created" ; document.getElementById('hint').style.visibility = "visible"; - //output sum new objects created + //output sum new objects created var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(init,history_array.length); Close_option(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12847-g46cec0c
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, master has been updated via 46cec0c8da0e7c1dafe37f9a9384f7666117c7ba (commit) via 78fdc7d3f4079dfe98cb648deb503557b0d7c62a (commit) via e466dec53b4fca185e03d0a66b434f491355c274 (commit) via c17add38ed40312f934451e1d1cf1f0b0ef8240e (commit) from 9fcb5e7c8662e5f9a71babe684a9a87b37208a46 (commit) - Log ----------------------------------------------------------------- commit 46cec0c8da0e7c1dafe37f9a9384f7666117c7ba Merge: 78fdc7d3f4079dfe98cb648deb503557b0d7c62a e466dec53b4fca185e03d0a66b434f491355c274 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:22:04 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' commit 78fdc7d3f4079dfe98cb648deb503557b0d7c62a Merge: 9fcb5e7c8662e5f9a71babe684a9a87b37208a46 c17add38ed40312f934451e1d1cf1f0b0ef8240e Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:21:56 2011 +0200 Merge commit 'c17add38ed40312f934451e1d1cf1f0b0ef8240e' Conflicts: js/sql.js ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 319658a..151e85f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ phpMyAdmin - ChangeLog 3.4.5.0 (not yet released) - 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 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git