- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. cbcceee4553b04209c53e6f0470f7c653fa4496e
by Marc Delisle 08 Feb '11

08 Feb '11

The branch, master has been updated via cbcceee4553b04209c53e6f0470f7c653fa4496e (commit) via d02c2862658b606340faa7c663d7aa6260a9e959 (commit) from c9b42a3a8dd42964d47c075822ca0d4023aace30 (commit) - Log ----------------------------------------------------------------- commit cbcceee4553b04209c53e6f0470f7c653fa4496e Merge: d02c2862658b606340faa7c663d7aa6260a9e959 c9b42a3a8dd42964d47c075822ca0d4023aace30 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Feb 8 10:12:51 2011 -0500 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/website commit d02c2862658b606340faa7c663d7aa6260a9e959 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Feb 8 10:12:16 2011 -0500 New SA ----------------------------------------------------------------------- Summary of changes: templates/security/PMASA-2011-1 | 53 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) create mode 100644 templates/security/PMASA-2011-1 diff --git a/templates/security/PMASA-2011-1 b/templates/security/PMASA-2011-1 new file mode 100644 index 0000000..015ec6b --- /dev/null +++ b/templates/security/PMASA-2011-1 @@ -0,0 +1,53 @@ +<html xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude" py:strip=""> + +<py:def function="announcement_id"> +PMASA-2011-1 +</py:def> + +<py:def function="announcement_date"> +2011-02-08 +</py:def> + +<py:def function="announcement_summary"> +Path disclosure when some files have been removed +</py:def> + +<py:def function="announcement_description"> +When the files README, ChangeLog or LICENSE have been removed from their +original place (possibly by the distributor), the scripts used to display +these files can show their full path, leading to possible further attacks. +</py:def> + +<py:def function="announcement_mitigation"> +For the error messages to be displayed, php.ini's error_reporting must be set +to E_ALL and display_errors must be On (these settings are not recommended +on a production server in the PHP manual). +</py:def> + +<py:def function="announcement_severity"> +We consider this vulnerability to be non critical. +</py:def> + +<py:def function="announcement_affected"> +The 2.11.x and 3.3.x versions are affected. +</py:def> + +<py:def function="announcement_solution"> +Upgrade to phpMyAdmin 3.3.9.1 or newer (2.11.11.2 or newer for the older +family) or apply the related patch listed below. +</py:def> + +<py:def function="announcement_references"> +Thanks to MustLive from <a href="http://websecurity.com.ua">Websecurity</a> + for reporting this issue. +</py:def> + +<py:def function="announcement_cve">CVE-xxxx-xxxx</py:def> + +<py:def function="announcement_cwe">661 200</py:def> + +<py:def function="announcement_commits"> +</py:def> + +<xi:include href="_page.tpl" /> +</html> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_2_11_11_2, created. RELEASE_2_11_11_2
by Marc Delisle 08 Feb '11

08 Feb '11

The annotated tag, RELEASE_2_11_11_2 has been created at d00aa850060d051ecff2b913ec1f38d693f2da5d (tag) tagging 448940b37b55648248d9a62139b8838feece3931 (commit) replaces RELEASE_2_11_11_1 tagged by Marc Delisle on Tue Feb 8 10:09:35 2011 -0500 - Log ----------------------------------------------------------------- Released 2.11.11.2 Herman van Rink (1): PMASA-2011-1 fixes Marc Delisle (1): 2.11.11.2 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. c9b42a3a8dd42964d47c075822ca0d4023aace30
by Michal Čihař 08 Feb '11

08 Feb '11

The branch, master has been updated via c9b42a3a8dd42964d47c075822ca0d4023aace30 (commit) from 52a3a75b194a1624743d01f4c33fae2086fed753 (commit) - Log ----------------------------------------------------------------- commit c9b42a3a8dd42964d47c075822ca0d4023aace30 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Feb 8 16:02:30 2011 +0100 Optimize images ----------------------------------------------------------------------- Summary of changes: images/awards/2002-12-sfnet-potm.png | Bin 6748 -> 5421 bytes images/awards/2005-os2world.png | Bin 4540 -> 3717 bytes images/awards/2006-phpmag-ger.png | Bin 15586 -> 11858 bytes images/awards/2006-trophees-logo.png | Bin 46979 -> 46634 bytes images/awards/sf_cca_2006_winner.png | Bin 29042 -> 22672 bytes images/awards/sf_cca_2008_winner.png | Bin 3722 -> 3720 bytes images/books/pma_en_100x123.png | Bin 20202 -> 18647 bytes images/books/pma_es_100x123.png | Bin 21701 -> 20009 bytes images/goPHP5_100x33.png | Bin 3375 -> 2787 bytes images/heads/nijel.png | Bin 9385 -> 9373 bytes images/icon-table-sort.png | Bin 3026 -> 2924 bytes images/icon.png | Bin 1667 -> 1390 bytes images/logo.png | Bin 5644 -> 4904 bytes images/screenshots/designer-small.png | Bin 12773 -> 10630 bytes images/screenshots/designer.png | Bin 30485 -> 25668 bytes images/screenshots/main-page-rtl-small.png | Bin 35305 -> 34028 bytes images/screenshots/main-page-rtl.png | Bin 101939 -> 86724 bytes images/screenshots/main-page-small.png | Bin 38734 -> 37798 bytes images/screenshots/main-page.png | Bin 104631 -> 90320 bytes images/screenshots/main_page-small.png | Bin 47647 -> 45049 bytes images/screenshots/main_page.png | Bin 135748 -> 112500 bytes images/screenshots/privileges-small.png | Bin 20845 -> 20502 bytes images/screenshots/privileges.png | Bin 65415 -> 57787 bytes images/screenshots/sql-export-small.png | Bin 35345 -> 32973 bytes images/screenshots/sql-export.png | Bin 109541 -> 97407 bytes images/themes/aqua.png | Bin 57854 -> 34220 bytes images/themes/aqua_brushed.png | Bin 30947 -> 29979 bytes images/themes/arctic_ocean.png | Bin 30378 -> 27311 bytes images/themes/cactica_blues.png | Bin 26483 -> 23727 bytes images/themes/clearview3.png | Bin 17502 -> 16916 bytes images/themes/crimson_gray.png | Bin 23122 -> 23098 bytes images/themes/dark_lime.png | Bin 37898 -> 32650 bytes images/themes/darkblue_gray.png | Bin 26971 -> 23779 bytes images/themes/garv_blue.png | Bin 30201 -> 27162 bytes images/themes/graphivore.png | Bin 15576 -> 15235 bytes images/themes/green_orange.png | Bin 27033 -> 24233 bytes images/themes/grid.png | Bin 11189 -> 7607 bytes images/themes/hillside.png | Bin 89156 -> 88793 bytes images/themes/openphpnuke.png | Bin 27636 -> 24837 bytes images/themes/original_small.png | Bin 22149 -> 18315 bytes images/themes/paradice.png | Bin 20790 -> 20275 bytes images/themes/pixeline.png | Bin 25330 -> 25327 bytes images/themes/pmahomme.png | Bin 52694 -> 49021 bytes images/themes/silk.png | Bin 46268 -> 33605 bytes images/themes/silkline.png | Bin 53077 -> 40690 bytes images/themes/smooth_yellow.png | Bin 61831 -> 55310 bytes images/themes/very_small.png | Bin 30378 -> 27311 bytes images/themes/xampp.png | Bin 25972 -> 23337 bytes images/themes/xp_basic.png | Bin 28213 -> 25513 bytes images/themes/xp_blue.png | Bin 26060 -> 23715 bytes images/themes/xp_dirty.png | Bin 32267 -> 29529 bytes images/themes/xp_green.png | Bin 26617 -> 23847 bytes images/themes/xp_silver.png | Bin 27058 -> 24288 bytes 53 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/awards/2002-12-sfnet-potm.png b/images/awards/2002-12-sfnet-potm.png index dd9dc92..51674a0 100644 Binary files a/images/awards/2002-12-sfnet-potm.png and b/images/awards/2002-12-sfnet-potm.png differ diff --git a/images/awards/2005-os2world.png b/images/awards/2005-os2world.png index 138cd4e..6ec76a4 100644 Binary files a/images/awards/2005-os2world.png and b/images/awards/2005-os2world.png differ diff --git a/images/awards/2006-phpmag-ger.png b/images/awards/2006-phpmag-ger.png index b67f5d6..f266cc0 100644 Binary files a/images/awards/2006-phpmag-ger.png and b/images/awards/2006-phpmag-ger.png differ diff --git a/images/awards/2006-trophees-logo.png b/images/awards/2006-trophees-logo.png index 9d56a4b..b1ffd69 100644 Binary files a/images/awards/2006-trophees-logo.png and b/images/awards/2006-trophees-logo.png differ diff --git a/images/awards/sf_cca_2006_winner.png b/images/awards/sf_cca_2006_winner.png index 3cb193d..00a4f8b 100644 Binary files a/images/awards/sf_cca_2006_winner.png and b/images/awards/sf_cca_2006_winner.png differ diff --git a/images/awards/sf_cca_2008_winner.png b/images/awards/sf_cca_2008_winner.png index ff33450..3c8cdf2 100644 Binary files a/images/awards/sf_cca_2008_winner.png and b/images/awards/sf_cca_2008_winner.png differ diff --git a/images/books/pma_en_100x123.png b/images/books/pma_en_100x123.png index 03ae5a9..7142cba 100644 Binary files a/images/books/pma_en_100x123.png and b/images/books/pma_en_100x123.png differ diff --git a/images/books/pma_es_100x123.png b/images/books/pma_es_100x123.png index 6ad432c..c624888 100644 Binary files a/images/books/pma_es_100x123.png and b/images/books/pma_es_100x123.png differ diff --git a/images/goPHP5_100x33.png b/images/goPHP5_100x33.png index 8bfa7bb..c3233ae 100644 Binary files a/images/goPHP5_100x33.png and b/images/goPHP5_100x33.png differ diff --git a/images/heads/nijel.png b/images/heads/nijel.png index aad2b85..91094f3 100644 Binary files a/images/heads/nijel.png and b/images/heads/nijel.png differ diff --git a/images/icon-table-sort.png b/images/icon-table-sort.png index 389169a..7a10f29 100644 Binary files a/images/icon-table-sort.png and b/images/icon-table-sort.png differ diff --git a/images/icon.png b/images/icon.png index f9df2f0..2448120 100644 Binary files a/images/icon.png and b/images/icon.png differ diff --git a/images/logo.png b/images/logo.png index 7dea574..1e00b36 100644 Binary files a/images/logo.png and b/images/logo.png differ diff --git a/images/screenshots/designer-small.png b/images/screenshots/designer-small.png index 5d187b2..f3e04d4 100644 Binary files a/images/screenshots/designer-small.png and b/images/screenshots/designer-small.png differ diff --git a/images/screenshots/designer.png b/images/screenshots/designer.png index aef2138..66844cd 100644 Binary files a/images/screenshots/designer.png and b/images/screenshots/designer.png differ diff --git a/images/screenshots/main-page-rtl-small.png b/images/screenshots/main-page-rtl-small.png index 53cc6f9..5b9021b 100644 Binary files a/images/screenshots/main-page-rtl-small.png and b/images/screenshots/main-page-rtl-small.png differ diff --git a/images/screenshots/main-page-rtl.png b/images/screenshots/main-page-rtl.png index 7110b33..e860db5 100644 Binary files a/images/screenshots/main-page-rtl.png and b/images/screenshots/main-page-rtl.png differ diff --git a/images/screenshots/main-page-small.png b/images/screenshots/main-page-small.png index 81ee5ef..c331b6b 100644 Binary files a/images/screenshots/main-page-small.png and b/images/screenshots/main-page-small.png differ diff --git a/images/screenshots/main-page.png b/images/screenshots/main-page.png index ce69698..df5de6d 100644 Binary files a/images/screenshots/main-page.png and b/images/screenshots/main-page.png differ diff --git a/images/screenshots/main_page-small.png b/images/screenshots/main_page-small.png index 5509857..60facd4 100644 Binary files a/images/screenshots/main_page-small.png and b/images/screenshots/main_page-small.png differ diff --git a/images/screenshots/main_page.png b/images/screenshots/main_page.png index 81d87c9..3f16c87 100644 Binary files a/images/screenshots/main_page.png and b/images/screenshots/main_page.png differ diff --git a/images/screenshots/privileges-small.png b/images/screenshots/privileges-small.png index 50d0535..fe19dd0 100644 Binary files a/images/screenshots/privileges-small.png and b/images/screenshots/privileges-small.png differ diff --git a/images/screenshots/privileges.png b/images/screenshots/privileges.png index 4637e7e..30c013b 100644 Binary files a/images/screenshots/privileges.png and b/images/screenshots/privileges.png differ diff --git a/images/screenshots/sql-export-small.png b/images/screenshots/sql-export-small.png index 173bb8c..77eaa2d 100644 Binary files a/images/screenshots/sql-export-small.png and b/images/screenshots/sql-export-small.png differ diff --git a/images/screenshots/sql-export.png b/images/screenshots/sql-export.png index 3865733..49e9fc7 100644 Binary files a/images/screenshots/sql-export.png and b/images/screenshots/sql-export.png differ diff --git a/images/themes/aqua.png b/images/themes/aqua.png index 04bfa60..95c70bc 100644 Binary files a/images/themes/aqua.png and b/images/themes/aqua.png differ diff --git a/images/themes/aqua_brushed.png b/images/themes/aqua_brushed.png index 9884c6d..388ff3f 100644 Binary files a/images/themes/aqua_brushed.png and b/images/themes/aqua_brushed.png differ diff --git a/images/themes/arctic_ocean.png b/images/themes/arctic_ocean.png index 827bdc9..b3038d5 100644 Binary files a/images/themes/arctic_ocean.png and b/images/themes/arctic_ocean.png differ diff --git a/images/themes/cactica_blues.png b/images/themes/cactica_blues.png index 0603e44..de2dc00 100644 Binary files a/images/themes/cactica_blues.png and b/images/themes/cactica_blues.png differ diff --git a/images/themes/clearview3.png b/images/themes/clearview3.png index 3c4b95f..4c0c39a 100644 Binary files a/images/themes/clearview3.png and b/images/themes/clearview3.png differ diff --git a/images/themes/crimson_gray.png b/images/themes/crimson_gray.png index c5bd376..4474458 100644 Binary files a/images/themes/crimson_gray.png and b/images/themes/crimson_gray.png differ diff --git a/images/themes/dark_lime.png b/images/themes/dark_lime.png index 76f1723..36c7242 100644 Binary files a/images/themes/dark_lime.png and b/images/themes/dark_lime.png differ diff --git a/images/themes/darkblue_gray.png b/images/themes/darkblue_gray.png index 57f1312..e7b48c2 100644 Binary files a/images/themes/darkblue_gray.png and b/images/themes/darkblue_gray.png differ diff --git a/images/themes/garv_blue.png b/images/themes/garv_blue.png index 182602a..1acf58d 100644 Binary files a/images/themes/garv_blue.png and b/images/themes/garv_blue.png differ diff --git a/images/themes/graphivore.png b/images/themes/graphivore.png index f6f0f85..043d1ac 100644 Binary files a/images/themes/graphivore.png and b/images/themes/graphivore.png differ diff --git a/images/themes/green_orange.png b/images/themes/green_orange.png index 1b00c67..1f67592 100644 Binary files a/images/themes/green_orange.png and b/images/themes/green_orange.png differ diff --git a/images/themes/grid.png b/images/themes/grid.png index 0dd5f89..50b5ee3 100644 Binary files a/images/themes/grid.png and b/images/themes/grid.png differ diff --git a/images/themes/hillside.png b/images/themes/hillside.png index cecbb80..8dee189 100644 Binary files a/images/themes/hillside.png and b/images/themes/hillside.png differ diff --git a/images/themes/openphpnuke.png b/images/themes/openphpnuke.png index 7c6dab3..ee6102f 100644 Binary files a/images/themes/openphpnuke.png and b/images/themes/openphpnuke.png differ diff --git a/images/themes/original_small.png b/images/themes/original_small.png index a08bfe2..4af51aa 100644 Binary files a/images/themes/original_small.png and b/images/themes/original_small.png differ diff --git a/images/themes/paradice.png b/images/themes/paradice.png index c47032d..3c7e3f7 100644 Binary files a/images/themes/paradice.png and b/images/themes/paradice.png differ diff --git a/images/themes/pixeline.png b/images/themes/pixeline.png index 9455956..f2e74b1 100644 Binary files a/images/themes/pixeline.png and b/images/themes/pixeline.png differ diff --git a/images/themes/pmahomme.png b/images/themes/pmahomme.png index 32194d9..468394c 100644 Binary files a/images/themes/pmahomme.png and b/images/themes/pmahomme.png differ diff --git a/images/themes/silk.png b/images/themes/silk.png index eaf8af7..4ae21ea 100644 Binary files a/images/themes/silk.png and b/images/themes/silk.png differ diff --git a/images/themes/silkline.png b/images/themes/silkline.png index 70f1b5e..77ed287 100644 Binary files a/images/themes/silkline.png and b/images/themes/silkline.png differ diff --git a/images/themes/smooth_yellow.png b/images/themes/smooth_yellow.png index ed413af..edb7e81 100644 Binary files a/images/themes/smooth_yellow.png and b/images/themes/smooth_yellow.png differ diff --git a/images/themes/very_small.png b/images/themes/very_small.png index 827bdc9..b3038d5 100644 Binary files a/images/themes/very_small.png and b/images/themes/very_small.png differ diff --git a/images/themes/xampp.png b/images/themes/xampp.png index 0bcd0a0..cd1dd4f 100644 Binary files a/images/themes/xampp.png and b/images/themes/xampp.png differ diff --git a/images/themes/xp_basic.png b/images/themes/xp_basic.png index afb327f..da5c1f3 100644 Binary files a/images/themes/xp_basic.png and b/images/themes/xp_basic.png differ diff --git a/images/themes/xp_blue.png b/images/themes/xp_blue.png index 66817a7..1af3226 100644 Binary files a/images/themes/xp_blue.png and b/images/themes/xp_blue.png differ diff --git a/images/themes/xp_dirty.png b/images/themes/xp_dirty.png index c607d31..2e5ee92 100644 Binary files a/images/themes/xp_dirty.png and b/images/themes/xp_dirty.png differ diff --git a/images/themes/xp_green.png b/images/themes/xp_green.png index 862b2e7..3a26722 100644 Binary files a/images/themes/xp_green.png and b/images/themes/xp_green.png differ diff --git a/images/themes/xp_silver.png b/images/themes/xp_silver.png index 0a61224..fab17e0 100644 Binary files a/images/themes/xp_silver.png and b/images/themes/xp_silver.png differ hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin themes branch, master, updated. a5b6ca2a58616de103e6b1a56bbd3b3b75136823
by Michal Čihař 08 Feb '11

08 Feb '11

The branch, master has been updated via a5b6ca2a58616de103e6b1a56bbd3b3b75136823 (commit) from 41bea3b25d6defb36441bfbf06bbd3a709bbaf79 (commit) - Log ----------------------------------------------------------------- commit a5b6ca2a58616de103e6b1a56bbd3b3b75136823 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Feb 8 15:55:37 2011 +0100 Optimize screenshots. In some cases the image could be 40% size. ----------------------------------------------------------------------- Summary of changes: aqua/screen.png | Bin 57854 -> 34220 bytes aqua_brushed/screen.png | Bin 30947 -> 29979 bytes arctic_ocean/screen.png | Bin 30378 -> 27311 bytes cactica_blues/screen.png | Bin 26483 -> 23727 bytes clearview3/screen.png | Bin 17502 -> 16916 bytes crimson_gray/screen.png | Bin 23122 -> 23098 bytes dark_lime/screen.png | Bin 37898 -> 32650 bytes darkblue_gray/screen.png | Bin 26971 -> 23779 bytes garvblue/screen.png | Bin 30201 -> 27162 bytes graphivore/screen.png | Bin 15576 -> 15235 bytes green_orange/screen.png | Bin 27033 -> 24233 bytes grid/screen.png | Bin 11189 -> 7607 bytes hillside/screen.png | Bin 89156 -> 88793 bytes openphpnuke/screen.png | Bin 27636 -> 24837 bytes original_small/screen.png | Bin 22149 -> 18315 bytes paradice/screen.png | Bin 20790 -> 20275 bytes pixeline/screen.png | Bin 25330 -> 25327 bytes pmahomme/screen.png | Bin 52694 -> 49021 bytes silk/screen.png | Bin 46268 -> 33605 bytes silkline/screen.png | Bin 53077 -> 40690 bytes smooth_yellow/screen.png | Bin 26318 -> 26315 bytes toba/screen.png | Bin 98922 -> 80503 bytes very_small/screen.png | Bin 30378 -> 27311 bytes xampp/screen.png | Bin 25972 -> 23337 bytes xp_basic/screen.png | Bin 28213 -> 25513 bytes xp_blue/screen.png | Bin 26060 -> 23715 bytes xp_dirty/screen.png | Bin 96965 -> 86949 bytes xp_green/screen.png | Bin 26617 -> 23847 bytes xp_silver/screen.png | Bin 27058 -> 24288 bytes 29 files changed, 0 insertions(+), 0 deletions(-) diff --git a/aqua/screen.png b/aqua/screen.png index 04bfa60..95c70bc 100644 Binary files a/aqua/screen.png and b/aqua/screen.png differ diff --git a/aqua_brushed/screen.png b/aqua_brushed/screen.png index 9884c6d..388ff3f 100644 Binary files a/aqua_brushed/screen.png and b/aqua_brushed/screen.png differ diff --git a/arctic_ocean/screen.png b/arctic_ocean/screen.png index 827bdc9..b3038d5 100644 Binary files a/arctic_ocean/screen.png and b/arctic_ocean/screen.png differ diff --git a/cactica_blues/screen.png b/cactica_blues/screen.png index 0603e44..de2dc00 100644 Binary files a/cactica_blues/screen.png and b/cactica_blues/screen.png differ diff --git a/clearview3/screen.png b/clearview3/screen.png index 3c4b95f..4c0c39a 100644 Binary files a/clearview3/screen.png and b/clearview3/screen.png differ diff --git a/crimson_gray/screen.png b/crimson_gray/screen.png index c5bd376..4474458 100644 Binary files a/crimson_gray/screen.png and b/crimson_gray/screen.png differ diff --git a/dark_lime/screen.png b/dark_lime/screen.png index 76f1723..36c7242 100644 Binary files a/dark_lime/screen.png and b/dark_lime/screen.png differ diff --git a/darkblue_gray/screen.png b/darkblue_gray/screen.png index 57f1312..e7b48c2 100644 Binary files a/darkblue_gray/screen.png and b/darkblue_gray/screen.png differ diff --git a/garvblue/screen.png b/garvblue/screen.png index 182602a..1acf58d 100644 Binary files a/garvblue/screen.png and b/garvblue/screen.png differ diff --git a/graphivore/screen.png b/graphivore/screen.png index f6f0f85..043d1ac 100644 Binary files a/graphivore/screen.png and b/graphivore/screen.png differ diff --git a/green_orange/screen.png b/green_orange/screen.png index 1b00c67..1f67592 100644 Binary files a/green_orange/screen.png and b/green_orange/screen.png differ diff --git a/grid/screen.png b/grid/screen.png index 0dd5f89..50b5ee3 100644 Binary files a/grid/screen.png and b/grid/screen.png differ diff --git a/hillside/screen.png b/hillside/screen.png index cecbb80..8dee189 100644 Binary files a/hillside/screen.png and b/hillside/screen.png differ diff --git a/openphpnuke/screen.png b/openphpnuke/screen.png index 7c6dab3..ee6102f 100644 Binary files a/openphpnuke/screen.png and b/openphpnuke/screen.png differ diff --git a/original_small/screen.png b/original_small/screen.png index a08bfe2..4af51aa 100644 Binary files a/original_small/screen.png and b/original_small/screen.png differ diff --git a/paradice/screen.png b/paradice/screen.png index c47032d..3c7e3f7 100644 Binary files a/paradice/screen.png and b/paradice/screen.png differ diff --git a/pixeline/screen.png b/pixeline/screen.png index 9455956..f2e74b1 100644 Binary files a/pixeline/screen.png and b/pixeline/screen.png differ diff --git a/pmahomme/screen.png b/pmahomme/screen.png index 32194d9..468394c 100644 Binary files a/pmahomme/screen.png and b/pmahomme/screen.png differ diff --git a/silk/screen.png b/silk/screen.png index eaf8af7..4ae21ea 100644 Binary files a/silk/screen.png and b/silk/screen.png differ diff --git a/silkline/screen.png b/silkline/screen.png index 70f1b5e..77ed287 100644 Binary files a/silkline/screen.png and b/silkline/screen.png differ diff --git a/smooth_yellow/screen.png b/smooth_yellow/screen.png index f779ab0..4125d40 100644 Binary files a/smooth_yellow/screen.png and b/smooth_yellow/screen.png differ diff --git a/toba/screen.png b/toba/screen.png index e39a85c..5a9f969 100644 Binary files a/toba/screen.png and b/toba/screen.png differ diff --git a/very_small/screen.png b/very_small/screen.png index 827bdc9..b3038d5 100644 Binary files a/very_small/screen.png and b/very_small/screen.png differ diff --git a/xampp/screen.png b/xampp/screen.png index 0bcd0a0..cd1dd4f 100644 Binary files a/xampp/screen.png and b/xampp/screen.png differ diff --git a/xp_basic/screen.png b/xp_basic/screen.png index afb327f..da5c1f3 100644 Binary files a/xp_basic/screen.png and b/xp_basic/screen.png differ diff --git a/xp_blue/screen.png b/xp_blue/screen.png index 66817a7..1af3226 100644 Binary files a/xp_blue/screen.png and b/xp_blue/screen.png differ diff --git a/xp_dirty/screen.png b/xp_dirty/screen.png index 2841529..ddfd82a 100644 Binary files a/xp_dirty/screen.png and b/xp_dirty/screen.png differ diff --git a/xp_green/screen.png b/xp_green/screen.png index 862b2e7..3a26722 100644 Binary files a/xp_green/screen.png and b/xp_green/screen.png differ diff --git a/xp_silver/screen.png b/xp_silver/screen.png index 0a61224..fab17e0 100644 Binary files a/xp_silver/screen.png and b/xp_silver/screen.png differ hooks/post-receive -- phpMyAdmin themes

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1903-g47a5cfe
by Michal Čihař 08 Feb '11

08 Feb '11

The branch, master has been updated via 47a5cfe7c74a769d9da25d038b41e8b82239a3d1 (commit) via 72165d9c9dd38b6c5775c9418e2999a291442e5c (commit) from ae44d8b1133298ec5f9fd0142492c15c41713ded (commit) - Log ----------------------------------------------------------------- commit 47a5cfe7c74a769d9da25d038b41e8b82239a3d1 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Feb 8 15:30:02 2011 +0100 Add missing subheader commit 72165d9c9dd38b6c5775c9418e2999a291442e5c Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Feb 8 15:28:29 2011 +0100 Use same icon as is used in links ----------------------------------------------------------------------- Summary of changes: server_binlog.php | 2 +- server_processlist.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/server_binlog.php b/server_binlog.php index a499dab..df41b97 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -92,7 +92,7 @@ if (empty($_REQUEST['dontlimitchars'])) { * Displays the sub-page heading */ echo '<h2>' . "\n" - . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_process.png" width="16" height="16" border="0" hspace="2" align="middle" alt="" />' : '') + . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_tbl.png" width="16" height="16" border="0" hspace="2" align="middle" alt="" />' : '') . ' ' . __('Binary log') . "\n" . '</h2>' . "\n"; diff --git a/server_processlist.php b/server_processlist.php index 0bfb5c2..1e31021 100644 --- a/server_processlist.php +++ b/server_processlist.php @@ -14,6 +14,14 @@ require './libraries/server_links.inc.php'; /** + * Displays the sub-page heading + */ +echo '<h2>' . "\n" + . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_process.png" width="16" height="16" border="0" hspace="2" align="middle" alt="" />' : '') + . ' ' . __('Processes') . "\n" + . '</h2>' . "\n"; + +/** * Kills a selected process */ if (!empty($_REQUEST['kill'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1901-gae44d8b
by Marc Delisle 08 Feb '11

08 Feb '11

The branch, master has been updated via ae44d8b1133298ec5f9fd0142492c15c41713ded (commit) via 035d002db1e1201e73e560d7d98591563b506a83 (commit) from 3c7b1efa57cc055062f43021cbef7557ebff4597 (commit) - Log ----------------------------------------------------------------- commit ae44d8b1133298ec5f9fd0142492c15c41713ded Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Feb 8 08:23:30 2011 -0500 ChangeLog for 3.3.9.1 commit 035d002db1e1201e73e560d7d98591563b506a83 Author: Herman van Rink <rink(a)initfour.nl> Date: Tue Feb 8 08:22:29 2011 -0500 PMASA-2011-1 fixes ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ changelog.php | 26 ++++++++++++++++++-------- license.php | 15 ++++++++++++--- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6089439..5eac03f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -144,6 +144,9 @@ - bug #3153409 [core] 0 row(s) affected - bug #3155842 [core] Edit relational page and page number +3.3.9.1 (2011-02-08) +- [security] Path disclosure, see PMASA-2011-1 + 3.3.9.0 (2011-01-03) - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand diff --git a/changelog.php b/changelog.php index 9ab2e39..ad45e62 100644 --- a/changelog.php +++ b/changelog.php @@ -7,20 +7,30 @@ */ /** - * Load paths. + * Gets core libraries and defines some variables */ -require('./libraries/vendor_config.php'); +require_once './libraries/common.inc.php'; + +$filename = CHANGELOG_FILE; /** * Read changelog. */ -if (substr(CHANGELOG_FILE, -3) == '.gz') { - ob_start(); - readgzfile(CHANGELOG_FILE); - $changelog = ob_get_contents(); - ob_end_clean(); +// Check if the file is available, some distributions remove these. +if (is_readable($filename)) { + + // Test if the if is in a compressed format + if (substr($filename, -3) == '.gz') { + ob_start(); + readgzfile($filename); + $changelog = ob_get_contents(); + ob_end_clean(); + } else { + $changelog = file_get_contents($filename); + } } else { - $changelog = file_get_contents(CHANGELOG_FILE); + printf(__('The %s file is not available on this system, please visit www.phpmyadmin.net for more information.'), $filename); + exit; } /** diff --git a/license.php b/license.php index b4b394f..851b52c 100644 --- a/license.php +++ b/license.php @@ -10,13 +10,22 @@ */ /** - * Load paths. + * Gets core libraries and defines some variables */ -require('./libraries/vendor_config.php'); +require_once './libraries/common.inc.php'; /** * */ header('Content-type: text/plain; charset=iso-8859-1'); -readfile(LICENSE_FILE); + +$filename = LICENSE_FILE; + +// Check if the file is available, some distributions remove these. +if (is_readable($filename)) { + readfile($filename); +} else { + printf(__('The %s file is not available on this system, please visit www.phpmyadmin.net for more information.'), $filename); +} + ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_9-14-g09b124c
by Marc Delisle 08 Feb '11

08 Feb '11

The branch, QA_3_3 has been updated via 09b124c2723c5bf28404d800f7f8940d18cfc8dd (commit) via 4c8c7080a76b837ae55cdc5e010c793b389a671a (commit) from df97b1d2c075a0db4241b8494e36fa85eb231dcf (commit) - Log ----------------------------------------------------------------- commit 09b124c2723c5bf28404d800f7f8940d18cfc8dd Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Feb 8 08:20:20 2011 -0500 ChangeLog for 3.3.9.1 commit 4c8c7080a76b837ae55cdc5e010c793b389a671a Author: Herman van Rink <rink(a)initfour.nl> Date: Tue Feb 8 08:19:20 2011 -0500 PMASA-2011-1 fixes ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ changelog.php | 18 ++++++++++++------ license.php | 11 ++++++++++- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5226f5..6e88a8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,9 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3153409 [core] 0 row(s) affected - bug #3155842 [core] Edit relational page and page number +3.3.9.1 (2011-02-08) +- [security] Path disclosure, see PMASA-2011-1 + 3.3.9.0 (2011-01-03) - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand diff --git a/changelog.php b/changelog.php index 7b8c6f3..637efd1 100644 --- a/changelog.php +++ b/changelog.php @@ -15,13 +15,19 @@ require('./libraries/vendor_config.php'); /** * Read changelog. */ -if (substr(CHANGELOG_FILE, -3) == '.gz') { - ob_start(); - readgzfile(CHANGELOG_FILE); - $changelog = ob_get_contents(); - ob_end_clean(); +// Check if the Changelog file is available, some distributions remove these. +if (is_readable(CHANGELOG_FILE)) { + if (substr(CHANGELOG_FILE, -3) == '.gz') { + ob_start(); + readgzfile(CHANGELOG_FILE); + $changelog = ob_get_contents(); + ob_end_clean(); + } else { + $changelog = file_get_contents(CHANGELOG_FILE); + } } else { - $changelog = file_get_contents(CHANGELOG_FILE); + echo "The Changelog file is not available on this system, please visit www.phpmyadmin.net for more information."; + exit; } /** diff --git a/license.php b/license.php index 0294611..6d63878 100644 --- a/license.php +++ b/license.php @@ -19,5 +19,14 @@ require('./libraries/vendor_config.php'); * */ header('Content-type: text/plain; charset=iso-8859-1'); -readfile(LICENSE_FILE); + +$filename = LICENSE_FILE; + +// Check if the file is available, some distributions remove these. +if (is_readable($filename)) { + readfile($filename); +} else { + echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information."; +} + ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_9, updated. RELEASE_3_3_9-2-g06081b8
by Marc Delisle 08 Feb '11

08 Feb '11

The branch, MAINT_3_3_9 has been updated via 06081b8f78431716f398e726c42beaf8f1d20b5a (commit) via 44ace60f77ede6081e32e516bfd52d597d3f72a6 (commit) from 08a6fd9c12f1520518b044d87e2a4da189649580 (commit) - Log ----------------------------------------------------------------- commit 06081b8f78431716f398e726c42beaf8f1d20b5a Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Feb 8 08:17:36 2011 -0500 3.3.9.1 release commit 44ace60f77ede6081e32e516bfd52d597d3f72a6 Author: Herman van Rink <rink(a)initfour.nl> Date: Tue Feb 8 08:15:01 2011 -0500 PMASA-2011-1 fixes ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ Documentation.html | 4 ++-- README | 4 ++-- changelog.php | 18 ++++++++++++------ libraries/Config.class.php | 2 +- license.php | 11 ++++++++++- translators.html | 4 ++-- 7 files changed, 32 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index a15b8fc..d7e104f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.9.1 (2011-02-08) +- [security] Path disclosure, see PMASA-2011-1 + 3.3.9.0 (2011-01-03) - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand diff --git a/Documentation.html b/Documentation.html index 0a5cf58..ad4e951 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.9 - Documentation</title> + <title>phpMyAdmin 3.3.9.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.9 + 3.3.9.1 Documentation </h1> </div> diff --git a/README b/README index 182b036..aeb211b 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.9 - ------------- + Version 3.3.9.1 + --------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/changelog.php b/changelog.php index 7b8c6f3..637efd1 100644 --- a/changelog.php +++ b/changelog.php @@ -15,13 +15,19 @@ require('./libraries/vendor_config.php'); /** * Read changelog. */ -if (substr(CHANGELOG_FILE, -3) == '.gz') { - ob_start(); - readgzfile(CHANGELOG_FILE); - $changelog = ob_get_contents(); - ob_end_clean(); +// Check if the Changelog file is available, some distributions remove these. +if (is_readable(CHANGELOG_FILE)) { + if (substr(CHANGELOG_FILE, -3) == '.gz') { + ob_start(); + readgzfile(CHANGELOG_FILE); + $changelog = ob_get_contents(); + ob_end_clean(); + } else { + $changelog = file_get_contents(CHANGELOG_FILE); + } } else { - $changelog = file_get_contents(CHANGELOG_FILE); + echo "The Changelog file is not available on this system, please visit www.phpmyadmin.net for more information."; + exit; } /** diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 7e6460d..89a80d2 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.9'); + $this->set('PMA_VERSION', '3.3.9.1'); /** * @deprecated */ diff --git a/license.php b/license.php index 0294611..6d63878 100644 --- a/license.php +++ b/license.php @@ -19,5 +19,14 @@ require('./libraries/vendor_config.php'); * */ header('Content-type: text/plain; charset=iso-8859-1'); -readfile(LICENSE_FILE); + +$filename = LICENSE_FILE; + +// Check if the file is available, some distributions remove these. +if (is_readable($filename)) { + readfile($filename); +} else { + echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information."; +} + ?> diff --git a/translators.html b/translators.html index 6d2f096..ebb9f51 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.9 - Official translators</title> + <title>phpMyAdmin 3.3.9.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.9 + 3.3.9.1 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_2_11, updated. RELEASE_2_11_11_1-14-gd620aaf
by Marc Delisle 08 Feb '11

08 Feb '11

The branch, QA_2_11 has been updated via d620aaf102e9a9f850cc3a5cd77ff6de40dda782 (commit) via f0e8849034132e2114f1d77d9d37185bc5b49886 (commit) from 373a6626ade37c0fee1dfc7c757ca55c7652874b (commit) - Log ----------------------------------------------------------------- commit d620aaf102e9a9f850cc3a5cd77ff6de40dda782 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Feb 8 08:13:01 2011 -0500 ChangeLog for 2.11.11.2 commit f0e8849034132e2114f1d77d9d37185bc5b49886 Author: Herman van Rink <rink(a)initfour.nl> Date: Tue Feb 8 08:11:37 2011 -0500 PMASA-2011-1 fixes ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ changelog.php | 10 +++++++++- license.php | 11 ++++++++++- readme.php | 10 +++++++++- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0663e1..e3244d9 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.2 (2011-02-08) +- [security] Path disclosure, see PMASA-2011-1 + 2.11.11.1 (2010-11-29) - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 diff --git a/changelog.php b/changelog.php index 2b0dc3a..1b4807a 100644 --- a/changelog.php +++ b/changelog.php @@ -6,7 +6,15 @@ * @version $Id$ */ -$changelog = htmlspecialchars(file_get_contents('ChangeLog')); +$filename = 'ChangeLog'; + +// Check if the file is available, some distributions remove these. +if (is_readable($filename)) { + $changelog = htmlspecialchars(file_get_contents($filename)); +} else { + echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information."; + exit; +} $replaces = array( '@(http://[./a-zA-Z0-9.-]*[/a-zA-Z0-9])@' diff --git a/license.php b/license.php index 91927f4..c8c2957 100644 --- a/license.php +++ b/license.php @@ -13,5 +13,14 @@ * */ header('Content-type: text/plain; charset=iso-8859-1'); -readfile('LICENSE'); + +$filename = 'LICENSE'; + +// Check if the file is available, some distributions remove these. +if (is_readable($filename)) { + readfile($filename); +} else { + echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information."; +} + ?> diff --git a/readme.php b/readme.php index 34fecce..7f59a4e 100644 --- a/readme.php +++ b/readme.php @@ -13,5 +13,13 @@ * */ header('Content-type: text/plain; charset=utf-8'); -readfile('README'); + +$filename = 'README'; + +// Check if the file is available, some distributions remove these. +if (is_readable($filename)) { + readfile($filename); +} else { + echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information."; +} ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_2_11_11, updated. RELEASE_2_11_11_1-2-g448940b
by Marc Delisle 08 Feb '11

08 Feb '11

The branch, MAINT_2_11_11 has been updated via 448940b37b55648248d9a62139b8838feece3931 (commit) via 87fad589653478875ba6f86a5c5ceec805d0f8b2 (commit) from 61d9e561580ccb4a07d6d0c5695c839a22cc3b78 (commit) - Log ----------------------------------------------------------------- commit 448940b37b55648248d9a62139b8838feece3931 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Feb 8 08:07:22 2011 -0500 2.11.11.2 release commit 87fad589653478875ba6f86a5c5ceec805d0f8b2 Author: Herman van Rink <rink(a)initfour.nl> Date: Tue Feb 8 07:57:34 2011 -0500 PMASA-2011-1 fixes ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ Documentation.html | 4 ++-- README | 4 ++-- changelog.php | 10 +++++++++- libraries/Config.class.php | 2 +- license.php | 11 ++++++++++- readme.php | 10 +++++++++- translators.html | 4 ++-- 8 files changed, 38 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89fe37c..06a61e2 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.2 (2011-02-08) +- [security] Path disclosure, see PMASA-2011-1 + 2.11.11.1 (2010-11-29) - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 diff --git a/Documentation.html b/Documentation.html index a3f7982..6fadc33 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.1 - Documentation</title> + <title>phpMyAdmin 2.11.11.2 - 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.1 Documentation</h1> +<h1>phpMyAdmin 2.11.11.2 Documentation</h1> <ul><li><a href="http://www.phpmyadmin.net/"> phpMyAdmin homepage</a></li> diff --git a/README b/README index a1dfb54..9a1d370 100644 --- a/README +++ b/README @@ -5,12 +5,12 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 2.11.11.1 + Version 2.11.11.2 ----------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> - Copyright (C) 2001-2010 Marc Delisle <Marc.Delisle_at_cegepsherbrooke.qc.ca> + Copyright (C) 2001-2011 Marc Delisle <marc_at_infomarc.info> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> Alexander M. Turek <me_at_derrabus.de> diff --git a/changelog.php b/changelog.php index 2b0dc3a..1b4807a 100644 --- a/changelog.php +++ b/changelog.php @@ -6,7 +6,15 @@ * @version $Id$ */ -$changelog = htmlspecialchars(file_get_contents('ChangeLog')); +$filename = 'ChangeLog'; + +// Check if the file is available, some distributions remove these. +if (is_readable($filename)) { + $changelog = htmlspecialchars(file_get_contents($filename)); +} else { + echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information."; + exit; +} $replaces = array( '@(http://[./a-zA-Z0-9.-]*[/a-zA-Z0-9])@' diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f1df2e0..755230f 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.1'); + $this->set('PMA_VERSION', '2.11.11.2'); /** * @deprecated */ diff --git a/license.php b/license.php index 91927f4..c8c2957 100644 --- a/license.php +++ b/license.php @@ -13,5 +13,14 @@ * */ header('Content-type: text/plain; charset=iso-8859-1'); -readfile('LICENSE'); + +$filename = 'LICENSE'; + +// Check if the file is available, some distributions remove these. +if (is_readable($filename)) { + readfile($filename); +} else { + echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information."; +} + ?> diff --git a/readme.php b/readme.php index 34fecce..7f59a4e 100644 --- a/readme.php +++ b/readme.php @@ -13,5 +13,13 @@ * */ header('Content-type: text/plain; charset=utf-8'); -readfile('README'); + +$filename = 'README'; + +// Check if the file is available, some distributions remove these. +if (is_readable($filename)) { + readfile($filename); +} else { + echo "The $filename file is not available on this system, please visit www.phpmyadmin.net for more information."; +} ?> diff --git a/translators.html b/translators.html index f59ca41..27ac0f7 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.1 - Official translators</title> + <title>phpMyAdmin 2.11.11.2 - 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.1 official translators list</h1> +<h1>phpMyAdmin 2.11.11.2 official translators list</h1> <p> Here is the list of the "official translators" of phpMyAdmin.</p> hooks/post-receive -- phpMyAdmin

1 0