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

- fix pm not_moved/removed retrieval (it was switched)

Browse source 
- cache db-size retrieval (saves a lot of seconds for very large boards)


git-svn-id: file:///svn/phpbb/trunk@8231 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-11-07 10:45:38 +00:00
parent 9114de0a0f
commit 8c26e780e3
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/functions_admin.php
View file

@ -2775,7 +2775,7 @@ function get_database_size()
$sql = 'SHOW TABLE STATUS $sql = 'SHOW TABLE STATUS
FROM ' . $db_name; FROM ' . $db_name;
$result = $db->sql_query($sql); $result = $db->sql_query($sql, 7200);
$database_size = 0; $database_size = 0;
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
@ -2825,7 +2825,7 @@ function get_database_size()
case 'mssql_odbc': case 'mssql_odbc':
$sql = 'SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize $sql = 'SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize
FROM sysfiles'; FROM sysfiles';
$result = $db->sql_query($sql); $result = $db->sql_query($sql, 7200);
$database_size = ($row = $db->sql_fetchrow($result)) ? $row['dbsize'] : false; $database_size = ($row = $db->sql_fetchrow($result)) ? $row['dbsize'] : false;
$db->sql_freeresult($result); $db->sql_freeresult($result);
break; break;
@ -2867,7 +2867,7 @@ function get_database_size()
case 'oracle': case 'oracle':
$sql = 'SELECT SUM(bytes) as dbsize $sql = 'SELECT SUM(bytes) as dbsize
FROM user_segments'; FROM user_segments';
$result = $db->sql_query($sql); $result = $db->sql_query($sql, 7200);
$database_size = ($row = $db->sql_fetchrow($result)) ? $row['dbsize'] : false; $database_size = ($row = $db->sql_fetchrow($result)) ? $row['dbsize'] : false;
$db->sql_freeresult($result); $db->sql_freeresult($result);
break; break;

4
phpBB/includes/functions_privmsgs.php
View file

@ -365,7 +365,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
if (!$user->data['user_new_privmsg']) if (!$user->data['user_new_privmsg'])
{ {
return 0; return array('not_moved' => 0, 'removed' => 0);
} }
$user_message_rules = (int) $user->data['user_message_rules']; $user_message_rules = (int) $user->data['user_message_rules'];
@ -717,7 +717,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
$num_not_moved = (int) $db->sql_fetchfield('num_messages'); $num_not_moved = (int) $db->sql_fetchfield('num_messages');
$db->sql_freeresult($result); $db->sql_freeresult($result);
return array($num_not_moved, $num_removed); return array('not_moved' => $num_not_moved, 'removed' => $num_removed);
} }
/** /**

4
phpBB/includes/ucp/ucp_pm.php
View file

@ -253,7 +253,9 @@ class ucp_pm
if ($user->data['user_new_privmsg'] && $action == 'view_folder') if ($user->data['user_new_privmsg'] && $action == 'view_folder')
{ {
list($num_not_moved, $num_removed) = each(place_pm_into_folder($global_privmsgs_rules, $release)); $return = place_pm_into_folder($global_privmsgs_rules, $release);
$num_not_moved = $return['not_moved'];
$num_removed = $return['removed'];
} }
if (!$msg_id && $folder_id == PRIVMSGS_NO_BOX) if (!$msg_id && $folder_id == PRIVMSGS_NO_BOX)