[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_9, updated. RELEASE_3_3_9-2-g06081b8

[Marc Delisle]

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 at infomarc.info>
Date:   Tue Feb 8 08:17:36 2011 -0500

    3.3.9.1 release

commit 44ace60f77ede6081e32e516bfd52d597d3f72a6
Author: Herman van Rink <rink at 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/ChangeLog $
 
+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