- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1496-gc432089
by Marc Delisle 30 Jan '11

30 Jan '11

The branch, master has been updated via c432089db8041ae0b2f2f725076ba1a169a416db (commit) from 783ad8c8685fcd6a97586a6802071e0ce0f93613 (commit) - Log ----------------------------------------------------------------- commit c432089db8041ae0b2f2f725076ba1a169a416db Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 30 06:46:15 2011 -0500 Remove author names per our policy ----------------------------------------------------------------------- Summary of changes: setup/lib/ConfigGenerator.class.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index ddad7f1..95c3325 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -31,7 +31,7 @@ class ConfigGenerator . ' * Generated configuration file' . $crlf . ' * Generated by: phpMyAdmin ' . $GLOBALS['PMA_Config']->get('PMA_VERSION') - . ' setup script by Piotr Przybylski <piotrprz(a)gmail.com>' . $crlf + . ' setup script' . $crlf . ' * Date: ' . date(DATE_RFC1123) . $crlf . ' */' . $crlf . $crlf; @@ -148,4 +148,4 @@ class ConfigGenerator return $ret; } } -?> \ No newline at end of file +?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1495-g783ad8c
by Madhura Jayaratne 29 Jan '11

29 Jan '11

The branch, master has been updated via 783ad8c8685fcd6a97586a6802071e0ce0f93613 (commit) from 41e0d5cc53d255cc87dc696d492e743ced3097b7 (commit) - Log ----------------------------------------------------------------- commit 783ad8c8685fcd6a97586a6802071e0ce0f93613 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Jan 30 07:56:54 2011 +0530 Fix typo. ----------------------------------------------------------------------- Summary of changes: js/functions.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/functions.js b/js/functions.js index 2c8d2a1..42325ca 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1699,7 +1699,7 @@ $(document).ready(function() { open: PMA_verifyTypeOfAllColumns, buttons : button_options_error })// end dialog options - //remove the redundant [Back] link in the error message// + //remove the redundant [Back] link in the error message. .find('fieldset').remove(); } else { $('<div id="create_table_dialog"></div>') hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1494-g41e0d5c
by Madhura Jayaratne 29 Jan '11

29 Jan '11

The branch, master has been updated via 41e0d5cc53d255cc87dc696d492e743ced3097b7 (commit) via 88bde613d2ac44b062c377db08caa342049c4d08 (commit) via 1c50e94ddd7565981cefdeb9b5c109ab473252dc (commit) from b6e62ff786339518f5289307eb2d4d8eb3f12684 (commit) - Log ----------------------------------------------------------------- commit 41e0d5cc53d255cc87dc696d492e743ced3097b7 Merge: 88bde613d2ac44b062c377db08caa342049c4d08 b6e62ff786339518f5289307eb2d4d8eb3f12684 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Jan 30 01:44:03 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 88bde613d2ac44b062c377db08caa342049c4d08 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Jan 30 01:41:26 2011 +0530 Button caption changed to 'OK' in the case of an error. Redundant 'Back' link removed from the error message. commit 1c50e94ddd7565981cefdeb9b5c109ab473252dc Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Jan 30 01:32:05 2011 +0530 Bug #3166950 [AJAX] Empty dialog after attempt to create already existing table ----------------------------------------------------------------------- Summary of changes: js/functions.js | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/js/functions.js b/js/functions.js index a13758e..2c8d2a1 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1679,21 +1679,39 @@ $(document).ready(function() { // in the following function we need to use $(this) button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} + var button_options_error = {}; + button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();} + PMA_ajaxShowMessage(); if (! $form.find('input:hidden').is('#ajax_request_hidden')) { $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); } $.get($form.attr('action'), $form.serialize(), function(data) { - $('<div id="create_table_dialog"></div>') - .append(data) - .dialog({ - title: PMA_messages['strCreateTable'], - height: 600, - width: 900, - open: PMA_verifyTypeOfAllColumns, - buttons : button_options - }); // end dialog options + //in the case of an error, show the error message returned. + if (data.success != undefined && data.success == false) { + $('<div id="create_table_dialog"></div>') + .append(data.error) + .dialog({ + title: PMA_messages['strCreateTable'], + height: 230, + width: 900, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options_error + })// end dialog options + //remove the redundant [Back] link in the error message// + .find('fieldset').remove(); + } else { + $('<div id="create_table_dialog"></div>') + .append(data) + .dialog({ + title: PMA_messages['strCreateTable'], + height: 600, + width: 900, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options + }); // end dialog options + } }) // end $.get() // empty table name and number of columns from the minimal form hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1490-gb0fcd26
by Marc Delisle 29 Jan '11

29 Jan '11

The branch, master has been updated via b0fcd264a9bfc23f53237404ba109787765ebb2a (commit) from 0b7d8e5bf44df5fa033399541f8982323ca99a7b (commit) - Log ----------------------------------------------------------------- commit b0fcd264a9bfc23f53237404ba109787765ebb2a Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 29 15:08:38 2011 -0500 Conditional Ajax parameter in user preferences ----------------------------------------------------------------------- Summary of changes: libraries/config/user_preferences.forms.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index a027007..cfa78ae 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -22,6 +22,7 @@ $forms = array(); $forms['Features']['General'] = array( + 'AjaxEnable', 'NaturalOrder', 'InitialSlidersState', 'ErrorIconic', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1489-g0b7d8e5
by Marc Delisle 29 Jan '11

29 Jan '11

The branch, master has been updated via 0b7d8e5bf44df5fa033399541f8982323ca99a7b (commit) from dea96e2e5ad21df2dd1c456457d451e137747e27 (commit) - Log ----------------------------------------------------------------- commit 0b7d8e5bf44df5fa033399541f8982323ca99a7b Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 29 15:04:08 2011 -0500 Conditional Ajax parameter in setup ----------------------------------------------------------------------- Summary of changes: libraries/config/messages.inc.php | 2 ++ libraries/config/setup.forms.php | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 654974d..560b1e5 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -14,6 +14,8 @@ if (!function_exists('__')) { die('Bad invocation!'); } +$strConfigAjaxEnable_desc = __('Improves efficiency of screen refresh'); +$strConfigAjaxEnable_name = __('Enable Ajax'); $strConfigAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth'); $strConfigAllowArbitraryServer_name = __('Allow login to any MySQL server'); $strConfigAllowThirdPartyFraming_desc = __('Enabling this allows a page located on a different domain to call phpMyAdmin inside a frame, and is a potential [strong]security hole[/strong] allowing cross-frame scripting attacks'); diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index 79c8bb7..7783065 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -120,6 +120,7 @@ $forms['Features']['Developer'] = array( 'Error_Handler/gather', 'DBG/sql'); $forms['Features']['Other_core_settings'] = array( + 'AjaxEnable', 'NaturalOrder', 'InitialSlidersState', 'ErrorIconic', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1488-gdea96e2
by Marc Delisle 29 Jan '11

29 Jan '11

The branch, master has been updated via dea96e2e5ad21df2dd1c456457d451e137747e27 (commit) from 3c573fc82e35834646ed861bbc53f55d30db1b4e (commit) - Log ----------------------------------------------------------------- commit dea96e2e5ad21df2dd1c456457d451e137747e27 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 29 11:15:35 2011 -0500 Conditional Ajax for db Structure and Tracking ----------------------------------------------------------------------- Summary of changes: db_structure.php | 8 ++++++-- db_tracking.php | 3 ++- js/db_structure.js | 17 +++++++++++++++-- libraries/db_events.inc.php | 7 ++++++- libraries/db_routines.inc.php | 9 ++++++++- 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/db_structure.php b/db_structure.php index fb2ecc0..dcce45b 100644 --- a/db_structure.php +++ b/db_structure.php @@ -266,7 +266,11 @@ foreach ($tables as $keyname => $each_table) { if (! $db_is_information_schema) { if (! empty($each_table['TABLE_ROWS'])) { - $empty_table = '<a class="truncate_table_anchor" href="sql.php?' . $tbl_url_query + $empty_table = '<a '; + if ($GLOBALS['cfg']['AjaxEnable']) { + $empty_table .= 'class="truncate_table_anchor"'; + } + $empty_table .= ' href="sql.php?' . $tbl_url_query . '&sql_query='; $empty_table .= urlencode('TRUNCATE ' . PMA_backquote($each_table['TABLE_NAME'])) . '&message_to_show=' @@ -355,7 +359,7 @@ foreach ($tables as $keyname => $each_table) { <?php echo $titles['Insert']; ?></a></td> <td align="center"><?php echo $empty_table; ?></td> <td align="center"> - <a class="drop_table_anchor" href="sql.php?<?php echo $tbl_url_query; + <a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="drop_table_anchor"' : ''); ?> href="sql.php?<?php echo $tbl_url_query; ?>&reload=1&purge=1&sql_query=<?php echo urlencode($drop_query); ?>&message_to_show=<?php echo urlencode($drop_message); ?>" > diff --git a/db_tracking.php b/db_tracking.php index 62f8554..d9a7da3 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -11,6 +11,7 @@ require_once './libraries/common.inc.php'; //Get some js files needed for Ajax requests $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; +$GLOBALS['js_include'][] = 'db_structure.js'; /** * If we are not in an Ajax request, then do the common work and show the links etc. @@ -129,7 +130,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) { <td><?php echo $version_data['date_created'];?></td> <td><?php echo $version_data['date_updated'];?></td> <td><?php echo $version_status;?></td> - <td><a class="drop_tracking_anchor" href="<?php echo $delete_link;?>" ><?php echo $drop_image_or_text; ?></a></td> + <td><a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="drop_tracking_anchor"' : ''); ?> href="<?php echo $delete_link;?>" ><?php echo $drop_image_or_text; ?></a></td> <td> <a href="<?php echo $tmp_link; ?>"><?php echo __('Versions');?></a> | <a href="<?php echo $tmp_link; ?>&report=true&version=<?php echo $version_data['version'];?>"><?php echo __('Tracking report');?></a> | <a href="<?php echo $tmp_link; ?>&snapshot=true&version=<?php echo $version_data['version'];?>"><?php echo __('Structure snapshot');?></a></td> diff --git a/js/db_structure.js b/js/db_structure.js index 8b529d7..4affd75 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -57,6 +57,7 @@ $(document).ready(function() { * * @uses $.PMA_confirm() * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ $(".truncate_table_anchor").live('click', function(event) { event.preventDefault(); @@ -105,6 +106,7 @@ $(document).ready(function() { * * @uses $.PMA_confirm() * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ $(".drop_table_anchor").live('click', function(event) { event.preventDefault(); @@ -150,6 +152,7 @@ $(document).ready(function() { * * @uses $.PMA_confirm() * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ $('.drop_event_anchor').live('click', function(event) { event.preventDefault(); @@ -188,6 +191,7 @@ $(document).ready(function() { * * @uses $.PMA_confirm() * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ $('.drop_procedure_anchor').live('click', function(event) { event.preventDefault(); @@ -217,19 +221,28 @@ $(document).ready(function() { }) // end $.PMA_confirm() }) //end Drop Procedure + /** + * Ajax Event handler for 'Drop tracking' + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] + */ $('.drop_tracking_anchor').live('click', function(event) { event.preventDefault(); + var $anchor = $(this); + /** * @var curr_tracking_row Object containing reference to the current tracked table's row */ - var curr_tracking_row = $(this).parents('tr'); + var curr_tracking_row = $anchor.parents('tr'); /** * @var question String containing the question to be asked for confirmation */ var question = PMA_messages['strDeleteTrackingData']; - $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + $anchor.PMA_confirm(question, $anchor.attr('href'), function(url) { PMA_ajaxShowMessage(PMA_messages['strDeletingTrackingData']); diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index 82ef51f..6e93299 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -25,6 +25,11 @@ if ($events) { __('Type')); $ct=0; $delimiter = '//'; + if ($GLOBALS['cfg']['AjaxEnable']) { + $conditional_class = 'class="drop_event_anchor"'; + } else { + $conditional_class = ''; + } foreach ($events as $event) { // information_schema (at least in MySQL 5.1.22) does not return @@ -45,7 +50,7 @@ if ($events) { ($ct%2 == 0) ? 'even' : 'odd', $event['EVENT_NAME'], ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&db_query_force=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ', - '<a class="drop_event_anchor" href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" >' . $titles['Drop'] . '</a>', + '<a ' . $conditional_class . ' href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" >' . $titles['Drop'] . '</a>', $event['EVENT_TYPE']); $ct++; } diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php index d898d00..648d80c 100644 --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -37,6 +37,12 @@ if ($routines) { __('Return type')); $ct=0; $delimiter = '//'; + if ($GLOBALS['cfg']['AjaxEnable']) { + $conditional_class = 'class="drop_procedure_anchor"'; + } else { + $conditional_class = ''; + } + foreach ($routines as $routine) { // information_schema (at least in MySQL 5.0.45) @@ -64,6 +70,7 @@ if ($routines) { } else { $sqlDropProc = 'DROP FUNCTION ' . PMA_backquote($routine['SPECIFIC_NAME']); } + echo sprintf('<tr class="%s"> <td><input type="hidden" class="drop_procedure_sql" value="%s" /><strong>%s</strong></td> <td>%s</td> @@ -75,7 +82,7 @@ if ($routines) { $sqlDropProc, $routine['ROUTINE_NAME'], ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&db_query_force=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ', - '<a class="drop_procedure_anchor" href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDropProc) . '" >' . $titles['Drop'] . '</a>', + '<a ' . $conditional_class . ' href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDropProc) . '" >' . $titles['Drop'] . '</a>', $routine['ROUTINE_TYPE'], $routine['DTD_IDENTIFIER']); $ct++; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1487-g3c573fc
by Marc Delisle 29 Jan '11

29 Jan '11

The branch, master has been updated via 3c573fc82e35834646ed861bbc53f55d30db1b4e (commit) from 21fd381c84482d2792902034f3292d274e11383c (commit) - Log ----------------------------------------------------------------- commit 3c573fc82e35834646ed861bbc53f55d30db1b4e Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 29 10:32:56 2011 -0500 Conditional Ajax for other db operations ----------------------------------------------------------------------- Summary of changes: db_operations.php | 8 ++++++-- js/db_operations.js | 20 ++++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/db_operations.php b/db_operations.php index 6382fe9..9280467 100644 --- a/db_operations.php +++ b/db_operations.php @@ -458,7 +458,7 @@ echo __('Remove database'); * Copy database */ ?> - <form id="copy_db_form" method="post" action="db_operations.php" + <form id="copy_db_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : ''); ?>method="post" action="db_operations.php" onsubmit="return emptyFormElements(this, 'newname')"> <?php if (isset($db_collation)) { @@ -528,7 +528,11 @@ echo __('Remove database'); /** * Change database charset */ - echo '<form id="change_db_charset_form" method="post" action="./db_operations.php">' . "\n" + echo '<form id="change_db_charset_form" '; + if ($GLOBALS['cfg']['AjaxEnable']) { + echo ' class="ajax" '; + } + echo 'method="post" action="./db_operations.php">' . PMA_generate_common_hidden_inputs($db, $table) . '<fieldset>' . "\n" . ' <legend>'; diff --git a/js/db_operations.js b/js/db_operations.js index 22511fb..915c537 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -30,7 +30,7 @@ $(document).ready(function() { $("#rename_db_form.ajax").live('submit', function(event) { event.preventDefault(); - $form = $(this); + var $form = $(this); var question = 'CREATE DATABASE ' + $('#new_db_name').val() + ' / DROP DATABASE ' + window.parent.db; @@ -86,12 +86,15 @@ $(document).ready(function() { * Ajax Event Handler for 'Copy Database' * * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ - $("#copy_db_form").live('submit', function(event) { + $("#copy_db_form.ajax").live('submit', function(event) { event.preventDefault(); PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase']); - $form = $(this); + + var $form = $(this); + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); } @@ -123,15 +126,20 @@ $(document).ready(function() { * Ajax Event handler for 'Change Charset' of the database * * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ - $("#change_db_charset_form").live('submit', function(event) { + $("#change_db_charset_form.ajax").live('submit', function(event) { event.preventDefault(); - $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + var $form = $(this); + + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { + $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } PMA_ajaxShowMessage(PMA_messages['strChangingCharset']); - $.get($(this).attr('action'), $(this).serialize() + "&submitcollation=" + $(this).find("input[name=submitcollation]").attr('value'), function(data) { + $.get($form.attr('action'), $form.serialize() + "&submitcollation=" + $form.find("input[name=submitcollation]").attr('value'), function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1486-g21fd381
by Marc Delisle 29 Jan '11

29 Jan '11

The branch, master has been updated via 21fd381c84482d2792902034f3292d274e11383c (commit) from cc8e3849cf88f90218df6c5b6c42b1c4393d8ec3 (commit) - Log ----------------------------------------------------------------- commit 21fd381c84482d2792902034f3292d274e11383c Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 29 08:22:26 2011 -0500 Conditional Ajax on db rename Remove extra wrapping of jQuery object Avoid extra generation of hidden field Improve confirmation message on db rename ----------------------------------------------------------------------- Summary of changes: db_operations.php | 4 ++-- js/db_operations.js | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/db_operations.php b/db_operations.php index b4a4263..6382fe9 100644 --- a/db_operations.php +++ b/db_operations.php @@ -378,7 +378,7 @@ if (!$is_information_schema) { */ if ($db != 'mysql') { ?> - <form id="rename_db_form" method="post" action="db_operations.php" + <form id="rename_db_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : ''); ?>method="post" action="db_operations.php" onsubmit="return emptyFormElements(this, 'newname')"> <?php if (isset($db_collation)) { @@ -399,7 +399,7 @@ if ($db != 'mysql') { echo __('Rename database to') . ':'; ?> </legend> - <input type="text" name="newname" size="30" class="textfield" value="" /> + <input id="new_db_name" type="text" name="newname" size="30" class="textfield" value="" /> <?php echo '(' . __('Command') . ': '; /** diff --git a/js/db_operations.js b/js/db_operations.js index 12b17c1..22511fb 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -25,12 +25,18 @@ $(document).ready(function() { * * @uses $.PMA_confirm() * @uses PMA_ajaxShowUser() + * @see $cfg['AjaxEnable'] */ - $("#rename_db_form").live('submit', function(event) { + $("#rename_db_form.ajax").live('submit', function(event) { event.preventDefault(); - var question = 'CREATE DATABASE ... and then DROP DATABASE ' + window.parent.db; - $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + $form = $(this); + + var question = 'CREATE DATABASE ' + $('#new_db_name').val() + ' / DROP DATABASE ' + window.parent.db; + + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { + $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } /** * @var button_options Object containing options for jQueryUI dialog buttons @@ -43,7 +49,7 @@ $(document).ready(function() { }; button_options[PMA_messages['strNo']] = function() { $(this).dialog("close").remove(); } - $(this).PMA_confirm(question, $(this).attr('action'), function(url) { + $form.PMA_confirm(question, $form.attr('action'), function(url) { PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases']); $.get(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function(data) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1485-gcc8e384
by Michal Čihař 28 Jan '11

28 Jan '11

The branch, master has been updated via cc8e3849cf88f90218df6c5b6c42b1c4393d8ec3 (commit) from 59f561b4502f59a6b3387992074c6db4b17f1c15 (commit) - Log ----------------------------------------------------------------- commit cc8e3849cf88f90218df6c5b6c42b1c4393d8ec3 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jan 28 23:12:18 2011 +0100 The decodeBB did not escape <>, keep this functionality. ----------------------------------------------------------------------- Summary of changes: libraries/Message.class.php | 2 +- libraries/sanitizing.lib.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/Message.class.php b/libraries/Message.class.php index 6a4df5b..a985393 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -654,7 +654,7 @@ class PMA_Message */ static public function decodeBB($message) { - return PMA_sanitize($message, false); + return PMA_sanitize($message, false, true); } /** diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 606c730..adb8df2 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -27,11 +27,12 @@ * * @access public */ -function PMA_sanitize($message, $escape = false) +function PMA_sanitize($message, $escape = false, $safe = false) { + if (!$safe) { + $message = strtr($message, array('<' => '<', '>' => '>')); + } $replace_pairs = array( - '<' => '<', - '>' => '>', '[i]' => '<em>', // deprecated by em '[/i]' => '</em>', // deprecated by em '[em]' => '<em>', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1484-g59f561b
by Marc Delisle 28 Jan '11

28 Jan '11

The branch, master has been updated via 59f561b4502f59a6b3387992074c6db4b17f1c15 (commit) from e0c0d21380fab68bf71fbfbdbd060f6f2178c29d (commit) - Log ----------------------------------------------------------------- commit 59f561b4502f59a6b3387992074c6db4b17f1c15 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jan 28 13:08:20 2011 -0500 To fix this jQuery 1.4.4 error: tds[0] is undefined jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0; I merged this commit that is planned to appear in jQuery 1.5: https://github.com/dmethvin/jquery/commit/ad0ebf00abca53caaaa46fb172024ba9b… ----------------------------------------------------------------------- Summary of changes: js/jquery/jquery-1.4.4.js | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/js/jquery/jquery-1.4.4.js b/js/jquery/jquery-1.4.4.js index a4f1145..a9f2ec7 100644 --- a/js/jquery/jquery-1.4.4.js +++ b/js/jquery/jquery-1.4.4.js @@ -1035,10 +1035,16 @@ return (window.jQuery = window.$ = jQuery); // Figure out if the W3C box model works as expected // document.body must exist before we can do this jQuery(function() { - var div = document.createElement("div"); - div.style.width = div.style.paddingLeft = "1px"; + var div = document.createElement("div"), + body = document.getElementsByTagName("body")[0]; - document.body.appendChild( div ); + // Frameset documents with no body should not run this code + if ( !body ) { + return; + } + + div.style.width = div.style.paddingLeft = "1px"; + body.appendChild( div ); jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2; if ( "zoom" in div.style ) { @@ -1077,7 +1083,7 @@ return (window.jQuery = window.$ = jQuery); jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0; div.innerHTML = ""; - document.body.removeChild( div ).style.display = "none"; + body.removeChild( div ).style.display = "none"; div = tds = null; }); hooks/post-receive -- phpMyAdmin

1 0