split

ChangeLog

@@ -7,6 +7,9 @@ $Source$
 
 2002-07-08 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/display_tbl.lib.php3: bug 577645: extra space in the cell
+    * libraries/common.lib.php3, defines.lib.php3, defines_php.lib.php3,
+      scripts/create-release.sh: split defines.lib.php3 because
+      of charset_conversion needs (thanks to Michal Cihar) 
 
 2002-07-07 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/common.lib.php3: Forgot a <meta /> tag in the config file error

libraries/common.lib.php3

@@ -19,6 +19,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
      * before they are referenced
      *
      * some functions need the constants of libraries/defines.lib.php3
+     * and defines_php.lib.php3
      *
      * the PMA_setFontSizes() function must be before the call to the
      * libraries/auth/cookie.auth.lib.php3 library
@@ -123,7 +124,19 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
     include('./libraries/mysql_wrappers.lib.php3');
 
     /**
-     * Gets constants that defines the PHP, MySQL... releases.
+     * Gets constants that defines the PHP version number.
+     * This include must be located physically before any code that needs to
+     * reference the constants, else PHP 3.0.16 won't be happy.
+     */
+    include('./libraries/defines_php.lib.php3');
+
+    /**
+     * Charset conversion.
+     */
+    include('./libraries/charset_conversion.lib.php3');
+
+    /**
+     * Gets constants that defines the MySQL version number.
      * This include must be located physically before any code that needs to
      * reference the constants, else PHP 3.0.16 won't be happy; and must be
      * located after we are connected to db to get the MySql version (see
@@ -131,10 +144,6 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
      */
     include('./libraries/defines.lib.php3');
 
-    /**
-     * Include charset conversion.
-     */
-    include('./libraries/charset_conversion.lib.php3');
 
     // For compatibility with old config.inc.php3
     if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 116) {

libraries/defines.lib.php3

@@ -4,48 +4,11 @@
 /**
  * DEFINES VARIABLES & CONSTANTS
  * Overview:
- *    PMA_VERSION              (string) - phpMyAdmin version string
- *    PMA_PHP_INT_VERSION      (int)    - eg: 30017 instead of 3.0.17 or
- *                                        40006 instead of 4.0.6RC3
- *    PMA_IS_WINDOWS           (bool)   - mark if phpMyAdmin running on windows
- *                                        server
  *    PMA_MYSQL_INT_VERSION    (int)    - eg: 32339 instead of 3.23.39
  *    PMA_USR_OS               (string) - the plateform (os) of the user
  *    PMA_USR_BROWSER_AGENT    (string) - the browser of the user
  *    PMA_USR_BROWSER_VER      (double) - the version of this browser
  */
-// phpMyAdmin release
-if (!defined('PMA_VERSION')) {
-    define('PMA_VERSION', '2.3.0-rc3');
-}
-
-// php version
-if (!defined('PMA_PHP_INT_VERSION')) {
-    if (!ereg('([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2})', phpversion(), $match)) {
-        $result = ereg('([0-9]{1,2}).([0-9]{1,2})', phpversion(), $match);
-    }
-    if (isset($match) && !empty($match[1])) {
-        if (!isset($match[2])) {
-            $match[2] = 0;
-        }
-        if (!isset($match[3])) {
-            $match[3] = 0;
-        }
-        define('PMA_PHP_INT_VERSION', (int)sprintf('%d%02d%02d', $match[1], $match[2], $match[3]));
-        unset($match);
-    } else {
-        define('PMA_PHP_INT_VERSION', 0);
-    }
-}
-
-// Whether the os php is running on is windows or not
-if (!defined('PMA_IS_WINDOWS')) {
-    if (defined('PHP_OS') && eregi('win', PHP_OS)) {
-        define('PMA_IS_WINDOWS', 1);
-    } else {
-        define('PMA_IS_WINDOWS', 0);
-    }
-}
 
 // MySQL Version
 if (!defined('PMA_MYSQL_INT_VERSION') && isset($userlink)) {

libraries/defines_php.lib.php3

@@ -0,0 +1,47 @@
+<?php
+/* $Id$ */
+
+/**
+ * DEFINES VARIABLES & CONSTANTS
+ * Overview:
+ *    PMA_VERSION              (string) - phpMyAdmin version string
+ *    PMA_PHP_INT_VERSION      (int)    - eg: 30017 instead of 3.0.17 or
+ *                                        40006 instead of 4.0.6RC3
+ *    PMA_IS_WINDOWS           (bool)   - mark if phpMyAdmin running on windows
+ *                                        server
+ */
+// phpMyAdmin release
+if (!defined('PMA_VERSION')) {
+    define('PMA_VERSION', '2.3.0-rc3');
+}
+
+// php version
+if (!defined('PMA_PHP_INT_VERSION')) {
+    if (!ereg('([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2})', phpversion(), $match)) {
+        $result = ereg('([0-9]{1,2}).([0-9]{1,2})', phpversion(), $match);
+    }
+    if (isset($match) && !empty($match[1])) {
+        if (!isset($match[2])) {
+            $match[2] = 0;
+        }
+        if (!isset($match[3])) {
+            $match[3] = 0;
+        }
+        define('PMA_PHP_INT_VERSION', (int)sprintf('%d%02d%02d', $match[1], $match[2], $match[3]));
+        unset($match);
+    } else {
+        define('PMA_PHP_INT_VERSION', 0);
+    }
+}
+
+// Whether the os php is running on is windows or not
+if (!defined('PMA_IS_WINDOWS')) {
+    if (defined('PHP_OS') && eregi('win', PHP_OS)) {
+        define('PMA_IS_WINDOWS', 1);
+    } else {
+        define('PMA_IS_WINDOWS', 0);
+    }
+}
+
+// $__PMA_DEFINES_PHP_LIB__
+?>

scripts/create-release.sh

@@ -37,7 +37,7 @@ cat <<END
 
 Please ensure you have:
   1. incremented rc count or version in CVS :
-     - in libraries/defines.lib.php3 the line
+     - in libraries/defines_php.lib.php3 the line
           " define('PMA_VERSION', '$1'); "
      - in Documentation.html the 2 lines
           " <h1>phpMyAdmin $1 Documentation</h1> "
@@ -106,7 +106,7 @@ Todo now:
         phpmyadmin-news@lists.sourceforge.net
         phpmyadmin-users@lists.sourceforge.net
  8. increment rc count or version in CVS :
-        - in libraries/defines.lib.php3 the line
+        - in libraries/defines_php.lib.php3 the line
               " define('PHPMYADMIN_VERSION', '2.2.2-rc1'); "
         - in Documentation.html the line
               " <h1>phpMyAdmin 2.2.2-rc1 Documentation</h1> "