From eeb4907112d4d6e3064e2ccac80d77f9b02d2375 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Sun, 12 Oct 2003 11:59:23 +0000 Subject: Let's break lots of things git-svn-id: file:///svn/phpbb/trunk@4578 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/common.php | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'phpBB/common.php') diff --git a/phpBB/common.php b/phpBB/common.php index 2f4af82291..919058ff2d 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -33,13 +33,13 @@ if (@ini_get('register_globals')) } // If magic quotes is off, addslashes -if (!get_magic_quotes_gpc()) +/*if (!get_magic_quotes_gpc()) { $_GET = slash_input_data($_GET); $_POST = slash_input_data($_POST); $_REQUEST = slash_input_data($_REQUEST); $_COOKIE = slash_input_data($_COOKIE); -} +}*/ require($phpbb_root_path . 'config.'.$phpEx); @@ -110,6 +110,11 @@ define('POST_GLOBAL', 3); define('TRACK_NORMAL', 0); // not used at the moment define('TRACK_POSTED', 1); +// Notify methods +define('NOTIFY_EMAIL', 0); +define('NOTIFY_IM', 1); +define('NOTIFY_BOTH', 2); + // Log types define('LOG_ADMIN', 0); define('LOG_MOD', 1); @@ -191,6 +196,8 @@ define('POLL_OPTIONS_TABLE', $table_prefix.'poll_results'); define('POLL_VOTES_TABLE', $table_prefix.'poll_voters'); define('ZEBRA_TABLE', $table_prefix.'zebra'); +define('STRIP', get_magic_quotes_gpc() ? true : false); + // Set PHP error handler to ours set_error_handler('msg_handler'); @@ -247,17 +254,6 @@ if (time() - $config['cache_interval'] >= $config['cache_last_gc']) } */ -// Handle email/cron queue. -if (time() - $config['queue_interval'] >= $config['last_queue_run'] && !defined('IN_ADMIN')) -{ - if (file_exists($phpbb_root_path . 'cache/queue.' . $phpEx)) - { - include($phpbb_root_path . 'includes/emailer.'.$phpEx); - $queue = new queue(); - $queue->process(); - } -} - // Warn about install/ directory if (file_exists('install')) { -- cgit v1.2.1