From d9a9a9195d1fdd95e923eb82c820d81e2148fa60 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 7 Jan 2014 10:08:05 -0500 Subject: [PATCH 1/5] 4.1.5-dev Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d17e2f6e1..02328912a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.1.4.0 (not yet released) +4.1.5.0 (not yet released) + +4.1.4.0 (2014-01-07) - bug #3840 (additional fix) When exporting to gzip format, the data is compressed 2 times - bug #4209 Missing compression in one case - bug #4208 Can't browse tables after sorting on columns with fieldnames that have a '-' diff --git a/README b/README index 94b7f8e9ad..615a94c554 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.1.4-dev +Version 4.1.5-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 6ea09a9eae..0f5614a9f9 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.1.4-dev' +version = '4.1.5-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 1642e46c8f..31b1ea0bcc 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.1.4-dev'); + $this->set('PMA_VERSION', '4.1.5-dev'); /** * @deprecated */ From 0fe5aac52d5a4bd5f16da282f5212e6391c5c45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Cie=C5=9Bluk?= Date: Tue, 7 Jan 2014 15:37:42 +0100 Subject: [PATCH 2/5] Translated using Weblate (Polish) Currently translated at 92.6% (2548 of 2749) --- po/pl.po | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/po/pl.po b/po/pl.po index 4cda08e081..12f51de754 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4,17 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-27 10:57-0500\n" -"PO-Revision-Date: 2013-11-03 12:06+0200\n" -"Last-Translator: Piotr Przybylski \n" -"Language-Team: Polish \n" +"PO-Revision-Date: 2014-01-07 15:37+0200\n" +"Last-Translator: Łukasz Cieśluk \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 1.8-dev\n" +"X-Generator: Weblate 1.9-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -423,7 +422,6 @@ msgid "You may want to refresh the page." msgstr "Możesz odświeżyć stronę." #: error_report.php:45 -#, fuzzy #| msgid "" #| "An error has been detected and an error report has been automatically " #| "submitted based on your settings." @@ -437,6 +435,8 @@ msgstr "" #: error_report.php:50 error_report.php:77 msgid "If you experience any problems please submit a bug report manually." msgstr "" +"W przypadku jakichkolwiek problemów prosimy o przysłanie zgłoszenia błędu " +"ręcznie." #: error_report.php:63 error_report.php:72 msgid "Thank you for submitting this report." @@ -757,48 +757,42 @@ msgid "Server version:" msgstr "Wersja serwera" #: index.php:264 -#, fuzzy #| msgid "Protocol version" msgid "Protocol version:" -msgstr "Wersja protokołu" +msgstr "Wersja protokołu:" #: index.php:268 -#, fuzzy #| msgid "User" msgid "User:" -msgstr "Użytkownik" +msgstr "Użytkownik:" #: index.php:273 -#, fuzzy #| msgid "Server charset" msgid "Server charset:" -msgstr "Kodowanie znaków serwera" +msgstr "Kodowanie znaków serwera:" #: index.php:287 msgid "Web server" msgstr "Serwer WWW" #: index.php:303 -#, fuzzy #| msgid "Database client version" msgid "Database client version:" -msgstr "Wersja klienta bazy danych" +msgstr "Wersja klienta bazy danych:" #: index.php:307 -#, fuzzy #| msgid "PHP extension" msgid "PHP extension:" -msgstr "Rozszerzenie PHP" +msgstr "Rozszerzenie PHP:" #: index.php:321 msgid "Show PHP information" -msgstr "Informacje o PHP" +msgstr "Pokaż informacje o PHP" #: index.php:344 -#, fuzzy #| msgid "Version information" msgid "Version information:" -msgstr "Informacja o wersji" +msgstr "Informacja o wersji:" #: index.php:353 libraries/Util.class.php:429 libraries/Util.class.php:496 #: libraries/config/FormDisplay.tpl.php:148 @@ -847,8 +841,9 @@ msgid "" "option is incompatible with phpMyAdmin and might cause some data to be " "corrupted!" msgstr "" -"Masz włączone mbstring.func_overload w konfiguracji PHP. Opcja ta jest " -"niezgodna z phpMyAdmin i może spowodować, że niektóre dane bądą uszkodzone!" +"Masz włączone mbstring.func_overload w Twojej konfiguracji PHP. Opcja ta " +"jest niezgodna z phpMyAdminem i może spowodować uszkodzenie niektórych " +"danych!" #: index.php:444 msgid "" From 848f1eee28a5db6572d352da586dbf08c2f6ea1d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 7 Jan 2014 10:13:48 -0500 Subject: [PATCH 3/5] Remove 2013 entries Signed-off-by: Marc Delisle --- ChangeLog | 423 ------------------------------------------------------ 1 file changed, 423 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02328912a1..de4b59c765 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,429 +15,6 @@ phpMyAdmin - ChangeLog - bug #4220 Incorrect key values in foreign key browser - bug #4215 MariaDB 5.5: error in Drizzle detection -4.1.3.0 (2013-12-31) -- bug #3938 PDFDefaultPageSize doc and easy configurability -- bug #4198 Hovering over pie chart gives fatal JS error -- bug #4200 Missing syntax highlighting -- bug #4201 Exports are not compressed -- bug #4131 Import: "number of rows to skip" is ambiguous -- bug #4205 Add a user shows additional "edit user group" link -- bug #4202 Cannot read property 'token' of undefined -- bug #4203 On refreshing designer, $.FullScreen is undefined -- bug #3920 Lost space in navigation area - -4.1.2.0 (2013-12-23) -- bug #4178 Quick edit for BIT type does not work -- bug #2760 Warn about incomplete exports -- bug #4190 Fractional seconds cause row update even if the value is not changed -- bug #4170 Overflow scroll for table grid is not a good solution -- bug #2961 Relations settings not updated on config change -- bug #4187 SQL query inline edit doesn't post changes on the first run -+ rfe #1465 Docs for connections to IPv6 only MySQL instances -+ rfe #1468 [interface] No floating for server breadcrumb menu - -4.1.1.0 (2013-12-17) -- bug #4154 Error using UNION query -- bug #4173 Transformations overview not reachable -- bug #4149 Js freezes in the management of replication -- bug #3903 Query fails when using aliases after ordering result -- bug #4181 Adding columns in table creation clears existing columns -- bug #4023 Requires wildcard EXECUTE/ALTER ROUTINE on DB to allow -Procedures to be executed by user -- bug #4186 Adding a column when creating a table does not propagate index info -- bug #4185 Unable to execute create procedure statement from query window - -4.1.0.0 (2013-12-11) -+ rfe #499 On user creation, warn if the user already exists -+ Use indeterminate check all checkbox in server privileges -+ Break server_status.php functions into smaller functions -+ PMA_DBI functions in database_interface.lib.php renamed to be compliant with PEAR standards -+ [interface] Make warning about existing config directory clearer -+ rfe #1414 Allow specifying controlport -+ PMA_DBI functions in database interface libraries renamed to be compliant with PEAR standards -+ rfe #1412 Creating a view from an empty set of results -+ Improved layout on db and table operations pages -+ rfe #1410 Added support for AES_ENCRYPT for blob fields -+ rfe #1423 Clarify option text for icon/text settings -+ [interface] Upgraded CodeMirror to 3.x series -+ rfe #1363 Improved query profiler -+ [interface] rfe #1429 Better suggestion for database name -+ rfe #1433 Support relations with ndbcluster -- bug #3962 Proper escaping of JSON export -+ rfe #1382 Optional ReCAPTCHA support -+ rfe #1434 Improvements to the table browsing navigation bar -+ rfe #1233 and rfe #1283 Improvements to Relation View interface -+ rfe #1397 Use fractional seconds in time, datetime, and timestamp -+ rfe #175 Allow cross-database relations -- [core] Dropped support for PHP 5.2. -+ rfe #487 and rfe #1405 Find and Replacing column wise -+ rfe #1373 Use same create view dialog for editing a view -+ rfe #316 Configurable menus; allow user groups with customized menus per group -- bug #4024 Editing field a record is selected by makes pma load forever -- bug #4035 Query "inline" link disappears when turning off "Explain SQL" option -+ rfe #1385 Hide tables, functions, procedures, events and views in navigation tree -+ rfe #1321 Export view as if it was a table -+ Dropped configuration directive: SQP -+ Dropped configuration directive: MySQLManual* -+ rfe #1041 and bug #2954 Improved support for SSL connections between MySQL and phpMyAdmin -- bug #4056 Language: Vague error message when adding a varchar field -+ [setup] rfe #1452 Use type="password" for server passwords -+ rfe #1451 HTML5 input tag enhancements -- bug #1193 Text field too small when editing a row longer than $cfg['LimitChars'] -+ Privileges tab for table level -- bug #4068 Headline in operations not readable in IE10 -- bug #4000 "Table does not contain unique column" message appears after adding a unique column -+ rfe #1428 add 'new database' entry to nav tree -+ rfe #1457 Stone Age icon found -+ rfe #1463 Filter tables and databases by regular expression -+ Change the proxy variable names in the config to remove the VersionCheck prefix from them -+ Added an Error Reporting Component -+ Javascript files are no longer uglified -- bug #4145 Config screen fails to validate MemoryLimit = -1 (new default) -- bug #4123 Double config including -- bug #4134 After deleting all rows on a page, it returns to a blank page -+ Dropped configuration directive: DisableIS, ShowDatabasesCommand -- bug #4152 Not possible to enter % for search in date fields -- bug #3931 IN Clause search does not permit multiple values -- bug #4086 Clicking OK from edit popup opens new tab -- bug #2983 unknown table status: TABLE_TYPE -- bug #4030 ORDER BY SUM(`field`) does not sort DESC -- bug #4133 CSV import breaks when no blank line at end of file -- bug #4153 Unable to import if newline encoding is MAC style -- bug #4096 horizontal scrollbar should not overflow on the left column -- bug #4159 bug with navigation between database and table filter -- bug #4119 Huge session data with $cfg['Error_Handler']['gather'] -- bug #4169 Table list jumps to table on click -- bug #4168 Rename multiple columns is not working - -4.0.10.0 (2013-12-04) -- bug #4150 Clicking database name in query window opens a new tab -- bug #4141 Wrong page is shown after editing; also, do not show a modal - dialog for multi-row edit -- bug #3939 PHP NavigationTree error when paging through list -- bug #4075 Support A10 Networks load balancer -- bug #4083 row deleting isn't binlogs friendly -- bug #4163 Setup script does not recognize manually-configured server -- bug #4158 Events page says no privileges with ALL PRIVILEGES - -4.0.9.0 (2013-11-04) -- bug #4104 Can't edit updatable view when searching -- bug #4108 Missing refresh by deleting databases -- bug #3995 Drizzle server charset notice -- bug #3911 Filtering database names includes empty groupings -- bug #3678 Does not display or manipulate bit(64) fields appropriately -- bug #4129 Unneeded navi panel refresh -- bug #4120 SSL redirects to port 80 -- bug #4144 DROP DATABASE displays wrong database name -- bug #4059 Running delete query asks for confirmation but says it was already executed -- bug #4147 Accessibility: Images without Alt nor title attribute - -4.0.8.0 (2013-10-06) -- bug #3988 Rename view is not working -- bug #4041 Interaction between linkified fields and grid editing -- bug #3975 Table grouping isn't implemented properly -- bug #4060 Browser tries to remember wrong password when creating new user -- bug #4002 Edit Index on big table doesn't show "Loading" or any message -- bug #4098 Default table tab is ignored -- bug #4099 Server/library difference warning: setting is ignored -- bug #4100 table tree group strategy -- bug #4102 ALTER TABLE ORDER BY and InnoDB -- bug #4103 Tracking report: cannot delete a statement -- bug #3996 Drizzle navigation doesn't expand -- bug #4074 GIS column editor: point not displayed -- bug #4109 Drizzle tables in navigation are shown as views -- bug #4095 NUL symbols added to the end of database dump file -- bug #4105 More disappears in table Structure -- bug #3992 Multi-row edit doesn't clear values when checking NULL - -4.0.7.0 (2013-09-23) -- bug #3993 Sorting in database overview with statistics doesn't work -- bug Handle the situation where PHP_SELF is not set -- bug #4080 Overwrite existing file not obeyed -- bug #3929 Database-specific privileges are not copied when cloning user -- bug #3997 Error handling in case MySQL extension is missing -- bug #4089 Moving Columns will alter column definition -- bug #4091 Insert ignore option does not work -- bug #4090 Downloading BLOB downloads page template -- bug #4092 Clicking on table name in view of information_schema redirects to wrong page -- bug #4079 Copy Table Add AUTO_INCREMENT value checkbox not working -- bug #4088 MySQL server version at index.php incorrect w/ controlhost -- bug #4001 Import error: Class 'ImportOds' not found -- bug #3986 Missing DROP VIEW button - -4.0.6.0 (2013-09-05) -- bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) -- bug Missing hints when changing a column's structure -- bug #4048 Cannot select foreign value in Search -- bug #4025 gzip export is not actually compressed with mod_deflate -- bug #4054 query analysis doesn't launch in status monitor -+ Add pmahomme icon credits (FamFamFam silk icon set) -- bug #4064 Table structure statistics "Space usage" caption too small for l10n -- bug #4051 Wrong tabindex when inserting rows -- bug #4066 varchar field not truncated in table browse mode -+ rfe #1435 Opening database should expand it in the navigation menu -- (performance) Removed ShowTooltip directive -- bug #4046 Exporting huge Tables causes memory-Problems - -4.0.5.0 (2013-08-04) -- bug #3977 Not detected configuration storage -- bug #3970 Pressing enter in the filter field reloads page -- bug #3984 Cannot insert in this table (PHP < 5.4) -- bug #3989 Reloading privileges does not update the interface -- bug #3960 NavigationBarIconic config not honored -- bug #3985 Call to undefined function mb_detect_encoding -- bug #4007 Analyze option not shown for InnoDB tables -- bug #4015 Forcing a storage engine for configuration storage -- bug Incorrect Drizzle 7 detection -- bug #4019 Create database if not exists (export): add an option to the - interface to enable generating CREATE DATABASE and USE (false by default) -- bug #4012 Crash on CSV file import -- bug #4009 Statistic Monitor shows only last 3 digits in graph -- bug #3998 Non-permanent SQL history not working -- bug #3578 Transformations for text/plain on a BLOB column -- [security] Improved protection against cross framing, see PMASA-2013-10 -+ Reinstated configuration directive: AllowThirdPartyFraming - -4.0.4.2 (2013-07-28) -- [security] fix unescaped parameter, see PMASA-2013-8 -- [security] Fix stored XSS in Server status monitor, see PMASA-2013-9 -- [security] Fix stored XSS in navigation panel logo link, see PMASA-2013-9 -- [security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2013-9 -- [security] Fix full path disclosure, see PMASA-2013-12 -- [security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-15 -- [security] Fix control user SQL injection in schema_export.php, see PMASA-2013-15 -- [security] Fix self-XSS in schema export, see PMASA-2013-14 -- [security] Fix unencoded json object, see PMASA-2013-11 -- [security] Fix stored XSS in link transformation plugin, see PMASA-2013-13 - -4.0.4.1 (2013-06-30) -- [security] Global variables scope injection vulnerability (see PMASA-2013-7) - -4.0.4.0 (2013-06-17) -- bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click -- bug #3961 Avoid Suhosin warning when in simulation mode -- bug #3897 Row Statistics and Space usage bugs -- bug #3966 Only display "table has no unique column" message when applicable -- bug #3965 Default language wrong with zh-TW -- bug #3921 Call to undefined function PMA_isSuperuser() if default server is -not set -- bug #3971 Ctrl/shift + click opens links in same window -- bug #3964 Import using https does not work -- bug Missing removeCRLF option in ExportCsv and ExportExcel plugins -- bug #3631 Drop not working Visio schema export. -- bug #3645 Better handling of invalid ODS documents -- bug #3976 Number of pages -- bug #3922 User privileges, database name unescaped - -4.0.3.0 (2013-06-05) -- bug #3941 Recent tables list always empty -- bug #3933 Do not translate "Open Document" in export settings -- bug #3927 List of tables is missing after expanding in the navigation frame -- bug #3942 Warnings about reserved word for many non reserved words -- bug #3912 Exporting row selection, resulted by ORDER BY query -- bug #3957 Cookies must be enabled past this point -- bug #3956 "Browse foreign values" search filter / page selector not working -- bug #3579 NOW() function incorrectly selected (partial regression) -- [security] Javascript execution vulnerability in Create view, - reported by Maxim Rupp (see PMASA-2013-6) - -4.0.2.0 (2013-05-24) -- bug #3902 Cannot browse when table name contains keyword "call" -+ center loading indicator for navigation refresh, related to bug #3920 -- bug #3925 Table sorting in navigation panel is case-sensitive -- bug #3915 Import of CSV file (Replace table data with file) with duplicate values -- bug #3907 undefined variables, function parameter problems -- bug #3898 Structure not refreshed after column drop -- bug #3926 View is not updatable -- bug #3919 PropertiesIconic not honored -- bug #3930 Databases to choose for specific privileges show up escaped -- bug #3910 Export database with empty table as a php array, does not produce valid PHP -- bug #3936 Query profiler chart not loading from SQL Query page -- bug #3946 Missing CSV import option "Do not abort on INSERT error" -- bug #3943 Missing Operations>Table options>AUTO_INCREMENT -- bug Missing CREATE DATABASE statement when exporting at database level -- bug #3924 Show warning when CSV file does not contain data for all columns -- bug #3947 Missing Sql Query after modify structure -- bug #3948 Server export problems -- bug #3917 CountTables directive is deprecated - -4.0.1.0 (2013-05-14) -- bug #3879 Import broken for CSV using LOAD DATA -- bug #3889 When login fails and error display is active, login data is displayed -- bug #3890 [import] Web server upload directory import fails -- bug #3891 [import] Server upload folder import file name missing in success message -+ rfe #1421 [auth] Add retry button on connection failure with config auth -- bug #3894 [interface] Provide feedback if no columns selected for multi-submit -- bug #3799 [interface] Incorrect select field change on ctrl key navigation in Firefox -- bug #3885 [browse] display_binary_as_hex option causes unexpected behavior -- bug #3899 Git commit links to Github missing -- bug #3900 CSP WARN in Firefox console -- bug #3901 Setup script warning for config auth (stored login data) shows link BBcode -- bug #3895 [browse] Fixed getting BLOB data -- bug #3905 [export] Custom Exporting exports all databases -- bug #3909 [import] Import of CSV FIle to selected table doesn't work -- bug #3904 Browsing an empty table should not display its Structure -- bug #3908 Calendar widget improperly redirects to home -- bug #3918 Greyed out tabs when there are no rows fixed -- bug #3916 [interface] Missing scrollbar (original theme) -+ [vendor] add tcpdf path to vendor_config.php -- bug fix compat with tcpdf >= 6.0 (tested with 6.0.012) - -4.0.0.0 (2013-05-03) -+ Patch #3481047 for rfe #3480477 Insert as new row enhancement -+ Patch #3480999 Activate codemirror in the query window -- Patch #3495284 XML Import - fix message and redirect -+ rfe #3484063 Null checkbox behavior -+ Patch #3497179 Contest-5: Add user: Allow create DB w/same name + grant u_% -+ Patch #3498201 Contest-6: Export all privileges -+ Patch #3502814 for rfe #3187077 Change password buttons should match -+ rfe #3488640 Expand table-group in non-light navigation frame if only one -+ Patch #3509360 Contest-3: Option "Truncate table" before "insert" -+ Patch #3506552 Contest-2: Show index information in the data dictionary -+ Patch #3510656 Contest-1: Ignoring foreign keys while dropping tables -- Bug #3509686 Reverting sort on joined column does not work -+ New transformation: append string -+ rfe #3507804 Session upload progress (PHP 5.4) -+ rfe #3488185 draggable columns vs copy column name -+ Patch #3507001 Contest-4: Textarea for large character columns -+ Removed the PHP version of the ENUM editor -+ Patch #3507111 Display distinct results, linked to corresponding data rows -- bug #3507917 [export] JSON has unescaped values for allegedly numeric columns -+ rfe #3516187 show tables creation, last update, last check timestamps in db_structure -- bug #3059806 Supporting running from CIFS/Samba shares -- bug #3516341 [export] Open Document Text, Word and Texy! Text show table structure twice -- bug [export] Texy! Text: Columns containing Pipe Character don't export properly -+ [export] Show triggers in Open Document Text, Word and Texy! Text -- Patch #3415061 [auth] Login screen appears under the page -+ rfe #3517354 [interface] Allow disabling CodeMirror with $cfg['CodemirrorEnable'] = false -+ rfe #3475567 [interface] New directive $cfg['HideStructureActions'] -- bug #3468272 [import] Fixed import of ODS with more paragraphs in a cell -- bug #3510196 [core] Improved redirecting with ForceSSL option -+ rfe #3518852 [edit] edit blob but not other binary, new option $cfg['ProtectBinary'] = 'noblob' -+ Hide language select box if there are no locales installed -+ Removed some directives: verbose_check, SuggestDBName, LightTabs, -VerboseMultiSubmit, ReplaceHelpImg -- Patch #3500882 Fixing checkbox behaviour while editing identical rows -+ rfe #3441722 [interface] Display description of datatypes -+ rfe #3517835 [structure] Move columns easily -+ Ajaxified "Create View" functionality -+ [import] New plugin: import mediawiki -+ New navigation system -+ Discontinued the use of a frame-based layout -+ rfe #3528994 [interface] Allow wrapping possibly long values in replication-status table -+ [interface] Autoselect username input on cookie login page -- bug #3563799 [interface] Grid editing destroying huge amount of data -+ [import] Remove support for the unactive docSQL import format -- bug #3577443 [edit] "Browse foreign values" does not show on ajax edit -+ rfe #3522109 [browse] Grid editing: action to trigger it (or disable) -- bug #3526598 [interface] SQL query not shown when creating table -+ Dropped configuration directive: AllowThirdPartyFraming -+ Dropped configuration directive: LeftFrameLight -+ Dropped configuration directive: DisplayDatabasesList -+ Dropped configuration directives: ShowTooltipAliasDB and ShowTooltipAliasTB -+ Dropped configuration directive: NaviDatabaseNameColor -+ Added configuration directive: MaxNavigationItems -+ Renamed configuration directive: LeftFrameDBTree => NavigationTreeEnableGrouping -+ Renamed configuration directive: LeftFrameDBSeparator => NavigationTreeDbSeparator -+ Renamed configuration directive: LeftFrameTableSeparator => NavigationTreeTableSeparator -+ Renamed configuration directive: LeftFrameTableLevel => NavigationTreeTableLevel -+ Renamed configuration directive: LeftPointerEnable => NavigationTreePointerEnable -+ Renamed configuration directive: LeftDefaultTabTable => NavigationTreeDefaultTabTable -+ Renamed configuration directive: LeftDisplayTableFilterMinimum => NavigationTreeDisplayTableFilterMinimum -+ Renamed configuration directive: LeftDisplayLogo => NavigationDisplayLogo -+ Renamed configuration directive: LeftLogoLink => NavigationLogoLink -+ Renamed configuration directive: LeftLogoLinkWindow => NavigationLogoLinkWindow -+ Renamed configuration directive: LeftDisplayServers => NavigationDisplayServers -+ Renamed configuration directive: LeftRecentTable => NumRecentTables -+ Renamed configuration directive: LeftDisplayDatabaseFilterMinimum => NavigationTreeDisplayDbFilterMinimum -+ Removed the "Mark row on click" feature; must now click the checkbox to mark -+ Removed the "Synchronize" feature -+ Improved layout of server variables page -+ rfe #1052091 [config] Double-underscores in PMA table names -+ Improved the "" dropdown on the table structure page -+ [interface] Added "scroll to top" link in menubar -+ [designer] Fullscreen mode for the designer -+ Upgraded jquery to v1.8.3 and jquery-ui to v1.9.2 -+ Patch #3597529 [status] Add raw value as title on server status page -+ Support MySQL 5.6 partitioning -+ Removed the AjaxEnable directive -+ rfe #3542567 Accept IPv6 ranges and IPv6 CIDR notations in $cfg['Servers'][$i]['AllowDeny']['rules'] -- Bug #3576788 Grid editing shows the value before silent truncation -- Upgraded jqPlot to 1.0.4 r1121 -- Upgraded to jquery-ui-timepicker-addon 1.1.1 -+ rfe #3599046 [interface] Added comments for indexes -- Replaced qtip with jQuery UI tooltip -- Upgraded CodeMirror to 2.37 -- bug #2951 [export] Correctly export decimal fields. -- bug #3762 [core] Make Advisor work on Windows withou COM extension. -- bug #3519 [export] Prevent infinite recursion in PDF export. -- bug #3827 Table specific privileges not displayed for db name containing -underscore -- rfe #1386 Add IF NOT EXISTS clause when copying database -- No longer package .travis.yml configuration file when creating a release. -- bug #3830 Can't export custom query because it lowercases table names -- bug #3829 Enabling query profiling crashes javascript based navigation -+ rfe #879 Reserved word warning -+ Remove the database ordering sub-feature of the only_db directive -- bug #3840 When exporting to gzip format, the data is compressed 2 times -+ rfe #1319 Permit to create index when creating foreign key -- bug #3703 Incorrect updating of the list of users -- bug #3853 Blowfish implementation might be broken (replace with phpseclib) -- bug #3865 Using like operator on each backslash needs 4 backslash protection -- bug #3860 Displayed git revision info is not set -- bug #3871 Check referential integrity broken across databases -- bug #3874 [export] No preselected option when exporting table -- bug #3873 Can't copy table to target database if table exists there -- bug #3683 Incorrect listing of records from to count -- bug #3876 [import] PHP 5.2 - unexpected T_PAAMAYIM_NEKUDOTAYIM -- [security] Local file inclusion vulnerability, reported by Janek Vind - (see PMASA-2013-4) -- [security] Global variables overwrite in export.php, reported by Janek Vind - (see PMASA-2013-5) -- bug #3892 [export] SQL Export files are empty - -3.5.8.2 (2013-07-28) -- [security] Fix self-XSS in "Showing rows", see PMASA-2013-8 -- [security] Fix self-XSS in Display chart, see PMASA-2013-9 -- [security] Fix stored XSS in Server status monitor, see PMASA-2013-9 -- [security] Fix stored XSS in navigation panel logo link, see PMASA-2013-9 -- [security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2013-9 -+ [security] JSON content type header for version_check.php, see PMASA-2013-9 -+ [security] Backport fix for jQuery issue #9521 from jQuery 1.6.3, see PMASA-2013-9 -+ [security] Fix full path disclosure, see PMASA-2013-12 -+ [security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-15 -+ [security] Fix control user SQL injection in schema_export.php, see PMASA-2013-15 -- [security] Fix self-XSS in schema export, see PMASA-2013-14 -- [security] Fix unencoded json object, see PMASA-2013-11 - -3.5.8.1 (2013-04-24) -- [security] Remote code execution (preg_replace), reported by Janek Vind - (see PMASA-2013-2) -- [security] Locally Saved SQL Dump File Multiple File Extension Remote Code - Execution, reported by Janek Vind (see PMASA-2013-3) - -3.5.8.0 (2013-04-08) -- bug #3828 MariaDB reported as MySQL -- bug #3854 Incorrect header for Safari 6.0 -- bug #3705 Attempt to open trigger for edit gives NULL -- Use HTML5 DOCTYPE -- [security] Self-XSS on GIS visualisation page, reported by Janek Vind -- bug #3800 Incorrect keyhandler behaviour #2 - -3.5.7.0 (2013-02-15) -- bug #3779 [core] Problem with backslash in enum fields -- bug #3816 Missing server_processlist.php -- bug #3821 Safari: white page -- Correct detection of the Chrome browser - -3.5.6.0 (2013-01-28) -- bug #3593604 [status] Erroneous advisor rule -- bug #3596070 [status] localStorage broken in server status monitor -- bug #3598736 [routines] Editing a procedure with special characters -- bug #3600322 [core] Visualize GIS data throws Fatal Error -- bug #3599362 [core] Double-escaped error message -- bug #3776 [cookies] Login without auth on second server - --- Older ChangeLogs can be found on our project website --- http://www.phpmyadmin.net/old-stuff/ChangeLogs/ From 43f250096e106e4f35d7e43ca0773cf5a00c7402 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Tue, 7 Jan 2014 22:59:33 +0530 Subject: [PATCH 4/5] Fix bug#3780: Allow aborting ajax request if user clicks on new link in time Signed-off-by: Atul Pratap Singh --- js/ajax.js | 33 +++++++++++++++++++++++++++------ js/messages.php | 1 + 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/js/ajax.js b/js/ajax.js index 5ff0a6857f..22265140e0 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -12,6 +12,10 @@ var AJAX = { * @var object source The object whose event initialized the request */ source: null, + /** + * @var object xhr A reference to the ajax request that is currently running + */ + xhr: null, /** * @var function Callback to execute after a successful request * Used by PMA_commonFunctions from common.js @@ -157,11 +161,25 @@ var AJAX = { event.stopImmediatePropagation(); } if (AJAX.active === true) { - // Silently bail out, there is already a request in progress. - // TODO: save a reference to the request and cancel the old request - // when the user requests something else. Something like this is - // already implemented in the PMA_fastFilter object in navigation.js - return false; + // Cancel the old request if abortable, when the user requests + // something else. Otherwise silently bail out, as there is already + // a request well in progress. + if (AJAX.xhr) { + //In case of a link request, attempt aborting + AJAX.xhr.abort(); + if(AJAX.xhr.status === 0 && AJAX.xhr.statusText === 'abort') { + //If aborted + AJAX.$msgbox = PMA_ajaxShowMessage(PMA_messages.strAbortedRequest); + AJAX.active = false; + AJAX.xhr = null; + } else { + //If can't abort + return false; + } + } else { + //In case submitting a form, don't attempt aborting + return false; + } } AJAX.source = $(this); @@ -184,7 +202,8 @@ var AJAX = { if (isLink) { AJAX.active = true; AJAX.$msgbox = PMA_ajaxShowMessage(); - $.get(url, params, AJAX.responseHandler); + //Save reference for the new link request + AJAX.xhr = $.get(url, params, AJAX.responseHandler); } else { /** * Manually fire the onsubmit event for the form, if any. @@ -222,6 +241,7 @@ var AJAX = { if (data._redirect) { PMA_ajaxShowMessage(data._redirect, false); AJAX.active = false; + AJAX.xhr = null; return; } @@ -311,6 +331,7 @@ var AJAX = { } else { PMA_ajaxShowMessage(data.error, false); AJAX.active = false; + AJAX.xhr = null; } }, /** diff --git a/js/messages.php b/js/messages.php index 9c9a8bd436..f816b838a1 100644 --- a/js/messages.php +++ b/js/messages.php @@ -227,6 +227,7 @@ $js_messages['strCancel'] = __('Cancel'); /* For Ajax Notifications */ $js_messages['strLoading'] = __('Loading…'); +$js_messages['strAbortedRequest'] = __('Request Aborted!!'); $js_messages['strProcessingRequest'] = __('Processing Request'); $js_messages['strErrorProcessingRequest'] = __('Error in Processing Request'); $js_messages['strErrorCode'] = __('Error code: %s'); From 0157919c5b9f88172d976197a4767f51ba26fc9b Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 8 Jan 2014 09:57:58 +0530 Subject: [PATCH 5/5] ChangeLog entry for bug #3780 --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index de4b59c765..83ac09a59f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.1.5.0 (not yet released) +- bug #3780 Allow aborting loading pages 4.1.4.0 (2014-01-07) - bug #3840 (additional fix) When exporting to gzip format, the data is compressed 2 times