diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2003-07-06 18:48:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2003-07-06 18:48:33 +0000 |
| commit | 1b320bbb006a685d33032a6d1a39de44b4e858a7 (patch) | |
| tree | 79959cc9ae9d93be18ecf5b56eb991b5511ec8bd /phpBB/common.php | |
| parent | f31b471ee12c96eb1a61484c684202f4d3a8b8bd (diff) | |
| download | forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.tar forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.tar.gz forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.tar.bz2 forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.tar.xz forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.zip | |
merged log tables, added new log_type (critical).
changed email class a little bit.
bug fixed the queue a little bit.
git-svn-id: file:///svn/phpbb/trunk@4210 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index afdd60a553..50d96213f6 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -105,6 +105,11 @@ define('POST_GLOBAL', 3); define('TRACK_NORMAL', 0); // not used at the moment define('TRACK_POSTED', 1); +// Log types +define('LOG_ADMIN', 0); +define('LOG_MOD', 1); +define('LOG_CRITICAL', 2); + // Private messaging define('PRIVMSGS_READ_MAIL', 0); define('PRIVMSGS_NEW_MAIL', 1); @@ -147,8 +152,7 @@ define('GROUPS_TABLE', $table_prefix.'groups'); define('GROUPS_MODERATOR_TABLE', $table_prefix.'groups_moderator'); define('ICONS_TABLE', $table_prefix.'icons'); define('LANG_TABLE', $table_prefix.'lang'); -define('LOG_ADMIN_TABLE', $table_prefix.'log_admin'); -define('LOG_MOD_TABLE', $table_prefix.'log_moderator'); +define('LOG_TABLE', $table_prefix.'log'); define('MODERATOR_TABLE', $table_prefix.'moderator_cache'); define('POSTS_TABLE', $table_prefix.'posts'); define('POSTS_TEXT_TABLE', $table_prefix.'posts_text'); @@ -234,7 +238,7 @@ if (time() - $config['cache_interval'] >= $config['cache_last_gc']) */ // Handle email/cron queue. -if (time() - $config['queue_interval'] >= $config['last_queue_run']) +if (time() - $config['queue_interval'] >= $config['last_queue_run'] && !defined('IN_ADMIN')) { if (file_exists($phpbb_root_path . 'cache/queue.' . $phpEx)) { |