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

- added a few missing log variables

Browse source 
- include acp/common.php language file if displaying logs (LOG_ variables should be stored there only now)
- added check to cron.php
- added database_gc config variable
- recalculate binary trees every once a week ;)


git-svn-id: file:///svn/phpbb/trunk@5929 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-05-18 18:18:32 +00:00
parent f15d6862ae
commit 7e25c8d9cc
16 changed files with 125 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
phpBB/cron.php
View file

@ -14,23 +14,27 @@ define('IN_PHPBB', true);
define('IN_CRON', true);
$phpbb_root_path = './';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
include($phpbb_root_path . 'common.'.$phpEx);
include($phpbb_root_path . 'common.' . $phpEx);
$cron_type = request_var('cron_type', '');
$use_shutdown_function = (@function_exists('register_shutdown_function')) ? true : false;
/**
* Run cron-like action
* Real cron-based layer will be introduced in 3.2
*
* @todo check gc-intervals here too (important!)
*/
switch ($cron_type)
{
case 'queue':
include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx);
if (time() - $config['queue_interval'] <= $config['last_queue_run'] || !file_exists($phpbb_root_path . 'cache/queue.' . $phpEx))
{
break;
}
include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
$queue = new queue();
if ($use_shutdown_function)
{
register_shutdown_function(array(&$queue, 'process'));
@ -39,9 +43,16 @@ switch ($cron_type)
{
$queue->process();
}
break;
case 'tidy_cache':
if (time() - $config['cache_gc'] <= $config['cache_last_gc'] || !method_exists($cache, 'tidy'))
{
break;
}
if ($use_shutdown_function)
{
register_shutdown_function(array(&$cache, 'tidy'));
@ -50,16 +61,19 @@ switch ($cron_type)
{
$cache->tidy();
}
break;
case 'tidy_search':
// Select the search method
$search_type = $config['search_type'];
$search_type = basename($config['search_type']);
if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx) || (time() - $config['search_last_gc'] <= $config['search_gc']))
if (time() - $config['search_gc'] <= $config['search_last_gc'] || !file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
{
break;
}
include_once("{$phpbb_root_path}includes/search/$search_type.$phpEx");
// We do some additional checks in the module to ensure it can actually be utilised
@ -79,10 +93,17 @@ switch ($cron_type)
{
$search->tidy();
}
set_config('search_last_gc', time());
break;
case 'tidy_warnings':
include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
if (time() - $config['warnings_gc'] <= $config['warnings_last_gc'])
{
break;
}
include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
if ($use_shutdown_function)
{
@ -92,10 +113,17 @@ switch ($cron_type)
{
tidy_warnings();
}
break;
case 'tidy_database':
include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
if (time() - $config['database_gc'] <= $config['database_last_gc'])
{
break;
}
include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
if ($use_shutdown_function)
{
@ -105,9 +133,16 @@ switch ($cron_type)
{
tidy_database();
}
break;
case 'tidy_sessions':
if (time() - $config['session_gc'] <= $config['session_last_gc'])
{
break;
}
if ($use_shutdown_function)
{
register_shutdown_function(array(&$user, 'session_gc'));
@ -116,6 +151,7 @@ switch ($cron_type)
{
$user->session_gc();
}
break;
case 'prune_forum':
@ -137,7 +173,7 @@ switch ($cron_type)
// Do the forum Prune thang
if ($row['prune_next'] < time() && $row['enable_prune'])
{
include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
if ($row['prune_days'])
{

1
phpBB/includes/acp/acp_board.php
View file

@ -6,6 +6,7 @@
* @copyright (c) 2005 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
* @todo add cron intervals to server settings? (database_gc, queue_interval, session_gc, search_gc, cache_gc, warnings_gc)
*/
/**

4
phpBB/includes/acp/acp_forums.php
View file

@ -76,8 +76,6 @@ class acp_forums
$auth->acl_clear_prefetch();
$cache->destroy('sql', FORUMS_TABLE);
recalc_btree('forum_id', FORUMS_TABLE);
trigger_error($user->lang['FORUM_DELETED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
break;
@ -223,8 +221,6 @@ class acp_forums
$auth->acl_clear_prefetch();
$cache->destroy('sql', FORUMS_TABLE);
recalc_btree('forum_id', FORUMS_TABLE);
$acl_url = '&amp;mode=setting_forum_local&amp;forum_id[]=' . $forum_data['forum_id'] . '&amp;select_all_groups=1';
// Redirect to permissions

6
phpBB/includes/acp/acp_modules.php
View file

@ -208,8 +208,6 @@ class acp_modules
add_log('admin', 'LOG_MODULE_' . strtoupper($action), $move_module_name);
// recalculate binary tree
recalc_btree('module_id', MODULES_TABLE, $this->module_class);
$this->remove_cache_file();
break;
@ -247,8 +245,6 @@ class acp_modules
if (!sizeof($errors))
{
// recalculate binary tree
recalc_btree('module_id', MODULES_TABLE, $this->module_class);
$this->remove_cache_file();
trigger_error($user->lang['MODULE_ADDED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $parent_id));
@ -337,8 +333,6 @@ class acp_modules
if (!sizeof($errors))
{
// recalculate binary tree
recalc_btree('module_id', MODULES_TABLE, $this->module_class);
$this->remove_cache_file();
trigger_error((($action == 'add') ? $user->lang['MODULE_ADDED'] : $user->lang['MODULE_EDITED']) . adm_back_link($this->u_action . '&amp;parent_id=' . $parent_id));

13
phpBB/includes/functions.php
View file

@ -2716,28 +2716,25 @@ function page_footer()
// Tidy the cache
$cron_type = 'tidy_cache';
}
else if (time() - $config['warnings_last_gc'] > $config['warnings_gc'])
else if (time() - $config['warnings_gc'] > $config['warnings_last_gc'])
{
$cron_type = 'tidy_warnings';
}
else if (time() - (7 * 24 * 3600) > $config['database_last_gc'])
else if (time() - $config['database_gc'] > $config['database_last_gc'])
{
// Tidy some table rows every week
// Tidy the database
// This includes recalculation binary trees, ...
$cron_type = 'tidy_database';
}
else if (time() - $config['search_last_gc'] > $config['search_gc'])
else if (time() - $config['search_gc'] > $config['search_last_gc'])
{
// Tidy the search
$cron_type = 'tidy_search';
}
/**
* @todo add session garbage collection
else if (time() - $config['session_gc'] > $config['session_last_gc'])
{
$cron_type = 'tidy_sessions';
}
*/
if ($cron_type)
{

29
phpBB/includes/functions_admin.php
View file

@ -178,6 +178,7 @@ function make_forum_select($select_id = false, $ignore_id = false, $ignore_acl =
$iteration++;
}
$db->sql_freeresult($result);
unset($padding_store);
return $forum_list;
@ -2264,27 +2265,31 @@ function tidy_warnings()
$db->sql_transaction('commit');
}
set_config('warnings_last_gc', time());
set_config('warnings_last_gc', time(), true);
}
/**
* Tidy database
* Removes all tracking rows older than 6 months, including mark_posted informations
* Tidy database, doing some maintanance tasks
*/
function tidy_database()
{
global $db;
/*
$remove_date = time() - (3 * 62 * 24 * 3600);
$sql = 'DELETE FROM ' . FORUMS_TRACK_TABLE . '
WHERE mark_time < ' . $remove_date;
$db->sql_query($sql);
// Recalculate binary tree for forums
recalc_btree('forum_id', FORUMS_TABLE);
// Recalculate binary tree for modules
$sql = 'SELECT module_class
FROM ' . MODULES_TABLE . '
GROUP BY module_class';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
recalc_btree('module_id', MODULES_TABLE, $row['module_class']);
}
$db->sql_freeresult($result);
$sql = 'DELETE FROM ' . TOPICS_TRACK_TABLE . '
WHERE mark_time < ' . $remove_date;
$db->sql_query($sql);
*/
set_config('database_last_gc', time(), true);
}

2
phpBB/includes/mcp/mcp_logs.php
View file

@ -28,6 +28,8 @@ class mcp_logs
global $auth, $db, $user, $template;
global $config, $phpbb_root_path, $phpEx, $SID;
$user->add_lang('acp/common');
$action = request_var('action', array('' => ''));
if (is_array($action))

7
phpBB/includes/mcp/mcp_notes.php
View file

@ -45,11 +45,14 @@ class mcp_notes
);
$this->tpl_name = 'mcp_notes_front';
break;
break;
case 'user_notes':
$user->add_lang('acp/common');
mcp_notes_user_view($id, $mode, $action);
$this->tpl_name = 'mcp_notes_user';
break;
break;
}
}
}

2
phpBB/includes/search/fulltext_mysql.php
View file

@ -615,6 +615,8 @@ class fulltext_mysql extends search_backend
// destroy too old cached search results
$this->destroy_cache(array());
set_config('search_last_gc', time(), true);
}
/**

3
phpBB/includes/search/fulltext_native.php
View file

@ -910,6 +910,7 @@ class fulltext_native extends search_backend
// carry on ... it's okay ... I know when I'm not wanted boo hoo
if (!$config['fulltext_native_load_upd'])
{
set_config('search_last_gc', time(), true);
return;
}
@ -978,6 +979,8 @@ class fulltext_native extends search_backend
// destroy cached search results containing any of the words that are now common or were removed
$this->destroy_cache(array_unique($destroy_cache_words));
set_config('search_last_gc', time(), true);
}
/**

6
phpBB/includes/session.php
View file

@ -270,12 +270,12 @@ class session
$this->data = array();
// Garbage collection ... remove old sessions updating user information
/* Garbage collection ... remove old sessions updating user information
// if necessary. It means (potentially) 11 queries but only infrequently
if ($this->time_now > $config['session_last_gc'] + $config['session_gc'])
{
$this->session_gc();
}
}*/
// Do we allow autologin on this board? No? Then override anything
// that may be requested here
@ -674,7 +674,7 @@ class session
{
// Less than 5 sessions, update gc timer ... else we want gc
// called again to delete other sessions
set_config('session_last_gc', $this->time_now);
set_config('session_last_gc', $this->time_now, true);
}
break;
}

1
phpBB/install/schemas/schema_data.sql
View file

@ -69,6 +69,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_enable', '0'
INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_hide_groups', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('database_gc', '604800');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat', 'D M d, Y g:i a');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_edited', '1');

39
phpBB/language/en/acp/common.php
View file

@ -350,6 +350,9 @@ $lang = array_merge($lang, array(
'LOG_ACL_TRANSFER_PERMISSIONS' => '<b>Permissions transfered from</b><br />&#187; %s',
'LOG_ACL_RESTORE_PERMISSIONS' => '<b>Own permissions restored after using permissions from</b><br />&#187; %s',
'LOG_ADMIN_AUTH_FAIL' => '<b>Failed administration login attempt</b>',
'LOG_ADMIN_AUTH_SUCCESS' => '<b>Sucessful administration login</b>',
'LOG_ATTACH_EXT_ADD' => '<b>Added or edited attachment extension</b><br />&#187; %s',
'LOG_ATTACH_EXT_DEL' => '<b>Removed attachment extension</b><br />&#187; %s',
'LOG_ATTACH_EXT_UPDATE' => '<b>Updated attachment extension</b><br />&#187; %s',
@ -400,6 +403,20 @@ $lang = array_merge($lang, array(
'LOG_CONFIG_SIGNATURE' => '<b>Altered signature settings</b>',
'LOG_CONFIG_VISUAL' => '<b>Altered visual confirmation settings</b>',
'LOG_APPROVE_TOPIC' => '<b>Approved topic</b><br />&#187; %s',
'LOG_DELETE_POST' => '<b>Deleted post</b><br />&#187; %s',
'LOG_DELETE_TOPIC' => '<b>Deleted topic</b><br />&#187; %s',
'LOG_FORK' => '<b>Copied topic</b><br />&#187; from %s',
'LOG_LOCK' => '<b>Locked topic</b><br />&#187; %s',
'LOG_LOCK_POST' => '<b>Locked post</b><br />&#187; %s',
'LOG_MERGE' => '<b>Merged posts</b> into topic<br />&#187;%s',
'LOG_MOVE' => '<b>Moved topic</b><br />&#187; from %s',
'LOG_TOPIC_DELETED' => '<b>Deleted topic</b><br />&#187; %s',
'LOG_TOPIC_RESYNC' => '<b>Resynchronised topic counters</b><br />&#187; %s',
'LOG_TOPIC_TYPE_CHANGED' => '<b>Changed topic type</b><br />&#187; %s',
'LOG_UNLOCK' => '<b>Unlocked topic</b><br />&#187; %s',
'LOG_UNLOCK_POST' => '<b>Unlocked post</b><br />&#187; %s',
'LOG_DISALLOW_ADD' => '<b>Added disallowed username</b><br />&#187; %s',
'LOG_DISALLOW_DELETE' => '<b>Deleted disallowed username</b>',
@ -451,6 +468,8 @@ $lang = array_merge($lang, array(
'LOG_INDEX_REMIND' => '<b>Sent reminder emails to inactive users</b><br />&#187; %s',
'LOG_INSTALL_INSTALLED' => '<b>Installed phpBB %s</b>',
'LOG_IP_BROWSER_CHECK' => '<b>Session IP/Browser check failed</b><br />&#187;User IP "<i>%s</i>" checked against session IP "<i>%s</i>" and user browser string "<i>%s</i>" checked against session browser string "<i>%s</i>".',
'LOG_JAB_CHANGED' => '<b>Jabber account changed</b>',
'LOG_JAB_PASSCHG' => '<b>Jabber password changed</b>',
'LOG_JAB_REGISTER' => '<b>Jabber account registered</b>',
@ -531,7 +550,6 @@ $lang = array_merge($lang, array(
'LOG_USER_DEL_AVATAR' => '<b>Removed user avatar</b><br />&#187; %s',
'LOG_USER_DEL_POSTS' => '<b>Removed all posts made by the user</b><br />&#187; %s',
'LOG_USER_DEL_SIG' => '<b>Removed user signature</b><br />&#187; %s',
'LOG_USER_GROUP_CHANGE' => '<b>User changed default group</b><br />&#187; %s',
'LOG_USER_INACTIVE' => '<b>User deactivated</b><br />&#187; %s',
'LOG_USER_MOVE_POSTS' => '<b>Moved user posts</b><br />&#187; posts by "%s" to forum "%s"',
'LOG_USER_NEW_PASSWORD' => '<b>Changed user password</b><br />&#187; %s',
@ -540,6 +558,25 @@ $lang = array_merge($lang, array(
'LOG_USER_UPDATE_NAME' => '<b>Changed username</b><br />&#187; from "%s" to "%s"',
'LOG_USER_USER_UPDATE' => '<b>Updated user details</b><br />&#187; %s',
'LOG_USER_ACTIVE_USER' => '<b>User account activated</b>',
'LOG_USER_DEL_AVATAR_USER' => '<b>User avatar removed</b>',
'LOG_USER_DEL_SIG_USER' => '<b>User signature removed</b>',
'LOG_USER_FEEDBACK' => '<b>Added user feedback</b><br />&#187; %s',
'LOG_USER_GENERAL' => '%s',
'LOG_USER_INACTIVE_USER' => '<b>User account de-activated</b>',
'LOG_USER_LOCK' => '<b>User locked own topic</b><br />&#187; %s',
'LOG_USER_MOVE_POSTS_USER' => '<b>Moved all posts to forum "%s"</b>',
'LOG_USER_REACTIVATE_USER' => '<b>Forced user account re-activation</b>',
'LOG_USER_UNLOCK' => '<b>User unlocked own topic</b><br />&#187; %s',
'LOG_USER_WARNING' => '<b>Added user warning</b><br />&#187;%s',
'LOG_USER_WARNING_BODY' => '<b>The following warning was issued to this user</b><br />&#187;%s',
'LOG_USER_GROUP_CHANGE' => '<b>User changed default group</b><br />&#187; %s',
'LOG_USER_GROUP_DEMOTE' => '<b>User demoted as leaders from usergroup</b><br />&#187; %s',
'LOG_USER_GROUP_JOIN' => '<b>User joined group</b><br />&#187; %s',
'LOG_USER_GROUP_JOIN_PENDING' => '<b>User joined group and needs to be approved</b><br />&#187; %s',
'LOG_USER_GROUP_RESIGN' => '<b>User resigned membership from group</b><br />&#187; %s',
'LOG_WORD_ADD' => '<b>Added word censor</b><br />&#187; %s',
'LOG_WORD_DELETE' => '<b>Deleted word censor</b><br />&#187; %s',
'LOG_WORD_EDIT' => '<b>Edited word censor</b><br />&#187; %s',

10
phpBB/language/en/common.php
View file

@ -238,17 +238,7 @@ $lang = array_merge($lang, array(
'LOGIN_VIEWFORUM' => 'The board administrator requires you to be registered and logged in to view this forum.',
'LOGOUT' => 'Logout',
'LOGOUT_USER' => 'Logout [ %s ]',
'LOG_ADMIN_AUTH_FAIL' => '<b>Failed administration login attempt</b>',
'LOG_ADMIN_AUTH_SUCCESS'=> '<b>Sucessful administration login</b>',
'LOG_DELETE_POST' => '<b>Deleted post</b><br />&#187; %s',
'LOG_DELETE_TOPIC' => '<b>Deleted topic</b><br />&#187; %s',
'LOG_ME_IN' => 'Log me on automatically each visit',
'LOG_USER_FEEDBACK' => '<b>Added user feedback</b><br />&#187; %s',
'LOG_USER_GENERAL' => '%s',
'LOG_USER_WARNING' => '<b>Added user warning</b><br />&#187;%s',
'LOG_USER_WARNING_BODY' => '<b>The following warning was issued to this user</b><br />&#187;%s',
'LOG_IP_BROWSER_CHECK' => '<b>Session IP/Browser check failed</b><br />&#187;User IP "<i>%s</i>" checked against session IP "<i>%s</i>" and user browser string "<i>%s</i>" checked against session browser string "<i>%s</i>".',
'MARK' => 'Mark',
'MARK_ALL' => 'Mark all',

2
phpBB/language/en/groups.php
View file

@ -66,7 +66,7 @@ $lang = array_merge($lang, array(
'GROUP_LIST' => 'Manage Users',
'LOGIN_EXPLAIN_GROUP' => 'You need to login to view group details',
'NOT_LEADER_OF_GROUP' => 'The requested operation cannot be taken because you are not a leader of the selected group.',
'NOT_MEMBER_OF_GROUP' => 'The requested operation cannot be taken because you are not a member of the selected group.',

20
phpBB/language/en/mcp.php
View file

@ -111,26 +111,6 @@ $lang = array_merge($lang, array(
'LOCK_TOPICS' => 'Lock selected topics',
'LOCK_TOPICS_CONFIRM' => 'Are you sure you want to lock all selected topics?',
'LOGS_CURRENT_TOPIC' => 'Currently viewing logs of:',
'LOG_APPROVE_TOPIC' => '<b>Approved topic</b><br />&#187; %s',
'LOG_FORK' => '<b>Copied topic</b><br />&#187; from %s',
'LOG_LOCK' => '<b>Locked topic</b><br />&#187; %s',
'LOG_LOCK_POST' => '<b>Locked post</b><br />&#187; %s',
'LOG_MERGE' => '<b>Merged posts</b> into topic<br />&#187;%s',
'LOG_MOVE' => '<b>Moved topic</b><br />&#187; from %s',
'LOG_TOPIC_DELETED' => '<b>Deleted topic</b><br />&#187; %s',
'LOG_TOPIC_RESYNC' => '<b>Resynchronised topic counters</b><br />&#187; %s',
'LOG_TOPIC_TYPE_CHANGED' => '<b>Changed topic type</b><br />&#187; %s',
'LOG_UNLOCK' => '<b>Unlocked topic</b><br />&#187; %s',
'LOG_UNLOCK_POST' => '<b>Unlocked post</b><br />&#187; %s',
'LOG_UNRATE' => '<b>Unrated post</b><br />&#187; %s',
'LOG_USER_ACTIVE_USER' => '<b>User account activated</b>',
'LOG_USER_DEL_AVATAR_USER' => '<b>User avatar removed</b>',
'LOG_USER_DEL_SIG_USER' => '<b>User signature removed</b>',
'LOG_USER_INACTIVE_USER' => '<b>User account de-activated</b>',
'LOG_USER_LOCK' => '<b>User locked own topic</b><br />&#187; %s',
'LOG_USER_MOVE_POSTS_USER' => '<b>Moved all posts to forum "%s"</b>',
'LOG_USER_REACTIVATE_USER' => '<b>Forced user account re-activation</b>',
'LOG_USER_UNLOCK' => '<b>User unlocked own topic</b><br />&#187; %s',
'LOGIN_EXPLAIN_MCP' => 'To moderate this forum you must login.',
'LOGVIEW_VIEWTOPIC' => 'View Topic',
'LOGVIEW_VIEWLOGS' => 'View Topic Log',