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

bug 434608

Browse Source
This commit is contained in:
Marc Delisle
2001-06-27 20:11:45 +00:00
parent 65fd312067
commit a6838b8646
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -6,6 +6,7 @@ $Id$
$Source$ $Source$
2001-06-27 Marc Delisle <lem9@users.sourceforge.net> 2001-06-27 Marc Delisle <lem9@users.sourceforge.net>
* add function tbl_name() to protect table names like 00001_Files
* bug 434608: support db names with special characters (MySQL >= 3.23.6) * bug 434608: support db names with special characters (MySQL >= 3.23.6)
(lib.inc.php3, db_create.php3, db_details.php3, tbl_addfield.php3, (lib.inc.php3, db_create.php3, db_details.php3, tbl_addfield.php3,
tbl_alter.php3, user_details.php3 (incomplete)) tbl_alter.php3, user_details.php3 (incomplete))

11
lib.inc.php3
View File

@@ -303,7 +303,8 @@ function display_table ($dt_result, $is_simple = false) {
$primary = false; $primary = false;
if(!$is_simple && !empty($table) && !empty($db)) { if(!$is_simple && !empty($table) && !empty($db)) {
$result = mysql_query("SELECT COUNT(*) as total FROM " .db_name($db).".$table") or mysql_die(); $result = mysql_query("SELECT COUNT(*) as total FROM " .db_name($db).
"." . tbl_name($table)) or mysql_die();
$row = mysql_fetch_array($result); $row = mysql_fetch_array($result);
$total = $row["total"]; $total = $row["total"];
} }
@@ -917,6 +918,14 @@ function db_name ($db) {
else return $db; else return $db;
} }
function tbl_name ($tbl) {
if (MYSQL_MAJOR_VERSION >= "3.23"
&& intval(MYSQL_MINOR_VERSION) >= 6) {
return "`" . $tbl . "`";
}
else return $tbl;
}
include ("./defines.inc.php3"); include ("./defines.inc.php3");
} // $__LIB_INC__ } // $__LIB_INC__

3
tbl_addfield.php3
View File

@@ -63,7 +63,8 @@ if(isset($submit))
} }
$sql_query = "ALTER TABLE $table ADD $query"; $sql_query = "ALTER TABLE $table ADD $query";
$result = mysql_query("ALTER TABLE ".db_name($db).".$table ADD $query"); $result = mysql_query("ALTER TABLE ".db_name($db)."."
. tbl_name($table) . " ADD $query");
$primary = ''; $primary = '';

5
tbl_alter.php3
View File

@@ -23,7 +23,7 @@ if(isset($submit))
$query = stripslashes($query); $query = stripslashes($query);
} }
//optimization fix - 2 May 2001 - Robbat2 //optimization fix - 2 May 2001 - Robbat2
$sql_query = "ALTER TABLE ".db_name($db).".$table CHANGE $query"; $sql_query = "ALTER TABLE ".db_name($db).".".tbl_name($table)." CHANGE $query";
$result = mysql_query($sql_query) or mysql_die(); $result = mysql_query($sql_query) or mysql_die();
$message = "$strTable $table $strHasBeenAltered"; $message = "$strTable $table $strHasBeenAltered";
include("./tbl_properties.php3"); include("./tbl_properties.php3");
@@ -31,7 +31,8 @@ if(isset($submit))
} }
else else
{ {
$result = mysql_query("SHOW FIELDS FROM ".db_name($db).".$table LIKE '$field'") or mysql_die(); $result = mysql_query("SHOW FIELDS FROM ".db_name($db).".".
tbl_name($table) . " LIKE '$field'") or mysql_die();
$num_fields = mysql_num_rows($result); $num_fields = mysql_num_rows($result);
$action = "tbl_alter.php3"; $action = "tbl_alter.php3";
include("./tbl_properties.inc.php3"); include("./tbl_properties.inc.php3");

9
user_details.php3
View File

@@ -298,7 +298,8 @@ function grant_operations()
<?php <?php
if (isset($dbgrant) && isset($tablegrant)) { if (isset($dbgrant) && isset($tablegrant)) {
$result = mysql_query("SHOW COLUMNS FROM ".db_name($dbgrant).".$tablegrant"); $result = mysql_query("SHOW COLUMNS FROM ".db_name($dbgrant)."." .
tbl_name($tablegrant));
if (@mysql_num_rows($result)) if (@mysql_num_rows($result))
while ($row = mysql_fetch_row($result)) while ($row = mysql_fetch_row($result))
echo "<option>" . $row[0] . "</option>\n"; echo "<option>" . $row[0] . "</option>\n";
@@ -400,7 +401,8 @@ function table_grants($host, $user, $dbcheck = false)
# Revoke # Revoke
$query = "server=$server&lang=$lang&db=mysql&table=user"; $query = "server=$server&lang=$lang&db=mysql&table=user";
$revoke_url = "sql.php3"; $revoke_url = "sql.php3";
$revoke_url .= "?sql_query=".urlencode("REVOKE $priv ON ".db_name($db).".$table FROM '$user'@'$host'"); $revoke_url .= "?sql_query=".urlencode("REVOKE $priv ON ".
db_name($db)."." . tbl_name($table) . " FROM '$user'@'$host'");
$revoke_url .= "&$query"; $revoke_url .= "&$query";
$revoke_url .= "&zero_rows=" . urlencode("$strRevokeMessage <font color=#002E80>$user@$host</font>"); $revoke_url .= "&zero_rows=" . urlencode("$strRevokeMessage <font color=#002E80>$user@$host</font>");
$revoke_url .= "&goto=$self"; $revoke_url .= "&goto=$self";
@@ -408,7 +410,8 @@ function table_grants($host, $user, $dbcheck = false)
# Revoke GRANT OPTION # Revoke GRANT OPTION
$revoke_grant_url = "sql.php3"; $revoke_grant_url = "sql.php3";
$revoke_grant_url .= "?sql_query=" $revoke_grant_url .= "?sql_query="
.urlencode("REVOKE GRANT OPTION ON ".db_name($db).".$table FROM '$user'@'$host'"); .urlencode("REVOKE GRANT OPTION ON ".
db_name($db)."." . tbl_name($table) . " FROM '$user'@'$host'");
$revoke_grant_url .= "&$query"; $revoke_grant_url .= "&$query";
$revoke_grant_url .= "&zero_rows=" . urlencode("$strRevokeGrantMessage <font color=#002E80>$user@$host</font>"); $revoke_grant_url .= "&zero_rows=" . urlencode("$strRevokeGrantMessage <font color=#002E80>$user@$host</font>");
$revoke_grant_url .= "&goto=$self"; $revoke_grant_url .= "&goto=$self";