[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_3_7RC1-12-g6969ad6
The branch, TESTING has been updated via 6969ad656d7fa01a8fe55618803648d5ea2ad13b (commit) via c39c407bb5c91fcd6d6f16049f921a3b3d7cd8a5 (commit) via 1b812f2d25189b4903028d7f98793542559b1d14 (commit) via 73ce5705bd1e0b62060f75702d62f88247ce09dd (commit) via 061b87f11f09633fbfe21d8c35f520ca9b80ff60 (commit) via ca18fad776bd845fff3db5d3381434a7384e24d5 (commit) via 4a234050f27806b98d0c8718bf9b8ebcaea9ec38 (commit) via 1052956cc908936cc0f301a9f47bd7a2a1aaaed8 (commit) via 23da6a6e1ababe74c9db0b781cb7c3d65c890814 (commit) via fee00e61aa505a83b097021e3f8e3c6f4dd37b67 (commit) via 8ec1c4a1647546477ebff2745c62fcf2627b89a9 (commit) via d1e9585c9e31b82a57e47c614c4989791117c78a (commit) via b301062beee05de9cbe995047b28add9f16a3d59 (commit) via 45bdf8f522728dba467fb62888fea2fb5f6e8cca (commit) via 362251abbf49df2ea8e489ed7c88827e3a97d414 (commit) via 5920476d442d42186b9f396b2de7ca80e681d33f (commit) via 9036ac09e3b5a835550ef62ebb1e1ba202728710 (commit) from 401d55dc4b563298451428cf2dfb33644e50f953 (commit) - Log ----------------------------------------------------------------- commit 6969ad656d7fa01a8fe55618803648d5ea2ad13b Merge: 401d55dc4b563298451428cf2dfb33644e50f953 c39c407bb5c91fcd6d6f16049f921a3b3d7cd8a5 Author: Marc Delisle <marc@infomarc.info> Date: Tue Aug 31 12:28:24 2010 -0400 Merge branch 'MAINT_3_3_7' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 7 +++++++ Documentation.html | 4 ++-- README | 4 ++-- js/functions.js | 1 + libraries/Config.class.php | 2 +- libraries/Message.class.php | 2 +- libraries/common.lib.php | 3 +++ libraries/sqlparser.data.php | 5 ++--- libraries/sqlparser.lib.php | 10 +++++++++- pdf_pages.php | 9 ++++++++- setup/frames/index.inc.php | 2 +- tbl_change.php | 14 +++++--------- test/PMA_headerLocation_test.php | 11 +++++++---- test/PMA_whichCrlf_test.php | 2 +- translators.html | 4 ++-- 15 files changed, 52 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24cc757..076faab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/C... $ +3.3.7.0 (not yet released) +- patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after + a page size increase, thanks to Martin Schönberger - mad05 +- bug #3054458 [core] Fixed displaying number of rows. +- bug #3035300 [parser] Fixed wrong definition of keywords. +- [setup] Fixed escaping of server name. + 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name - bug #3031705 [core] Fix generating condition for real numbers by comparing diff --git a/Documentation.html b/Documentation.html index 7cacfdb..90dce27 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.6 - Documentation</title> + <title>phpMyAdmin 3.3.7-rc1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.6 + 3.3.7-rc1 Documentation </h1> </div> diff --git a/README b/README index 8810ad1..e5c7dd0 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.6 - ------------- + Version 3.3.7-rc1 + ----------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/js/functions.js b/js/functions.js index 93cee60..697c344 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1385,6 +1385,7 @@ function refreshDragOption(e) { myid = getElement(e); if (myid.style.visibility == 'visible') { refreshLayout(); + TableDragInit(); } } diff --git a/libraries/Config.class.php b/libraries/Config.class.php index afd226c..7cb432d 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.6'); + $this->set('PMA_VERSION', '3.3.7-rc1'); /** * @deprecated */ diff --git a/libraries/Message.class.php b/libraries/Message.class.php index e7947b8..9bf5847 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -666,7 +666,7 @@ class PMA_Message static public function format() { $params = func_get_args(); - if (is_array($params[1])) { + if (isset($params[1]) && is_array($params[1])) { array_unshift($params[1], $params[0]); $params = $params[1]; } diff --git a/libraries/common.lib.php b/libraries/common.lib.php index d5b38cc..610438c 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1080,6 +1080,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice') // Basic url query part $url_params = array(); + if (! isset($GLOBALS['db'])) { + $GLOBALS['db'] = ''; + } if (strlen($GLOBALS['db'])) { $url_params['db'] = $GLOBALS['db']; if (strlen($GLOBALS['table'])) { diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 41bf096..5fb1451 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -211,7 +211,6 @@ $PMA_SQPdata_function_name = array ( 'MOD', 'MONTH', 'MONTHNAME', - 'NOW', 'MPOINTFROMTEXT', // MPointFromText() 'MPOINTFROMWKB', // MPointFromWKB() 'MPOLYFROMTEXT', // MPolyFromText() @@ -339,7 +338,7 @@ $PMA_SQPdata_function_name = array ( * * @global integer MySQL attributes count */ -$PMA_SQPdata_function_name_cnt = 299; +$PMA_SQPdata_function_name_cnt = 298; /* * DEBUG @@ -1047,9 +1046,9 @@ $PMA_SQPdata_forbidden_word = array ( 'RAID_TYPE', 'RANGE', // 5.1 'READ', + 'READS', 'READ_ONLY', // 5.1 'READ_WRITE', // 5.1 - 'READS', 'REAL', 'RECOVER', 'REDUNDANT', diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index f844e23..738d2fb 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2456,7 +2456,15 @@ if (! defined('PMA_MINIMUM_COMMON')) { } $after .= "\n"; */ - $str .= $before . ($mode=='color' ? PMA_SQP_formatHTML_colorize($arr[$i]) : htmlspecialchars($arr[$i]['data'])). $after; + $str .= $before; + if ($mode=='color') { + $str .= PMA_SQP_formatHTML_colorize($arr[$i]); + } elseif ($mode == 'text') { + $str .= htmlspecialchars($arr[$i]['data']); + } else { + $str .= $arr[$i]['data']; + } + $str .= $after; } // end for if ($mode=='color') { $str .= '</span>'; diff --git a/pdf_pages.php b/pdf_pages.php index aff7385..4ec0601 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -326,6 +326,7 @@ $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . $page_rs = PMA_query_as_controluser($page_query, FALSE, $query_default_option); $array_sh_page = array(); $draginit = ''; +$draginit2 = ''; $reset_draginit = ''; $i = 0; while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) { @@ -349,7 +350,7 @@ foreach ($array_sh_page AS $key => $temp_sh_page) { $drag_x = $temp_sh_page['x']; $drag_y = $temp_sh_page['y']; - $draginit .= ' Drag.init(getElement("table_' . $i . '"), null, 0, parseInt(myid.style.width)-2, 0, parseInt(myid.style.height)-5);' . "\n"; + $draginit2 .= ' Drag.init(getElement("table_' . $i . '"), null, 0, parseInt(myid.style.width)-2, 0, parseInt(myid.style.height)-5);' . "\n"; $draginit .= ' getElement("table_' . $i . '").onDrag = function (x, y) { document.edcoord.elements["c_table_' . $i . '[x]"].value = parseInt(x); document.edcoord.elements["c_table_' . $i . '[y]"].value = parseInt(y) }' . "\n"; $draginit .= ' getElement("table_' . $i . '").style.left = "' . $drag_x . 'px";' . "\n"; $draginit .= ' getElement("table_' . $i . '").style.top = "' . $drag_y . 'px";' . "\n"; @@ -385,6 +386,12 @@ function init() { refreshLayout(); myid = getElement('pdflayout'); <?php echo $draginit; ?> + TableDragInit(); +} + +function TableDragInit() { + myid = getElement('pdflayout'); + <?php echo $draginit2; ?> } function resetDrag() { diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 1c93aee..fb37b90 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -126,7 +126,7 @@ display_form_top('index.php', 'get', array( <?php foreach ($_SESSION['ConfigFile']['Servers'] as $id => $server): ?> <tr> <td><?php echo $id ?></td> - <td><?php echo $cf->getServerName($id) ?></td> + <td><?php echo htmlspecialchars($cf->getServerName($id)) ?></td> <td><?php echo htmlspecialchars($cf->getValue("Servers/$id/auth_type")) ?></td> <td><?php echo htmlspecialchars($cf->getServerDSN($id)) ?></td> <td style="white-space: nowrap"> diff --git a/tbl_change.php b/tbl_change.php index 9731974..aa1a74f 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -180,7 +180,7 @@ if (isset($where_clause)) { } else { // end if (no row returned) $meta = PMA_DBI_get_fields_meta($result[$key_id]); list($unique_condition, $tmp_clause_is_unique) = PMA_getUniqueCondition($result[$key_id], count($meta), $meta, $rows[$key_id], true); - if (! empty($unique_condition)) { + if (! empty($unique_condition)) { $found_unique_key = true; } unset($unique_condition, $tmp_clause_is_unique); @@ -429,11 +429,7 @@ foreach ($rows as $row_id => $vrow) { $real_null_value = FALSE; $special_chars_encoded = ''; if (isset($vrow)) { - // (we are editing) - // On a BLOB that can have a NULL value, the is_null() returns - // true if it has no content but for me this is different than - // having been set explicitely to NULL so I put an exception here - if (! $field['is_blob'] && is_null($vrow[$field['Field']])) { + if (is_null($vrow[$field['Field']])) { $real_null_value = TRUE; $vrow[$field['Field']] = ''; $special_chars = ''; @@ -548,12 +544,12 @@ foreach ($rows as $row_id => $vrow) { ) { $default_function = $cfg['DefaultFunctions']['pk_char36']; } - + // this is set only when appropriate and is always true if (isset($field['display_binary_as_hex'])) { $default_function = 'UNHEX'; } - + // garvin: loop on the dropdown array and print all available options for that field. foreach ($dropdown as $each_dropdown){ echo '<option'; @@ -627,7 +623,7 @@ foreach ($rows as $row_id => $vrow) { // foreign key in a drop-down $onclick .= '4, '; } elseif ($foreigners && isset($foreigners[$field['Field']]) && $foreignData['foreign_link'] == true) { - // foreign key with a browsing icon + // foreign key with a browsing icon $onclick .= '6, '; } else { $onclick .= '5, '; diff --git a/test/PMA_headerLocation_test.php b/test/PMA_headerLocation_test.php index 649d914..5d0a02d 100644 --- a/test/PMA_headerLocation_test.php +++ b/test/PMA_headerLocation_test.php @@ -19,6 +19,7 @@ require_once 'PHPUnit/Extensions/OutputTestCase.php'; require_once './libraries/common.lib.php'; require_once './libraries/url_generating.lib.php'; require_once './libraries/core.lib.php'; +require_once './libraries/select_lang.lib.php'; /** * Test function sending headers. @@ -248,6 +249,8 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase // over 600 chars $testUri = 'http://testurl.com/test.php?testlonguri=over600chars&test=test&test=test&tes...'; + $testUri_html = htmlspecialchars($testUri); + $testUri_js = PMA_escapeJsString($testUri); $GLOBALS['strGo'] = 'test link'; @@ -255,17 +258,17 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase "<meta http-equiv=\"expires\" content=\"0\">\n" . "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n" . "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n" . - "<meta http-equiv=\"Refresh\" content=\"0;url=" . $testUri . "\">\n" . + "<meta http-equiv=\"Refresh\" content=\"0;url=" . $testUri_html . "\">\n" . "<script type=\"text/javascript\">\n". "//<![CDATA[\n" . - "setTimeout(\"window.location = unescape('\"" . $testUri . "\"')\", 2000);\n" . + "setTimeout(\"window.location = unescape('\"" . $testUri_js . "\"')\", 2000);\n" . "//]]>\n" . "</script>\n" . "</head>\n" . "<body>\n" . "<script type=\"text/javascript\">\n" . "//<![CDATA[\n" . - "document.write('<p><a href=\"" . $testUri . "\">" . $GLOBALS['strGo'] . "</a></p>');\n" . + "document.write('<p><a href=\"" . $testUri_html . "\">" . $GLOBALS['strGo'] . "</a></p>');\n" . "//]]>\n" . "</script></body></html>\n"; @@ -284,7 +287,7 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase $GLOBALS['reload'] = true; $GLOBALS['db'] = 'test_db'; - $url = './navigation.php?db='.$GLOBALS['db']; + $url = './navigation.php?db='.$GLOBALS['db'] . '&lang=en-utf-8&convcharset=utf-8'; $write = PHP_EOL . '<script type="text/javascript">' . PHP_EOL . '//<
Marc Delisle