makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hopefully killed bug #472269 dead, a touch of Domestos power

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1271 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-11-03 21:56:17 +00:00
parent 68795b03d5
commit 1fcd1afe9d
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
phpBB/admin/index.php
View file

@ -195,13 +195,15 @@ elseif( $HTTP_GET_VARS['pane'] == 'right' )
// This code is heavily influenced by a similar routine // This code is heavily influenced by a similar routine
// in phpMyAdmin 2.2.0 // in phpMyAdmin 2.2.0
// //
if(SQL_LAYER == 'mysql') if( preg_match("/^mysql/", SQL_LAYER) )
{ {
$sql = "SELECT VERSION() AS mysql_version"; $sql = "SELECT VERSION() AS mysql_version";
if($result = $db->sql_query($sql)) if($result = $db->sql_query($sql))
{ {
list($version) = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
if( ereg("^3\.23", $version) ) echo $version = $row['mysql_version'];
if( preg_match("/^(3\.23|4\.)/", $version) )
{ {
$sql = "SHOW TABLE STATUS $sql = "SHOW TABLE STATUS
FROM " . $dbname; FROM " . $dbname;
@ -214,17 +216,27 @@ elseif( $HTTP_GET_VARS['pane'] == 'right' )
$dbsize = 0; $dbsize = 0;
for($i = 0; $i < count($tabledata_ary); $i++) for($i = 0; $i < count($tabledata_ary); $i++)
{ {
if($tabledata_ary[$i]['Type'] != "MRG_MyISAM" && strstr($tabledata_ary[$i]['Name'], $table_prefix) ) if( $tabledata_ary[$i]['Type'] != "MRG_MyISAM" )
{ {
$dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length']; if( $table_prefix != "" )
{
if( strstr($tabledata_ary[$i]['Name'], $table_prefix) )
{
$dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length'];
}
}
else
{
$dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length'];
}
} }
} }
if($dbsize >= 1048576) if( $dbsize >= 1048576 )
{ {
$dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 )); $dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 ));
} }
else if($dbsize >= 1024) else if( $dbsize >= 1024 )
{ {
$dbsize = sprintf("%.2f KB", ( $dbsize / 1024 )); $dbsize = sprintf("%.2f KB", ( $dbsize / 1024 ));
} }