Hello community,
here is the log from the commit of package phpMyAdmin for openSUSE:Factory
checked in at Mon Aug 29 10:37:01 CEST 2011.
--------
--- phpMyAdmin/phpMyAdmin.changes 2011-07-29 17:10:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/phpMyAdmin/phpMyAdmin.changes 2011-08-27 19:25:01.000000000 +0200
@@ -1,0 +2,27 @@
+Sat Aug 27 17:17:27 UTC 2011 - chris@computersalat.de
+
+- update to 3.4.4
+ - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed
+ quotes
+ - bug #3323101 [parser] Invalid escape sequence in SQL parser
+ - bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select
+ as Text option
+ - bug #3340151 [export] Working SQL query exports error page
+ - bug #3353649 [interface] "Create an index on X columns" form not validated
+ - bug #3350790 [interface] JS error in Table->Structure->Index->Edit
+ - bug #3353811 [interface] Info message has "error" class
+ - bug #3357837 [interface] TABbing through a NULL field in the inline mode
+ resets NULL
+ - remove version number in /setup
+ - bug #3367993 [usability] Missing "Generate Password" button
+ - bug #3363221 [display] Missing Server Parameter on inline sql query
+ - bug #3367986 [navi] Drop field -> lost active table
+ - remove misleading comment on the "Rename database" interface
+ - bug #3374374 [interface] Fix footnote for inexact count while browsing
+ - bug #3372807 [interface] Fix security warning link in setup
+ - bug #3374347 [display] Backquotes in normal text on import page
+ - bug #3358750 [core] With Suhosin, urls are too long in edit links
+ - [security] Missing sanitization on the table, column and index names leads to
+ XSS vulnerabilities, see PMASA-2011-13
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
phpMyAdmin-3.4.3.2-all-languages.tar.bz2
New:
----
phpMyAdmin-3.4.4-all-languages.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
--- /var/tmp/diff_new_pack.UsT5TW/_old 2011-08-29 10:35:39.000000000 +0200
+++ /var/tmp/diff_new_pack.UsT5TW/_new 2011-08-29 10:35:39.000000000 +0200
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: phpMyAdmin
@@ -34,7 +33,7 @@
%endif
Summary: Administration of MySQL over the web
-Version: 3.4.3.2
+Version: 3.4.4
Release: 1
License: GPLv2+
Group: Productivity/Networking/Web/Frontends
++++++ phpMyAdmin-3.4.3.2-all-languages.tar.bz2 -> phpMyAdmin-3.4.4-all-languages.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/ChangeLog new/phpMyAdmin-3.4.4-all-languages/ChangeLog
--- old/phpMyAdmin-3.4.3.2-all-languages/ChangeLog 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/ChangeLog 2011-08-24 18:45:52.000000000 +0200
@@ -1,6 +1,26 @@
phpMyAdmin - ChangeLog
======================
+3.4.4.0 (2011-08-24)
+- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
+- bug #3323101 [parser] Invalid escape sequence in SQL parser
+- bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option
+- bug #3340151 [export] Working SQL query exports error page
+- bug #3353649 [interface] "Create an index on X columns" form not validated
+- bug #3350790 [interface] JS error in Table->Structure->Index->Edit
+- bug #3353811 [interface] Info message has "error" class
+- bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL
+- remove version number in /setup
+- bug #3367993 [usability] Missing "Generate Password" button
+- bug #3363221 [display] Missing Server Parameter on inline sql query
+- bug #3367986 [navi] Drop field -> lost active table
+- remove misleading comment on the "Rename database" interface
+- bug #3374374 [interface] Fix footnote for inexact count while browsing
+- bug #3372807 [interface] Fix security warning link in setup
+- bug #3374347 [display] Backquotes in normal text on import page
+- bug #3358750 [core] With Suhosin, urls are too long in edit links
+- [security] Missing sanitization on the table, column and index names leads to XSS vulnerabilities, see PMASA-2011-13
+
3.4.3.2 (2011-07-23)
- [security] Fixed XSS vulnerability, see PMASA-2011-9
- [security] Fixed local file inclusion vulnerability, see PMASA-2011-10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/Documentation.html new/phpMyAdmin-3.4.4-all-languages/Documentation.html
--- old/phpMyAdmin-3.4.3.2-all-languages/Documentation.html 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/Documentation.html 2011-08-24 18:45:52.000000000 +0200
@@ -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.3.2 - Documentation</title>
+ <title>phpMyAdmin 3.4.4 - 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.3.2
+ 3.4.4
Documentation
</h1>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/Documentation.txt new/phpMyAdmin-3.4.4-all-languages/Documentation.txt
--- old/phpMyAdmin-3.4.3.2-all-languages/Documentation.txt 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/Documentation.txt 2011-08-24 18:45:52.000000000 +0200
@@ -1,4 +1,4 @@
-phpMyAdmin 3.4.3.2 Documentation
+phpMyAdmin 3.4.4 Documentation
* Top
* Requirements
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/README new/phpMyAdmin-3.4.4-all-languages/README
--- old/phpMyAdmin-3.4.3.2-all-languages/README 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/README 2011-08-24 18:45:52.000000000 +0200
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 3.4.3.2
+Version 3.4.4
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.3.2-all-languages/RELEASE-DATE-3.4.3.2 new/phpMyAdmin-3.4.4-all-languages/RELEASE-DATE-3.4.3.2
--- old/phpMyAdmin-3.4.3.2-all-languages/RELEASE-DATE-3.4.3.2 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/RELEASE-DATE-3.4.3.2 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Sat Jul 23 12:41:41 UTC 2011
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/RELEASE-DATE-3.4.4 new/phpMyAdmin-3.4.4-all-languages/RELEASE-DATE-3.4.4
--- old/phpMyAdmin-3.4.3.2-all-languages/RELEASE-DATE-3.4.4 1970-01-01 01:00:00.000000000 +0100
+++ new/phpMyAdmin-3.4.4-all-languages/RELEASE-DATE-3.4.4 2011-08-24 18:45:52.000000000 +0200
@@ -0,0 +1 @@
+Wed Aug 24 16:44:42 UTC 2011
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/db_operations.php new/phpMyAdmin-3.4.4-all-languages/db_operations.php
--- old/phpMyAdmin-3.4.3.2-all-languages/db_operations.php 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/db_operations.php 2011-08-24 18:45:52.000000000 +0200
@@ -405,17 +405,6 @@
?>
</legend>
<input id="new_db_name" type="text" name="newname" size="30" class="textfield" value="" />
- <?php
- echo '(' . __('Command') . ': ';
- /**
- * @todo (see explanations above in a previous todo)
- */
- //if (PMA_MYSQL_INT_VERSION >= XYYZZ) {
- // echo 'RENAME DATABASE';
- //} else {
- echo 'INSERT INTO ... SELECT';
- //}
- echo ')'; ?>
</fieldset>
<fieldset class="tblFooters">
<input id="rename_db_input" type="submit" value="<?php echo __('Go'); ?>" />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/export.php new/phpMyAdmin-3.4.4-all-languages/export.php
--- old/phpMyAdmin-3.4.3.2-all-languages/export.php 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/export.php 2011-08-24 18:45:52.000000000 +0200
@@ -343,6 +343,7 @@
// (avoid rewriting data containing HTML with anchors and forms;
// this was reported to happen under Plesk)
@ini_set('url_rewriter.tags','');
+ $filename = PMA_sanitize_filename($filename);
header('Content-Type: ' . $mime_type);
header('Expires: ' . gmdate('D, d M Y H:i:s') . ' GMT');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/js/export.js new/phpMyAdmin-3.4.4-all-languages/js/export.js
--- old/phpMyAdmin-3.4.3.2-all-languages/js/export.js 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/js/export.js 2011-08-24 18:45:52.000000000 +0200
@@ -3,7 +3,7 @@
"disabled")}else{$("#checkbox_sql_dates").parent().fadeTo("fast",1);$("#checkbox_sql_dates").removeAttr("disabled");$("#checkbox_sql_relation").parent().fadeTo("fast",1);$("#checkbox_sql_relation").removeAttr("disabled");$("#checkbox_sql_mime").parent().fadeTo("fast",1);$("#checkbox_sql_mime").removeAttr("disabled")}})});
function toggle_structure_data_opts(a){var b="#"+a+"_data",c="#"+a+"_structure";a=$("input[type='radio'][name='"+(a+"_structure_or_data")+"']:checked").attr("value");if(a=="data"){$(b).slideDown("slow");$(c).slideUp("slow")}else{$(c).slideDown("slow");a=="structure"?$(b).slideUp("slow"):$(b).slideDown("slow")}}
$(document).ready(function(){$("input[type='radio'][name='latex_structure_or_data']").change(function(){toggle_structure_data_opts("latex")});$("input[type='radio'][name='odt_structure_or_data']").change(function(){toggle_structure_data_opts("odt")});$("input[type='radio'][name='texytext_structure_or_data']").change(function(){toggle_structure_data_opts("texytext")});$("input[type='radio'][name='htmlword_structure_or_data']").change(function(){toggle_structure_data_opts("htmlword")});$("input[type='radio'][name='sql_structure_or_data']").change(function(){toggle_structure_data_opts("sql")})});
-$(document).ready(function(){$("input[type='radio'][name='output_format']").change(function(){if($("#radio_dump_asfile:checked").length==0){$("#ul_save_asfile > li").fadeTo("fast",0.4);$("#ul_save_asfile > li > input").attr("disabled","disabled");$("#ul_save_asfile > li> select").attr("disabled","disabled")}else{$("#ul_save_asfile > li").fadeTo("fast",1);$("#ul_save_asfile > li > input").removeAttr("disabled");$("#ul_save_asfile > li> select").removeAttr("disabled")}})});
+function toggle_save_to_file(){if($("#radio_dump_asfile:checked").length==0){$("#ul_save_asfile > li").fadeTo("fast",0.4);$("#ul_save_asfile > li > input").attr("disabled","disabled");$("#ul_save_asfile > li> select").attr("disabled","disabled")}else{$("#ul_save_asfile > li").fadeTo("fast",1);$("#ul_save_asfile > li > input").removeAttr("disabled");$("#ul_save_asfile > li> select").removeAttr("disabled")}}$(document).ready(function(){toggle_save_to_file();$("input[type='radio'][name='output_format']").change(function(){toggle_save_to_file()})});
function toggle_sql_include_comments(){$("#checkbox_sql_include_comments").change(function(){if($("#checkbox_sql_include_comments:checked").length==0){$("#ul_include_comments > li").fadeTo("fast",0.4);$("#ul_include_comments > li > input").attr("disabled","disabled")}else if($("#radio_sql_structure_or_data_data:checked").length==1){$("#text_sql_header_comment").parent("li").fadeTo("fast",1);$("#text_sql_header_comment").removeAttr("disabled")}else{$("#ul_include_comments > li").fadeTo("fast",1);$("#ul_include_comments > li > input").removeAttr("disabled")}})}
$(document).ready(function(){$("#checkbox_sql_create_table_statements").change(function(){if($("#checkbox_sql_create_table_statements:checked").length==0){$("#checkbox_sql_if_not_exists").removeAttr("checked");$("#checkbox_sql_auto_increment").removeAttr("checked")}else{$("#checkbox_sql_if_not_exists").attr("checked","checked");$("#checkbox_sql_auto_increment").attr("checked","checked")}})});
$(document).ready(function(){$("#plugins").change(function(){var a=$("#plugins option:selected").attr("value");if($("#force_file_"+a).attr("value")=="true"){$("#radio_view_as_text").attr("disabled","disabled");$("#radio_view_as_text").parent().fadeTo("fast",0.4)}else{$("#radio_view_as_text").removeAttr("disabled");$("#radio_view_as_text").parent().fadeTo("fast",1)}})});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/js/functions.js new/phpMyAdmin-3.4.4-all-languages/js/functions.js
--- old/phpMyAdmin-3.4.3.2-all-languages/js/functions.js 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/js/functions.js 2011-08-24 18:45:52.000000000 +0200
@@ -31,12 +31,12 @@
"x"?1218.9:1729.13;case "RA3":return b=="x"?864.57:1218.9;case "RA4":return b=="x"?609.45:864.57;case "SRA0":return b=="x"?2551.18:3628.35;case "SRA1":return b=="x"?1814.17:2551.18;case "SRA2":return b=="x"?1275.59:1814.17;case "SRA3":return b=="x"?907.09:1275.59;case "SRA4":return b=="x"?637.8:907.09;case "LETTER":return b=="x"?612:792;case "LEGAL":return b=="x"?612:1008;case "EXECUTIVE":return b=="x"?521.86:756;case "FOLIO":return b=="x"?612:936}return 0}
function popupBSMedia(a,b,c,d,e,g){if(e==undefined)e=640;if(g==undefined)g=480;window.open("bs_play_media.php?"+a+"&bs_reference="+b+"&media_type="+c+"&custom_type="+d,"viewBSMedia","width="+e+", height="+g+", resizable=1, scrollbars=1, status=0")}function requestMIMETypeChange(a,b,c,d){if(undefined==d)d="";var e=prompt("Enter custom MIME type",d);e&&e!=d&&changeMIMEType(a,b,c,e)}
function changeMIMEType(a,b,c,d){jQuery.post("bs_change_mime_type.php",{bs_db:a,bs_table:b,bs_reference:c,bs_new_mime_type:d})}
-$(document).ready(function(){$(".inline_edit_sql").live("click",function(){var a=$(this).prev().find("input[name='db']").val(),b=$(this).prev().find("input[name='table']").val(),c=$(this).prev().find("input[name='token']").val(),d=$(this).prev().find("input[name='sql_query']").val(),e=$(this).parent().prev().find(".inner_sql"),g=e.html(),h='<textarea name="sql_query_edit" id="sql_query_edit">'+d+"</textarea>\n";h+='<input type="button" class="btnSave" value="'+PMA_messages.strGo+'">\n';h+='<input type="button" class="btnDiscard" value="'+
-PMA_messages.strCancel+'">\n';e.replaceWith(h);$(".btnSave").each(function(){$(this).click(function(){d=$(this).prev().val();window.location.replace("import.php?db="+encodeURIComponent(a)+"&table="+encodeURIComponent(b)+"&sql_query="+encodeURIComponent(d)+"&show_query=1&token="+c)})});$(".btnDiscard").each(function(){$(this).click(function(){$(this).closest(".sql").html('<span class="syntax"><span class="inner_sql">'+g+"</span></span>")})});return false});$(".sqlbutton").click(function(a){a.target.id==
-"clear"?$("#sqlquery").val(""):insertQuery(a.target.id);return false});$("#export_type").change(function(){if($("#export_type").val()=="svg"){$("#show_grid_opt").attr("disabled","disabled");$("#orientation_opt").attr("disabled","disabled");$("#with_doc").attr("disabled","disabled");$("#show_table_dim_opt").removeAttr("disabled");$("#all_table_same_wide").removeAttr("disabled");$("#paper_opt").removeAttr("disabled","disabled");$("#show_color_opt").removeAttr("disabled","disabled")}else if($("#export_type").val()==
-"dia"){$("#show_grid_opt").attr("disabled","disabled");$("#with_doc").attr("disabled","disabled");$("#show_table_dim_opt").attr("disabled","disabled");$("#all_table_same_wide").attr("disabled","disabled");$("#paper_opt").removeAttr("disabled","disabled");$("#show_color_opt").removeAttr("disabled","disabled");$("#orientation_opt").removeAttr("disabled","disabled")}else if($("#export_type").val()=="eps"){$("#show_grid_opt").attr("disabled","disabled");$("#orientation_opt").removeAttr("disabled");$("#with_doc").attr("disabled",
-"disabled");$("#show_table_dim_opt").attr("disabled","disabled");$("#all_table_same_wide").attr("disabled","disabled");$("#paper_opt").attr("disabled","disabled");$("#show_color_opt").attr("disabled","disabled")}else if($("#export_type").val()=="pdf"){$("#show_grid_opt").removeAttr("disabled");$("#orientation_opt").removeAttr("disabled");$("#with_doc").removeAttr("disabled","disabled");$("#show_table_dim_opt").removeAttr("disabled","disabled");$("#all_table_same_wide").removeAttr("disabled","disabled");
-$("#paper_opt").removeAttr("disabled","disabled");$("#show_color_opt").removeAttr("disabled","disabled")}});$("#sqlquery").focus();if($("#input_username"))$("#input_username").val()==""?$("#input_username").focus():$("#input_password").focus()});
+$(document).ready(function(){$(".inline_edit_sql").live("click",function(){var a=$(this).prev().find("input[name='server']").val(),b=$(this).prev().find("input[name='db']").val(),c=$(this).prev().find("input[name='table']").val(),d=$(this).prev().find("input[name='token']").val(),e=$(this).prev().find("input[name='sql_query']").val(),g=$(this).parent().prev().find(".inner_sql"),h=g.html(),f='<textarea name="sql_query_edit" id="sql_query_edit">'+e+"</textarea>\n";f+='<input type="button" class="btnSave" value="'+
+PMA_messages.strGo+'">\n';f+='<input type="button" class="btnDiscard" value="'+PMA_messages.strCancel+'">\n';g.replaceWith(f);$(".btnSave").each(function(){$(this).click(function(){e=$(this).prev().val();window.location.replace("import.php?server="+encodeURIComponent(a)+"&db="+encodeURIComponent(b)+"&table="+encodeURIComponent(c)+"&sql_query="+encodeURIComponent(e)+"&show_query=1&token="+d)})});$(".btnDiscard").each(function(){$(this).click(function(){$(this).closest(".sql").html('<span class="syntax"><span class="inner_sql">'+
+h+"</span></span>")})});return false});$(".sqlbutton").click(function(a){a.target.id=="clear"?$("#sqlquery").val(""):insertQuery(a.target.id);return false});$("#export_type").change(function(){if($("#export_type").val()=="svg"){$("#show_grid_opt").attr("disabled","disabled");$("#orientation_opt").attr("disabled","disabled");$("#with_doc").attr("disabled","disabled");$("#show_table_dim_opt").removeAttr("disabled");$("#all_table_same_wide").removeAttr("disabled");$("#paper_opt").removeAttr("disabled",
+"disabled");$("#show_color_opt").removeAttr("disabled","disabled")}else if($("#export_type").val()=="dia"){$("#show_grid_opt").attr("disabled","disabled");$("#with_doc").attr("disabled","disabled");$("#show_table_dim_opt").attr("disabled","disabled");$("#all_table_same_wide").attr("disabled","disabled");$("#paper_opt").removeAttr("disabled","disabled");$("#show_color_opt").removeAttr("disabled","disabled");$("#orientation_opt").removeAttr("disabled","disabled")}else if($("#export_type").val()=="eps"){$("#show_grid_opt").attr("disabled",
+"disabled");$("#orientation_opt").removeAttr("disabled");$("#with_doc").attr("disabled","disabled");$("#show_table_dim_opt").attr("disabled","disabled");$("#all_table_same_wide").attr("disabled","disabled");$("#paper_opt").attr("disabled","disabled");$("#show_color_opt").attr("disabled","disabled")}else if($("#export_type").val()=="pdf"){$("#show_grid_opt").removeAttr("disabled");$("#orientation_opt").removeAttr("disabled");$("#with_doc").removeAttr("disabled","disabled");$("#show_table_dim_opt").removeAttr("disabled",
+"disabled");$("#all_table_same_wide").removeAttr("disabled","disabled");$("#paper_opt").removeAttr("disabled","disabled");$("#show_color_opt").removeAttr("disabled","disabled")}});$("#sqlquery").focus();if($("#input_username"))$("#input_username").val()==""?$("#input_username").focus():$("#input_password").focus()});
function PMA_ajaxShowMessage(a,b){if(a=="")return true;var c=a?a:PMA_messages.strLoading,d=b?b:5E3;if(ajax_message_init)$("#loading").stop(true,true).html(c).fadeIn("medium").delay(d).fadeOut("medium",function(){$(this).html("").hide()});else{$(function(){$('<div id="loading_parent"></div>').insertBefore("#serverinfo");$('<span id="loading" class="ajax_notification"></span>').appendTo("#loading_parent").html(c).fadeIn("medium").delay(d).fadeOut("medium",function(){$(this).html("").hide()})},"top.frame_content");
ajax_message_init=true}return $("#loading")}function PMA_ajaxRemoveMessage(a){a.stop(true,true).fadeOut("medium",function(){a.hide()})}function PMA_showNoticeForEnum(a){var b=a.attr("id").split("_")[1];b+="_"+(parseInt(a.attr("id").split("_")[2])+1);a=a.attr("value");a=="ENUM"||a=="SET"?$("p[id='enum_notice_"+b+"']").show():$("p[id='enum_notice_"+b+"']").hide()}
jQuery.fn.PMA_confirm=function(a,b,c){if(PMA_messages.strDoYouReally=="")return true;var d={};d[PMA_messages.strOK]=function(){$(this).dialog("close").remove();$.isFunction(c)&&c.call(this,b)};d[PMA_messages.strCancel]=function(){$(this).dialog("close").remove()};$('<div id="confirm_dialog"></div>').prepend(a).dialog({buttons:d})};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/js/indexes.js new/phpMyAdmin-3.4.4-all-languages/js/indexes.js
--- old/phpMyAdmin-3.4.3.2-all-languages/js/indexes.js 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/js/indexes.js 2011-08-24 18:45:52.000000000 +0200
@@ -1,2 +1,2 @@
-function checkIndexName(){if(typeof document.forms.index_frm=="undefined")return false;var a=document.forms.index_frm.elements.index,b=document.forms.index_frm.elements.index_type;if(b.options[0].value=="PRIMARY"&&b.options[0].selected){document.forms.index_frm.elements.index.value="PRIMARY";if(typeof a.disabled!="undefined")document.forms.index_frm.elements.index.disabled=true}else{if(a.value=="PRIMARY")document.forms.index_frm.elements.index.value="";if(typeof a.disabled!="undefined")document.forms.index_frm.elements.index.disabled=
-false}return true}onload=checkIndexName;
+function checkIndexName(){if(typeof document.forms.index_frm=="undefined")return false;var a=document.forms.index_frm.elements["index[Key_name]"],b=document.forms.index_frm.elements["index[Index_type]"];if(b.options[0].value=="PRIMARY"&&b.options[0].selected){document.forms.index_frm.elements["index[Key_name]"].value="PRIMARY";if(typeof a.disabled!="undefined")document.forms.index_frm.elements["index[Key_name]"].disabled=true}else{if(a.value=="PRIMARY")document.forms.index_frm.elements["index[Key_name]"].value=
+"";if(typeof a.disabled!="undefined")document.forms.index_frm.elements["index[Key_name]"].disabled=false}return true}onload=checkIndexName;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/js/server_privileges.js new/phpMyAdmin-3.4.4-all-languages/js/server_privileges.js
--- old/phpMyAdmin-3.4.3.2-all-languages/js/server_privileges.js 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/js/server_privileges.js 2011-08-24 18:45:52.000000000 +0200
@@ -10,4 +10,4 @@
function(a){a.preventDefault();PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);$(this).append('<input type="hidden" name="ajax_request" value="true" />');a=$(this).find(".tblFooters").find("input:submit").attr("name");var c=$(this).find(".tblFooters").find("input:submit").val();$.post($(this).attr("action"),$(this).serialize()+"&"+a+"="+c,function(b){if(b.success==true){PMA_ajaxShowMessage(b.message);$("#edit_user_dialog").dialog("close").remove();if(b.sql_query){$("#topmenucontainer").next("div").remove().end().after(b.sql_query);
var d=$("#topmenucontainer").next("div").find(".notice");$(d).text()==""&&$(d).remove()}b.new_user_string&&appendNewUser(b.new_user_string,b.new_user_initial,b.new_user_initial_string);d=!!$("#dbspecificuserrights").length;var e=false;if(b.db_specific_privs==false||d==b.db_specific_privs)e=true;b.new_privileges&&e&&$("#usersForm").find(".current_row").find("tt").html(b.new_privileges);$("#usersForm").find(".current_row").removeClass("current_row")}else PMA_ajaxShowMessage(b.error)})});$(".export_user_anchor.ajax").live("click",
function(a){a.preventDefault();var c=PMA_ajaxShowMessage(),b={};b[PMA_messages.strClose]=function(){$(this).dialog("close").remove()};$.get($(this).attr("href"),{ajax_request:true},function(d){$('<div id="export_dialog"></div>').prepend(d).dialog({width:500,buttons:b});PMA_ajaxRemoveMessage(c)})});$("#initials_table.ajax").find("a").live("click",function(a){a.preventDefault();var c=PMA_ajaxShowMessage();$.get($(this).attr("href"),{ajax_request:true},function(b){$("#usersForm").hide("medium").remove();
-$("#fieldset_add_user").hide("medium").remove();$("#initials_table").after(b).show("medium").siblings("h2").not(":first").remove();PMA_ajaxRemoveMessage(c)})});$("#checkbox_drop_users_db").click(function(){$this_checkbox=$(this);if($this_checkbox.is(":checked"))confirm(PMA_messages.strDropDatabaseStrongWarning+"\n"+PMA_messages.strDoYouReally+" :\nDROP DATABASE")||$this_checkbox.attr("checked",false)})},"top.frame_content");
+$("#fieldset_add_user").hide("medium").remove();$("#initials_table").after(b).show("medium").siblings("h2").not(":first").remove();PMA_ajaxRemoveMessage(c)})});$("#checkbox_drop_users_db").click(function(){$this_checkbox=$(this);if($this_checkbox.is(":checked"))confirm(PMA_messages.strDropDatabaseStrongWarning+"\n"+PMA_messages.strDoYouReally+" :\nDROP DATABASE")||$this_checkbox.attr("checked",false)});displayPasswordGenerateButton()},"top.frame_content");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/js/sql.js new/phpMyAdmin-3.4.4-all-languages/js/sql.js
--- old/phpMyAdmin-3.4.3.2-all-languages/js/sql.js 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/js/sql.js 2011-08-24 18:45:52.000000000 +0200
@@ -10,23 +10,23 @@
$("#togglequerybox").siblings(":visible").length>0&&$("#togglequerybox").trigger("click");PMA_init_slider()}}PMA_ajaxRemoveMessage(a)})});$("input[name=navig].ajax").live("click",function(c){c.preventDefault();var a=PMA_ajaxShowMessage();c=$(this).parent("form");c.append('<input type="hidden" name="ajax_request" value="true" />');$.post(c.attr("action"),c.serialize(),function(d){$("#sqlqueryresults").html(d);$("#sqlqueryresults").trigger("appendAnchor");PMA_init_slider();PMA_ajaxRemoveMessage(a)})});
$("#pageselector").live("change",function(c){var a=$(this).parent("form");if($(this).hasClass("ajax")){c.preventDefault();var d=PMA_ajaxShowMessage();$.post(a.attr("action"),a.serialize()+"&ajax_request=true",function(g){$("#sqlqueryresults").html(g);$("#sqlqueryresults").trigger("appendAnchor");PMA_init_slider();PMA_ajaxRemoveMessage(d)})}else a.submit()});$("#table_results.ajax").find("a[title=Sort]").live("click",function(c){c.preventDefault();var a=PMA_ajaxShowMessage();$anchor=$(this);$.get($anchor.attr("href"),
$anchor.serialize()+"&ajax_request=true",function(d){$("#sqlqueryresults").html(d).trigger("appendAnchor");PMA_ajaxRemoveMessage(a)})});$("#displayOptionsForm.ajax").live("submit",function(c){c.preventDefault();$form=$(this);$.post($form.attr("action"),$form.serialize()+"&ajax_request=true",function(a){$("#sqlqueryresults").html(a).trigger("appendAnchor");PMA_init_slider()})});$(".inline_edit_anchor span a").live("click",function(c){c.preventDefault();c=$(this).parents("td");c.removeClass("inline_edit_anchor").addClass("inline_edit_active").parent("tr").addClass("noclick");
-var a=c.children("span.nowrap").children("a").children("span.nowrap");$data_a=c.children("span.nowrap").children("a").clone();var d=a.find("img");a.parent("a").find('span:contains("'+PMA_messages.strInlineEdit+'")').length>0?a.text(" "+PMA_messages.strSave):a.empty();if(d.length>0){d.attr("title",PMA_messages.strSave);var g=d.attr("src").replace(/b_inline_edit/,"b_save");d.attr("src",g);a.prepend(d)}a=c.children("span.nowrap").children("a").clone().attr("id","hide");var n=a.find("span");d=a.find("span img");
-a.find('span:contains("'+PMA_messages.strSave+'")').length>0?n.text(" "+PMA_messages.strHide):n.empty();if(d.length>0){d.attr("title",PMA_messages.strHide);g=d.attr("src").replace(/b_save/,"b_close");d.attr("src",g);n.prepend(d)}c.children("span.nowrap").append($("<br /><br />")).append(a);if(e!="vertical")$("#table_results tbody tr td span a#hide").click(function(){var f=$(this).parents("td"),b=f.find("span");b.find("a, br").remove();b.append($data_a.clone());f.removeClass("inline_edit_active hover").addClass("inline_edit_anchor");
+var a=c.children("span.nowrap").children("a").children("span.nowrap");$data_a=c.children("span.nowrap").children("a").clone();var d=a.find("img");a.parent("a").find('span:contains("'+PMA_messages.strInlineEdit+'")').length>0?a.text(" "+PMA_messages.strSave):a.empty();if(d.length>0){d.attr("title",PMA_messages.strSave);var g=d.attr("src").replace(/b_inline_edit/,"b_save");d.attr("src",g);a.prepend(d)}a=c.children("span.nowrap").children("a").clone().attr("id","hide");var o=a.find("span");d=a.find("span img");
+a.find('span:contains("'+PMA_messages.strSave+'")').length>0?o.text(" "+PMA_messages.strHide):o.empty();if(d.length>0){d.attr("title",PMA_messages.strHide);g=d.attr("src").replace(/b_save/,"b_close");d.attr("src",g);o.prepend(d)}c.children("span.nowrap").append($("<br /><br />")).append(a);if(e!="vertical")$("#table_results tbody tr td span a#hide").click(function(){var f=$(this).parents("td"),b=f.find("span");b.find("a, br").remove();b.append($data_a.clone());f.removeClass("inline_edit_active hover").addClass("inline_edit_anchor");
f.parent().removeClass("hover noclick");f.siblings().removeClass("hover");b=f.siblings().length;for(var i="",h=4;h</div>');b.is(".null")&&$(".checkbox_null_"+i+"_"+l).attr("checked",true);if(b.is(".enum, .set"))b.find("select").live("change",function(){$(".checkbox_null_"+i+"_"+l).attr("checked",false)});else if(b.is(".relation")){b.find("select").live("change",function(){$(".checkbox_null_"+i+"_"+l).attr("checked",false)});b.find(".browse_foreign").live("click",function(){$(".checkbox_null_"+
-i+"_"+l).attr("checked",false)})}else b.find("textarea").live("keypress",function(){$(".checkbox_null_"+i+"_"+l).attr("checked",false)});$(".checkbox_null_"+i+"_"+l).bind("click",function(){if(b.is(".enum"))b.find("select").attr("value","");else if(b.is(".set"))b.find("select").find("option").each(function(){$(this).attr("selected",false)});else if(b.is(".relation"))b.find("select").length>0?b.find("select").attr("value",""):b.find("span.curr_value").empty();else b.find("textarea").val("")})}else b.html('<div class="null_div"></div>');
-if(b.is(":not(.truncated, .transformed, .relation, .enum, .set, .null)")){value=f.replace("<br>","\n");b.append("<textarea>"+value+"</textarea>");b.data("original_data",f)}else if(b.is(".truncated, .transformed")){h="SELECT `"+i+"` FROM `"+window.parent.table+"` WHERE "+PMA_urldecode(q);$.post("sql.php",{token:window.parent.token,db:window.parent.db,ajax_request:true,sql_query:h,inline_edit:true},function(o){if(o.success==true){b.append("<textarea>"+o.value+"</textarea>");b.data("original_data",f)}else PMA_ajaxShowMessage(o.error)})}else if(b.is(".relation")){h=
-{ajax_request:true,get_relational_values:true,db:window.parent.db,table:window.parent.table,column:i,token:window.parent.token,curr_value:h,relation_key_or_display_column:t};$.post("sql.php",h,function(o){b.append(o.dropdown);b.data("original_data",f)})}else if(b.is(".enum")){h={ajax_request:true,get_enum_values:true,db:window.parent.db,table:window.parent.table,column:i,token:window.parent.token,curr_value:s};$.post("sql.php",h,function(o){b.append(o.dropdown);b.data("original_data",f)})}else if(b.is(".set")){h=
-{ajax_request:true,get_set_values:true,db:window.parent.db,table:window.parent.table,column:i,token:window.parent.token,curr_value:s};$.post("sql.php",h,function(o){b.append(o.select);b.data("original_data",f)})}else if(b.is(".null")){b.append("<textarea></textarea>");b.data("original_data","NULL")}})});$(".inline_edit_active span a").live("click",function(c){c.preventDefault();var a=$(this).parent().parent(),d="";if(e=="vertical")var g=a.index(),n=a.parents("tbody").find("tr").find(".inline_edit:nth("+
-g+")"),k=a.parents("tbody").find("tr").find(".where_clause:nth("+g+")").val();else{n=a.parent("tr").find(".inline_edit");k=a.parent("tr").find(".where_clause").val()}c=a.is(".nonunique")?0:1;var r={},l=$("#relational_display_K").attr("checked")?"K":"D",q={},f=false,b="UPDATE `"+window.parent.table+"` SET ",i=false,h="";n.each(function(){var j=$(this),m=getFieldName(j,e),p={};if(j.is(".transformed"))f=true;var u=true;if(j.find("input:checkbox").is(":checked")){b+=" `"+m+"`=NULL , ";i=true}else{if(j.is(":not(.relation, .enum, .set, .bit)")){p[m]=
-j.find("textarea").val();j.is(".transformed")&&$.extend(q,p)}else if(j.is(".bit")){p[m]="0b"+j.find("textarea").val();u=false}else if(j.is(".set")){d=j.find("select");p[m]=d.map(function(){return $(this).val()}).get().join(",")}else{d=j.find("select");if(d.length!=0)p[m]=d.val();d=j.find("span.curr_value");if(d.length!=0)p[m]=d.text();j.is(".relation")&&$.extend(r,p)}if(k.indexOf(m)>-1)h+="`"+window.parent.table+"`.`"+m+"` = '"+p[m].replace(/'/g,"''")+"' AND ";if(p[m]!=j.data("original_data")){b+=
-u==true?" `"+m+"`='"+p[m].replace(/'/g,"''")+"', ":" `"+m+"`="+p[m].replace(/'/g,"''")+", ";i=true}}});b=b.replace(/,\s$/,"");b=b.replace(/\\/g,"\\\\");h=h.substring(0,h.length-5);h=PMA_urlencode(h);b+=" WHERE "+PMA_urldecode(k);b+=" LIMIT 1";var t=$.param(r),s=$.param(q),o=$(this).parent(),v=$(this);i?$.post("tbl_replace.php",{ajax_request:true,sql_query:b,disp_direction:e,token:window.parent.token,db:window.parent.db,table:window.parent.table,clause_is_unique:c,where_clause:k,rel_fields_list:t,
-do_transformations:f,transform_fields_list:s,relational_display:l,"goto":"sql.php",submit_type:"save"},function(j){if(j.success==true){PMA_ajaxShowMessage(j.message);e=="vertical"?a.parents("tbody").find("tr").find(".where_clause:nth("+g+")").attr("value",h):a.parent("tr").find(".where_clause").attr("value",h);$("#result_query").remove();typeof j.sql_query!="undefined"&&$("#sqlqueryresults").prepend(j.sql_query);PMA_unInlineEditRow(o,v,a,n,j,e)}else PMA_ajaxShowMessage(j.error)}):PMA_unInlineEditRow(o,
-v,a,n,"",e)})},"top.frame_content");
-function PMA_unInlineEditRow(e,c,a,d,g,n){e.find("a, br").remove();e.append($data_a.clone());a.removeClass("inline_edit_active").addClass("inline_edit_anchor");a.parent("tr").removeClass("noclick");n!="vertical"?a.parent("tr").removeClass("hover").find("td").removeClass("hover"):a.parents("tbody").find("tr").find("td:eq("+a.index()+")").removeClass("marked hover");d.each(function(){$this_sibling=$(this);if($this_sibling.find("input:checkbox").is(":checked")){$this_sibling.html("NULL");$this_sibling.addClass("null")}else{$this_sibling.removeClass("null");
-if($this_sibling.is(":not(.relation, .enum, .set)")){var k=$this_sibling.find("textarea").val();if($this_sibling.is(".transformed")){var r=getFieldName($this_sibling,n);typeof g.transformations!="undefined"&&$.each(g.transformations,function(q,f){if(q==r){if($this_sibling.is(".text_plain, .application_octetstream"))k=f;else{var b=$this_sibling.find("textarea").val();k=$(f).append(b)}return false}})}}else{var l=k="";$test_element=$this_sibling.find("select");if($test_element.length!=0)l=$test_element.val();
-$test_element=$this_sibling.find("span.curr_value");if($test_element.length!=0)l=$test_element.text();if($this_sibling.is(".relation")){r=getFieldName($this_sibling,n);typeof g.relations!="undefined"&&$.each(g.relations,function(q,f){if(q==r){k=$(f);return false}})}else if($this_sibling.is(".enum"))k=l;else if($this_sibling.is(".set"))if(l!=null){$.each(l,function(q,f){k=k+f+","});k=k.substring(0,k.length-1)}}$this_sibling.html(k)}})}
+i+"_"+l).attr("checked",false)})}else b.find("textarea").live("keypress",function(m){m.which!=0&&$(".checkbox_null_"+i+"_"+l).attr("checked",false)});$(".checkbox_null_"+i+"_"+l).bind("click",function(){if(b.is(".enum"))b.find("select").attr("value","");else if(b.is(".set"))b.find("select").find("option").each(function(){$(this).attr("selected",false)});else if(b.is(".relation"))b.find("select").length>0?b.find("select").attr("value",""):b.find("span.curr_value").empty();else b.find("textarea").val("")})}else b.html('<div class="null_div"></div>');
+if(b.is(":not(.truncated, .transformed, .relation, .enum, .set, .null)")){value=f.replace("<br>","\n");b.append("<textarea>"+value+"</textarea>");b.data("original_data",f)}else if(b.is(".truncated, .transformed")){h="SELECT `"+i+"` FROM `"+window.parent.table+"` WHERE "+PMA_urldecode(q);$.post("sql.php",{token:window.parent.token,db:window.parent.db,ajax_request:true,sql_query:h,inline_edit:true},function(m){if(m.success==true){b.append("<textarea>"+m.value+"</textarea>");b.data("original_data",f)}else PMA_ajaxShowMessage(m.error)})}else if(b.is(".relation")){h=
+{ajax_request:true,get_relational_values:true,db:window.parent.db,table:window.parent.table,column:i,token:window.parent.token,curr_value:h,relation_key_or_display_column:t};$.post("sql.php",h,function(m){b.append(m.dropdown);b.data("original_data",f)})}else if(b.is(".enum")){h={ajax_request:true,get_enum_values:true,db:window.parent.db,table:window.parent.table,column:i,token:window.parent.token,curr_value:s};$.post("sql.php",h,function(m){b.append(m.dropdown);b.data("original_data",f)})}else if(b.is(".set")){h=
+{ajax_request:true,get_set_values:true,db:window.parent.db,table:window.parent.table,column:i,token:window.parent.token,curr_value:s};$.post("sql.php",h,function(m){b.append(m.select);b.data("original_data",f)})}else if(b.is(".null")){b.append("<textarea></textarea>");b.data("original_data","NULL")}})});$(".inline_edit_active span a").live("click",function(c){c.preventDefault();var a=$(this).parent().parent(),d="";if(e=="vertical")var g=a.index(),o=a.parents("tbody").find("tr").find(".inline_edit:nth("+
+g+")"),k=a.parents("tbody").find("tr").find(".where_clause:nth("+g+")").val();else{o=a.parent("tr").find(".inline_edit");k=a.parent("tr").find(".where_clause").val()}c=a.is(".nonunique")?0:1;var r={},l=$("#relational_display_K").attr("checked")?"K":"D",q={},f=false,b="UPDATE `"+window.parent.table+"` SET ",i=false,h="";o.each(function(){var j=$(this),n=getFieldName(j,e),p={};if(j.is(".transformed"))f=true;var u=true;if(j.find("input:checkbox").is(":checked")){b+=" `"+n+"`=NULL , ";i=true}else{if(j.is(":not(.relation, .enum, .set, .bit)")){p[n]=
+j.find("textarea").val();j.is(".transformed")&&$.extend(q,p)}else if(j.is(".bit")){p[n]="0b"+j.find("textarea").val();u=false}else if(j.is(".set")){d=j.find("select");p[n]=d.map(function(){return $(this).val()}).get().join(",")}else{d=j.find("select");if(d.length!=0)p[n]=d.val();d=j.find("span.curr_value");if(d.length!=0)p[n]=d.text();j.is(".relation")&&$.extend(r,p)}if(k.indexOf(n)>-1)h+="`"+window.parent.table+"`.`"+n+"` = '"+p[n].replace(/'/g,"''")+"' AND ";if(p[n]!=j.data("original_data")){b+=
+u==true?" `"+n+"`='"+p[n].replace(/'/g,"''")+"', ":" `"+n+"`="+p[n].replace(/'/g,"''")+", ";i=true}}});b=b.replace(/,\s$/,"");b=b.replace(/\\/g,"\\\\");h=h.substring(0,h.length-5);h=PMA_urlencode(h);b+=" WHERE "+PMA_urldecode(k);b+=" LIMIT 1";var t=$.param(r),s=$.param(q),m=$(this).parent(),v=$(this);i?$.post("tbl_replace.php",{ajax_request:true,sql_query:b,disp_direction:e,token:window.parent.token,db:window.parent.db,table:window.parent.table,clause_is_unique:c,where_clause:k,rel_fields_list:t,
+do_transformations:f,transform_fields_list:s,relational_display:l,"goto":"sql.php",submit_type:"save"},function(j){if(j.success==true){PMA_ajaxShowMessage(j.message);e=="vertical"?a.parents("tbody").find("tr").find(".where_clause:nth("+g+")").attr("value",h):a.parent("tr").find(".where_clause").attr("value",h);$("#result_query").remove();typeof j.sql_query!="undefined"&&$("#sqlqueryresults").prepend(j.sql_query);PMA_unInlineEditRow(m,v,a,o,j,e)}else PMA_ajaxShowMessage(j.error)}):PMA_unInlineEditRow(m,
+v,a,o,"",e)})},"top.frame_content");
+function PMA_unInlineEditRow(e,c,a,d,g,o){e.find("a, br").remove();e.append($data_a.clone());a.removeClass("inline_edit_active").addClass("inline_edit_anchor");a.parent("tr").removeClass("noclick");o!="vertical"?a.parent("tr").removeClass("hover").find("td").removeClass("hover"):a.parents("tbody").find("tr").find("td:eq("+a.index()+")").removeClass("marked hover");d.each(function(){$this_sibling=$(this);if($this_sibling.find("input:checkbox").is(":checked")){$this_sibling.html("NULL");$this_sibling.addClass("null")}else{$this_sibling.removeClass("null");
+if($this_sibling.is(":not(.relation, .enum, .set)")){var k=$this_sibling.find("textarea").val();if($this_sibling.is(".transformed")){var r=getFieldName($this_sibling,o);typeof g.transformations!="undefined"&&$.each(g.transformations,function(q,f){if(q==r){if($this_sibling.is(".text_plain, .application_octetstream"))k=f;else{var b=$this_sibling.find("textarea").val();k=$(f).append(b)}return false}})}}else{var l=k="";$test_element=$this_sibling.find("select");if($test_element.length!=0)l=$test_element.val();
+$test_element=$this_sibling.find("span.curr_value");if($test_element.length!=0)l=$test_element.text();if($this_sibling.is(".relation")){r=getFieldName($this_sibling,o);typeof g.relations!="undefined"&&$.each(g.relations,function(q,f){if(q==r){k=$(f);return false}})}else if($this_sibling.is(".enum"))k=l;else if($this_sibling.is(".set"))if(l!=null){$.each(l,function(q,f){k=k+f+","});k=k.substring(0,k.length-1)}}$this_sibling.html(k)}})}
function PMA_changeClassForColumn(e,c){var a=e.index();!e.closest("tr").children(":first").hasClass("column_heading")&&a--;a=e.closest("table").find("tbody tr").find("td.data:eq("+a+")");if(e.data("has_class_"+c)){a.removeClass(c);e.data("has_class_"+c,false)}else{a.addClass(c);e.data("has_class_"+c,true)}}
$(document).ready(function(){$(".browse_foreign").live("click",function(e){e.preventDefault();window.open(this.href,"foreigners","width=640,height=240,scrollbars=yes,resizable=yes");$anchor=$(this);$anchor.addClass("browse_foreign_clicked");return false});$(".column_heading.pointer").live("hover",function(){PMA_changeClassForColumn($(this),"hover")});$(".column_heading.marker").live("click",function(){PMA_changeClassForColumn($(this),"marked")})});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/libraries/Config.class.php new/phpMyAdmin-3.4.4-all-languages/libraries/Config.class.php
--- old/phpMyAdmin-3.4.3.2-all-languages/libraries/Config.class.php 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/libraries/Config.class.php 2011-08-24 18:45:52.000000000 +0200
@@ -96,7 +96,7 @@
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.4.3.2');
+ $this->set('PMA_VERSION', '3.4.4');
/**
* @deprecated
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/libraries/config.default.php new/phpMyAdmin-3.4.4-all-languages/libraries/config.default.php
--- old/phpMyAdmin-3.4.3.2-all-languages/libraries/config.default.php 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/libraries/config.default.php 2011-08-24 18:45:52.000000000 +0200
@@ -2596,8 +2596,11 @@
* Limit for length of URL in links. When length would be above this limit, it
* is replaced by form with button.
* This is required as some web servers (IIS) have problems with long URLs.
+ * The recommended limit is 2000
+ * (see http://www.boutell.com/newfaq/misc/urllength.html) but we put
+ * 1000 to accommodate Suhosin, see bug #3358750.
*/
-$cfg['LinkLengthLimit'] = 2000;
+$cfg['LinkLengthLimit'] = 1000;
/*******************************************************************************
* SQL Parser Settings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/libraries/core.lib.php new/phpMyAdmin-3.4.4-all-languages/libraries/core.lib.php
--- old/phpMyAdmin-3.4.3.2-all-languages/libraries/core.lib.php 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/libraries/core.lib.php 2011-08-24 18:45:52.000000000 +0200
@@ -275,7 +275,13 @@
*/
function PMA_warnMissingExtension($extension, $fatal = false, $extra = '')
{
- $message = sprintf(__('The %s extension is missing. Please check your PHP configuration.'),
+ /* Gettext does not have to be loaded yet here */
+ if (function_exists('__')) {
+ $message = __('The %s extension is missing. Please check your PHP configuration.');
+ } else {
+ $message = 'The %s extension is missing. Please check your PHP configuration.';
+ }
+ $message = sprintf($message,
'[a@' . PMA_getPHPDocLink('book.' . $extension . '.php') . '@Documentation][em]' . $extension . '[/em][/a]');
if ($extra != '') {
$message .= ' ' . $extra;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/libraries/display_export.lib.php new/phpMyAdmin-3.4.4-all-languages/libraries/display_export.lib.php
--- old/phpMyAdmin-3.4.3.2-all-languages/libraries/display_export.lib.php 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/libraries/display_export.lib.php 2011-08-24 18:45:52.000000000 +0200
@@ -35,13 +35,6 @@
PMA_Message::error( __('Could not load export plugins, please check your installation!'))->display();
require './libraries/footer.inc.php';
}
-
-// If the form data is being loaded from GET data, decode it
-foreach($_GET as $name => $value) {
- if(is_string($value)) {
- $_GET[urldecode($name)] = urldecode($value);
- }
-}
?>
<form method="post" action="export.php" name="dump">
@@ -73,7 +66,7 @@
if(isset($_GET['sql_query'])) {
- echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars(urldecode($_GET['sql_query'])) . '" />' . "\n";
+ echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($_GET['sql_query']) . '" />' . "\n";
} elseif (! empty($sql_query)) {
echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n";
}
@@ -325,7 +318,7 @@
<?php } ?>
</ul>
</li>
- <li><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li>
+ <li><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li>
</ul>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/libraries/display_import.lib.php new/phpMyAdmin-3.4.4-all-languages/libraries/display_import.lib.php
--- old/phpMyAdmin-3.4.3.2-all-languages/libraries/display_import.lib.php 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/libraries/display_import.lib.php 2011-08-24 18:45:52.000000000 +0200
@@ -63,7 +63,7 @@
complete = response.complete;
if (total==0 && complete==0 && percent==0) {
- $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.')); ?>');
+ $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'), false); ?>');
$('#upload_form_status').css("display", "none");
} else {
$('#upload_form_status_info').html(' '+Math.round(percent)+'%, '+complete+'/'+total);
@@ -73,7 +73,7 @@
if (finished==true) {
$('#importmain').css('display', 'none');
$('#import_form_status').css('display', 'inline');
- $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.')); ?> ');
+ $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.'), false); ?> ');
$('#import_form_status').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error
<?php
// reload the left sidebar when the import is finished
@@ -95,7 +95,7 @@
<?php
} else { // no plugin available
?>
- $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.')) . PMA_showDocu('faq2_9'); ?>');
+ $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.'), false) . PMA_showDocu('faq2_9'); ?>');
$('#upload_form_status').css("display", "none");
<?php
} // else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/libraries/display_tbl.lib.php new/phpMyAdmin-3.4.4-all-languages/libraries/display_tbl.lib.php
--- old/phpMyAdmin-3.4.3.2-all-languages/libraries/display_tbl.lib.php 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/libraries/display_tbl.lib.php 2011-08-24 18:45:52.000000000 +0200
@@ -1937,7 +1937,7 @@
|| $analyzed_sql[0]['where_clause'] == '1 ')) {
// "j u s t b r o w s i n g"
$pre_count = '~';
- $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')), true);
+ $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')));
} else {
$pre_count = '';
$after_count = '';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.3.2-all-languages/libraries/export/codegen.php new/phpMyAdmin-3.4.4-all-languages/libraries/export/codegen.php
--- old/phpMyAdmin-3.4.3.2-all-languages/libraries/export/codegen.php 2011-07-23 14:42:50.000000000 +0200
+++ new/phpMyAdmin-3.4.4-all-languages/libraries/export/codegen.php 2011-08-24 18:45:52.000000000 +0200
@@ -138,12 +138,12 @@
*/
function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
{
- global $CG_FORMATS, $CG_HANDLERS;
- $format = cgGetOption("format");
- $index = array_search($format, $CG_FORMATS);
- if ($index >= 0)
- return PMA_exportOutputHandler($CG_HANDLERS[$index]($db, $table, $crlf));
- return PMA_exportOutputHandler(sprintf("%s is not supported.", $format));
+ global $CG_FORMATS, $CG_HANDLERS;
+ $format = cgGetOption("format");
+ if (isset($CG_FORMATS[$format])) {
+ return PMA_exportOutputHandler($CG_HANDLERS[$format]($db, $table, $crlf));
+ }
+ return PMA_exportOutputHandler(sprintf("%s is not supported.", $format));
}
/**
@@ -152,162 +152,184 @@
*/
class TableProperty
{
- public $name;
- public $type;
- public $nullable;
- public $key;
- public $defaultValue;
- public $ext;
- function __construct($row)
- {
- $this->name = trim($row[0]);
- $this->type = trim($row[1]);
- $this->nullable = trim($row[2]);
- $this->key = trim($row[3]);
- $this->defaultValue = trim($row[4]);
- $this->ext = trim($row[5]);
- }
- function getPureType()
- {
- $pos=strpos($this->type, "(");
- if ($pos > 0)
- return substr($this->type, 0, $pos);
- return $this->type;
- }
- function isNotNull()
- {
- return $this->nullable == "NO" ? "true" : "false";
- }
- function isUnique()
- {
- return $this->key == "PRI" || $this->key == "UNI" ? "true" : "false";
- }
- function getDotNetPrimitiveType()
- {
- if (strpos($this->type, "int") === 0) return "int";
- if (strpos($this->type, "long") === 0) return "long";
- if (strpos($this->type, "char") === 0) return "string";
- if (strpos($this->type, "varchar") === 0) return "string";
- if (strpos($this->type, "text") === 0) return "string";
- if (strpos($this->type, "longtext") === 0) return "string";
- if (strpos($this->type, "tinyint") === 0) return "bool";
- if (strpos($this->type, "datetime") === 0) return "DateTime";
- return "unknown";
- }
- function getDotNetObjectType()
- {
- if (strpos($this->type, "int") === 0) return "Int32";
- if (strpos($this->type, "long") === 0) return "Long";
- if (strpos($this->type, "char") === 0) return "String";
- if (strpos($this->type, "varchar") === 0) return "String";
- if (strpos($this->type, "text") === 0) return "String";
- if (strpos($this->type, "longtext") === 0) return "String";
- if (strpos($this->type, "tinyint") === 0) return "Boolean";
- if (strpos($this->type, "datetime") === 0) return "DateTime";
- return "Unknown";
- }
- function getIndexName()
- {
- if (strlen($this->key)>0)
- return "index=\"" . $this->name . "\"";
- return "";
- }
- function isPK()
- {
- return $this->key=="PRI";
- }
- function format($pattern)
- {
- $text=$pattern;
- $text=str_replace("#name#", $this->name, $text);
- $text=str_replace("#type#", $this->getPureType(), $text);
- $text=str_replace("#notNull#", $this->isNotNull(), $text);
- $text=str_replace("#unique#", $this->isUnique(), $text);
- $text=str_replace("#ucfirstName#", ucfirst($this->name), $text);
- $text=str_replace("#dotNetPrimitiveType#", $this->getDotNetPrimitiveType(), $text);
- $text=str_replace("#dotNetObjectType#", $this->getDotNetObjectType(), $text);
- $text=str_replace("#indexName#", $this->getIndexName(), $text);
- return $text;
- }
+ public $name;
+ public $type;
+ public $nullable;
+ public $key;
+ public $defaultValue;
+ public $ext;
+ function __construct($row)
+ {
+ $this->name = trim($row[0]);
+ $this->type = trim($row[1]);
+ $this->nullable = trim($row[2]);
+ $this->key = trim($row[3]);
+ $this->defaultValue = trim($row[4]);
+ $this->ext = trim($row[5]);
+ }
+ function getPureType()
+ {
+ $pos=strpos($this->type, "(");
+ if ($pos > 0)
+ return substr($this->type, 0, $pos);
+ return $this->type;
+ }
+ function isNotNull()
+ {
+ return $this->nullable == "NO" ? "true" : "false";
+ }
+ function isUnique()
+ {
+ return $this->key == "PRI" || $this->key == "UNI" ? "true" : "false";
+ }
+ function getDotNetPrimitiveType()
+ {
+ if (strpos($this->type, "int") === 0) return "int";
+ if (strpos($this->type, "long") === 0) return "long";
+ if (strpos($this->type, "char") === 0) return "string";
+ if (strpos($this->type, "varchar") === 0) return "string";
+ if (strpos($this->type, "text") === 0) return "string";
+ if (strpos($this->type, "longtext") === 0) return "string";
+ if (strpos($this->type, "tinyint") === 0) return "bool";
+ if (strpos($this->type, "datetime") === 0) return "DateTime";
+ return "unknown";
+ }
+ function getDotNetObjectType()
+ {
+ if (strpos($this->type, "int") === 0) return "Int32";
+ if (strpos($this->type, "long") === 0) return "Long";
+ if (strpos($this->type, "char") === 0) return "String";
+ if (strpos($this->type, "varchar") === 0) return "String";
+ if (strpos($this->type, "text") === 0) return "String";
+ if (strpos($this->type, "longtext") === 0) return "String";
+ if (strpos($this->type, "tinyint") === 0) return "Boolean";
+ if (strpos($this->type, "datetime") === 0) return "DateTime";
+ return "Unknown";
+ }
+ function getIndexName()
+ {
+ if (strlen($this->key)>0)
+ return "index=\"" . htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8') . "\"";
+ return "";
+ }
+ function isPK()
+ {
+ return $this->key=="PRI";
+ }
+ function formatCs($text)
+ {
+ $text=str_replace("#name#", cgMakeIdentifier($this->name, false), $text);
+ return $this->format($text);
+ }
+ function formatXml($text)
+ {
+ $text=str_replace("#name#", htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8'), $text);
+ $text=str_replace("#indexName#", $this->getIndexName(), $text);
+ return $this->format($text);
+ }
+ function format($text)
+ {
+ $text=str_replace("#ucfirstName#", cgMakeIdentifier($this->name), $text);
+ $text=str_replace("#dotNetPrimitiveType#", $this->getDotNetPrimitiveType(), $text);
+ $text=str_replace("#dotNetObjectType#", $this->getDotNetObjectType(), $text);
+ $text=str_replace("#type#", $this->getPureType(), $text);
+ $text=str_replace("#notNull#", $this->isNotNull(), $text);
+ $text=str_replace("#unique#", $this->isUnique(), $text);
+ return $text;
+ }
}
- function handleNHibernateCSBody($db, $table, $crlf)
- {
- $lines=array();
- $result=PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table)));
- if ($result)
- {
- $tableProperties=array();
- while ($row = PMA_DBI_fetch_row($result))
- $tableProperties[] = new TableProperty($row);
- $lines[] = "using System;";
- $lines[] = "using System.Collections;";
- $lines[] = "using System.Collections.Generic;";
- $lines[] = "using System.Text;";
- $lines[] = "namespace ".ucfirst($db);
- $lines[] = "{";
- $lines[] = " #region ".ucfirst($table);
- $lines[] = " public class ".ucfirst($table);
- $lines[] = " {";
- $lines[] = " #region Member Variables";
- foreach ($tableProperties as $tablePropertie)
- $lines[] = $tablePropertie->format(" protected #dotNetPrimitiveType# _#name#;");
- $lines[] = " #endregion";
- $lines[] = " #region Constructors";
- $lines[] = " public ".ucfirst($table)."() { }";
- $temp = array();
- foreach ($tableProperties as $tablePropertie)
- if (! $tablePropertie->isPK())
- $temp[] = $tablePropertie->format("#dotNetPrimitiveType# #name#");
- $lines[] = " public ".ucfirst($table)."(".implode(", ", $temp).")";
- $lines[] = " {";
- foreach ($tableProperties as $tablePropertie)
- if (! $tablePropertie->isPK())
- $lines[] = $tablePropertie->format(" this._#name#=#name#;");
- $lines[] = " }";
- $lines[] = " #endregion";
- $lines[] = " #region Public Properties";
- foreach ($tableProperties as $tablePropertie)
- $lines[] = $tablePropertie->format(" public virtual #dotNetPrimitiveType# _#ucfirstName#\n {\n get {return _#name#;}\n set {_#name#=value;}\n }");
- $lines[] = " #endregion";
- $lines[] = " }";
- $lines[] = " #endregion";
- $lines[] = "}";
- PMA_DBI_free_result($result);
- }
- return implode("\n", $lines);
- }
+ function cgMakeIdentifier($str, $ucfirst = true)
+ {
+ // remove unsafe characters
+ $str = preg_replace('/[^\p{L}\p{Nl}_]/u', '', $str);
+ // make sure first character is a letter or _
+ if (!preg_match('/^\pL/u', $str)) {
+ $str = '_' . $str;
+ }
+ if ($ucfirst) {
+ $str = ucfirst($str);
+ }
+ return $str;
+ }
- function handleNHibernateXMLBody($db, $table, $crlf)
- {
- $lines=array();
- $lines[] = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>";
- $lines[] = "