Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2012-02-15 16:17:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2011-12-21 10:03:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2012-02-15 16:17:36.000000000 +0100 @@ -1,0 +2,22 @@ +Wed Dec 28 13:41:55 UTC 2011 - [email protected] + +- update to 3.4.9 + - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown + - bug #3442004 [interface] DB suggestion not correct for user with underscore + - bug #3438420 [core] Magic quotes removed in PHP 5.4 + - bug #3398788 [session] No feedback when result is empty (signon auth_type) + - bug #3384035 [display] Problems regarding ShowTooltipAliasTB + - bug #3306875 [edit] Can't rename a database that contains views + - bug #3452506 [edit] Unable to move tables with triggers + - bug #3449659 [navi] Fast filter broken with table tree + - bug #3448485 [GUI] Firefox favicon frameset regression + - [core] Better compatibility with mysql extension + - [security] Self-XSS on export options (export server/database/table), + see PMASA-2011-20 + - [security] Self-XSS in setup (host parameter), see PMASA-2011-19 +- fix for bnc#738411 + * PMASA-2011-19 (CVE-2011-4780) + * PMASA-2011-20 (CVE-2011-4782) +- rework config patch + +------------------------------------------------------------------- Old: ---- phpMyAdmin-3.4.1-config.patch phpMyAdmin-3.4.8-all-languages.tar.bz2 New: ---- phpMyAdmin-3.4.9-all-languages.tar.bz2 phpMyAdmin-3.4.9-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.47UFOM/_old 2012-02-15 16:17:38.000000000 +0100 +++ /var/tmp/diff_new_pack.47UFOM/_new 2012-02-15 16:17:38.000000000 +0100 @@ -35,12 +35,12 @@ Summary: Administration of MySQL over the web License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends -Version: 3.4.8 +Version: 3.4.9 Release: 0 Url: http://www.phpMyAdmin.net Source0: %{name}-%{version}-all-languages.tar.bz2 Source1: %{name}.http -Patch0: %{name}-3.4.1-config.patch +Patch0: %{name}-3.4.9-config.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwgen coreutils sed grep @@ -97,7 +97,7 @@ %prep %setup -q -n %{name}-%{version}-all-languages -%patch0 -p1 +%patch0 find . -type d -exec chmod 755 {} \; find . -type f -exec chmod 644 {} \; ++++++ phpMyAdmin-3.4.8-all-languages.tar.bz2 -> phpMyAdmin-3.4.9-all-languages.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/ChangeLog new/phpMyAdmin-3.4.9-all-languages/ChangeLog --- old/phpMyAdmin-3.4.8-all-languages/ChangeLog 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/ChangeLog 2011-12-21 21:07:53.000000000 +0100 @@ -1,6 +1,20 @@ phpMyAdmin - ChangeLog ====================== +3.4.9.0 (2011-12-21) +- bug #3442028 [edit] Inline editing enum fields with null shows no dropdown +- bug #3442004 [interface] DB suggestion not correct for user with underscore +- bug #3438420 [core] Magic quotes removed in PHP 5.4 +- bug #3398788 [session] No feedback when result is empty (signon auth_type) +- bug #3384035 [display] Problems regarding ShowTooltipAliasTB +- bug #3306875 [edit] Can't rename a database that contains views +- bug #3452506 [edit] Unable to move tables with triggers +- bug #3449659 [navi] Fast filter broken with table tree +- bug #3448485 [GUI] Firefox favicon frameset regression +- [core] Better compatibility with mysql extension +- [security] Self-XSS on export options (export server/database/table), see PMASA-2011-20 +- [security] Self-XSS in setup (host parameter), see PMASA-2011-19 + 3.4.8.0 (2011-12-01) - bug #3425230 [interface] enum data split at space char (more space to edit) - bug #3426840 [interface] ENUM/SET editor can't handle commas in values diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/Documentation.html new/phpMyAdmin-3.4.9-all-languages/Documentation.html --- old/phpMyAdmin-3.4.8-all-languages/Documentation.html 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/Documentation.html 2011-12-21 21:07:53.000000000 +0100 @@ -9,7 +9,7 @@ <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.4.8 - Documentation</title> + <title>phpMyAdmin 3.4.9 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/";>php<span class="myadmin">MyAdmin</span></a> - 3.4.8 + 3.4.9 Documentation </h1> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/Documentation.txt new/phpMyAdmin-3.4.9-all-languages/Documentation.txt --- old/phpMyAdmin-3.4.8-all-languages/Documentation.txt 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/Documentation.txt 2011-12-21 21:07:53.000000000 +0100 @@ -1,4 +1,4 @@ -phpMyAdmin 3.4.8 Documentation +phpMyAdmin 3.4.9 Documentation * Top * Requirements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/README new/phpMyAdmin-3.4.9-all-languages/README --- old/phpMyAdmin-3.4.8-all-languages/README 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/README 2011-12-21 21:07:53.000000000 +0100 @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.8 +Version 3.4.9 A set of PHP-scripts to manage MySQL over the web. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/RELEASE-DATE-3.4.8 new/phpMyAdmin-3.4.9-all-languages/RELEASE-DATE-3.4.8 --- old/phpMyAdmin-3.4.8-all-languages/RELEASE-DATE-3.4.8 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/RELEASE-DATE-3.4.8 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Thu Dec 1 17:19:47 UTC 2011 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/RELEASE-DATE-3.4.9 new/phpMyAdmin-3.4.9-all-languages/RELEASE-DATE-3.4.9 --- old/phpMyAdmin-3.4.8-all-languages/RELEASE-DATE-3.4.9 1970-01-01 01:00:00.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/RELEASE-DATE-3.4.9 2011-12-21 21:07:53.000000000 +0100 @@ -0,0 +1 @@ +Wed Dec 21 20:06:46 UTC 2011 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/config.sample.inc.php new/phpMyAdmin-3.4.9-all-languages/config.sample.inc.php --- old/phpMyAdmin-3.4.8-all-languages/config.sample.inc.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/config.sample.inc.php 2011-12-21 21:07:53.000000000 +0100 @@ -31,8 +31,8 @@ $cfg['Servers'][$i]['host'] = 'localhost'; $cfg['Servers'][$i]['connect_type'] = 'tcp'; $cfg['Servers'][$i]['compress'] = false; -/* Select mysqli if your server has it */ -$cfg['Servers'][$i]['extension'] = 'mysql'; +/* Select mysql if your server does not have mysqli */ +$cfg['Servers'][$i]['extension'] = 'mysqli'; $cfg['Servers'][$i]['AllowNoPassword'] = false; /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/db_operations.php new/phpMyAdmin-3.4.9-all-languages/db_operations.php --- old/phpMyAdmin-3.4.8-all-languages/db_operations.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/db_operations.php 2011-12-21 21:07:53.000000000 +0100 @@ -124,7 +124,6 @@ } unset($sql_constraints, $sql_drop_foreign_keys, $sql_structure); - foreach ($tables_full as $each_table => $tmp) { // to be able to rename a db containing views, // first all the views are collected and a stand-in is created @@ -133,11 +132,17 @@ $views[] = $each_table; // Create stand-in definition to resolve view dependencies $sql_view_standin = PMA_getTableDefStandIn($db, $each_table, "\n"); + PMA_DBI_select_db($newname); PMA_DBI_query($sql_view_standin); $GLOBALS['sql_query'] .= "\n" . $sql_view_standin . ';'; - continue; } + } + foreach ($tables_full as $each_table => $tmp) { + // skip the views; we have creted stand-in definitions + if (PMA_Table::isView($db, $each_table)) { + continue; + } $back = $sql_query; $sql_query = ''; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/js/navigation.js new/phpMyAdmin-3.4.9-all-languages/js/navigation.js --- old/phpMyAdmin-3.4.8-all-languages/js/navigation.js 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/js/navigation.js 2011-12-21 21:07:53.000000000 +0100 @@ -3,5 +3,5 @@ function PMA_saveFrameSize(){if(typeof pma_saveframesize_timeout=="number"){window.clearTimeout(pma_saveframesize_timeout);pma_saveframesize_timeout=null}pma_saveframesize_timeout=window.setTimeout(PMA_saveFrameSizeReal,2E3)} function PMA_setFrameSize(){pma_navi_width=PMA_getCookie("pma_navi_width");if(pma_navi_width!=null&&parent.document!=document)if(parent.text_dir=="ltr")parent.document.getElementById("mainFrameset").cols=pma_navi_width+",*";else parent.document.getElementById("mainFrameset").cols="*,"+pma_navi_width} function PMA_getCookie(a){var d=document.cookie.indexOf(a+"="),b=d+a.length+1;if(!d&&a!=document.cookie.substring(0,a.length))return null;if(d==-1)return null;a=document.cookie.indexOf(";",b);if(a==-1)a=document.cookie.length;return unescape(document.cookie.substring(b,a))}function PMA_setCookie(a,d,b,c,e,f){document.cookie=a+"="+escape(d)+(b?";expires="+b.toGMTString():"")+(c?";path="+c:"")+(e?";domain="+e:"")+(f?";secure":"")} -function fast_filter(a){lowercase_value=a.toLowerCase();$("#subel0 a[class!='tableicon']").each(function(d,b){$elem=$(b);a&&$elem.html().toLowerCase().indexOf(lowercase_value)==-1?$elem.parent().hide():$elem.parent().show()})}function clear_fast_filter(){var a=$("#NavFilter input");a.val("");fast_filter("");a.focus()} +function fast_filter(a){lowercase_value=a.toLowerCase();$("#subel0 a[class!='tableicon']").each(function(d,b){$elem=$(b);a&&$elem.html().toLowerCase().indexOf(lowercase_value)==-1?$elem.parent().hide():$elem.parents("li").show()})}function clear_fast_filter(){var a=$("#NavFilter input");a.val("");fast_filter("");a.focus()} $(document).ready(function(){$("#NavFilter").css("display","inline");$('input[id="fast_filter"]').focus(function(){$(this).attr("value")==="filter tables by name"&&clear_fast_filter()});$("#clear_fast_filter").click(clear_fast_filter);$("#fast_filter").focus(function(a){a.target.select()});$("#fast_filter").keyup(function(a){fast_filter(a.target.value)})}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/js/update-location.js new/phpMyAdmin-3.4.9-all-languages/js/update-location.js --- old/phpMyAdmin-3.4.8-all-languages/js/update-location.js 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/js/update-location.js 2011-12-21 21:07:53.000000000 +0100 @@ -1,2 +1,2 @@ -var hash_to_set="",hash_init_done=0;function setURLHash(a){if(!jQuery.browser.webkit)if(window.parent!=window&&window.parent.setURLHash)window.parent.setURLHash(a);else{var b=window.location.pathname;if(b.substring(b.length-9,b.length)=="index.php")if(hash_init_done)window.location.hash="PMAURL:"+a;else hash_to_set="PMAURL:"+a}} -$(document).ready(function(){if(!(window.parent!=window&&window.parent.setURLHash))if(window.location.hash.substring(0,8)=="#PMAURL:")window.location="index.php?"+window.location.hash.substring(8);else{if(hash_to_set!=""){window.location.hash=hash_to_set;hash_to_set=""}hash_init_done=1}}); +var hash_to_set="",hash_init_done=0;function setURLHash(a){if(!jQuery.browser.webkit)if(window.parent!=window&&window.parent.setURLHash)window.parent.setURLHash(a);else{var b=window.location.pathname;if(b.substring(b.length-9,b.length)=="index.php")if(hash_init_done){window.location.hash="PMAURL:"+a;fix_favicon()}else hash_to_set="PMAURL:"+a}}function fix_favicon(){jQuery.browser.mozilla&&$("head > link[href=\\.\\/favicon\\.ico]").appendTo("head")} +$(document).ready(function(){if(!(window.parent!=window&&window.parent.setURLHash))if(window.location.hash.substring(0,8)=="#PMAURL:")window.location="index.php?"+window.location.hash.substring(8);else{if(hash_to_set!=""){window.location.hash=hash_to_set;hash_to_set="";fix_favicon()}hash_init_done=1}}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/Config.class.php new/phpMyAdmin-3.4.9-all-languages/libraries/Config.class.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/Config.class.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/Config.class.php 2011-12-21 21:07:53.000000000 +0100 @@ -96,7 +96,7 @@ */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.8'); + $this->set('PMA_VERSION', '3.4.9'); /** * @deprecated */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/Table.class.php new/phpMyAdmin-3.4.9-all-languages/libraries/Table.class.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/Table.class.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/Table.class.php 2011-12-21 21:07:53.000000000 +0100 @@ -1033,6 +1033,17 @@ return false; } + // If the table is moved to a different database drop its triggers first + $triggers = PMA_DBI_get_triggers($this->getDbName(), $this->getName(), ''); + $handle_triggers = $this->getDbName() != $new_db && $triggers; + if ($handle_triggers) { + foreach ($triggers as $trigger) { + $sql = 'DROP TRIGGER IF EXISTS ' . PMA_backquote($this->getDbName()) . '.' + . PMA_backquote($trigger['name']) . ';'; + PMA_DBI_query($sql); + } + } + /* * tested also for a view, in MySQL 5.0.92, 5.1.55 and 5.5.13 */ @@ -1041,6 +1052,13 @@ TO ' . $new_table->getFullName(true) . ';'; // I don't think a specific error message for views is necessary if (! PMA_DBI_query($GLOBALS['sql_query'])) { + // Restore triggers in the old database + if ($handle_triggers) { + PMA_DBI_select_db($this->getDbName()); + foreach ($triggers as $trigger) { + PMA_DBI_query($trigger['create']); + } + } $this->errors[] = sprintf(__('Error renaming table %1$s to %2$s'), $this->getFullName(), $new_table->getFullName()); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/check_user_privileges.lib.php new/phpMyAdmin-3.4.9-all-languages/libraries/check_user_privileges.lib.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/check_user_privileges.lib.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/check_user_privileges.lib.php 2011-12-21 21:07:53.000000000 +0100 @@ -128,8 +128,11 @@ && substr(PMA_DBI_getError(), 1, 4) != 1044) ) { if ($GLOBALS['cfg']['SuggestDBName']) { - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '_/', '\\1?', $show_grants_dbname); - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1...', $GLOBALS['db_to_create']); + /** + * Do not handle the underscore wildcard + * (this case must be rare anyway) + */ + $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1...', $show_grants_dbname); $GLOBALS['db_to_create'] = preg_replace('/' . $re1 . '(%|_)/', '\\1\\3', $GLOBALS['db_to_create']); } $GLOBALS['is_create_db_priv'] = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/common.inc.php new/phpMyAdmin-3.4.9-all-languages/libraries/common.inc.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/common.inc.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/common.inc.php 2011-12-21 21:07:53.000000000 +0100 @@ -69,11 +69,15 @@ } /** - * Avoid problems with magic_quotes_runtime - * (in the future, this setting will be removed but it's not yet - * known in which PHP version) + * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. */ -@ini_set('magic_quotes_runtime', false); +if (version_compare(phpversion(), '5.4', 'lt')) { + /** + * Avoid problems with magic_quotes_runtime + */ + @ini_set('magic_quotes_runtime', false); +} /** * for verification in all procedural scripts under libraries @@ -253,12 +257,18 @@ } // end check if a subform is submitted -// remove quotes added by php -if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { - PMA_arrayWalkRecursive($_GET, 'stripslashes', true); - PMA_arrayWalkRecursive($_POST, 'stripslashes', true); - PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); - PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true); +/** + * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. + */ +if (version_compare(phpversion(), '5.4', 'lt')) { + // remove quotes added by PHP + if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { + PMA_arrayWalkRecursive($_GET, 'stripslashes', true); + PMA_arrayWalkRecursive($_POST, 'stripslashes', true); + PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); + PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true); + } } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/common.lib.php new/phpMyAdmin-3.4.9-all-languages/libraries/common.lib.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/common.lib.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/common.lib.php 2011-12-21 21:07:53.000000000 +0100 @@ -811,8 +811,8 @@ if ($GLOBALS['cfg']['ShowTooltipAliasTB'] && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') { // switch tooltip and name - $table['Comment'] = $table['Name']; $table['disp_name'] = $table['Comment']; + $table['Comment'] = $table['Name']; } else { $table['disp_name'] = $table['Name']; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/config/ConfigFile.class.php new/phpMyAdmin-3.4.9-all-languages/libraries/config/ConfigFile.class.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/config/ConfigFile.class.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/config/ConfigFile.class.php 2011-12-21 21:07:53.000000000 +0100 @@ -425,7 +425,7 @@ return htmlspecialchars($verbose); } $host = $this->get("Servers/$id/host"); - return empty($host) ? 'localhost' : $host; + return empty($host) ? 'localhost' : htmlspecialchars($host); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/db_info.inc.php new/phpMyAdmin-3.4.9-all-languages/libraries/db_info.inc.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/db_info.inc.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/db_info.inc.php 2011-12-21 21:07:53.000000000 +0100 @@ -87,7 +87,7 @@ } if ($GLOBALS['cfg']['ShowTooltipAliasTB'] - && $GLOBALS['cfg']['ShowTooltipAliasTB'] != 'nested') { + && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') { $tooltip_truename[$table['Name']] = $table['Comment']; $tooltip_aliasname[$table['Name']] = $table['Name']; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/dbi/mysql.dbi.lib.php new/phpMyAdmin-3.4.9-all-languages/libraries/dbi/mysql.dbi.lib.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/dbi/mysql.dbi.lib.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/dbi/mysql.dbi.lib.php 2011-12-21 21:07:53.000000000 +0100 @@ -175,8 +175,8 @@ $r = mysql_query($query, $link); } - if ($cache_affected_rows) { - $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + if ($cache_affected_rows) { + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); } if ($GLOBALS['cfg']['DBG']['sql']) { @@ -406,7 +406,7 @@ * @uses $GLOBALS['userlink'] * @uses mysql_affected_rows() * @param object mysql $link the mysql object - * @param boolean $get_from_cache + * @param boolean $get_from_cache * @return string integer */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) @@ -427,14 +427,18 @@ } /** - * @todo add missing keys like in from mysqli_query (orgname, orgtable, flags, decimals) + * @todo add missing keys like in from mysqli_query (decimals) */ function PMA_DBI_get_fields_meta($result) { $fields = array(); $num_fields = mysql_num_fields($result); for ($i = 0; $i < $num_fields; $i++) { - $fields[] = mysql_fetch_field($result, $i); + $field = mysql_fetch_field($result, $i); + $field->flags = mysql_field_flags($result, $i); + $field->orgtable = mysql_field_table($result, $i); + $field->orgname = mysql_field_name($result, $i); + $fields[] = $field; } return $fields; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/display_export.lib.php new/phpMyAdmin-3.4.9-all-languages/libraries/display_export.lib.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/display_export.lib.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/display_export.lib.php 2011-12-21 21:07:53.000000000 +0100 @@ -150,10 +150,10 @@ echo '<label for ="radio_allrows_0">' . __('Dump some row(s)') . '</label>'; ?> <ul> <li><label for="limit_to"><?php echo __('Number of rows:') . '</label> <input type="text" id="limit_to" name="limit_to" size="5" value="' - . ((isset($_GET['limit_to'])) ? $_GET['limit_to'] : ((isset($unlim_num_rows) ? $unlim_num_rows : PMA_Table::countRecords($db, $table)))) + . ((isset($_GET['limit_to'])) ? htmlspecialchars($_GET['limit_to']) : ((isset($unlim_num_rows) ? $unlim_num_rows : PMA_Table::countRecords($db, $table)))) . '" onfocus="this.select()" />' ?></li> <li><label for="limit_from"><?php echo __('Row to begin at:') . '</label> <input type="text" id="limit_from" name="limit_from" value="' - . ((isset($_GET['limit_from'])) ? $_GET['limit_from'] : '0') + . ((isset($_GET['limit_from'])) ? htmlspecialchars($_GET['limit_from']) : '0') . '" size="5" onfocus="this.select()" />'; ?></li> </ul> </li> @@ -242,7 +242,7 @@ <?php echo ' value="'; if(isset($_GET['filename_template'])) { - echo $_GET['filename_template']; + echo htmlspecialchars($_GET['filename_template']); } else { if ($export_type == 'database') { echo htmlspecialchars($GLOBALS['PMA_Config']->getUserValue( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/display_tbl.lib.php new/phpMyAdmin-3.4.9-all-languages/libraries/display_tbl.lib.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/display_tbl.lib.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/display_tbl.lib.php 2011-12-21 21:07:53.000000000 +0100 @@ -996,14 +996,16 @@ /** * Prepares the display for a null value * - * @param string $class - * @param string $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 */ -function PMA_buildNullDisplay($class, $condition_field) { +function PMA_buildNullDisplay($class, $condition_field, $meta, $align = '') { // the null class is needed for inline editing - return '<td align="right"' . ' class="' . $class . ($condition_field ? ' condition' : '') . ' null"><i>NULL</i></td>'; + return '<td ' . $align . ' class="' . PMA_addClass($class, $condition_field, $meta, '') . ' null"><i>NULL</i></td>'; } /** @@ -1359,7 +1361,7 @@ // so use the $pointer if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta, 'align="right"'); } elseif ($row[$i] != '') { $nowrap = ' nowrap'; @@ -1382,7 +1384,7 @@ if (stristr($field_flags, 'BINARY')) { if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } else { // for blobstreaming // if valid BS reference exists @@ -1398,7 +1400,7 @@ // not binary: } else { if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // if a transform function for blob is set, none of these replacements will be made if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P') { @@ -1426,7 +1428,7 @@ // n o t n u m e r i c a n d n o t B L O B } else { if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // support blanks in the key $relation_id = $row[$i]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/language_stats.inc.php new/phpMyAdmin-3.4.9-all-languages/libraries/language_stats.inc.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/language_stats.inc.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/language_stats.inc.php 2011-12-21 21:07:53.000000000 +0100 @@ -30,7 +30,7 @@ 'hi' => 77, 'hr' => 48, 'hu' => 83, - 'id' => 48, + 'id' => 73, 'it' => 99, 'ja' => 99, 'ka' => 64, @@ -43,9 +43,9 @@ 'ms' => 18, 'nb' => 88, 'nl' => 99, - 'pl' => 82, - 'pt_BR' => 67, - 'pt' => 31, + 'pl' => 83, + 'pt_BR' => 70, + 'pt' => 37, 'ro' => 52, 'ru' => 99, 'si' => 74, @@ -61,7 +61,7 @@ 'tr' => 99, 'tt' => 35, 'ug' => 22, - 'uk' => 35, + 'uk' => 44, 'ur' => 38, 'uz@latin' => 72, 'uz' => 72, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/session.inc.php new/phpMyAdmin-3.4.9-all-languages/libraries/session.inc.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/session.inc.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/session.inc.php 2011-12-21 21:07:53.000000000 +0100 @@ -44,7 +44,8 @@ // but not all user allow cookies @ini_set('session.use_only_cookies', false); -@ini_set('session.use_trans_sid', true); +// do not force transparent session ids, see bug #3398788 +//@ini_set('session.use_trans_sid', true); @ini_set('url_rewriter.tags', 'a=href,frame=src,input=src,form=fakeentry,fieldset='); //ini_set('arg_separator.output', '&'); Files old/phpMyAdmin-3.4.8-all-languages/locale/ar/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/ar/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/be/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/be/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/be@latin/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/be@latin/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/bg/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/bg/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/bn/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/bn/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/ca/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/ca/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/cs/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/cs/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/da/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/da/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/de/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/de/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/el/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/el/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/en_GB/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/en_GB/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/es/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/es/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/et/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/et/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/fi/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/fi/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/fr/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/fr/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/gl/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/gl/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/hi/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/hi/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/hr/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/hr/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/hu/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/hu/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/id/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/id/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/it/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/it/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/ja/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/ja/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/ka/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/ka/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/lt/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/lt/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/mn/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/mn/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/nb/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/nb/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/nl/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/nl/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/pl/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/pl/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/ro/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/ro/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/ru/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/ru/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/si/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/si/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/sk/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/sk/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/sl/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/sl/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/sr/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/sr/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/sr@latin/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/sr@latin/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/sv/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/sv/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/tr/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/tr/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/uk/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/uk/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/uz/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/uz/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/uz@latin/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/uz@latin/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo differ ++++++ phpMyAdmin-3.4.1-config.patch -> phpMyAdmin-3.4.9-config.patch ++++++ --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin-3.4.1-config.patch 2011-10-27 11:23:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin-3.4.9-config.patch 2012-02-15 16:17:36.000000000 +0100 @@ -1,6 +1,7 @@ -diff -ruN phpMyAdmin-3.4.1-all-languages-orig/config.sample.inc.php phpMyAdmin-3.4.1-all-languages/config.sample.inc.php ---- phpMyAdmin-3.4.1-all-languages-orig/config.sample.inc.php 2011-05-20 19:24:04.000000000 +0200 -+++ phpMyAdmin-3.4.1-all-languages/config.sample.inc.php 2011-05-24 18:21:28.000000000 +0200 +Index: config.sample.inc.php +=================================================================== +--- config.sample.inc.php.orig 2011-12-21 21:07:53.000000000 +0100 ++++ config.sample.inc.php 2011-12-28 14:33:11.000000000 +0100 @@ -10,55 +10,223 @@ * @package phpMyAdmin */ @@ -67,8 +68,8 @@ -$cfg['Servers'][$i]['host'] = 'localhost'; -$cfg['Servers'][$i]['connect_type'] = 'tcp'; -$cfg['Servers'][$i]['compress'] = false; --/* Select mysqli if your server has it */ --$cfg['Servers'][$i]['extension'] = 'mysql'; +-/* Select mysql if your server does not have mysqli */ +-$cfg['Servers'][$i]['extension'] = 'mysqli'; -$cfg['Servers'][$i]['AllowNoPassword'] = false; +// MySQL hostname or IP address +$cfg['Servers'][$i]['host'] = 'localhost'; @@ -256,9 +257,10 @@ * End of servers configuration */ -diff -ruN phpMyAdmin-3.4.1-all-languages-orig/libraries/vendor_config.php phpMyAdmin-3.4.1-all-languages/libraries/vendor_config.php ---- phpMyAdmin-3.4.1-all-languages-orig/libraries/vendor_config.php 2011-05-20 19:24:04.000000000 +0200 -+++ phpMyAdmin-3.4.1-all-languages/libraries/vendor_config.php 2011-05-24 17:24:15.000000000 +0200 +Index: libraries/vendor_config.php +=================================================================== +--- libraries/vendor_config.php.orig 2011-12-21 21:07:53.000000000 +0100 ++++ libraries/vendor_config.php 2011-12-28 14:35:48.000000000 +0100 @@ -14,18 +14,18 @@ * Path to changelog file, can be gzip compressed. Useful when you want to * have documentation somewhere else, eg. /usr/share/doc. @@ -281,7 +283,7 @@ /** * Whether setup requires writable directory where config -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ define('CONFIG_DIR', './'); /** * Filename of a configuration file. */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
