- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0ALPHA1-530-g1aff32a
by Michal Čihař 26 Nov '10

26 Nov '10

The branch, MAINT_3_4_0 has been updated via 1aff32ac2c5a1f91ce6656970136d34966ca0e4c (commit) via de139609e8fc30aafe15833716e2398d1ef3907d (commit) via 349180ef97641bcf84cfd140b4e3100ad5830942 (commit) via 17ee6f349c33bb2d096d48c1b9bda4f3d47133c0 (commit) via 7b5bfe2478c4e4627e3bd392cb03b07de57945ac (commit) via e13e48bd858c413d495ec626741161ee4b6ede9c (commit) via c490c396043f83431e9250287f7b3ecfee580ff8 (commit) via 8e515b1686587dd4ccc1a03a0c74abeea572ee14 (commit) via 36d5c50947c811064303976723604d6eae9e8b94 (commit) from 3f12de1746a25fe8f34d5892c21ae899356483be (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/el.po | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/po/el.po b/po/el.po index 07fd764..ec11275 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-20 07:34-0500\n" -"PO-Revision-Date: 2010-11-26 15:53+0200\n" +"PO-Revision-Date: 2010-11-26 15:56+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" "Language: el\n" @@ -5555,16 +5555,14 @@ msgstr "" "τους δίδεται ο επόμενος αύξων αριθμός." #: libraries/export/csv.php:21 libraries/import/csv.php:27 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns separated with:" -msgstr "Γραμμές που τελειώνουν σε" +msgstr "Στήλες που χωρίζονται με" #: libraries/export/csv.php:22 libraries/import/csv.php:28 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed with:" -msgstr "Πεδία που περικλείονται σε" +msgstr "Στήλες που περικλείονται με" #: libraries/export/csv.php:23 libraries/import/csv.php:29 #| msgid "Fields escaped by" @@ -5572,28 +5570,24 @@ msgid "Columns escaped with:" msgstr "Τα πεδία χρησιμοποιούν το χαρακτήρα διαφυγής: " #: libraries/export/csv.php:24 libraries/import/csv.php:30 -#, fuzzy #| msgid "Lines terminated by" msgid "Lines terminated with:" -msgstr "Γραμμές που τελειώνουν σε" +msgstr "Γραμμές που τελειώνουν με" #: libraries/export/csv.php:25 libraries/export/excel.php:22 #: libraries/export/htmlword.php:28 libraries/export/latex.php:79 #: libraries/export/ods.php:23 libraries/export/odt.php:59 #: libraries/export/xls.php:23 libraries/export/xlsx.php:23 -#, fuzzy #| msgid "Replace NULL by" msgid "Replace NULL with:" msgstr "Αντικατάσταση τιμής NULL με" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove carriage return/line feed characters within columns" -msgstr "Απομάκρυνση χαρακτήρων CRLF μέσα στα πεδία" +msgstr "Απομάκρυνση χαρακτήρων CRLF μέσα στις στήλες" #: libraries/export/excel.php:32 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition:" msgstr "Έκδοση Excel" @@ -5601,10 +5595,9 @@ msgstr "Έκδοση Excel" #: libraries/export/htmlword.php:27 libraries/export/latex.php:69 #: libraries/export/odt.php:55 libraries/export/sql.php:132 #: libraries/export/texytext.php:25 libraries/export/xml.php:45 -#, fuzzy #| msgid "Databases display options" msgid "Data dump options" -msgstr "Επιλογές προβολής βάσεων δεδομένων" +msgstr "Επιλογές απορριμμάτων δεδομένων" #: libraries/export/htmlword.php:135 libraries/export/odt.php:175 #: libraries/export/sql.php:946 libraries/export/texytext.php:123 @@ -5617,10 +5610,9 @@ msgid "Table structure for table" msgstr "Δομή Πίνακα για τον Πίνακα" #: libraries/export/latex.php:13 -#, fuzzy #| msgid "Content of table __TABLE__" msgid "Content of table @TABLE@" -msgstr "Περιεχόμενο του πίνακα __TABLE__" +msgstr "Περιεχόμενο του πίνακα @TABLE@" #: libraries/export/latex.php:14 msgid "(continued)" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_8, updated. RELEASE_3_3_8-3-gfcc0499
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, MAINT_3_3_8 has been updated via fcc04991533333d18c86b3005967da2d75a56fb9 (commit) from 38547bea51e3ee1b84564dc111c64cc476d2e73c (commit) - Log ----------------------------------------------------------------- commit fcc04991533333d18c86b3005967da2d75a56fb9 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 09:20:07 2010 -0500 3.3.8.1 release ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation.html b/Documentation.html index a233ccd..bf30068 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.8 - Documentation</title> + <title>phpMyAdmin 3.3.8.1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.8 + 3.3.8.1 Documentation </h1> </div> diff --git a/README b/README index 967acde..d84e8d7 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.8 - ------------- + Version 3.3.8.1 + --------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 6594e3a..8f5c43d 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.8'); + $this->set('PMA_VERSION', '3.3.8.1'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 598e218..f390397 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,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.3.8 - Official translators</title> + <title>phpMyAdmin 3.3.8.1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.8 + 3.3.8.1 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_2_11_11, updated. RELEASE_2_11_11-3-ga6e7939
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, MAINT_2_11_11 has been updated via a6e79391b92a48ffef307fa107ce1a61965e4244 (commit) from 21f624a26574fd45c043ddd27bf5a190b80c2757 (commit) - Log ----------------------------------------------------------------- commit a6e79391b92a48ffef307fa107ce1a61965e4244 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 09:17:30 2010 -0500 2.11.11.1 release ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation.html b/Documentation.html index 5513e18..a3f7982 100644 --- a/Documentation.html +++ b/Documentation.html @@ -11,7 +11,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=iso-8859-1" /> - <title>phpMyAdmin 2.11.11 - Documentation</title> + <title>phpMyAdmin 2.11.11.1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -33,7 +33,7 @@ <li><a href="#glossary">Glossary</a></li> </ul> -<h1>phpMyAdmin 2.11.11 Documentation</h1> +<h1>phpMyAdmin 2.11.11.1 Documentation</h1> <ul><li><a href="http://www.phpmyadmin.net/"> phpMyAdmin homepage</a></li> diff --git a/README b/README index 375317e..a1dfb54 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 2.11.11 - --------------- + Version 2.11.11.1 + ----------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index a2cf481..f1df2e0 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -85,7 +85,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '2.11.11'); + $this->set('PMA_VERSION', '2.11.11.1'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 88148b9..f59ca41 100644 --- a/translators.html +++ b/translators.html @@ -8,7 +8,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=iso-8859-1" /> - <title>phpMyAdmin 2.11.11 - Official translators</title> + <title>phpMyAdmin 2.11.11.1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -31,7 +31,7 @@ <li><a href="Documentation.html#glossary">Glossary</a></li> </ul> -<h1>phpMyAdmin 2.11.11 official translators list</h1> +<h1>phpMyAdmin 2.11.11.1 official translators list</h1> <p> Here is the list of the "official translators" of phpMyAdmin.</p> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA1-1099-g87fa9bd
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, master has been updated via 87fa9bd524efe78c45d79f05ccec83612e03c9e4 (commit) via 6d3b66059afe25da2bb1df00bdac76829f2f940d (commit) from e356354c44323407dc5c2626117b1aa924365049 (commit) - Log ----------------------------------------------------------------- commit 87fa9bd524efe78c45d79f05ccec83612e03c9e4 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 09:03:22 2010 -0500 ChangeLog for XSS fix commit 6d3b66059afe25da2bb1df00bdac76829f2f940d Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Nov 25 11:50:50 2010 +0100 bug #3115519: fixed XSS on search ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++--- libraries/common.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19b3110..f01a96b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -132,6 +132,9 @@ - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc +3.3.8.1 (2010-10-26) +- bug #3115519 (private) [security] XSS on db search + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -145,9 +148,6 @@ 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ec5100f..4b194de 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1769,7 +1769,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0ALPHA1-535-g968a8d2
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, QA_3_4 has been updated via 968a8d2ad72a831a3447b3e9785da21878ee7fed (commit) via e90aebf71be2fd26e464e6d33f753ce925eb6ff4 (commit) from 9ea69bd18ef73f761624d3daa2824e3a6cd1c8cc (commit) - Log ----------------------------------------------------------------- commit 968a8d2ad72a831a3447b3e9785da21878ee7fed Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 09:03:22 2010 -0500 ChangeLog for XSS fix commit e90aebf71be2fd26e464e6d33f753ce925eb6ff4 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Nov 25 11:50:50 2010 +0100 bug #3115519: fixed XSS on search ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++--- libraries/common.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a027c0..c120c04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -132,6 +132,9 @@ - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc +3.3.8.1 (2010-10-26) +- bug #3115519 (private) [security] XSS on db search + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -145,9 +148,6 @@ 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ec5100f..4b194de 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1769,7 +1769,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-19-gb1103e2
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, QA_3_3 has been updated via b1103e2db99405d032a230ed50f0b88b799605a3 (commit) via f805097b86fabd3d4c8dff1f2324efdae1ca0d70 (commit) from d6a7bd40faa240c23016ce482c36650294faa13e (commit) - Log ----------------------------------------------------------------- commit b1103e2db99405d032a230ed50f0b88b799605a3 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 09:07:19 2010 -0500 fix merge conflicts commit f805097b86fabd3d4c8dff1f2324efdae1ca0d70 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Nov 25 11:50:50 2010 +0100 bug #3115519: fixed XSS on search ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++--- libraries/common.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65fed96..41c784f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,9 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc +3.3.8.1 (2010-10-26) +- bug #3115519 (private) [security] XSS on db search + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -27,9 +30,6 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 610438c..b926e92 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1634,7 +1634,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_2_11, updated. RELEASE_2_11_11-8-g6821353
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, QA_2_11 has been updated via 68213538d7b53e3c97b8730a2e6a0e897b8b5ce9 (commit) via 3756112c7fbb243a954e96e762e1122b80b71dc4 (commit) from 80766a95caae8dec56e52efdb20abfd3867205c5 (commit) - Log ----------------------------------------------------------------- commit 68213538d7b53e3c97b8730a2e6a0e897b8b5ce9 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 08:55:40 2010 -0500 fix merge conflicts commit 3756112c7fbb243a954e96e762e1122b80b71dc4 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Nov 25 11:50:50 2010 +0100 bug #3115519: fixed XSS on search ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ libraries/common.lib.php | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 056c119..a98d172 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 2.11.12.0 (not yet released) +2.11.11.1 (2010-11-26) +- bug #3115519 (private) [security] XSS on db search + 2.11.11.0 (2010-09-07) - [core] Fix broken cleanup of $_GET - bug #3054458 [core] Fixed displaying number of rows. diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 716af94..4dcbe8e 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1644,7 +1644,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0ALPHA1-521-g3f12de1
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, MAINT_3_4_0 has been updated via 3f12de1746a25fe8f34d5892c21ae899356483be (commit) via 3f95ef5c20691037ec7c6dac06df3a8ded53523e (commit) from 86747ee08495700055ac4f7689c85a6d18cbf728 (commit) - Log ----------------------------------------------------------------- commit 3f12de1746a25fe8f34d5892c21ae899356483be Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 09:03:22 2010 -0500 ChangeLog for XSS fix commit 3f95ef5c20691037ec7c6dac06df3a8ded53523e Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Nov 25 11:50:50 2010 +0100 bug #3115519: fixed XSS on search ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++--- libraries/common.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6bff75..994b4fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -130,6 +130,9 @@ - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc +3.3.8.1 (2010-10-26) +- bug #3115519 (private) [security] XSS on db search + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -143,9 +146,6 @@ 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ec5100f..4b194de 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1769,7 +1769,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_8, updated. RELEASE_3_3_8-2-g38547be
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, MAINT_3_3_8 has been updated via 38547bea51e3ee1b84564dc111c64cc476d2e73c (commit) via 4341818d73d454451f024950a4ce0141608ac7f8 (commit) from cdf76774d1773c5ceea8686a8c4ea1352ebc1ca5 (commit) - Log ----------------------------------------------------------------- commit 38547bea51e3ee1b84564dc111c64cc476d2e73c Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 09:03:22 2010 -0500 ChangeLog for XSS fix commit 4341818d73d454451f024950a4ce0141608ac7f8 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Nov 25 11:50:50 2010 +0100 bug #3115519: fixed XSS on search ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++--- libraries/common.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4827fb6..6a10607 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.8.1 (2010-10-26) +- bug #3115519 (private) [security] XSS on db search + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -18,9 +21,6 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 610438c..b926e92 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1634,7 +1634,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_2_11_11, updated. RELEASE_2_11_11-2-g21f624a
by Marc Delisle 26 Nov '10

26 Nov '10

The branch, MAINT_2_11_11 has been updated via 21f624a26574fd45c043ddd27bf5a190b80c2757 (commit) via e1f4901ffc400b6d2df15eac0ba5015fe48a27c4 (commit) from e6aeaf1925be0804e068d50b8c193d8b13f80ced (commit) - Log ----------------------------------------------------------------- commit 21f624a26574fd45c043ddd27bf5a190b80c2757 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 26 08:51:46 2010 -0500 ChangeLog for XSS search commit e1f4901ffc400b6d2df15eac0ba5015fe48a27c4 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Nov 25 11:50:50 2010 +0100 bug #3115519: fixed XSS on search ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ libraries/common.lib.php | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff8b9dd..6cb1ab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +2.11.11.1 (2010-11-26) +- bug #3115519 (private) [security] XSS on db search + 2.11.11.0 (2010-09-07) - [core] Fix broken cleanup of $_GET - bug #3054458 [core] Fixed displaying number of rows. diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 716af94..4dcbe8e 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1644,7 +1644,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } hooks/post-receive -- phpMyAdmin

1 0