From 1b320bbb006a685d33032a6d1a39de44b4e858a7 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 6 Jul 2003 18:48:33 +0000
Subject: 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
---
 phpBB/common.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'phpBB/common.php')

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))
 	{
-- 
cgit v1.2.1