Hello community,
here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2011-10-27 11:20:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old)
and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin", Maintainer is "CrRodriguez@novell.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2011-10-05 01:46:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2011-10-27 11:23:18.000000000 +0200
@@ -1,0 +2,38 @@
+Wed Oct 26 10:49:15 UTC 2011 - chris@computersalat.de
+
+- update to 3.4.7
+ - bug #3418610 [interface] Links in navigation when
+ $cfg['MainPageIconic'] = false
+ - bug #3418849 [interface] Inline edit shows dropdowns even after closing
+ - bug [view] View renaming did not work
+ - bug [navi] Wrong icon for view (MySQL 5.5)
+ - bug #3420229 [doc] Missing documentation section
+ - bug #3423725 [pdf] Broken PDF file when exporting database to PDF
+ - [core] Allow to set language in URL
+ - bug #3425184 [doc] Fix links to PHP documentation
+ - bug #3426031 [export] Export to bzip2 is not working
+- 3.4.6.0 (2011-10-16)
+ - patch #3404173 InnoDB comment display with tooltips/aliases
+ - bug #3404886 [navi] Edit SQL statement after error
+ - bug #3403165 [interface] Collation not displayed for long enum fields
+ - bug #3399951 [export] Config for export compression not used
+ - bug #3400690 [privileges] DB-specific privileges won't submit
+ - bug #3410604 [config] Configuration storage incorrect suggested table name
+ - bug #3383572 [interface] Cannot execute saved query
+ - bug #3411535 [display] Full text button unchecks results display options
+ - bug #3411224 [display] Broken binary column when 'Show binary contents'
+ is not set
+ - bug #3411633 [core] Call to undefined function PMA_isSuperuser()
+ - bug #3413743 [interface] Display options link missing after search
+ - bug #3324161 [core] CSP policy causing designer JS buttons to fail
+ - bug #3412862 [relation] Relations/constraints are dropped/created
+ on every change
+ - bug #3390832 [display] Delete records from last page breaks search
+ - bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken
+ - bug #3414744 [core] External link fails in 3.4.5
+ - patch #3314626 [display] CharTextareaRows is not respected
+ - bug #3417089 [synchronize] Extraneous db choices
+ - [security] Fixed local path disclosure vulnerability, see PMASA-2011-15
+ - [security] Fixed XSS in setup (host/verbose parameter), see PMASA-2011-16
+
+-------------------------------------------------------------------
Old:
----
phpMyAdmin-3.4.5-all-languages.tar.bz2
New:
----
phpMyAdmin-3.4.7-all-languages.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
--- /var/tmp/diff_new_pack.fgjcxc/_old 2011-10-27 11:23:20.000000000 +0200
+++ /var/tmp/diff_new_pack.fgjcxc/_new 2011-10-27 11:23:20.000000000 +0200
@@ -33,7 +33,7 @@
%endif
Summary: Administration of MySQL over the web
-Version: 3.4.5
+Version: 3.4.7
Release: 1
License: GPLv2+
Group: Productivity/Networking/Web/Frontends
++++++ phpMyAdmin-3.4.1-config.patch ++++++
--- /var/tmp/diff_new_pack.fgjcxc/_old 2011-10-27 11:23:20.000000000 +0200
+++ /var/tmp/diff_new_pack.fgjcxc/_new 2011-10-27 11:23:20.000000000 +0200
@@ -100,7 +100,7 @@
+$cfg['Servers'][$i]['controlpass'] = '';
+
+// Authentication method (config, http or cookie based)?
-+$cfg['Servers'][$i]['auth_type'] = 'http';
++$cfg['Servers'][$i]['auth_type'] = 'cookie';
+
+// MySQL user
+$cfg['Servers'][$i]['user'] = 'root';
++++++ phpMyAdmin-3.4.5-all-languages.tar.bz2 -> phpMyAdmin-3.4.7-all-languages.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/ChangeLog new/phpMyAdmin-3.4.7-all-languages/ChangeLog
--- old/phpMyAdmin-3.4.5-all-languages/ChangeLog 2011-09-14 13:48:14.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/ChangeLog 2011-10-23 14:17:12.000000000 +0200
@@ -1,6 +1,39 @@
phpMyAdmin - ChangeLog
======================
+3.4.7.0 (not yet released)
+- bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false
+- bug #3418849 [interface] Inline edit shows dropdowns even after closing
+- bug [view] View renaming did not work
+- bug [navi] Wrong icon for view (MySQL 5.5)
+- bug #3420229 [doc] Missing documentation section
+- bug #3423725 [pdf] Broken PDF file when exporting database to PDF
+- [core] Allow to set language in URL
+- bug #3425184 [doc] Fix links to PHP documentation
+- bug #3426031 [export] Export to bzip2 is not working
+
+3.4.6.0 (2011-10-16)
+- patch #3404173 InnoDB comment display with tooltips/aliases
+- bug #3404886 [navi] Edit SQL statement after error
+- bug #3403165 [interface] Collation not displayed for long enum fields
+- bug #3399951 [export] Config for export compression not used
+- bug #3400690 [privileges] DB-specific privileges won't submit
+- bug #3410604 [config] Configuration storage incorrect suggested table name
+- bug #3383572 [interface] Cannot execute saved query
+- bug #3411535 [display] Full text button unchecks results display options
+- bug #3411224 [display] Broken binary column when 'Show binary contents' is not set
+- bug #3411633 [core] Call to undefined function PMA_isSuperuser()
+- bug #3413743 [interface] Display options link missing after search
+- bug #3324161 [core] CSP policy causing designer JS buttons to fail
+- bug #3412862 [relation] Relations/constraints are dropped/created on every change
+- bug #3390832 [display] Delete records from last page breaks search
+- bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken
+- bug #3414744 [core] External link fails in 3.4.5
+- patch #3314626 [display] CharTextareaRows is not respected
+- bug #3417089 [synchronize] Extraneous db choices
+- [security] Fixed local path disclosure vulnerability, see PMASA-2011-15
+- [security] Fixed XSS in setup (host/verbose parameter), see PMASA-2011-16
+
3.4.5.0 (2011-09-14)
- bug #3375325 [interface] Page list in navigation frame looks odd
- bug #3313235 [interface] Error div misplaced
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/Documentation.html new/phpMyAdmin-3.4.7-all-languages/Documentation.html
--- old/phpMyAdmin-3.4.5-all-languages/Documentation.html 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/Documentation.html 2011-10-23 14:17:12.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.5 - Documentation</title>
+ <title>phpMyAdmin 3.4.7 - 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.5
+ 3.4.7
Documentation
</h1>
</div>
@@ -2163,6 +2163,10 @@
that users can't set through user preferences. For possible values, refer
to <tt>libraries/config/user_preferences.forms.php</tt>.</dd>
+ <dt id="cfg_UserprefsDeveloperTab">$cfg['UserprefsDeveloperTab'] boolean</dt>
+ <dd>Activates in the user preferences a tab containing options for
+ developers of phpMyAdmin.</dd>
+
<dt id="cfg_TitleTable">$cfg['TitleTable'] string</dt>
<dt id="cfg_TitleDatabase">$cfg['TitleDatabase'] string</dt>
<dt id="cfg_TitleServer">$cfg['TitleServer'] string</dt>
@@ -2277,7 +2281,7 @@
<dt id="cfg_DBG">$cfg['DBG']</dt>
<dd><b>DEVELOPERS ONLY!</b></dd>
- <dt id="cfg_DBG_enable_sql">$cfg['DBG']['sql'] boolean</dt>
+ <dt id="cfg_DBG_sql">$cfg['DBG']['sql'] boolean</dt>
<dd><b>DEVELOPERS ONLY!</b><br />
Enable logging queries and execution times to be displayed in the bottom
of main page (right frame).</dd>
@@ -4187,7 +4191,7 @@
<a href="#faq6_22">6.22 Bookmarks: Can I execute a default bookmark
automatically when entering Browse mode for a table?</a></h4>
-<p> Yes. If a bookmark has the same label as a table name, it will be executed.
+<p> Yes. If a bookmark has the same label as a table name and it's not a public bookmark, it will be executed.
</p>
<h4 id="faq6_23">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/Documentation.txt new/phpMyAdmin-3.4.7-all-languages/Documentation.txt
--- old/phpMyAdmin-3.4.5-all-languages/Documentation.txt 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/Documentation.txt 2011-10-23 14:17:12.000000000 +0200
@@ -1,4 +1,4 @@
-phpMyAdmin 3.4.5 Documentation
+phpMyAdmin 3.4.7 Documentation
* Top
* Requirements
@@ -1523,6 +1523,9 @@
Contains names of configuration options (keys in $cfg array) that users
can't set through user preferences. For possible values, refer to libraries
/config/user_preferences.forms.php.
+$cfg['UserprefsDeveloperTab'] boolean
+ Activates in the user preferences a tab containing options for developers
+ of phpMyAdmin.
$cfg['TitleTable'] string
$cfg['TitleDatabase'] string
$cfg['TitleServer'] string
@@ -3079,7 +3082,8 @@
6.22 Bookmarks: Can I execute a default bookmark automatically when entering
Browse mode for a table?
-Yes. If a bookmark has the same label as a table name, it will be executed.
+Yes. If a bookmark has the same label as a table name and it's not a public
+bookmark, it will be executed.
6.23 Export: I heard phpMyAdmin can export Microsoft Excel files?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/README new/phpMyAdmin-3.4.7-all-languages/README
--- old/phpMyAdmin-3.4.5-all-languages/README 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/README 2011-10-23 14:17:12.000000000 +0200
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 3.4.5
+Version 3.4.7
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.5-all-languages/RELEASE-DATE-3.4.5 new/phpMyAdmin-3.4.7-all-languages/RELEASE-DATE-3.4.5
--- old/phpMyAdmin-3.4.5-all-languages/RELEASE-DATE-3.4.5 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/RELEASE-DATE-3.4.5 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Wed Sep 14 11:46:50 UTC 2011
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/RELEASE-DATE-3.4.7 new/phpMyAdmin-3.4.7-all-languages/RELEASE-DATE-3.4.7
--- old/phpMyAdmin-3.4.5-all-languages/RELEASE-DATE-3.4.7 1970-01-01 01:00:00.000000000 +0100
+++ new/phpMyAdmin-3.4.7-all-languages/RELEASE-DATE-3.4.7 2011-10-23 14:17:12.000000000 +0200
@@ -0,0 +1 @@
+Sun Oct 23 12:16:04 UTC 2011
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/export.php new/phpMyAdmin-3.4.7-all-languages/export.php
--- old/phpMyAdmin-3.4.5-all-languages/export.php 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/export.php 2011-10-23 14:17:12.000000000 +0200
@@ -31,7 +31,7 @@
$compression_methods = array(
'zip',
'gzip',
- 'bzip',
+ 'bzip2',
);
/**
@@ -150,7 +150,7 @@
$dump_buffer = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $dump_buffer);
}
// as bzipped
- if ($GLOBALS['compression'] == 'bzip' && @function_exists('bzcompress')) {
+ if ($GLOBALS['compression'] == 'bzip2' && @function_exists('bzcompress')) {
$dump_buffer = bzcompress($dump_buffer);
}
// as a gzipped file
@@ -222,7 +222,7 @@
&& $type != 'xls';
// Use on the fly compression?
-$onfly_compression = $GLOBALS['cfg']['CompressOnFly'] && ($compression == 'gzip' || $compression == 'bzip');
+$onfly_compression = $GLOBALS['cfg']['CompressOnFly'] && ($compression == 'gzip' || $compression == 'bzip2');
if ($onfly_compression) {
$memory_limit = trim(@ini_get('memory_limit'));
// 2 MB as default
@@ -285,7 +285,7 @@
// If dump is going to be compressed, set correct mime_type and add
// compression to extension
- if ($compression == 'bzip') {
+ if ($compression == 'bzip2') {
$filename .= '.bz2';
$mime_type = 'application/x-bzip2';
} elseif ($compression == 'gzip') {
@@ -649,7 +649,7 @@
}
}
// 2. as a bzipped file
- elseif ($compression == 'bzip') {
+ elseif ($compression == 'bzip2') {
if (@function_exists('bzcompress')) {
$dump_buffer = bzcompress($dump_buffer);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/js/server_privileges.js new/phpMyAdmin-3.4.7-all-languages/js/server_privileges.js
--- old/phpMyAdmin-3.4.5-all-languages/js/server_privileges.js 2011-09-14 13:48:14.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/js/server_privileges.js 2011-10-23 14:17:12.000000000 +0200
@@ -6,7 +6,7 @@
PMA_ajaxShowMessage(e.message);$("#topmenucontainer").next("div").remove().end().after(e.sql_query);var f=$("#topmenucontainer").next("div").find(".notice");f.text()==""&&f.remove();appendNewUser(e.new_user_string,e.new_user_initial,e.new_user_initial_string)}else PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest+" : "+e.error,"7000")})};b[PMA_messages.strCancel]=function(){$(this).dialog("close").remove()};$.get($(this).attr("href"),{ajax_request:true},function(d){$('<div id="add_user_dialog"></div>').prepend(d).find("#fieldset_add_user_footer").hide().end().find("form[name=usersForm]").append('<input type="hidden" name="ajax_request" value="true" />').end().dialog({title:PMA_messages.strAddNewUser,
width:800,height:600,modal:true,buttons:b});displayPasswordGenerateButton();PMA_ajaxRemoveMessage(c)})});$("#reload_privileges_anchor.ajax").live("click",function(a){a.preventDefault();PMA_ajaxShowMessage(PMA_messages.strReloadingPrivileges);$.get($(this).attr("href"),{ajax_request:true},function(c){c.success==true?PMA_ajaxShowMessage(c.message):PMA_ajaxShowMessage(c.error)})});$("#fieldset_delete_user_footer #buttonGo.ajax").live("click",function(a){a.preventDefault();PMA_ajaxShowMessage(PMA_messages.strRemovingSelectedUsers);
$form=$("#usersForm");$.post($form.attr("action"),$form.serialize()+"&delete="+$(this).attr("value")+"&ajax_request=true",function(c){if(c.success==true){PMA_ajaxShowMessage(c.message);$form.find("input:checkbox:checked").parents("tr").slideUp("medium",function(){var b=$(this).find("input:checkbox").val().charAt(0).toUpperCase();$(this).remove();$("#tableuserrights").find("input:checkbox[value^="+b+"]").length==0&&$("#initials_table").find("td > a:contains("+b+")").parent("td").html(b);$form.find("tbody").find("tr:odd").removeClass("even").addClass("odd").end().find("tr:even").removeClass("odd").addClass("even")})}else PMA_ajaxShowMessage(c.error)})});
-$(".edit_user_anchor.ajax").live("click",function(a){a.preventDefault();var c=PMA_ajaxShowMessage();$(this).parents("tr").addClass("current_row");var b={};b[PMA_messages.strCancel]=function(){$(this).dialog("close").remove()};$.get($(this).attr("href"),{ajax_request:true,edit_user_dialog:true},function(d){$('<div id="edit_user_dialog"></div>').append(d).dialog({width:900,height:600,buttons:b});displayPasswordGenerateButton();PMA_ajaxRemoveMessage(c)})});$("#edit_user_dialog").find("form").live("submit",
+$(".edit_user_anchor.ajax").live("click",function(a){a.preventDefault();var c=PMA_ajaxShowMessage();$(this).parents("tr").addClass("current_row");var b={};b[PMA_messages.strCancel]=function(){$(this).dialog("close").remove()};$.get($(this).attr("href"),{ajax_request:true,edit_user_dialog:true},function(d){$('<div id="edit_user_dialog"></div>').append(d).dialog({width:900,height:600,buttons:b});displayPasswordGenerateButton();PMA_ajaxRemoveMessage(c)})});$("#edit_user_dialog").find("form:not(#db_or_table_specific_priv)").live("submit",
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();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/js/sql.js new/phpMyAdmin-3.4.7-all-languages/js/sql.js
--- old/phpMyAdmin-3.4.5-all-languages/js/sql.js 2011-09-14 13:48:14.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/js/sql.js 2011-10-23 14:17:12.000000000 +0200
@@ -1,33 +1,33 @@
-var $data_a;function PMA_urldecode(e){return decodeURIComponent(e.replace(/\+/g,"%20"))}function PMA_urlencode(e){return encodeURIComponent(e.replace(/\%20/g,"+"))}
-function getFieldName(e,c){if(c=="vertical"){var a=e.siblings("th").find("a").clone();if(a.length==0)a=e.siblings("th").clone()}else{var d=e.index();a=$("#table_results").find("thead").find("th:nth("+(d-4)+") a").clone();if(a.length==0)a=$("#table_results").find("thead").find("th:nth("+(d-4)+")").clone()}a.children().remove();return $.trim(a.text())}
-function appendInlineAnchor(){if($("#top_direction_dropdown").val()=="vertical"){$("#table_results tr").find(".edit_row_anchor").removeClass("edit_row_anchor").parent().each(function(){var e=$(this),c=e.clone(),a=c.find("img:first").attr("title",PMA_messages.strInlineEdit);if(a.length!=0){var d=a.attr("src").replace(/b_edit/,"b_inline_edit");a.attr("src",d)}c.find("td").addClass("inline_edit_anchor").find("a").attr("href","#");d=c.find('span:contains("'+PMA_messages.strEdit+'")');var g=c.find("a").find("span");
-if(d.length>0){g.text(" "+PMA_messages.strInlineEdit);g.prepend(a)}else{g.text("");g.append(a)}c.insertAfter(e)});$("#rowsDeleteForm").find("tbody").find("th").each(function(){var e=$(this);e.attr("rowspan")==4&&e.attr("rowspan","5")})}else{$(".edit_row_anchor").each(function(){var e=$(this);e.removeClass("edit_row_anchor");var c=e.clone(),a=c.find("img").attr("title",PMA_messages.strInlineEdit);if(a.length!=0){var d=a.attr("src").replace(/b_edit/,"b_inline_edit");a.attr("src",d);c.find("a").attr("href",
-"#");d=c.find('span:contains("'+PMA_messages.strEdit+'")');var g=c.find("a").find("span");if(d.length>0){g.text(" "+PMA_messages.strInlineEdit);g.prepend(a)}else{g.text("");g.append(a)}}else{c.find("a").attr("href","#");c.find("a span").text(PMA_messages.strInlineEdit);a=c.find("input:image").attr("title",PMA_messages.strInlineEdit);if(a.length>0){d=a.attr("src").replace(/b_edit/,"b_inline_edit");a.attr("src",d)}c.find(".clickprevimage").text(" "+PMA_messages.strInlineEdit)}c.addClass("inline_edit_anchor");
-e.after(c)});$("#rowsDeleteForm").find("thead, tbody").find("th").each(function(){var e=$(this);e.attr("colspan")==4&&e.attr("colspan","5")})}}
-$(document).ready(function(){$.ajaxSetup({cache:"false"});var e=$("#top_direction_dropdown").val();$("#top_direction_dropdown, #bottom_direction_dropdown").live("change",function(){e=$(this).val()});$("#sqlqueryresults").live("appendAnchor",function(){appendInlineAnchor()});$("#sqlqueryresults.ajax").trigger("appendAnchor");if(!$("#sqlqueryform").find("a").is("#togglequerybox")){$('<a id="togglequerybox"></a>').html(PMA_messages.strHideQueryBox).appendTo("#sqlqueryform").hide();$("#togglequerybox").bind("click",
-function(){var c=$(this);c.siblings().slideToggle("fast");if(c.text()==PMA_messages.strHideQueryBox){c.text(PMA_messages.strShowQueryBox);$("#togglequerybox_spacer").remove();c.before('<br id="togglequerybox_spacer" />')}else c.text(PMA_messages.strHideQueryBox);return false})}$("#sqlqueryform.ajax").live("submit",function(c){c.preventDefault();$form=$(this);if(!checkSqlQuery($form[0]))return false;$(".error").remove();var a=PMA_ajaxShowMessage();PMA_prepareForAjaxRequest($form);$.post($(this).attr("action"),
-$(this).serialize(),function(d){if(d.success==true){$(".success").fadeOut();$(".sqlquery_message").fadeOut();if(typeof d.sql_query!="undefined"){$('<div class="sqlquery_message"></div>').html(d.sql_query).insertBefore("#sqlqueryform");$(".notice").remove()}else $("#sqlqueryform").before(d.message);$("#sqlqueryresults").show();if(typeof d.reload!="undefined"){$("#sqlqueryform.ajax").die("submit");$form.find("input[name=db]").val(d.db);$form.find("input[name=ajax_request]").remove();$form.append('<input type="hidden" name="reload" value="true" />');
-$.post("db_sql.php",$form.serialize(),function(g){$("body").html(g)})}}else if(d.success==false){$("#sqlqueryform").before(d.error);$("#sqlqueryresults").hide()}else{$(".success").fadeOut();$(".sqlquery_message").fadeOut();$received_data=$(d);$zero_row_results=$received_data.find('textarea[name="sql_query"]');if($zero_row_results.length>0)$("#sqlquery").val($zero_row_results.val());else{$("#sqlqueryresults").show();$("#sqlqueryresults").html(d);$("#sqlqueryresults").trigger("appendAnchor");$("#togglequerybox").show();
-$("#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 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(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.text(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")})});
+var $data_a;function PMA_urldecode(d){return decodeURIComponent(d.replace(/\+/g,"%20"))}function PMA_urlencode(d){return encodeURIComponent(d.replace(/\%20/g,"+"))}
+function getFieldName(d,b){if(b=="vertical"){var a=d.siblings("th").find("a").clone();if(a.length==0)a=d.siblings("th").clone()}else{var e=d.index();a=$("#table_results").find("thead").find("th:nth("+(e-4)+") a").clone();if(a.length==0)a=$("#table_results").find("thead").find("th:nth("+(e-4)+")").clone()}a.children().remove();return $.trim(a.text())}
+function appendInlineAnchor(){if($("#top_direction_dropdown").val()=="vertical"){$("#table_results tr").find(".edit_row_anchor").removeClass("edit_row_anchor").parent().each(function(){var d=$(this),b=d.clone(),a=b.find("img:first").attr("title",PMA_messages.strInlineEdit);if(a.length!=0){var e=a.attr("src").replace(/b_edit/,"b_inline_edit");a.attr("src",e)}b.find("td").addClass("inline_edit_anchor").find("a").attr("href","#");e=b.find('span:contains("'+PMA_messages.strEdit+'")');var g=b.find("a").find("span");
+if(e.length>0){g.text(" "+PMA_messages.strInlineEdit);g.prepend(a)}else{g.text("");g.append(a)}b.insertAfter(d)});$("#rowsDeleteForm").find("tbody").find("th").each(function(){var d=$(this);d.attr("rowspan")==4&&d.attr("rowspan","5")})}else{$(".edit_row_anchor").each(function(){var d=$(this);d.removeClass("edit_row_anchor");var b=d.clone(),a=b.find("img").attr("title",PMA_messages.strInlineEdit);if(a.length!=0){var e=a.attr("src").replace(/b_edit/,"b_inline_edit");a.attr("src",e);b.find("a").attr("href",
+"#");e=b.find('span:contains("'+PMA_messages.strEdit+'")');var g=b.find("a").find("span");if(e.length>0){g.text(" "+PMA_messages.strInlineEdit);g.prepend(a)}else{g.text("");g.append(a)}}else{b.find("a").attr("href","#");b.find("a span").text(PMA_messages.strInlineEdit);a=b.find("input:image").attr("title",PMA_messages.strInlineEdit);if(a.length>0){e=a.attr("src").replace(/b_edit/,"b_inline_edit");a.attr("src",e)}b.find(".clickprevimage").text(" "+PMA_messages.strInlineEdit)}b.addClass("inline_edit_anchor");
+d.after(b)});$("#rowsDeleteForm").find("thead, tbody").find("th").each(function(){var d=$(this);d.attr("colspan")==4&&d.attr("colspan","5")})}}
+$(document).ready(function(){$.ajaxSetup({cache:"false"});var d=$("#top_direction_dropdown").val();$("#top_direction_dropdown, #bottom_direction_dropdown").live("change",function(){d=$(this).val()});$("#sqlqueryresults").live("appendAnchor",function(){appendInlineAnchor()});$("#sqlqueryresults.ajax").trigger("appendAnchor");if(!$("#sqlqueryform").find("a").is("#togglequerybox")){$('<a id="togglequerybox"></a>').html(PMA_messages.strHideQueryBox).appendTo("#sqlqueryform").hide();$("#togglequerybox").bind("click",
+function(){var b=$(this);b.siblings().slideToggle("fast");if(b.text()==PMA_messages.strHideQueryBox){b.text(PMA_messages.strShowQueryBox);$("#togglequerybox_spacer").remove();b.before('<br id="togglequerybox_spacer" />')}else b.text(PMA_messages.strHideQueryBox);return false})}$("#sqlqueryform.ajax input:submit").live("click",function(b){b.preventDefault();var a=$(this).closest("form");"button_submit_query"==$(this).attr("id")&&a.find("select[name=id_bookmark]").attr("value","");if(!checkSqlQuery(a[0]))return false;
+$(".error").remove();var e=PMA_ajaxShowMessage();PMA_prepareForAjaxRequest(a);$.post(a.attr("action"),a.serialize(),function(g){if(g.success==true){$(".success").fadeOut();$(".sqlquery_message").fadeOut();if(typeof g.sql_query!="undefined"){$('<div class="sqlquery_message"></div>').html(g.sql_query).insertBefore("#sqlqueryform");$(".notice").remove()}else $("#sqlqueryform").before(g.message);$("#sqlqueryresults").show();if(typeof g.reload!="undefined"){$("#sqlqueryform.ajax").die("submit");a.find("input[name=db]").val(g.db);
+a.find("input[name=ajax_request]").remove();a.append('<input type="hidden" name="reload" value="true" />');$.post("db_sql.php",a.serialize(),function(m){$("body").html(m)})}}else if(g.success==false){$("#sqlqueryform").before(g.error);$("#sqlqueryresults").hide()}else{$(".success").fadeOut();$(".sqlquery_message").fadeOut();$received_data=$(g);$zero_row_results=$received_data.find('textarea[name="sql_query"]');if($zero_row_results.length>0)$("#sqlquery").val($zero_row_results.val());else{$("#sqlqueryresults").show();
+$("#sqlqueryresults").html(g);$("#sqlqueryresults").trigger("appendAnchor");$("#togglequerybox").show();$("#togglequerybox").siblings(":visible").length>0&&$("#togglequerybox").trigger("click");PMA_init_slider()}}PMA_ajaxRemoveMessage(e)})});$("input[name=navig].ajax").live("click",function(b){b.preventDefault();var a=PMA_ajaxShowMessage();b=$(this).parent("form");b.append('<input type="hidden" name="ajax_request" value="true" />');$.post(b.attr("action"),b.serialize(),function(e){$("#sqlqueryresults").html(e);
+$("#sqlqueryresults").trigger("appendAnchor");PMA_init_slider();PMA_ajaxRemoveMessage(a)})});$("#pageselector").live("change",function(b){var a=$(this).parent("form");if($(this).hasClass("ajax")){b.preventDefault();var e=PMA_ajaxShowMessage();$.post(a.attr("action"),a.serialize()+"&ajax_request=true",function(g){$("#sqlqueryresults").html(g);$("#sqlqueryresults").trigger("appendAnchor");PMA_init_slider();PMA_ajaxRemoveMessage(e)})}else a.submit()});$("#table_results.ajax").find("a[title=Sort]").live("click",
+function(b){b.preventDefault();var a=PMA_ajaxShowMessage();$anchor=$(this);$.get($anchor.attr("href"),$anchor.serialize()+"&ajax_request=true",function(e){$("#sqlqueryresults").html(e).trigger("appendAnchor");PMA_ajaxRemoveMessage(a)})});$("#displayOptionsForm.ajax").live("submit",function(b){b.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(b){b.preventDefault();var a=$(this).parents("td");a.removeClass("inline_edit_anchor").addClass("inline_edit_active").parent("tr").addClass("noclick");var e=a.children("span.nowrap").children("a").children("span.nowrap");$data_a=a.children("span.nowrap").children("a").clone();b=e.find("img");e.parent("a").find('span:contains("'+PMA_messages.strInlineEdit+'")').length>0?e.text(" "+PMA_messages.strSave):e.empty();if(b.length>0){b.attr("title",PMA_messages.strSave);var g=b.attr("src").replace(/b_inline_edit/,
+"b_save");b.attr("src",g);e.prepend(b)}e=a.children("span.nowrap").children("a").clone().attr("id","hide");var m=e.find("span");b=e.find("span img");e.find('span:contains("'+PMA_messages.strSave+'")').length>0?m.text(" "+PMA_messages.strHide):m.empty();if(b.length>0){b.attr("title",PMA_messages.strHide);g=b.attr("src").replace(/b_save/,"b_close");b.attr("src",g);m.prepend(b)}a.children("span.nowrap").append($("<br /><br />")).append(e);if(d!="vertical")$("#table_results tbody tr td span a#hide").click(function(){var f=
+$(this).parents("td"),c=f.find("span");c.find("a, br").remove();c.append($data_a.clone());f.removeClass("inline_edit_active hover").addClass("inline_edit_anchor");f.parent().removeClass("hover noclick");f.siblings().removeClass("hover");c=f.siblings().length;for(var i="",h=4;h</div>');c.is(".null")&&$(".checkbox_null_"+i+"_"+l).attr("checked",true);if(c.is(".enum, .set"))c.find("select").live("change",function(){$(".checkbox_null_"+i+"_"+l).attr("checked",
+false)});else if(c.is(".relation")){c.find("select").live("change",function(){$(".checkbox_null_"+i+"_"+l).attr("checked",false)});c.find(".browse_foreign").live("click",function(){$(".checkbox_null_"+i+"_"+l).attr("checked",false)})}else c.find("textarea").live("keypress",function(n){n.which!=0&&$(".checkbox_null_"+i+"_"+l).attr("checked",false)});$(".checkbox_null_"+i+"_"+l).bind("click",function(){if(c.is(".enum"))c.find("select").attr("value","");else if(c.is(".set"))c.find("select").find("option").each(function(){$(this).attr("selected",
+false)});else if(c.is(".relation"))c.find("select").length>0?c.find("select").attr("value",""):c.find("span.curr_value").empty();else c.find("textarea").val("")})}else c.html('<div class="null_div"></div>');if(c.is(":not(.truncated, .transformed, .relation, .enum, .set, .null)")){value=f.replace("<br>","\n");c.append("<textarea>"+value+"</textarea>");c.data("original_data",f)}else if(c.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(n){n.success==true&&a.hasClass("inline_edit_active")?c.append("<textarea>"+n.value+"</textarea>"):PMA_ajaxShowMessage(n.error)});c.data("original_data",f)}else if(c.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(n){a.hasClass("inline_edit_active")&&
+c.append(n.dropdown)});c.data("original_data",f)}else if(c.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(n){a.hasClass("inline_edit_active")&&c.append(n.dropdown)});c.data("original_data",f)}else if(c.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(n){a.hasClass("inline_edit_active")&&
+c.append(n.select)});c.data("original_data",f)}else if(c.is(".null")){c.append("<textarea></textarea>");c.data("original_data","NULL")}})});$(".inline_edit_active span a").live("click",function(b){b.preventDefault();var a=$(this).parent().parent(),e="";if(d=="vertical")var g=a.index(),m=a.parents("tbody").find("tr").find(".inline_edit:nth("+g+")"),k=a.parents("tbody").find("tr").find(".where_clause:nth("+g+")").val();else{m=a.parent("tr").find(".inline_edit");k=a.parent("tr").find(".where_clause").val()}b=
+a.is(".nonunique")?0:1;var r={},l=$("#relational_display_K").attr("checked")?"K":"D",q={},f=false,c="UPDATE `"+window.parent.table+"` SET ",i=false,h="";m.each(function(){var j=$(this),o=getFieldName(j,d),p={};if(j.is(".transformed"))f=true;var u=true;if(j.find("input:checkbox").is(":checked")){c+=" `"+o+"`=NULL , ";i=true}else{if(j.is(":not(.relation, .enum, .set, .bit)")){p[o]=j.find("textarea").val();j.is(".transformed")&&$.extend(q,p)}else if(j.is(".bit")){p[o]="0b"+j.find("textarea").val();u=
+false}else if(j.is(".set")){e=j.find("select");p[o]=e.map(function(){return $(this).val()}).get().join(",")}else{e=j.find("select");if(e.length!=0)p[o]=e.val();e=j.find("span.curr_value");if(e.length!=0)p[o]=e.text();j.is(".relation")&&$.extend(r,p)}if(k.indexOf(o)>-1)h+="`"+window.parent.table+"`.`"+o+"` = '"+p[o].replace(/'/g,"''")+"' AND ";if(p[o]!=j.data("original_data")){c+=u==true?" `"+o+"`='"+p[o].replace(/'/g,"''")+"', ":" `"+o+"`="+p[o].replace(/'/g,"''")+", ";i=true}}});c=c.replace(/,\s$/,
+"");c=c.replace(/\\/g,"\\\\");h=h.substring(0,h.length-5);h=PMA_urlencode(h);c+=" WHERE "+PMA_urldecode(k);c+=" LIMIT 1";var t=$.param(r),s=$.param(q),n=$(this).parent(),v=$(this);i?$.post("tbl_replace.php",{ajax_request:true,sql_query:c,disp_direction:d,token:window.parent.token,db:window.parent.db,table:window.parent.table,clause_is_unique:b,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);d=="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(n,v,a,m,j,d)}else PMA_ajaxShowMessage(j.error)}):PMA_unInlineEditRow(n,v,a,m,"",d)})},"top.frame_content");
+function PMA_unInlineEditRow(d,b,a,e,g,m){d.find("a, br").remove();d.append($data_a.clone());a.removeClass("inline_edit_active").addClass("inline_edit_anchor");a.parent("tr").removeClass("noclick");m!="vertical"?a.parent("tr").removeClass("hover").find("td").removeClass("hover"):a.parents("tbody").find("tr").find("td:eq("+a.index()+")").removeClass("marked hover");e.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,m);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 c=$this_sibling.find("textarea").val();k=$(f).append(c)}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,m);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.text(k)}})}
+function PMA_changeClassForColumn(d,b){var a=d.index();!d.closest("tr").children(":first").hasClass("column_heading")&&a--;a=d.closest("table").find("tbody tr").find("td.data:eq("+a+")");if(d.data("has_class_"+b)){a.removeClass(b);d.data("has_class_"+b,false)}else{a.addClass(b);d.data("has_class_"+b,true)}}
+$(document).ready(function(){$(".browse_foreign").live("click",function(d){d.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.5-all-languages/js/tbl_select.js new/phpMyAdmin-3.4.7-all-languages/js/tbl_select.js
--- old/phpMyAdmin-3.4.5-all-languages/js/tbl_select.js 2011-09-14 13:48:14.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/js/tbl_select.js 2011-10-23 14:17:12.000000000 +0200
@@ -1,3 +1,3 @@
$(document).ready(function(){$.ajaxSetup({cache:"false"});$('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>').insertAfter("#tbl_search_form").hide();$("#togglesearchformlink").html(PMA_messages.strShowSearchCriteria).bind("click",function(){var a=$(this);$("#tbl_search_form").slideToggle();a.text()==PMA_messages.strHideSearchCriteria?a.text(PMA_messages.strShowSearchCriteria):a.text(PMA_messages.strHideSearchCriteria);return false});$("#tbl_search_form.ajax").live("submit",
-function(a){$search_form=$(this);a.preventDefault();$("#sqlqueryresults").empty();var c=PMA_ajaxShowMessage(PMA_messages.strSearching);PMA_prepareForAjaxRequest($search_form);$.post($search_form.attr("action"),$search_form.serialize(),function(b){if(typeof b=="string"){$("#sqlqueryresults").html(b);$("#sqlqueryresults").trigger("appendAnchor");$("#tbl_search_form").slideToggle().hide();$("#togglesearchformlink").text(PMA_messages.strShowSearchCriteria);$("#togglesearchformdiv").show()}else $("#sqlqueryresults").html(b.message);
+function(a){$search_form=$(this);a.preventDefault();$("#sqlqueryresults").empty();var c=PMA_ajaxShowMessage(PMA_messages.strSearching);PMA_prepareForAjaxRequest($search_form);$.post($search_form.attr("action"),$search_form.serialize(),function(b){if(typeof b=="string"){$("#sqlqueryresults").html(b);$("#sqlqueryresults").trigger("appendAnchor");$("#tbl_search_form").slideToggle().hide();$("#togglesearchformlink").text(PMA_messages.strShowSearchCriteria);$("#togglesearchformdiv").show();PMA_init_slider()}else $("#sqlqueryresults").html(b.message);
c.clearQueue().fadeOut("medium",function(){$(this).hide()})})})},"top.frame_content");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/libraries/Config.class.php new/phpMyAdmin-3.4.7-all-languages/libraries/Config.class.php
--- old/phpMyAdmin-3.4.5-all-languages/libraries/Config.class.php 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/libraries/Config.class.php 2011-10-23 14:17:12.000000000 +0200
@@ -96,7 +96,7 @@
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.4.5');
+ $this->set('PMA_VERSION', '3.4.7');
/**
* @deprecated
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/libraries/Table.class.php new/phpMyAdmin-3.4.7-all-languages/libraries/Table.class.php
--- old/phpMyAdmin-3.4.5-all-languages/libraries/Table.class.php 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/libraries/Table.class.php 2011-10-23 14:17:12.000000000 +0200
@@ -1008,6 +1008,7 @@
* @param string new database name
* @param boolean is this for a VIEW rename?
* @return boolean success
+ * @todo remove the $is_view parameter (also in callers)
*/
function rename($new_name, $new_db = null, $is_view = false)
{
@@ -1032,15 +1033,12 @@
return false;
}
- if (! $is_view) {
- $GLOBALS['sql_query'] = '
- RENAME TABLE ' . $this->getFullName(true) . '
- TO ' . $new_table->getFullName(true) . ';';
- } else {
- $GLOBALS['sql_query'] = '
- ALTER TABLE ' . $this->getFullName(true) . '
- RENAME ' . $new_table->getFullName(true) . ';';
- }
+ /*
+ * tested also for a view, in MySQL 5.0.92, 5.1.55 and 5.5.13
+ */
+ $GLOBALS['sql_query'] = '
+ RENAME TABLE ' . $this->getFullName(true) . '
+ TO ' . $new_table->getFullName(true) . ';';
// I don't think a specific error message for views is necessary
if (! PMA_DBI_query($GLOBALS['sql_query'])) {
$this->errors[] = sprintf(__('Error renaming table %1$s to %2$s'), $this->getFullName(), $new_table->getFullName());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/libraries/common.inc.php new/phpMyAdmin-3.4.7-all-languages/libraries/common.inc.php
--- old/phpMyAdmin-3.4.5-all-languages/libraries/common.inc.php 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/libraries/common.inc.php 2011-10-23 14:17:12.000000000 +0200
@@ -466,7 +466,7 @@
/* needed for direct access, see FAQ 1.34
* also, server needed for cookie login screen (multi-server)
*/
- 'server', 'db', 'table', 'target',
+ 'server', 'db', 'table', 'target', 'lang',
/* Session ID */
'phpMyAdmin',
/* Cookie preferences */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/libraries/common.lib.php new/phpMyAdmin-3.4.7-all-languages/libraries/common.lib.php
--- old/phpMyAdmin-3.4.5-all-languages/libraries/common.lib.php 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/libraries/common.lib.php 2011-10-23 14:17:12.000000000 +0200
@@ -614,12 +614,12 @@
if (strlen($table)) {
$_url_params['db'] = $db;
$_url_params['table'] = $table;
- $doedit_goto = '<a href="tbl_sql.php?' . PMA_generate_common_url($_url_params) . '">';
+ $doedit_goto = '<a href="tbl_sql.php' . PMA_generate_common_url($_url_params) . '">';
} elseif (strlen($db)) {
$_url_params['db'] = $db;
- $doedit_goto = '<a href="db_sql.php?' . PMA_generate_common_url($_url_params) . '">';
+ $doedit_goto = '<a href="db_sql.php' . PMA_generate_common_url($_url_params) . '">';
} else {
- $doedit_goto = '<a href="server_sql.php?' . PMA_generate_common_url($_url_params) . '">';
+ $doedit_goto = '<a href="server_sql.php' . PMA_generate_common_url($_url_params) . '">';
}
$error_msg_output .= $doedit_goto
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/libraries/config/ConfigFile.class.php new/phpMyAdmin-3.4.7-all-languages/libraries/config/ConfigFile.class.php
--- old/phpMyAdmin-3.4.5-all-languages/libraries/config/ConfigFile.class.php 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/libraries/config/ConfigFile.class.php 2011-10-23 14:17:12.000000000 +0200
@@ -422,7 +422,7 @@
}
$verbose = $this->get("Servers/$id/verbose");
if (!empty($verbose)) {
- return $verbose;
+ return htmlspecialchars($verbose);
}
$host = $this->get("Servers/$id/host");
return empty($host) ? 'localhost' : $host;
@@ -508,4 +508,4 @@
return $c;
}
}
-?>
\ No newline at end of file
+?>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/libraries/config/messages.inc.php new/phpMyAdmin-3.4.7-all-languages/libraries/config/messages.inc.php
--- old/phpMyAdmin-3.4.5-all-languages/libraries/config/messages.inc.php 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/libraries/config/messages.inc.php 2011-10-23 14:17:12.000000000 +0200
@@ -428,7 +428,7 @@
$strConfigServers_tracking_name = __('SQL query tracking table');
$strConfigServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.');
$strConfigServers_tracking_version_auto_create_name = __('Automatically create versions');
-$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_config[/kbd]');
+$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_userconfig[/kbd]');
$strConfigServers_userconfig_name = __('User preferences storage table');
$strConfigServers_user_desc = __('Leave empty if not using config auth');
$strConfigServers_user_name = __('User for config auth');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/libraries/core.lib.php new/phpMyAdmin-3.4.7-all-languages/libraries/core.lib.php
--- old/phpMyAdmin-3.4.5-all-languages/libraries/core.lib.php 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/libraries/core.lib.php 2011-10-23 14:17:12.000000000 +0200
@@ -260,10 +260,15 @@
* @access public
*/
function PMA_getPHPDocLink($target) {
- /* l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. */
- $lang = _pgettext('PHP documentation language', 'en');
+ /* Gettext does not have to be loaded yet */
+ if (function_exists('_pgettext')) {
+ /* l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. */
+ $lang = _pgettext('PHP documentation language', 'en');
+ } else {
+ $lang = 'en';
+ }
- return 'http://php.net/manual/' . $lang . '/' . $target;
+ return PMA_linkURL('http://php.net/manual/' . $lang . '/' . $target);
}
/**
@@ -690,6 +695,9 @@
if (!preg_match('#^https?://#', $url) || defined('PMA_SETUP')) {
return $url;
} else {
+ if (!function_exists('PMA_generate_common_url')) {
+ require_once('./libraries/url_generating.lib.php');
+ }
$params = array();
$params['url'] = $url;
return './url.php' . PMA_generate_common_url($params);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/libraries/db_info.inc.php new/phpMyAdmin-3.4.7-all-languages/libraries/db_info.inc.php
--- old/phpMyAdmin-3.4.5-all-languages/libraries/db_info.inc.php 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/libraries/db_info.inc.php 2011-10-23 14:17:12.000000000 +0200
@@ -66,6 +66,15 @@
*/
function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table)
{
+ if (strstr($table['Comment'], '; InnoDB free') === false) {
+ if (!strstr($table['Comment'], 'InnoDB free') === false) {
+ // here we have just InnoDB generated part
+ $table['Comment'] = '';
+ }
+ } else {
+ // remove InnoDB comment from end, just the minimal part (*? is non greedy)
+ $table['Comment'] = preg_replace('@; InnoDB free:.*?$@', '', $table['Comment']);
+ }
if (empty($table['Comment'])) {
$table['Comment'] = $table['Name'];
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.5-all-languages/libraries/display_export.lib.php new/phpMyAdmin-3.4.7-all-languages/libraries/display_export.lib.php
--- old/phpMyAdmin-3.4.5-all-languages/libraries/display_export.lib.php 2011-09-14 13:48:13.000000000 +0200
+++ new/phpMyAdmin-3.4.7-all-languages/libraries/display_export.lib.php 2011-10-23 14:17:12.000000000 +0200
@@ -298,8 +298,8 @@
// zip, gzip and bzip2 encode features
$is_zip = ($cfg['ZipDump'] && @function_exists('gzcompress'));
$is_gzip = ($cfg['GZipDump'] && @function_exists('gzencode'));
- $is_bzip = ($cfg['BZipDump'] && @function_exists('bzcompress'));
- if ($is_zip || $is_gzip || $is_bzip) { ?>
+ $is_bzip2 = ($cfg['BZipDump'] && @function_exists('bzcompress'));
+ if ($is_zip || $is_gzip || $is_bzip2) { ?>
<li>
<label for="compression" class="desc"><?php echo __('Compression:'); ?></label>
<select id="compression" name="compression">
@@ -308,8 +308,8 @@