Git January 2011

git@phpmyadmin.net

5 participants
154 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1474-g85ab22d

by Michal Čihař

The branch, master has been updated via 85ab22ddc0544c886fc33d1e291d3aa7a6e0edc8 (commit) from 701268fb5778e4031c6b79d910c068f05c14c79e (commit) - Log ----------------------------------------------------------------- commit 85ab22ddc0544c886fc33d1e291d3aa7a6e0edc8 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jan 28 10:40:23 2011 +0100 input element can not be under tr This prevented the JS confirmation to work with Chromium, because it moved the element outside the table. ----------------------------------------------------------------------- Summary of changes: js/db_structure.js | 2 +- libraries/db_routines.inc.php | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/js/db_structure.js b/js/db_structure.js index 03aa8e1..8b529d7 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -199,7 +199,7 @@ $(document).ready(function() { /** * @var question String containing the question to be asked for confirmation */ - var question = $(curr_proc_row).children('.drop_procedure_sql').val(); + var question = $(curr_proc_row).children('td').children('.drop_procedure_sql').val(); $(this).PMA_confirm(question, $(this).attr('href'), function(url) { diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php index 49819dd..d898d00 100644 --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -65,20 +65,19 @@ if ($routines) { $sqlDropProc = 'DROP FUNCTION ' . PMA_backquote($routine['SPECIFIC_NAME']); } echo sprintf('<tr class="%s"> - <td><strong>%s</strong></td> + <td><input type="hidden" class="drop_procedure_sql" value="%s" /><strong>%s</strong></td> <td>%s</td> <td>%s</td> <td>%s</td> <td>%s</td> - <input type="hidden" class="drop_procedure_sql" value="%s" /> </tr>', ($ct%2 == 0) ? 'even' : 'odd', + $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>', $routine['ROUTINE_TYPE'], - $routine['DTD_IDENTIFIER'], - $sqlDropProc); + $routine['DTD_IDENTIFIER']); $ct++; } echo '</table>'; hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1473-g701268f

by Michal Čihař

The branch, master has been updated via 701268fb5778e4031c6b79d910c068f05c14c79e (commit) via b2fa59876b335facc96464a357f5b234494d8fe5 (commit) from 39bc66df25b98aa61caba73b36003fe763346703 (commit) - Log ----------------------------------------------------------------- commit 701268fb5778e4031c6b79d910c068f05c14c79e Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jan 28 10:29:47 2011 +0100 No javascript footer in AJAX requests. commit b2fa59876b335facc96464a357f5b234494d8fe5 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jan 28 10:24:34 2011 +0100 Avoid showing open in new window for AJAX requests. ----------------------------------------------------------------------- Summary of changes: libraries/footer.inc.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index f5e6e98..f6222f8 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -88,6 +88,7 @@ if (! empty($_SESSION['debug'])) { $_SESSION['debug'] = array(); } +if (!$GLOBALS['is_ajax_request']) { ?> <script type="text/javascript"> //<![CDATA[ @@ -162,13 +163,14 @@ if (window.parent.frame_content) { //]]> </script> <?php +} // Link to itself to replicate windows including frameset if (!isset($GLOBALS['checked_special'])) { $GLOBALS['checked_special'] = false; } -if (PMA_getenv('SCRIPT_NAME') && empty($_POST) && !$GLOBALS['checked_special']) { +if (PMA_getenv('SCRIPT_NAME') && empty($_POST) && !$GLOBALS['checked_special'] && ! $GLOBALS['is_ajax_request']) { echo '<div id="selflink" class="print_ignore">' . "\n"; $url_params['target'] = basename(PMA_getenv('SCRIPT_NAME')); ?> hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1471-g39bc66d

by Michal Čihař

The branch, master has been updated via 39bc66df25b98aa61caba73b36003fe763346703 (commit) via 311fd3b7cb626f1e4be97e2865d4a4da82a579ce (commit) from d50215684a9b5b0cab7d8404f489a721f92d93f4 (commit) - Log ----------------------------------------------------------------- commit 39bc66df25b98aa61caba73b36003fe763346703 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jan 28 09:55:20 2011 +0100 rfe #1954161 [interface] Do not display long numbers in server status. Fixed again, hopefully this way will work better. commit 311fd3b7cb626f1e4be97e2865d4a4da82a579ce Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jan 28 09:36:36 2011 +0100 Add another link to documentation ----------------------------------------------------------------------- Summary of changes: server_status.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/server_status.php b/server_status.php index a797446..55f72b3 100644 --- a/server_status.php +++ b/server_status.php @@ -605,7 +605,9 @@ foreach ($sections as $section_name => $section) { <h3 id="serverstatusqueries"><?php echo sprintf(__('<b>Query statistics</b>: Since its startup, %s queries have been sent to the server.'), - PMA_formatNumber($server_status['Questions'], 0)); ?></h3> + PMA_formatNumber($server_status['Questions'], 0)); + echo PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_Questions'); + ?></h3> <table id="serverstatusqueriessummary" class="data"> <thead> @@ -801,6 +803,8 @@ if (! empty($section['title'])) { } if ('%' === substr($name, -1, 1)) { echo PMA_formatNumber($value, 0, 2) . ' %'; + } elseif (is_numeric($value) && $value == (int) $value && $value > 1000) { + echo PMA_formatNumber($value, 3, 1); } elseif (is_numeric($value) && $value == (int) $value) { echo PMA_formatNumber($value, 4, 0); } elseif (is_numeric($value)) { hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1469-gd502156

by Michal Čihař

The branch, master has been updated via d50215684a9b5b0cab7d8404f489a721f92d93f4 (commit) from 5b900ead54f457e75398ba22910b58663e922aac (commit) - Log ----------------------------------------------------------------- commit d50215684a9b5b0cab7d8404f489a721f92d93f4 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jan 28 09:28:37 2011 +0100 [interface] Add link to documentation for status variables. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_status.php | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a7d64f..45e274b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -130,6 +130,7 @@ - bug #3141327 [relation] Foreign key input options - [export] Better handling of export to PHP array. - rfe #3158867 [privileges] No DROP DATABASE warning if you delete a user +- [interface] Add link to documentation for status variables. 3.3.10.0 (not yet released) - patch #3147400 [structure] Aria table size printed as unknown, diff --git a/server_status.php b/server_status.php index bd5dafc..a797446 100644 --- a/server_status.php +++ b/server_status.php @@ -41,7 +41,7 @@ require_once './libraries/replication_gui.lib.php'; require_once './libraries/chart.lib.php'; /** - * Messages are built using the message name + * Messages are built using the message name */ $strShowStatusBinlog_cache_disk_useDescr = __('The number of transactions that used the temporary binary log cache but that exceeded the value of binlog_cache_size and used a temporary file to store statements from the transaction.'); $strShowStatusBinlog_cache_useDescr = __('The number of transactions that used the temporary binary log cache.'); @@ -789,7 +789,8 @@ if (! empty($section['title'])) { $odd_row = !$odd_row; ?> <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>"> - <th class="name"><?php echo htmlspecialchars($name); ?></th> + <th class="name"><?php echo htmlspecialchars($name) . PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name); ?> + </th> <td class="value"><?php if (isset($alerts[$name])) { if ($value > $alerts[$name]) { hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1468-g5b900ea

by Marc Delisle

The branch, master has been updated via 5b900ead54f457e75398ba22910b58663e922aac (commit) from 916126d0347901cd2a99f02c166bc10bf6b559e9 (commit) - Log ----------------------------------------------------------------- commit 5b900ead54f457e75398ba22910b58663e922aac Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jan 27 13:08:33 2011 -0500 Conditional Ajax on table Structure ----------------------------------------------------------------------- Summary of changes: js/tbl_structure.js | 3 +++ libraries/Index.class.php | 6 +++++- tbl_structure.php | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 40397c1..6a7c773 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -24,6 +24,7 @@ $(document).ready(function() { * * @uses $.PMA_confirm() * @uses PMA_ajaxShowMessage() + * (see $GLOBALS['cfg']['AjaxEnable']) */ $(".drop_column_anchor").live('click', function(event) { event.preventDefault(); @@ -66,6 +67,7 @@ $(document).ready(function() { * * @uses $.PMA_confirm() * @uses PMA_ajaxShowMessage() + * (see $GLOBALS['cfg']['AjaxEnable']) */ $(".action_primary a").live('click', function(event) { event.preventDefault(); @@ -107,6 +109,7 @@ $(document).ready(function() { * * @uses $.PMA_confirm() * @uses PMA_ajaxShowMessage() + * (see $GLOBALS['cfg']['AjaxEnable']) */ $('.drop_primary_key_index_anchor').live('click', function(event) { event.preventDefault(); diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 285f578..53ea62d 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -477,7 +477,11 @@ class PMA_Index } $r .= '<td ' . $row_span . '>' - . ' <a class="drop_primary_key_index_anchor" href="sql.php' . PMA_generate_common_url($this_params) + . ' <a '; + if ($GLOBALS['cfg']['AjaxEnable']) { + $r .= 'class="drop_primary_key_index_anchor" '; + } + $r .= ' href="sql.php' . PMA_generate_common_url($this_params) . '" >' . PMA_getIcon('b_drop.png', __('Drop')) . '</a>' . '</td>' . "\n"; diff --git a/tbl_structure.php b/tbl_structure.php index 17c2e73..66cfb53 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -394,7 +394,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <?php echo $titles['Change']; ?></a> </td> <td align="center" class="drop"> - <a class="drop_column_anchor" href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&dropped_column=<?php echo urlencode($row['Field']); ?>&message_to_show=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>" > + <a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="drop_column_anchor"' : ''); ?> href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&dropped_column=<?php echo urlencode($row['Field']); ?>&message_to_show=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>" > <?php echo $titles['Drop']; ?></a> </td> <td align="center" class="primary"> @@ -476,7 +476,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <?php echo $hidden_titles['BrowseDistinctValues']; ?> </a> </div> - <div class="action_primary"> + <div <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="action_primary"' : ''); ?>> <?php if(isset($primary_enabled)) { if($primary_enabled) { ?> hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1467-g916126d

by Michal Čihař

The branch, master has been updated via 916126d0347901cd2a99f02c166bc10bf6b559e9 (commit) from 6b51fd57adcfe67ac4ad8188458e692d310521e7 (commit) - Log ----------------------------------------------------------------- commit 916126d0347901cd2a99f02c166bc10bf6b559e9 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jan 27 17:43:39 2011 +0100 Fix typo ----------------------------------------------------------------------- Summary of changes: po/cs.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/cs.po b/po/cs.po index fc17d79..a196210 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9609,7 +9609,7 @@ msgstr "Procházet odlišné hodnoty" #: tbl_structure.php:165 tbl_structure.php:166 msgid "Add primary key" -msgstr "Přidávt primární klíč" +msgstr "Přidat primární klíč" #: tbl_structure.php:167 tbl_structure.php:168 msgid "Add index" hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1466-g6b51fd5

by Marc Delisle

The branch, master has been updated via 6b51fd57adcfe67ac4ad8188458e692d310521e7 (commit) from b8b77503d2427b268340af68dad414e13b1dd16d (commit) - Log ----------------------------------------------------------------- commit 6b51fd57adcfe67ac4ad8188458e692d310521e7 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jan 27 06:46:17 2011 -0500 Conditional Ajax on db Search Remove extra wrapping of jQuery object Avoid extra generation of hidden field Add vim modeline ----------------------------------------------------------------------- Summary of changes: db_search.php | 2 +- js/db_search.js | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/db_search.php b/db_search.php index 22415aa..0185879 100644 --- a/db_search.php +++ b/db_search.php @@ -290,7 +290,7 @@ else { */ ?> <a name="db_search"></a> -<form id="db_search_form" method="post" action="db_search.php" name="db_search"> +<form id="db_search_form"<?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> method="post" action="db_search.php" name="db_search"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db']); ?> <fieldset> <legend><?php echo __('Search in database'); ?></legend> diff --git a/js/db_search.js b/js/db_search.js index 93daa1f..ea7280b 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -1,3 +1,4 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @fileoverview JavaScript functions used on Database Search page * @name Database Search @@ -25,18 +26,23 @@ $(document).ready(function() { /** * Ajax Event handler for retrieving the result of an SQL Query + * (see $GLOBALS['cfg']['AjaxEnable']) * * @uses PMA_ajaxShowMessage() */ - $("#db_search_form").live('submit', function(event) { + $("#db_search_form.ajax").live('submit', function(event) { event.preventDefault(); PMA_ajaxShowMessage(PMA_messages['strSearching']); - $(this).append('<input type="hidden" name="ajax_request" value="true">'); + $form = $(this); - $.get($(this).attr('action'), $(this).serialize() + "&submit_search=" + $("#buttonGo").val(), function(data) { + 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() + "&submit_search=" + $("#buttonGo").val(), function(data) { $("#searchresults").html(data); }) // end $.get() }) -}, 'top.frame_content'); // end $(document).ready() \ No newline at end of file +}, 'top.frame_content'); // end $(document).ready() hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1465-gb8b7750

by Madhura Jayaratne

The branch, master has been updated via b8b77503d2427b268340af68dad414e13b1dd16d (commit) from 03b648ff46c207c43ef97cf1df454a6cc1f13fdc (commit) - Log ----------------------------------------------------------------- commit b8b77503d2427b268340af68dad414e13b1dd16d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jan 27 15:33:09 2011 +0530 Bug #3166356 Search result panel duplicates the elements in Chrome ----------------------------------------------------------------------- Summary of changes: js/db_search.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/db_search.js b/js/db_search.js index 3527b62..93daa1f 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -33,7 +33,7 @@ $(document).ready(function() { PMA_ajaxShowMessage(PMA_messages['strSearching']); - $(this).append('<input type="hidden" name="ajax_request" value="true"'); + $(this).append('<input type="hidden" name="ajax_request" value="true">'); $.get($(this).attr('action'), $(this).serialize() + "&submit_search=" + $("#buttonGo").val(), function(data) { $("#searchresults").html(data); hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1464-g03b648f

by Michal Čihař

The branch, master has been updated via 03b648ff46c207c43ef97cf1df454a6cc1f13fdc (commit) via 3d54060945b6ef3968e40f812c1ca7663fb5943b (commit) via 8252f8a4cab2d3ac0857a61af6757023cbb9fdce (commit) via b0d1ba07208c8599bf16bad7ea50062a0e727a4a (commit) from f57daa0a59a0058a4b3be1bbdf1577b59d7d697a (commit) - Log ----------------------------------------------------------------- commit 03b648ff46c207c43ef97cf1df454a6cc1f13fdc Merge: 3d54060945b6ef3968e40f812c1ca7663fb5943b f57daa0a59a0058a4b3be1bbdf1577b59d7d697a Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jan 27 10:02:03 2011 +0100 Merge remote branch 'origin/master' commit 3d54060945b6ef3968e40f812c1ca7663fb5943b Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jan 27 10:01:17 2011 +0100 Generate reload params on place where they are used. This fixes reloading navigation frame when database is selected. commit 8252f8a4cab2d3ac0857a61af6757023cbb9fdce Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jan 27 09:58:39 2011 +0100 Offer switch to designer only if it is available. commit b0d1ba07208c8599bf16bad7ea50062a0e727a4a Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Jan 27 09:55:30 2011 +0100 Better translation. ----------------------------------------------------------------------- Summary of changes: db_qbe.php | 6 +++++- libraries/navigation_header.inc.php | 4 ++++ navigation.php | 4 ---- po/cs.po | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/db_qbe.php b/db_qbe.php index ea95884..95e72d8 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -176,16 +176,20 @@ function showColumnSelectCell($columns, $column_number, $selected = '') if (! empty($tab['fragment'])) { $tab['link'] .= $tab['fragment']; } + if (isset($tab_designer['link'])) { ?> <div id="visual_builder_anchor" class="notice hide"> <span id="footnote_1"> <?php echo __('Switch to'); ?> <form action="<?php echo $tab_designer['link'] ?>" method="post"> - <input type="submit" style="background-color:#FFD; border-width:0; color:#00F; + <input type="submit" style="background-color:#FFD; border-width:0; color:#00F; font-size: 15px;cursor: pointer" name="query" onmouseover="this.style.color='#F00';" value="<?php echo __('visual builder'); ?>" onmouseout="this.style.color='#00F'"/></span> </form> </div> +<?php + } +?> <form action="db_qbe.php" method="post"> <fieldset> <table class="data" style="width: 100%;"> diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index 2b4606e..fa5255a 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -101,6 +101,10 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { echo '</a>'; echo ' ' . PMA_showMySQLDocu('', '', TRUE) . "\n"; + $params = array('uniqid' => uniqid()); + if (!empty($GLOBALS['db'])) { + $params['db'] = $GLOBALS['db']; + } echo '<a href="navigation.php?' . PMA_generate_common_url($params) . '" target="frame_navigation">'; if ($GLOBALS['cfg']['MainPageIconic']) { echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"' diff --git a/navigation.php b/navigation.php index 6f799d6..8c2b65c 100644 --- a/navigation.php +++ b/navigation.php @@ -49,10 +49,6 @@ require_once './libraries/common.inc.php'; */ function PMA_exitNavigationFrame() { - $params = array('uniqid' => uniqid()); - if (!empty($GLOBALS['db'])) { - $params['db'] = $GLOBALS['db']; - } echo '</body></html>'; exit; } diff --git a/po/cs.po b/po/cs.po index 7e12be1..fc17d79 100644 --- a/po/cs.po +++ b/po/cs.po @@ -414,11 +414,11 @@ msgstr "Musíte zvolit alespoň jedno pole, které chcete zobrazit" #: db_qbe.php:182 msgid "Switch to" -msgstr "Přepnou na" +msgstr "Přepnout na" #: db_qbe.php:186 msgid "visual builder" -msgstr "vizuální návrhář" +msgstr "vizuálního návrháře" #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1460-gf57daa0

by Herman van Rink

The branch, master has been updated via f57daa0a59a0058a4b3be1bbdf1577b59d7d697a (commit) from acf2e0a0340bfca162120c08b29f85e763cf08a5 (commit) - Log ----------------------------------------------------------------- commit f57daa0a59a0058a4b3be1bbdf1577b59d7d697a Author: Herman van Rink <rink(a)initfour.nl> Date: Wed Jan 26 11:36:10 2011 +0100 Fix XSS problem, regression in the 3.4 branch. Dev releases until -beta2 are vulnerable. Thanks to Aung Khant from YGN Ethical Hacker Group (http://yehg.net/) for reporting this issue. ----------------------------------------------------------------------- Summary of changes: libraries/header.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 6ce37b8..dee9b15 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -121,7 +121,7 @@ if (!$GLOBALS['is_ajax_request']) { printf($item, $GLOBALS['cfg']['DefaultTabDatabase'], PMA_generate_common_url($GLOBALS['db']), - $GLOBALS['db'], + htmlspecialchars($GLOBALS['db']), __('Database'), 's_tbl.png'); // if the table is being dropped, $_REQUEST['purge'] is set hooks/post-receive -- phpMyAdmin

13 years, 7 months

← Newer
1
2
3
4
5
6
7
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git January 2011