nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* ensures each constant isn't already defined before to define it

Browse Source 
* renamed PMA_INT_VERSION to PHP_INT_VERSION
This commit is contained in:
Loïc Chapeaux
2001-08-21 09:27:41 +00:00
parent 05a392964f
commit c705d707d9
3 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db_details.php3
View File

@@ -484,7 +484,7 @@ if ($num_tables > 0) {
<?php echo $strSend . "\n"; ?> <?php echo $strSend . "\n"; ?>
<?php <?php
// gzip and bzip2 encode features // gzip and bzip2 encode features
if (PMA_INT_VERSION >= 40004) { if (PHP_INT_VERSION >= 40004) {
$is_gzip = (isset($cfgGZipDump) && $cfgGZipDump && @function_exists('gzencode')); $is_gzip = (isset($cfgGZipDump) && $cfgGZipDump && @function_exists('gzencode'));
$is_bzip = (isset($cfgBZipDump) && $cfgBZipDump && @function_exists('bzcompress')); $is_bzip = (isset($cfgBZipDump) && $cfgBZipDump && @function_exists('bzcompress'));
if ($is_gzip || $is_bzip) { if ($is_gzip || $is_bzip) {

91
defines.inc.php3
View File

@@ -8,53 +8,64 @@
* MYSQL_MAJOR_VERSION (double) - eg: 3.23 * MYSQL_MAJOR_VERSION (double) - eg: 3.23
* MYSQL_MINOR_VERSION (double) - eg: 39 * MYSQL_MINOR_VERSION (double) - eg: 39
* PHPMYADMIN_VERSION (string) - phpMyAdmin version string * PHPMYADMIN_VERSION (string) - phpMyAdmin version string
* PMA_INT_VERSION (int) - eg: 30017 instead of 3.0.17 or * PHP_INT_VERSION (int) - eg: 30017 instead of 3.0.17 or
* 40006 instead of 4.0.6RC3 * 40006 instead of 4.0.6RC3
* PMA_WINDOWS (bool) - mark if phpMyAdmin running on windows * PMA_WINDOWS (bool) - mark if phpMyAdmin running on windows
* server * server
*/ */
define('PHPMYADMIN_VERSION', '2.2.0rc5'); // phpMyAdmin release
if (!defined('PHPMYADMIN_VERSION')) {
if (!ereg('([0-9]).([0-9]).([0-9])', phpversion(), $match)) { define('PHPMYADMIN_VERSION', '2.2.0rc5');
$result = ereg('([0-9]).([0-9])', phpversion(), $match);
} }
if (isset($match) && !empty($match[1])) {
if (!isset($match[2])) { // php version
$match[2] = 0; if (!defined('PHP_INT_VERSION')) {
if (!ereg('([0-9]).([0-9]).([0-9])', phpversion(), $match)) {
$result = ereg('([0-9]).([0-9])', phpversion(), $match);
} }
if (!isset($match[3])) { if (isset($match) && !empty($match[1])) {
$match[3] = 0; if (!isset($match[2])) {
} $match[2] = 0;
define('PMA_INT_VERSION', (int)sprintf('%d%02d%02d', $match[1], $match[2], $match[3]));
unset($match);
} else {
define('PMA_INT_VERSION', FALSE);
}
if (defined('PHP_OS') && eregi('win', PHP_OS)) {
define('PMA_WINDOWS', TRUE);
} else {
define('PMA_WINDOWS', FALSE);
}
// MySQL Version
if (!empty($server)) {
$result = mysql_query('SELECT VERSION() AS version');
if ($result != FALSE && @mysql_num_rows($result) > 0) {
$row = mysql_fetch_array($result);
define('MYSQL_MAJOR_VERSION', (double)substr($row['version'], 0, 4));
define('MYSQL_MINOR_VERSION', (double)substr($row['version'], 5));
} else {
$result = @mysql_query('SHOW VARIABLES LIKE \'version\'');
if ($result != FALSE && @mysql_num_rows($result) > 0){
$row = mysql_fetch_row($result);
define('MYSQL_MAJOR_VERSION', (double)substr($row[1], 0, 4));
define('MYSQL_MINOR_VERSION', (double)substr($row[1], 5));
} }
if (!isset($match[3])) {
$match[3] = 0;
}
define('PHP_INT_VERSION', (int)sprintf('%d%02d%02d', $match[1], $match[2], $match[3]));
unset($match);
} else {
define('PHP_INT_VERSION', FALSE);
} }
} // end server id is defined case }
// Whether the os php is running on is windows or not
if (!defined('PMA_WINDOWS')) {
if (defined('PHP_OS') && eregi('win', PHP_OS)) {
define('PMA_WINDOWS', TRUE);
} else {
define('PMA_WINDOWS', FALSE);
}
}
// MySQL Version
if (!defined('MYSQL_MAJOR_VERSION')) { if (!defined('MYSQL_MAJOR_VERSION')) {
define('MYSQL_MAJOR_VERSION', 3.21); if (!empty($server)) {
define('MYSQL_MINOR_VERSION', 0); $result = mysql_query('SELECT VERSION() AS version');
} // end if if ($result != FALSE && @mysql_num_rows($result) > 0) {
$row = mysql_fetch_array($result);
define('MYSQL_MAJOR_VERSION', (double)substr($row['version'], 0, 4));
define('MYSQL_MINOR_VERSION', (double)substr($row['version'], 5));
} else {
$result = @mysql_query('SHOW VARIABLES LIKE \'version\'');
if ($result != FALSE && @mysql_num_rows($result) > 0){
$row = mysql_fetch_row($result);
define('MYSQL_MAJOR_VERSION', (double)substr($row[1], 0, 4));
define('MYSQL_MINOR_VERSION', (double)substr($row[1], 5));
}
}
} // end server id is defined case
if (!defined('MYSQL_MAJOR_VERSION')) {
define('MYSQL_MAJOR_VERSION', 3.21);
define('MYSQL_MINOR_VERSION', 0);
} // end if
}
?> ?>

2
tbl_properties.php3
View File

@@ -708,7 +708,7 @@ echo "\n";
<?php echo $strSend . "\n"; ?> <?php echo $strSend . "\n"; ?>
<?php <?php
// gzip and bzip2 encode features // gzip and bzip2 encode features
if (PMA_INT_VERSION >= 40004) { if (PHP_INT_VERSION >= 40004) {
$is_gzip = (isset($cfgGZipDump) && $cfgGZipDump && @function_exists('gzencode')); $is_gzip = (isset($cfgGZipDump) && $cfgGZipDump && @function_exists('gzencode'));
$is_bzip = (isset($cfgBZipDump) && $cfgBZipDump && @function_exists('bzcompress')); $is_bzip = (isset($cfgBZipDump) && $cfgBZipDump && @function_exists('bzcompress'));
if ($is_gzip || $is_bzip) { if ($is_gzip || $is_bzip) {