This commit is contained in:
Steve Alberty
2001-08-04 14:18:58 +00:00
parent 0e038ac3d6
commit 7eac26503d
5 changed files with 9 additions and 7 deletions

View File

@@ -7,6 +7,8 @@ $Source$
2001-08-04 Steve Alberty <alberty@neptunlabs.de> 2001-08-04 Steve Alberty <alberty@neptunlabs.de>
* lib.inc.php3: fixed #444017 (thanks anonymous) * lib.inc.php3: fixed #444017 (thanks anonymous)
* db_details.php3, tbl_replace.php3, sql.php3, user_details.php3
fixed #444542 - replace preg_xxx with ereg (thanks Marc)
2001-08-04 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2001-08-04 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* config.inc.php3, db_details.php3, Documentation.html, * config.inc.php3, db_details.php3, Documentation.html,

View File

@@ -31,7 +31,7 @@ if ($num_tables > 0 && MYSQL_MAJOR_VERSION >= 3.23 && intval(MYSQL_MINOR_VERSION
if ($result != FALSE && mysql_num_rows($result) > 0) { if ($result != FALSE && mysql_num_rows($result) > 0) {
while ($tmp = mysql_fetch_array($result)) { while ($tmp = mysql_fetch_array($result)) {
// if in use memorize tablename // if in use memorize tablename
if (preg_match('/in_use=[1-9]+/', $tmp['Comment'])) { if (eregi('in_use=[1-9]+', $tmp)) {
$sot_cache[$tmp[0]] = TRUE; $sot_cache[$tmp[0]] = TRUE;
} }
} }
@@ -443,8 +443,8 @@ if ($num_tables > 0) {
<?php <?php
// gzip and bzip2 encode features // gzip and bzip2 encode features
if (PMA_INT_VERSION >= 40004) { if (PMA_INT_VERSION >= 40004) {
$is_gzip = ($cfgGZipDump && @function_exists('gzencode')); $is_gzip = @function_exists('gzencode');
$is_bzip = ($cfgBZipDump && @function_exists('bzcompress')); $is_bzip = @function_exists('bzcompress');
if ($is_gzip || $is_bzip) { if ($is_gzip || $is_bzip) {
echo "\n" . ' ('; echo "\n" . ' (';
if ($is_gzip) { if ($is_gzip) {

View File

@@ -42,7 +42,7 @@ if (isset($goto) && $goto == 'sql.php3') {
} }
if (isset($btnDrop) && $btnDrop == $strNo) { if (isset($btnDrop) && $btnDrop == $strNo) {
if (file_exists('./' . $goto)) { if (file_exists('./' . $goto)) {
include('./' . preg_replace('/\.\.*/', '.', $goto)); include('./' . ereg_replace('\.\.*', '.', $goto));
} else { } else {
header('Location: ' . $goto); header('Location: ' . $goto);
} }
@@ -161,7 +161,7 @@ else {
} else { } else {
$message = $strEmptyResultSet; $message = $strEmptyResultSet;
} }
$goto = preg_replace('/\.\.*/', '.', $goto); $goto = ereg_replace('\.\.*', '.', $goto);
if ($goto != 'main.php3') { if ($goto != 'main.php3') {
include('./header.inc.php3'); include('./header.inc.php3');
} }

View File

@@ -175,7 +175,7 @@ if (!$result) {
if (file_exists('./' . $goto)) { if (file_exists('./' . $goto)) {
include('./header.inc.php3'); include('./header.inc.php3');
$message = $strModifications; $message = $strModifications;
include('./' . preg_replace('/\.\.*/', '.', $goto)); include('./' . ereg_replace('\.\.*', '.', $goto)); //preg_replace('/\.\.*/', '.', $goto));
} else { } else {
header('Location: ' . $goto); header('Location: ' . $goto);
} }

View File

@@ -388,7 +388,7 @@ function table_grants($host, $user, $dbcheck = FALSE)
$i = 0; $i = 0;
while ($row = mysql_fetch_row($result)) { while ($row = mysql_fetch_row($result)) {
if (preg_match("/GRANT (.*) ON ([^\.]+).([^\.]+) TO .*$/i", $row[0], $parts)) { if (eregi("GRANT (.*) ON ([^\.]+).([^\.]+) TO .*$", $row[0], $parts)) {
$priv = $parts[1]; $priv = $parts[1];
$db = $parts[2]; $db = $parts[2];
$table = trim($parts[3]); $table = trim($parts[3]);