- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13268-g680cfbe
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via 680cfbe726e52c016435683fec809d105954afa1 (commit) via 990820f5fac3ad741662419c923e2bda74097442 (commit) via 23389d2e4f9bce3e12def3ab479f376738c83216 (commit) via 36e1af721ef427214dcf4e276bdf247ebce4032b (commit) from ca9c30f1d60ad88ed1a0320dd231c54e866ab439 (commit) - Log ----------------------------------------------------------------- commit 680cfbe726e52c016435683fec809d105954afa1 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 22:39:16 2011 +0200 Server Synchronize: better layout for displayed queries commit 990820f5fac3ad741662419c923e2bda74097442 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 22:38:50 2011 +0200 Server Synchronize: fix a few cases of undefined variable warning commit 23389d2e4f9bce3e12def3ab479f376738c83216 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 22:38:10 2011 +0200 Server Synchronize: make it fully work on servers other than the first one commit 36e1af721ef427214dcf4e276bdf247ebce4032b Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 22:36:12 2011 +0200 Server Synchronize: display semicolon after executed queries ----------------------------------------------------------------------- Summary of changes: js/server_synchronize.js | 30 ++++++++++-------------------- libraries/server_synchronize.lib.php | 4 ++++ server_synchronize.php | 21 +++++++++++---------- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/js/server_synchronize.js b/js/server_synchronize.js index 2cc0365..8425423 100644 --- a/js/server_synchronize.js +++ b/js/server_synchronize.js @@ -226,33 +226,23 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem */ function ApplySelectedChanges(token) { - var div = document.getElementById("list"); - var table = div.getElementsByTagName('table')[0]; - var table_body = table.getElementsByTagName('tbody')[0]; - // Get all the rows from the details table - var table_rows = table_body.getElementsByTagName('tr'); - var x = table_rows.length; - var i; /** Append the token at the beginning of the query string followed by Table_ids that shows that "Apply Selected Changes" button is pressed */ - var append_string = "?token="+token+"&Table_ids="+1; - for(i=0; i<x; i++){ - append_string += "&"; - append_string += i+"="+table_rows[i].id; + var params = { + token: $('#synchronize_form input[name=token]').val(), + server: $('#synchronize_form input[name=server]').val(), + checked: $('#delete_rows').prop('checked') ? 'true' : 'false', + Table_ids: 1 + }; + var $rows = $('#list tbody tr'); + for(var i = 0; i < $rows.length; i++) { + params[i] = $($rows[i]).attr('id'); } - // Getting the value of checkbox delete_rows - var checkbox = document.getElementById("delete_rows"); - if (checkbox.checked){ - append_string += "&checked=true"; - } else { - append_string += "&checked=false"; - } //Appending the token and list of table ids in the URL - location.href += token; - location.href += append_string; + location.href += '?' + $.param(params); } diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 1d8bfab..eacae70 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -422,6 +422,7 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li } } } + $query .= ';'; if ($display == true) { echo "<p>" . $query . "</p>"; } @@ -621,6 +622,7 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm } } } + $Create_Table_Query .= ';'; if ($display == true) { echo '<p>' . $Create_Table_Query . '</p>'; } @@ -1040,6 +1042,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s } } } + $query .= ';'; if ($check) { if ($display == true) { echo '<p>' . $query . '</p>'; @@ -1229,6 +1232,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind $query .= " )"; } } + $query .= ';'; if ($display == true) { echo '<p>' . $query . '</p>'; } diff --git a/server_synchronize.php b/server_synchronize.php index faffd65..623681c 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -254,7 +254,7 @@ if ((isset($_REQUEST['submit_connect']))) { */ ?> <form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php"> - <?php PMA_generate_common_hidden_inputs('', ''); ?> + <?php echo PMA_generate_common_hidden_inputs('', ''); ?> <table width="40%"> <tr> <td> @@ -281,8 +281,9 @@ if ((isset($_REQUEST['submit_connect']))) { /** * Calculating the number of updates for each matching table */ - if (isset($update_array[$i]) && isset($update_array[$i][0]) && - isset($update_array[$i][0][$matching_tables_keys[$i][0]])) { + if (isset($update_array[$i]) && isset($update_array[$i][0]) + && !empty($matching_tables_keys[$i][0]) + && isset($update_array[$i][0][$matching_tables_keys[$i][0]])) { $num_of_updates = sizeof($update_array[$i]); } else { $num_of_updates = 0; @@ -290,8 +291,9 @@ if ((isset($_REQUEST['submit_connect']))) { /** * Calculating the number of insertions for each matching table */ - if (isset($insert_array[$i]) && isset($insert_array[$i][0]) && - isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { + if (isset($insert_array[$i]) && isset($insert_array[$i][0]) + && !empty($matching_tables_keys[$i]) + && isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { $num_of_insertions = sizeof($insert_array[$i]); } else { $num_of_insertions = 0; @@ -341,7 +343,7 @@ if ((isset($_REQUEST['submit_connect']))) { /** * 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]) || isset($insert_array[$i])) && !empty($matching_tables_keys[$i])) { if (isset($update_array[$i][0][$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); } @@ -743,6 +745,7 @@ if (isset($_REQUEST['Table_ids'])) { } $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 @@ -945,9 +948,7 @@ if (isset($_REQUEST['synchronize_db'])) { /** * Displaying the queries. */ - echo '<h5>' . __('The following queries have been executed:') . '</h5>'; - echo '<div id="serverstatus" style = "overflow: auto; width: 1050px; height: 180px; - border-left: 1px gray solid; border-bottom: 1px gray solid; padding: 0px; margin: 0px"> '; + echo '<fieldset><legend>' . __('Executed queries') . '</legend>'; /** * Applying all sorts of differences for each matching table */ @@ -1018,7 +1019,7 @@ if (isset($_REQUEST['synchronize_db'])) { PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, true); } } - echo "</div>"; + echo "</fieldset>"; } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13264-gca9c30f
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via ca9c30f1d60ad88ed1a0320dd231c54e866ab439 (commit) from efa788d00d4ab546f7ec1b24522087c9cbc13743 (commit) - Log ----------------------------------------------------------------- commit ca9c30f1d60ad88ed1a0320dd231c54e866ab439 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 18:14:05 2011 +0200 Synchronize: allow to connect to local server through socket ----------------------------------------------------------------------- Summary of changes: server_synchronize.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server_synchronize.php b/server_synchronize.php index 3e57f44..faffd65 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1083,7 +1083,7 @@ if (isset($_REQUEST['synchronize_db'])) { echo '>' . __('Current connection') . '</option>'; foreach ($GLOBALS['cfg']['Servers'] as $key => $tmp_server) { - if (empty($tmp_server['host'])) { + if (empty($tmp_server['host']) && empty($tmp_server['socket'])) { continue; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13263-gefa788d
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via efa788d00d4ab546f7ec1b24522087c9cbc13743 (commit) from 7a14dd6ba80432f9627ae66e6f114bc2f7ff8751 (commit) - Log ----------------------------------------------------------------- commit efa788d00d4ab546f7ec1b24522087c9cbc13743 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 17:12:46 2011 +0200 Synchronize: add missing arguments to a function, document possibly broken function ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index a862a60..1d8bfab 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -436,6 +436,9 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li /** * PMA_insertIntoTargetTable() inserts missing rows in the target table using $array_insert[$matching_table_index] * + * @todo this function uses undefined variables and is possibly broken: $matching_tables, + * $matching_tables_fields, $remove_indexes_array, $matching_table_keys + * * @param array $matching_table matching table names * @param string $src_db name of source database * @param string $trg_db name of target database @@ -865,8 +868,8 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma if (isset($is_fk_result)) { if (in_array($is_fk_result[0]['REFERENCED_TABLE_NAME'], $uncommon_tables)) { $table_index = array_keys($uncommon_tables, $is_fk_result[0]['REFERENCED_TABLE_NAME']); - PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link, $is_fk_result[0]['REFERENCED_TABLE_NAME'], $uncommon_tables, $uncommon_tables_fields); - PMA_createTargetTables($src_db, $trg_db, $trg_link, $src_link, $uncommon_tables, $table_index[0], $uncommon_tables_fields); + PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link, $is_fk_result[0]['REFERENCED_TABLE_NAME'], $uncommon_tables, $uncommon_tables_fields, $display); + PMA_createTargetTables($src_db, $trg_db, $trg_link, $src_link, $uncommon_tables, $table_index[0], $uncommon_tables_fields, $display); unset($uncommon_tables[$table_index[0]]); } $fk_query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]) . hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13262-g7a14dd6
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via 7a14dd6ba80432f9627ae66e6f114bc2f7ff8751 (commit) from 092108bdee43d0dd4389e323eadc7d3ae58d8a37 (commit) - Log ----------------------------------------------------------------- commit 7a14dd6ba80432f9627ae66e6f114bc2f7ff8751 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 16:50:00 2011 +0200 Fix file ----------------------------------------------------------------------- Summary of changes: libraries/replication.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index a6b5d99..58ed7c5 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -358,7 +358,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) * INTEGRATION OF STRUCTURE DIFFERENCE CODE * */ - $source_columns = array();test/libraries/common/PMA_contains_nonprintable_ascii_test.php: + $source_columns = array(); $target_columns = array(); $alter_str_array = array(array()); $add_column_array = array(array()); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13261-g092108b
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via 092108bdee43d0dd4389e323eadc7d3ae58d8a37 (commit) via 9d7d5f960f7da9242c9a69a7eba82e135bb52b59 (commit) from efee7ec87094a31885adfe96e7667733a1c763aa (commit) - Log ----------------------------------------------------------------- commit 092108bdee43d0dd4389e323eadc7d3ae58d8a37 Merge: 9d7d5f960f7da9242c9a69a7eba82e135bb52b59 efee7ec87094a31885adfe96e7667733a1c763aa Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 16:47:14 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 9d7d5f960f7da9242c9a69a7eba82e135bb52b59 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 12:51:05 2011 +0200 Remove unused variables ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 1edbb83..a862a60 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -125,9 +125,6 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching } $update_row = 0; $insert_row = 0; - $update_field = 0; - $insert_field = 0; - $starting_index = 0; for ($j = 0; $j < $source_size; $j++) { $starting_index = 0; @@ -307,11 +304,9 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma { if (isset($trg_keys[$matching_table_index])) { $target_key_values = PMA_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link); - $target_row_size = sizeof($target_key_values); } if (isset($src_keys[$matching_table_index])) { $source_key_values = PMA_get_column_values($src_db, $matching_table[$matching_table_index], $src_keys[$matching_table_index], $src_link); - $source_size = sizeof($source_key_values); } $all_keys_match = 1; for ($a = 0; $a < sizeof($trg_keys[$matching_table_index]); $a++) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13259-gefee7ec
by Michal Čihař 05 Aug '11

05 Aug '11

The branch, master has been updated via efee7ec87094a31885adfe96e7667733a1c763aa (commit) from 43161e7876fc27975ea27e44d21401d5cbcb95ab (commit) - Log ----------------------------------------------------------------- commit efee7ec87094a31885adfe96e7667733a1c763aa Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Aug 5 16:10:31 2011 +0200 Definie missing variable ----------------------------------------------------------------------- Summary of changes: .../rte/PMA_RTN_getDataFromRequest_test.php | 3 +++ test/libraries/rte/PMA_RTN_getEditorForm_test.php | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php index 1a75ca7..db61325 100644 --- a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php @@ -18,6 +18,9 @@ class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase { public function setUp() { + global $cfg; + + $cfg['ShowFunctionFields'] = false; require 'libraries/data_mysql.inc.php'; } diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php index ac1ba52..2fd0129 100644 --- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php +++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php @@ -17,6 +17,9 @@ class PMA_RTN_getEditorForm_test extends PHPUnit_Framework_TestCase { public function setUp() { + global $cfg; + + $cfg['ShowFunctionFields'] = false; require 'libraries/data_mysql.inc.php'; if (! function_exists('PMA_generateCharsetDropdownBox')) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13258-g43161e7
by Michal Čihař 05 Aug '11

05 Aug '11

The branch, master has been updated via 43161e7876fc27975ea27e44d21401d5cbcb95ab (commit) from cdd2044274fa8de257fbdc873d9df57922c8ba19 (commit) - Log ----------------------------------------------------------------- commit 43161e7876fc27975ea27e44d21401d5cbcb95ab Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Aug 5 16:01:39 2011 +0200 Ensure that ColumnTypes is set on test run ----------------------------------------------------------------------- Summary of changes: .../rte/PMA_RTN_getDataFromRequest_test.php | 10 +++++----- test/libraries/rte/PMA_RTN_getEditorForm_test.php | 3 ++- test/libraries/rte/PMA_RTN_getExecuteForm_test.php | 2 +- .../rte/PMA_RTN_getQueryFromRequest_test.php | 9 +-------- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php index d24de2b..1a75ca7 100644 --- a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php @@ -6,7 +6,6 @@ * @package phpMyAdmin-test */ -require_once 'libraries/data_mysql.inc.php'; require_once 'libraries/common.lib.php'; @@ -17,6 +16,11 @@ require_once 'libraries/rte/rte_routines.lib.php'; class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase { + public function setUp() + { + require 'libraries/data_mysql.inc.php'; + } + /** * @dataProvider provider */ @@ -24,10 +28,6 @@ class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase { global $cfg, $_REQUEST; - if (! isset($cfg['ColumnTypes'])) { - $this->markTestSkipped('Can\'t get column types'); // FIXME - } - unset($_REQUEST); foreach ($in as $key => $value) { if ($value !== '') { diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php index ef96a79..ac1ba52 100644 --- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php +++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php @@ -6,7 +6,6 @@ * @package phpMyAdmin-test */ require_once 'libraries/common.lib.php'; -require_once 'libraries/data_mysql.inc.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/url_generating.lib.php'; /* @@ -18,6 +17,8 @@ class PMA_RTN_getEditorForm_test extends PHPUnit_Framework_TestCase { public function setUp() { + require 'libraries/data_mysql.inc.php'; + if (! function_exists('PMA_generateCharsetDropdownBox')) { function PMA_generateCharsetDropdownBox() {} } diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php index eab74b4..f74f5a3 100644 --- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php +++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php @@ -53,7 +53,7 @@ class PMA_RTN_getExecuteForm_test extends PHPUnit_Framework_TestCase $cfg['DefaultFunctions']['FUNC_DATE'] = ''; $GLOBALS['tear_down']['default'] = true; } - eval(substr(file_get_contents('libraries/data_mysql.inc.php'), 5, -3)); // FIXME + require 'libraries/data_mysql.inc.php'; } public function tearDown() diff --git a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php index 175c95b..db11ff4 100644 --- a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php @@ -9,7 +9,6 @@ /* * Needed for PMA_backquote() and PMA_RTN_getQueryFromRequest() */ -//require_once 'libraries/data_mysql.inc.php'; require_once 'libraries/common.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; @@ -28,15 +27,9 @@ class PMA_RTN_getQueryFromRequest_test extends PHPUnit_Framework_TestCase { global $_REQUEST, $errors, $cfg; - // FIXME: the below two lines are needed to get the test to work, - // but are definitely the wrong way to go about the issue - // of $cfg['ColumnTypes'] being undefined $cfg['ShowFunctionFields'] = false; - eval(substr(file_get_contents('libraries/data_mysql.inc.php'), 5, -3)); - if (! isset($cfg['ColumnTypes'])) { - $this->markTestSkipped('Can\'t get column types'); // FIXME - } + require 'libraries/data_mysql.inc.php'; $errors = array(); PMA_RTN_setGlobals(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13257-gcdd2044
by Michal Čihař 05 Aug '11

05 Aug '11

The branch, master has been updated via cdd2044274fa8de257fbdc873d9df57922c8ba19 (commit) from 99986466008f4729f29b990b440afc1c9693b220 (commit) - Log ----------------------------------------------------------------- commit cdd2044274fa8de257fbdc873d9df57922c8ba19 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Aug 5 15:50:14 2011 +0200 Add some missing spacing in docblocks ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 353e775..e491adb 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -31,6 +31,7 @@ function PMA_detect_pow() * @param string $base base to raise * @param string $exp exponent to use * @param mixed $use_function pow function to use, or false for auto-detect + * * @return mixed string or float */ function PMA_pow($base, $exp, $use_function = false) @@ -76,6 +77,7 @@ function PMA_pow($base, $exp, $use_function = false) * @param string $alternate alternate text * @param boolean $force_text whether to force alternate text to be displayed * @param boolean $noSprite If true, the image source will be not replaced with a CSS Sprite + * * @return html img tag */ function PMA_getIcon($icon, $alternate = '', $force_text = false, $noSprite = false) @@ -119,6 +121,7 @@ function PMA_getIcon($icon, $alternate = '', $force_text = false, $noSprite = fa * Displays the maximum size for an upload * * @param integer $max_upload_size the size + * * @return string the message * * @access public @@ -136,6 +139,7 @@ function PMA_displayMaximumUploadSize($max_upload_size) * the maximum size for upload * * @param integer $max_size the size + * * @return string the INPUT field * * @access public @@ -191,6 +195,7 @@ function PMA_sqlAddSlashes($a_string = '', $is_like = false, $crlf = false, $php * Note: This function does not escape backslashes! * * @param string $name the string to escape + * * @return string the escaped string * * @access public @@ -208,7 +213,9 @@ function PMA_escape_mysql_wildcards($name) * Note: This function does not unescape backslashes! * * @param string $name the string to escape + * * @return string the escaped string + * * @access public */ function PMA_unescape_mysql_wildcards($name) @@ -226,6 +233,7 @@ function PMA_unescape_mysql_wildcards($name) * * @param string $quoted_string string to remove quotes from * @param string $quote type of quote to remove + * * @return string unqoted string */ function PMA_unQuote($quoted_string, $quote = null) @@ -259,6 +267,7 @@ function PMA_unQuote($quoted_string, $quote = null) * @todo move into PMA_Sql * @param mixed $parsed_sql pre-parsed SQL structure * @param string $unparsed_sql raw SQL string + * * @return string the formatted sql * * @global array the configuration array @@ -406,6 +415,7 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju * Displays a link to the phpMyAdmin documentation * * @param string $anchor anchor in documentation + * * @return string the html link * * @access public @@ -423,6 +433,7 @@ function PMA_showDocu($anchor) * Displays a link to the PHP documentation * * @param string $target anchor in documentation + * * @return string the html link * * @access public @@ -444,7 +455,9 @@ function PMA_showPHPDocu($target) * @param string $message the error message * @param bool $bbcode * @param string $type + * * @return string html code for a footnote marker + * * @access public */ function PMA_showHint($message, $bbcode = false, $type = 'notice') @@ -636,6 +649,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', * @param string $tables name of tables * @param integer $limit_offset list offset * @param int|bool $limit_count max tables to return + * * @return array (recursive) grouped table list */ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = false) @@ -766,7 +780,9 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = * or array of it * @param boolean $do_it a flag to bypass this function (used by dump * functions) + * * @return mixed the "backquoted" database, table or field name + * * @access public */ function PMA_backquote($a_name, $do_it = true) @@ -860,7 +876,9 @@ if (!$jsonly) * @param string $sql_query the query to display * @param string $type the type (level) of the message * @param boolean $is_view is this a message after a VIEW operation? + * * @return string + * * @access public */ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view = false) @@ -1216,6 +1234,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view * Verifies if current MySQL server supports profiling * * @access public + * * @return boolean whether profiling is supported */ function PMA_profilingSupported() @@ -1301,6 +1320,7 @@ function PMA_formatByteDown($value, $limes = 6, $comma = 0) * Changes thousands and decimal separators to locale specific values. * * @param $value + * * @return string */ function PMA_localizeNumber($value) @@ -1414,6 +1434,7 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow * Returns the number of bytes when a formatted size is given * * @param string $formatted_size the size expression (for example 8MB) + * * @return integer The numerical part of the expression (for example 8) */ function PMA_extractValueFromFormattedSize($formatted_size) @@ -1435,6 +1456,7 @@ function PMA_extractValueFromFormattedSize($formatted_size) * * @param string $timestamp the current timestamp * @param string $format format + * * @return string the formatted date * * @access public @@ -1504,7 +1526,9 @@ function PMA_localisedDate($timestamp = -1, $format = '') * * @param array $tab array with all options * @param array $url_params + * * @return string html code for one tab, a link if valid otherwise a span + * * @access public */ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') @@ -1603,6 +1627,7 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') * * @param array $tabs one element per tab * @param string $url_params + * * @return string html-code for tab-navigation */ function PMA_generate_html_tabs($tabs, $url_params, $base_dir='') @@ -1779,6 +1804,7 @@ function PMA_timespanFormat($seconds) * @param string $Separator The Separator (defaults to "<br />\n") * * @access public + * * @return string The flipped string */ function PMA_flipstring($string, $Separator = "<br />\n") @@ -1880,6 +1906,7 @@ function PMA_checkParameters($params, $die = true, $request = true) * @param boolean $force_unique generate condition only on pk or unique * * @access public + * * @return array the calculated condition and whether condition is unique */ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force_unique=false) @@ -2049,6 +2076,7 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, * @param string $prompt The prompt to display (sometimes empty) * * @return string + * * @access public */ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, @@ -2223,7 +2251,9 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou * $user_dir = PMA_userDir('/var/pma_tmp/%u/'); // '/var/pma_tmp/root/' * * </code> + * * @param string $dir with wildcard for user + * * @return string per user directory */ function PMA_userDir($dir) @@ -2240,6 +2270,7 @@ function PMA_userDir($dir) * returns html code for db link to default db page * * @param string $database + * * @return string html link to default db page */ function PMA_getDbLink($database = null) @@ -2330,6 +2361,7 @@ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '' * @param string $id id of the select element; can be different in case * the dropdown is present more than once on the page * @return string + * * @todo support titles */ function PMA_generate_html_dropdown($select_name, $choices, $active_choice, $id) @@ -2467,6 +2499,7 @@ function PMA_clearUserCache() * * @param string $var * @param int|true $server + * * @return boolean */ function PMA_cacheExists($var, $server = 0) @@ -2482,6 +2515,7 @@ function PMA_cacheExists($var, $server = 0) * * @param string $var * @param int|true $server + * * @return mixed */ function PMA_cacheGet($var, $server = 0) @@ -2502,6 +2536,7 @@ function PMA_cacheGet($var, $server = 0) * @param string $var * @param mixed $val * @param int|true $server + * * @return mixed */ function PMA_cacheSet($var, $val = null, $server = 0) @@ -2533,6 +2568,7 @@ function PMA_cacheUnset($var, $server = 0) * * @param numeric $value coming from a BIT field * @param integer $length + * * @return string the printable value */ function PMA_printable_bit_value($value, $length) @@ -2549,6 +2585,7 @@ function PMA_printable_bit_value($value, $length) * Verifies whether the value contains a non-printable character * * @param string $value + * * @return boolean */ function PMA_contains_nonprintable_ascii($value) @@ -2561,6 +2598,7 @@ function PMA_contains_nonprintable_ascii($value) * for example, b'010' becomes 010 * * @param string $bit_default_value + * * @return string the converted value */ function PMA_convert_bit_default_value($bit_default_value) @@ -2572,6 +2610,7 @@ function PMA_convert_bit_default_value($bit_default_value) * Extracts the various parts from a field type spec * * @param string $fieldspec + * * @return array associative array containing type, spec_in_brackets * and possibly enum_set_values (another array) */ @@ -2687,6 +2726,7 @@ function PMA_extractFieldSpec($fieldspec) * Verifies if this table's engine supports foreign keys * * @param string $engine + * * @return boolean */ function PMA_foreignkey_supported($engine) @@ -2703,6 +2743,7 @@ function PMA_foreignkey_supported($engine) * Replaces some characters by a displayable equivalent * * @param string $content + * * @return string the content with characters replaced */ function PMA_replace_binary_contents($content) @@ -2719,6 +2760,7 @@ function PMA_replace_binary_contents($content) * If the string starts with a \r\n pair (0x0d0a) add an extra \n * * @param string $string + * * @return string with the chars replaced */ @@ -2737,6 +2779,7 @@ function PMA_duplicateFirstNewline($string) * * @param string $target a valid value for $cfg['LeftDefaultTabTable'], $cfg['DefaultTabTable'] * or $cfg['DefaultTabDatabase'] + * * @return array */ function PMA_getTitleForTarget($target) @@ -2764,6 +2807,7 @@ function PMA_getTitleForTarget($target) * @param string $string Text where to do expansion. * @param function $escape Function to call for escaping variable values. * @param array $updates Array with overrides for default parameters (obtained from GLOBALS). + * * @return string */ function PMA_expandUserString($string, $escape = null, $updates = array()) @@ -3154,6 +3198,7 @@ function PMA_getFunctionsForField($field, $insert_mode) * string, db name where to also check for privileges * @param mixed $tbl null, to only check global privileges * string, db name where to also check for privileges + * * @return bool */ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13256-g9998646
by Michal Čihař 05 Aug '11

05 Aug '11

The branch, master has been updated via 99986466008f4729f29b990b440afc1c9693b220 (commit) from 4afb63d08f3814bf9769752ef7eb57944612247d (commit) - Log ----------------------------------------------------------------- commit 99986466008f4729f29b990b440afc1c9693b220 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Aug 5 15:46:59 2011 +0200 Add some docblocks ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index d2bb7de..797a3eb 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -206,7 +206,6 @@ function PMA_isSelect() /** * Displays a navigation button * - * * @param string $caption iconic caption for button * @param string $title text for button * @param integer $pos position for next query @@ -215,6 +214,8 @@ function PMA_isSelect() * @param string $input_for_real_end optional hidden field for special treatment * @param string $onclick optional onclick clause * + * @return nothing + * * @global string $db the database name * @global string $table the table name * @global string $goto the URL to go back in case of errors @@ -260,6 +261,8 @@ function PMA_displayTableNavigationOneButton($caption, $title, $pos, $html_sql_q * @param string $sql_query the URL-encoded query * @param string $id_for_direction_dropdown the id for the direction dropdown * + * @return nothing + * * @global string $db the database name * @global string $table the table name * @global string $goto the URL to go back in case of errors @@ -467,10 +470,13 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di /** * Displays the headers of the results table * - * @param array which elements to display - * @param array the list of fields properties - * @param integer the total number of fields returned by the SQL query - * @param array the analyzed query + * @param array &$is_display which elements to display + * @param array &$fields_meta the list of fields properties + * @param integer $fields_cnt the total number of fields returned by the SQL query + * @param array $analyzed_sql the analyzed query + * @param string $sort_expression sort expression + * @param string $sort_expression_nodirection sort expression without direction + * @param string $sort_direction sort direction * * @return boolean $clause_is_unique * @@ -1099,6 +1105,7 @@ function PMA_buildNullDisplay($class, $condition_field) * * @param string $class class of table cell * @param bool $condition_field whether to add CSS class condition + * @param object $meta the meta-information about this field * @param string $align cell allignment * * @return string the td @@ -1116,7 +1123,7 @@ function PMA_buildEmptyDisplay($class, $condition_field, $meta, $align = '') * @param bool $condition_field whether to add CSS class condition * @param object $meta the meta-information about this field * @param string $nowrap avoid wrapping - * @param bool $is_field_truncated is field truncated (display ...) + * @param bool $is_field_truncated is field truncated (display ...) * @param string $transform_function transformation function * @param string $default_function default transformation function * hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13255-g4afb63d
by Michal Čihař 05 Aug '11

05 Aug '11

The branch, master has been updated via 4afb63d08f3814bf9769752ef7eb57944612247d (commit) from 37ec6cae8496c3a5ce4719a611fafae8059581e6 (commit) - Log ----------------------------------------------------------------- commit 4afb63d08f3814bf9769752ef7eb57944612247d Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Aug 5 15:31:36 2011 +0200 Upgrade to jQuery 1.6.2 This should be compatible with 1.6.1 and my tests show no problems. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- index.php | 2 +- js/jquery/{jquery-1.6.1.js => jquery-1.6.2.js} | 415 +++++++++++++----------- libraries/common.inc.php | 2 +- navigation.php | 2 +- setup/index.php | 2 +- 6 files changed, 235 insertions(+), 190 deletions(-) rename js/jquery/{jquery-1.6.1.js => jquery-1.6.2.js} (96%) diff --git a/ChangeLog b/ChangeLog index 265e924..ca7feb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,7 @@ phpMyAdmin - ChangeLog 3.5.0.0 (not yet released) + rfe #2021981 [interface] Add support for mass prefix change. + "up to date" message on main page when current version is up to date -+ Update to jQuery 1.6.1 ++ Update to jQuery 1.6.2 + Patch #3256122 [search] Show/hide db search results + Patch #3302354 Add gettext wrappers around a message + Remove deprecated function PMA_DBI_get_fields diff --git a/index.php b/index.php index cb5eb63..5e0fa36 100644 --- a/index.php +++ b/index.php @@ -132,7 +132,7 @@ include ('./libraries/header_http.inc.php'); // ]]> </script> <?php -echo PMA_includeJS('jquery/jquery-1.6.1.js'); +echo PMA_includeJS('jquery/jquery-1.6.2.js'); echo PMA_includeJS('update-location.js'); echo PMA_includeJS('common.js'); ?> diff --git a/js/jquery/jquery-1.6.1.js b/js/jquery/jquery-1.6.2.js similarity index 96% rename from js/jquery/jquery-1.6.1.js rename to js/jquery/jquery-1.6.2.js index 5d5a1d5..f3201aa 100644 --- a/js/jquery/jquery-1.6.1.js +++ b/js/jquery/jquery-1.6.2.js @@ -1,5 +1,5 @@ /*! - * jQuery JavaScript Library v1.6.1 + * jQuery JavaScript Library v1.6.2 * http://jquery.com/ * * Copyright 2011, John Resig @@ -11,7 +11,7 @@ * Copyright 2011, The Dojo Foundation * Released under the MIT, BSD, and GPL Licenses. * - * Date: Thu May 12 15:04:36 2011 -0400 + * Date: Thu Jun 30 14:16:56 2011 -0400 */ (function( window, undefined ) { @@ -65,6 +65,14 @@ var jQuery = function( selector, context ) { rmsie = /(msie) ([\w.]+)/, rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/, + // Matches dashed string for camelizing + rdashAlpha = /-([a-z])/ig, + + // Used by jQuery.camelCase as callback to replace() + fcamelCase = function( all, letter ) { + return letter.toUpperCase(); + }, + // Keep a UserAgent string for use with jQuery.browser userAgent = navigator.userAgent, @@ -204,7 +212,7 @@ jQuery.fn = jQuery.prototype = { selector: "", // The current version of jQuery being used - jquery: "1.6.1", + jquery: "1.6.2", // The default length of a jQuery object is 0 length: 0, @@ -603,6 +611,12 @@ jQuery.extend({ } }, + // Converts a dashed string to camelCased string; + // Used by both the css and data modules + camelCase: function( string ) { + return string.replace( rdashAlpha, fcamelCase ); + }, + nodeName: function( elem, name ) { return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase(); }, @@ -799,7 +813,7 @@ jQuery.extend({ }, // Mutifunctional method to get and set values to a collection - // The value/s can be optionally by executed if its a function + // The value/s can optionally be executed if it's a function access: function( elems, key, value, exec, fn, pass ) { var length = elems.length; @@ -930,7 +944,6 @@ function doScrollCheck() { jQuery.ready(); } -// Expose jQuery to the global object return jQuery; })(); @@ -1147,7 +1160,9 @@ jQuery.support = (function() { support, fragment, body, - bodyStyle, + testElementParent, + testElement, + testElementStyle, tds, events, eventName, @@ -1241,11 +1256,10 @@ jQuery.support = (function() { } if ( !div.addEventListener && div.attachEvent && div.fireEvent ) { - div.attachEvent( "onclick", function click() { + div.attachEvent( "onclick", function() { // Cloning a node shouldn't copy over any // bound event handlers (IE does this) support.noCloneEvent = false; - div.detachEvent( "onclick", click ); }); div.cloneNode( true ).fireEvent( "onclick" ); } @@ -1270,22 +1284,30 @@ jQuery.support = (function() { // Figure out if the W3C box model works as expected div.style.width = div.style.paddingLeft = "1px"; - // We use our own, invisible, body - body = document.createElement( "body" ); - bodyStyle = { + body = document.getElementsByTagName( "body" )[ 0 ]; + // We use our own, invisible, body unless the body is already present + // in which case we use a div (#9239) + testElement = document.createElement( body ? "div" : "body" ); + testElementStyle = { visibility: "hidden", width: 0, height: 0, border: 0, - margin: 0, - // Set background to avoid IE crashes when removing (#9028) - background: "none" + margin: 0 }; - for ( i in bodyStyle ) { - body.style[ i ] = bodyStyle[ i ]; + if ( body ) { + jQuery.extend( testElementStyle, { + position: "absolute", + left: -1000, + top: -1000 + }); + } + for ( i in testElementStyle ) { + testElement.style[ i ] = testElementStyle[ i ]; } - body.appendChild( div ); - documentElement.insertBefore( body, documentElement.firstChild ); + testElement.appendChild( div ); + testElementParent = body || documentElement; + testElementParent.insertBefore( testElement, testElementParent.firstChild ); // Check if a disconnected checkbox will retain its checked // value of true after appended to the DOM (IE6/7) @@ -1344,8 +1366,8 @@ jQuery.support = (function() { } // Remove the body element we added - body.innerHTML = ""; - documentElement.removeChild( body ); + testElement.innerHTML = ""; + testElementParent.removeChild( testElement ); // Technique from Juriy Zaytsev // http://thinkweb2.com/projects/prototype/detecting-event-support-without-bro… @@ -1369,6 +1391,9 @@ jQuery.support = (function() { } } + // Null connected elements to avoid leaks in IE + testElement = fragment = select = opt = body = marginDiv = div = input = null; + return support; })(); @@ -1486,7 +1511,10 @@ jQuery.extend({ return thisCache[ internalKey ] && thisCache[ internalKey ].events; } - return getByName ? thisCache[ jQuery.camelCase( name ) ] : thisCache; + return getByName ? + // Check for both converted-to-camel and non-converted data property names + thisCache[ jQuery.camelCase( name ) ] || thisCache[ name ] : + thisCache; }, removeData: function( elem, name, pvt /* Internal Use Only */ ) { @@ -1882,7 +1910,7 @@ var rclass = /[\n\t\r]/g, rfocusable = /^(?:button|input|object|select|textarea)$/i, rclickable = /^a(?:rea)?$/i, rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, - rinvalidChar = /\:/, + rinvalidChar = /\:|^on/, formHook, boolHook; jQuery.fn.extend({ @@ -1912,30 +1940,31 @@ jQuery.fn.extend({ }, addClass: function( value ) { + var classNames, i, l, elem, + setClass, c, cl; + if ( jQuery.isFunction( value ) ) { - return this.each(function(i) { - var self = jQuery(this); - self.addClass( value.call(this, i, self.attr("class") || "") ); + return this.each(function( j ) { + jQuery( this ).addClass( value.call(this, j, this.className) ); }); } if ( value && typeof value === "string" ) { - var classNames = (value || "").split( rspace ); + classNames = value.split( rspace ); - for ( var i = 0, l = this.length; i < l; i++ ) { - var elem = this[i]; + for ( i = 0, l = this.length; i < l; i++ ) { + elem = this[ i ]; if ( elem.nodeType === 1 ) { - if ( !elem.className ) { + if ( !elem.className && classNames.length === 1 ) { elem.className = value; } else { - var className = " " + elem.className + " ", - setClass = elem.className; + setClass = " " + elem.className + " "; - for ( var c = 0, cl = classNames.length; c < cl; c++ ) { - if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) { - setClass += " " + classNames[c]; + for ( c = 0, cl = classNames.length; c < cl; c++ ) { + if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) { + setClass += classNames[ c ] + " "; } } elem.className = jQuery.trim( setClass ); @@ -1948,24 +1977,25 @@ jQuery.fn.extend({ }, removeClass: function( value ) { - if ( jQuery.isFunction(value) ) { - return this.each(function(i) { - var self = jQuery(this); - self.removeClass( value.call(this, i, self.attr("class")) ); + var classNames, i, l, elem, className, c, cl; + + if ( jQuery.isFunction( value ) ) { + return this.each(function( j ) { + jQuery( this ).removeClass( value.call(this, j, this.className) ); }); } if ( (value && typeof value === "string") || value === undefined ) { - var classNames = (value || "").split( rspace ); + classNames = (value || "").split( rspace ); - for ( var i = 0, l = this.length; i < l; i++ ) { - var elem = this[i]; + for ( i = 0, l = this.length; i < l; i++ ) { + elem = this[ i ]; if ( elem.nodeType === 1 && elem.className ) { if ( value ) { - var className = (" " + elem.className + " ").replace(rclass, " "); - for ( var c = 0, cl = classNames.length; c < cl; c++ ) { - className = className.replace(" " + classNames[c] + " ", " "); + className = (" " + elem.className + " ").replace( rclass, " " ); + for ( c = 0, cl = classNames.length; c < cl; c++ ) { + className = className.replace(" " + classNames[ c ] + " ", " "); } elem.className = jQuery.trim( className ); @@ -1984,9 +2014,8 @@ jQuery.fn.extend({ isBool = typeof stateVal === "boolean"; if ( jQuery.isFunction( value ) ) { - return this.each(function(i) { - var self = jQuery(this); - self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal ); + return this.each(function( i ) { + jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal ); }); } @@ -2040,7 +2069,13 @@ jQuery.fn.extend({ return ret; } - return (elem.value || "").replace(rreturn, ""); + ret = elem.value; + + return typeof ret === "string" ? + // handle most common string cases + ret.replace(rreturn, "") : + // handle cases where value is null/undef or number + ret == null ? "" : ret; } return undefined; @@ -2186,20 +2221,23 @@ jQuery.extend({ notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); // Normalize the name if needed - name = notxml && jQuery.attrFix[ name ] || name; + if ( notxml ) { + name = jQuery.attrFix[ name ] || name; - hooks = jQuery.attrHooks[ name ]; + hooks = jQuery.attrHooks[ name ]; - if ( !hooks ) { - // Use boolHook for boolean attributes - if ( rboolean.test( name ) && - (typeof value === "boolean" || value === undefined || value.toLowerCase() === name.toLowerCase()) ) { + if ( !hooks ) { + // Use boolHook for boolean attributes + if ( rboolean.test( name ) ) { - hooks = boolHook; + hooks = boolHook; - // Use formHook for forms and if the name contains certain characters - } else if ( formHook && (jQuery.nodeName( elem, "form" ) || rinvalidChar.test( name )) ) { - hooks = formHook; + // Use formHook for forms and if the name contains certain characters + } else if ( formHook && name !== "className" && + (jQuery.nodeName( elem, "form" ) || rinvalidChar.test( name )) ) { + + hooks = formHook; + } } } @@ -2217,8 +2255,8 @@ jQuery.extend({ return value; } - } else if ( hooks && "get" in hooks && notxml ) { - return hooks.get( elem, name ); + } else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) { + return ret; } else { @@ -2282,6 +2320,25 @@ jQuery.extend({ 0 : undefined; } + }, + // Use the value property for back compat + // Use the formHook for button elements in IE6/7 (#1954) + value: { + get: function( elem, name ) { + if ( formHook && jQuery.nodeName( elem, "button" ) ) { + return formHook.get( elem, name ); + } + return name in elem ? + elem.value : + null; + }, + set: function( elem, value, name ) { + if ( formHook && jQuery.nodeName( elem, "button" ) ) { + return formHook.set( elem, value, name ); + } + // Does not return so that setAttribute is also used + elem.value = value; + } } }, @@ -2311,10 +2368,11 @@ jQuery.extend({ var ret, hooks, notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); - // Try to normalize/fix the name - name = notxml && jQuery.propFix[ name ] || name; - - hooks = jQuery.propHooks[ name ]; + if ( notxml ) { + // Fix name and attach hooks + name = jQuery.propFix[ name ] || name; + hooks = jQuery.propHooks[ name ]; + } if ( value !== undefined ) { if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { @@ -2341,7 +2399,7 @@ jQuery.extend({ boolHook = { get: function( elem, name ) { // Align boolean attributes with corresponding properties - return elem[ jQuery.propFix[ name ] || name ] ? + return jQuery.prop( elem, name ) ? name.toLowerCase() : undefined; }, @@ -2356,7 +2414,7 @@ boolHook = { propName = jQuery.propFix[ name ] || name; if ( propName in elem ) { // Only set the IDL specifically if it already exists on the element - elem[ propName ] = value; + elem[ propName ] = true; } elem.setAttribute( name, name.toLowerCase() ); @@ -2365,24 +2423,6 @@ boolHook = { } }; -// Use the value property for back compat -// Use the formHook for button elements in IE6/7 (#1954) -jQuery.attrHooks.value = { - get: function( elem, name ) { - if ( formHook && jQuery.nodeName( elem, "button" ) ) { - return formHook.get( elem, name ); - } - return elem.value; - }, - set: function( elem, value, name ) { - if ( formHook && jQuery.nodeName( elem, "button" ) ) { - return formHook.set( elem, value, name ); - } - // Does not return so that setAttribute is also used - elem.value = value; - } -}; - // IE6/7 do not support getting/setting some attributes with get/setAttribute if ( !jQuery.support.getSetAttribute ) { @@ -2390,7 +2430,7 @@ if ( !jQuery.support.getSetAttribute ) { jQuery.attrFix = jQuery.propFix; // Use this for any attribute on a form in IE6/7 - formHook = jQuery.attrHooks.name = jQuery.valHooks.button = { + formHook = jQuery.attrHooks.name = jQuery.attrHooks.title = jQuery.valHooks.button = { get: function( elem, name ) { var ret; ret = elem.getAttributeNode( name ); @@ -2493,8 +2533,7 @@ jQuery.each([ "radio", "checkbox" ], function() { -var hasOwn = Object.prototype.hasOwnProperty, - rnamespaces = /\.(.*)$/, +var rnamespaces = /\.(.*)$/, rformElems = /^(?:textarea|input|select)$/i, rperiod = /\./g, rspaces = / /g, @@ -2838,7 +2877,7 @@ jQuery.event = { event.target = elem; // Clone any incoming data and prepend the event, creating the handler arg list - data = data ? jQuery.makeArray( data ) : []; + data = data != null ? jQuery.makeArray( data ) : []; data.unshift( event ); var cur = elem, @@ -3144,34 +3183,27 @@ jQuery.Event.prototype = { // Checks if an event happened on an element within another element // Used in jQuery.event.special.mouseenter and mouseleave handlers var withinElement = function( event ) { + // Check if mouse(over|out) are still within the same parent element - var parent = event.relatedTarget; + var related = event.relatedTarget, + inside = false, + eventType = event.type; - // set the correct event type event.type = event.data; - // Firefox sometimes assigns relatedTarget a XUL element - // which we cannot access the parentNode property of - try { + if ( related !== this ) { - // Chrome does something similar, the parentNode property - // can be accessed but is null. - if ( parent && parent !== document && !parent.parentNode ) { - return; + if ( related ) { + inside = jQuery.contains( this, related ); } - // Traverse up the tree - while ( parent && parent !== this ) { - parent = parent.parentNode; - } + if ( !inside ) { - if ( parent !== this ) { - // handle event if we actually just moused on to a non sub-element jQuery.event.handle.apply( this, arguments ); - } - // assuming we've left the element since we most likely mousedover a xul element - } catch(e) { } + event.type = eventType; + } + } }, // In case of event delegation, we only need to rename the event.type, @@ -5890,8 +5922,21 @@ function cloneFixAttributes( src, dest ) { } jQuery.buildFragment = function( args, nodes, scripts ) { - var fragment, cacheable, cacheresults, - doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document); + var fragment, cacheable, cacheresults, doc; + + // nodes may contain either an explicit document object, + // a jQuery collection or context object. + // If nodes[0] contains a valid object to assign to doc + if ( nodes && nodes[0] ) { + doc = nodes[0].ownerDocument || nodes[0]; + } + + // Ensure that an attr object doesn't incorrectly stand in as a document object + // Chrome and Firefox seem to allow this to occur and will throw exception + // Fixes #8950 + if ( !doc.createDocumentFragment ) { + doc = document; + } // Only cache "small" (1/2 KB) HTML strings that are associated with the main document // Cloning options loses the selected state, so don't cache them @@ -5972,7 +6017,7 @@ function fixDefaultChecked( elem ) { function findInputs( elem ) { if ( jQuery.nodeName( elem, "input" ) ) { fixDefaultChecked( elem ); - } else if ( elem.getElementsByTagName ) { + } else if ( "getElementsByTagName" in elem ) { jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked ); } } @@ -6021,6 +6066,8 @@ jQuery.extend({ } } + srcElements = destElements = null; + // Return the cloned set return clone; }, @@ -6201,10 +6248,8 @@ function evalScript( i, elem ) { - var ralpha = /alpha$[^)]*$/i, ropacity = /opacity=([^)]*)/, - rdashAlpha = /-([a-z])/ig, // fixed for IE9, see #8346 rupper = /([A-Z]|^ms)/g, rnumpx = /^-?\d+(?:px)?$/i, @@ -6218,11 +6263,7 @@ var ralpha = /alpha$[^)]*$/i, curCSS, getComputedStyle, - currentStyle, - - fcamelCase = function( all, letter ) { - return letter.toUpperCase(); - }; + currentStyle; jQuery.fn.css = function( name, value ) { // Setting 'undefined' is a no-op @@ -6257,13 +6298,14 @@ jQuery.extend({ // Exclude the following css properties to add px cssNumber: { - "zIndex": true, + "fillOpacity": true, "fontWeight": true, - "opacity": true, - "zoom": true, "lineHeight": true, + "opacity": true, + "orphans": true, "widows": true, - "orphans": true + "zIndex": true, + "zoom": true }, // Add in properties whose names you wish to fix before @@ -6298,6 +6340,8 @@ jQuery.extend({ // convert relative number strings (+= or -=) to relative numbers. #7345 if ( type === "string" && rrelNum.test( value ) ) { value = +value.replace( rrelNumFilter, "" ) + parseFloat( jQuery.css( elem, name ) ); + // Fixes bug #9237 + type = "number"; } // If a number was passed in, add 'px' to the (except for certain CSS properties) @@ -6364,10 +6408,6 @@ jQuery.extend({ for ( name in options ) { elem.style[ name ] = old[ name ]; } - }, - - camelCase: function( string ) { - return string.replace( rdashAlpha, fcamelCase ); } }); @@ -6381,44 +6421,21 @@ jQuery.each(["height", "width"], function( i, name ) { if ( computed ) { if ( elem.offsetWidth !== 0 ) { - val = getWH( elem, name, extra ); - + return getWH( elem, name, extra ); } else { jQuery.swap( elem, cssShow, function() { val = getWH( elem, name, extra ); }); } - if ( val <= 0 ) { - val = curCSS( elem, name, name ); - - if ( val === "0px" && currentStyle ) { - val = currentStyle( elem, name, name ); - } - - if ( val != null ) { - // Should return "auto" instead of 0, use 0 for - // temporary backwards-compat - return val === "" || val === "auto" ? "0px" : val; - } - } - - if ( val < 0 || val == null ) { - val = elem.style[ name ]; - - // Should return "auto" instead of 0, use 0 for - // temporary backwards-compat - return val === "" || val === "auto" ? "0px" : val; - } - - return typeof val === "string" ? val : val + "px"; + return val; } }, set: function( elem, value ) { if ( rnumpx.test( value ) ) { // ignore negative width and height values #1599 - value = parseFloat(value); + value = parseFloat( value ); if ( value >= 0 ) { return value + "px"; @@ -6541,27 +6558,50 @@ if ( document.documentElement.currentStyle ) { curCSS = getComputedStyle || currentStyle; function getWH( elem, name, extra ) { - var which = name === "width" ? cssWidth : cssHeight, - val = name === "width" ? elem.offsetWidth : elem.offsetHeight; - if ( extra === "border" ) { - return val; - } + // Start with offset property + var val = name === "width" ? elem.offsetWidth : elem.offsetHeight, + which = name === "width" ? cssWidth : cssHeight; - jQuery.each( which, function() { - if ( !extra ) { - val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0; + if ( val > 0 ) { + if ( extra !== "border" ) { + jQuery.each( which, function() { + if ( !extra ) { + val -= parseFloat( jQuery.css( elem, "padding" + this ) ) || 0; + } + if ( extra === "margin" ) { + val += parseFloat( jQuery.css( elem, extra + this ) ) || 0; + } else { + val -= parseFloat( jQuery.css( elem, "border" + this + "Width" ) ) || 0; + } + }); } - if ( extra === "margin" ) { - val += parseFloat(jQuery.css( elem, "margin" + this )) || 0; + return val + "px"; + } - } else { - val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0; - } - }); + // Fall back to computed then uncomputed css if necessary + val = curCSS( elem, name, name ); + if ( val < 0 || val == null ) { + val = elem.style[ name ] || 0; + } + // Normalize "", auto, and prepare for extra + val = parseFloat( val ) || 0; + + // Add padding, border, margin + if ( extra ) { + jQuery.each( which, function() { + val += parseFloat( jQuery.css( elem, "padding" + this ) ) || 0; + if ( extra !== "padding" ) { + val += parseFloat( jQuery.css( elem, "border" + this + "Width" ) ) || 0; + } + if ( extra === "margin" ) { + val += parseFloat( jQuery.css( elem, extra + this ) ) || 0; + } + }); + } - return val; + return val + "px"; } if ( jQuery.expr && jQuery.expr.filters ) { @@ -7957,8 +7997,8 @@ var elemdisplay = {}, ], fxNow, requestAnimationFrame = window.webkitRequestAnimationFrame || - window.mozRequestAnimationFrame || - window.oRequestAnimationFrame; + window.mozRequestAnimationFrame || + window.oRequestAnimationFrame; jQuery.fn.extend({ show: function( speed, easing, callback ) { @@ -8272,15 +8312,15 @@ jQuery.extend({ // Queueing opt.old = opt.complete; opt.complete = function( noUnmark ) { + if ( jQuery.isFunction( opt.old ) ) { + opt.old.call( this ); + } + if ( opt.queue !== false ) { jQuery.dequeue( this ); } else if ( noUnmark !== false ) { jQuery._unmark( this ); } - - if ( jQuery.isFunction( opt.old ) ) { - opt.old.call( this ); - } }; return opt; @@ -8353,7 +8393,7 @@ jQuery.fx.prototype = { if ( t() && jQuery.timers.push(t) && !timerId ) { // Use requestAnimationFrame instead of setInterval if available if ( requestAnimationFrame ) { - timerId = 1; + timerId = true; raf = function() { // When timerId gets set to null at any point, this stops if ( timerId ) { @@ -8516,7 +8556,8 @@ function defaultDisplay( nodeName ) { if ( !elemdisplay[ nodeName ] ) { - var elem = jQuery( "<" + nodeName + ">" ).appendTo( "body" ), + var body = document.body, + elem = jQuery( "<" + nodeName + ">" ).appendTo( body ), display = elem.css( "display" ); elem.remove(); @@ -8530,14 +8571,15 @@ function defaultDisplay( nodeName ) { iframe.frameBorder = iframe.width = iframe.height = 0; } - document.body.appendChild( iframe ); + body.appendChild( iframe ); // Create a cacheable copy of the iframe document on first call. - // IE and Opera will allow us to reuse the iframeDoc without re-writing the fake html - // document to it, Webkit & Firefox won't allow reusing the iframe document + // IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML + // document to it; WebKit & Firefox won't allow reusing the iframe document. if ( !iframeDoc || !iframe.createElement ) { iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document; - iframeDoc.write( "<!doctype><html><body></body></html>" ); + iframeDoc.write( ( document.compatMode === "CSS1Compat" ? "<!doctype html>" : "" ) + "<html><body>" ); + iframeDoc.close(); } elem = iframeDoc.createElement( nodeName ); @@ -8546,7 +8588,7 @@ function defaultDisplay( nodeName ) { display = jQuery.css( elem, "display" ); - document.body.removeChild( iframe ); + body.removeChild( iframe ); } // Store the correct default display @@ -8867,22 +8909,24 @@ function getWindow( elem ) { -// Create innerHeight, innerWidth, outerHeight and outerWidth methods +// Create width, height, innerHeight, innerWidth, outerHeight and outerWidth methods jQuery.each([ "Height", "Width" ], function( i, name ) { var type = name.toLowerCase(); // innerHeight and innerWidth - jQuery.fn["inner" + name] = function() { - return this[0] ? - parseFloat( jQuery.css( this[0], type, "padding" ) ) : + jQuery.fn[ "inner" + name ] = function() { + var elem = this[0]; + return elem && elem.style ? + parseFloat( jQuery.css( elem, type, "padding" ) ) : null; }; // outerHeight and outerWidth - jQuery.fn["outer" + name] = function( margin ) { - return this[0] ? - parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) : + jQuery.fn[ "outer" + name ] = function( margin ) { + var elem = this[0]; + return elem && elem.style ? + parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) : null; }; @@ -8932,5 +8976,6 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { }); +// Expose jQuery to the global object window.jQuery = window.$ = jQuery; })(window); diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 2b2cf60..5f56352 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -552,7 +552,7 @@ $_REQUEST['js_frame'] = PMA_ifSetOr($_REQUEST['js_frame'], ''); * @global array $js_include */ $GLOBALS['js_include'] = array(); -$GLOBALS['js_include'][] = 'jquery/jquery-1.6.1.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-1.6.2.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'update-location.js'; diff --git a/navigation.php b/navigation.php index dad2683..22e4cda 100644 --- a/navigation.php +++ b/navigation.php @@ -105,7 +105,7 @@ require_once './libraries/header_http.inc.php'; <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> <?php - echo PMA_includeJS('jquery/jquery-1.6.1.js'); + echo PMA_includeJS('jquery/jquery-1.6.2.js'); echo PMA_includeJS('jquery/jquery-ui-1.8.custom.js'); echo PMA_includeJS('navigation.js'); echo PMA_includeJS('functions.js'); diff --git a/setup/index.php b/setup/index.php index 561679c..99c7847 100644 --- a/setup/index.php +++ b/setup/index.php @@ -37,7 +37,7 @@ require './libraries/header_http.inc.php'; <link href="../favicon.ico" rel="icon" type="image/x-icon" /> <link href="../favicon.ico" rel="shortcut icon" type="image/x-icon" /> <link href="styles.css" rel="stylesheet" type="text/css" /> -<script type="text/javascript" src="../js/jquery/jquery-1.6.1.js"></script> +<script type="text/javascript" src="../js/jquery/jquery-1.6.2.js"></script> <script type="text/javascript" src="../js/jquery/jquery-ui-1.8.custom.js"></script> <script type="text/javascript" src="../js/jquery/jquery.json-2.2.js"></script> <script type="text/javascript" src="../js/config.js"></script> hooks/post-receive -- phpMyAdmin

1 0