[Phpbb-checkins] CVS: phpBB2 common.php,1.108,1.109

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory sc8-pr-cvs1:/tmp/cvs-serv28683

Modified Files:
	common.php 
Log Message:
Line feeds

Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -r1.108 -r1.109
*** common.php	17 Mar 2003 10:54:45 -0000	1.108
--- common.php	18 Mar 2003 22:24:09 -0000	1.109
***************
*** 1,250 ****
! <?php
! /***************************************************************************
!  *                                common.php
!  *                            -------------------
!  *   begin                : Saturday, Feb 23, 2001
!  *   copyright            : (C) 2001 The phpBB Group
!  *   email                : su...@ph...
!  *
!  *   $Id$
!  *
!  ***************************************************************************/
! 
! /***************************************************************************
!  *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU General Public License as published by
!  *   the Free Software Foundation; either version 2 of the License, or
!  *   (at your option) any later version.
!  *
!  ***************************************************************************/
! 
! if (!defined('IN_PHPBB'))
! {
! 	die('Hacking attempt');
! }
! 
! error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! //error_reporting(E_ALL);
! set_magic_quotes_runtime(0);
! 
! // If magic quotes is off, addslashes
! if (!get_magic_quotes_gpc())
! {
! 	$_GET = slash_input_data($_GET);
! 	$_POST = slash_input_data($_POST);
! 	$_COOKIE = slash_input_data($_COOKIE);
! }
! 
! require($phpbb_root_path . 'config.'.$phpEx);
! 
! if (!defined('PHPBB_INSTALLED'))
! {
! 	header('Location: install/install.'.$phpEx);
! 	exit;
! }
! 
! // Load Extensions
! if (!empty($load_extensions))
! {
! 	$load_extensions = explode(',', $load_extensions);
! 
! 	foreach ($load_extensions as $extension)
! 	{
! 		@dl(trim($extension));
! 	}
! }
! 
! // Include files
! require($phpbb_root_path . 'includes/acm/cache_' . $acm_type . '.'.$phpEx);
! require($phpbb_root_path . 'includes/db/' . $dbms . '.'.$phpEx);
! require($phpbb_root_path . 'includes/template.'.$phpEx);
! require($phpbb_root_path . 'includes/session.'.$phpEx);
! require($phpbb_root_path . 'includes/functions.'.$phpEx);
! 
! // User related
! define('ANONYMOUS', 1);
! 
! define('USER_ACTIVATION_NONE', 0);
! define('USER_ACTIVATION_SELF', 1);
! define('USER_ACTIVATION_ADMIN', 2);
! define('USER_ACTIVATION_DISABLE', 3);
! 
! define('USER_AVATAR_NONE', 0);
! define('USER_AVATAR_UPLOAD', 1);
! define('USER_AVATAR_REMOTE', 2);
! define('USER_AVATAR_GALLERY', 3);
! 
! // ACL
! define('ACL_DENY', 0);
! define('ACL_ALLOW', 1);
! define('ACL_INHERIT', 2);
! 
! // Group settings
! define('GROUP_OPEN', 0);
! define('GROUP_CLOSED', 1);
! define('GROUP_HIDDEN', 2);
! define('GROUP_SPECIAL', 3);
! define('GROUP_FREE', 4);
! 
! // Forum/Topic states
! define('ITEM_UNLOCKED', 0);
! define('ITEM_LOCKED', 1);
! define('ITEM_MOVED', 2);
! 
! // Topic types
! define('POST_NORMAL', 0);
! define('POST_STICKY', 1);
! define('POST_ANNOUNCE', 2);
! 
! // Lastread types
! define('LASTREAD_NORMAL', 0); // not used at the moment
! define('LASTREAD_POSTED', 1);
! 
! // Private messaging
! define('PRIVMSGS_READ_MAIL', 0);
! define('PRIVMSGS_NEW_MAIL', 1);
! define('PRIVMSGS_UNREAD_MAIL', 5);
! 
! // Table names
! define('ACL_GROUPS_TABLE', $table_prefix.'auth_groups');
! define('ACL_OPTIONS_TABLE', $table_prefix.'auth_options');
! define('ACL_PRESETS_TABLE', $table_prefix.'auth_presets');
! define('ACL_USERS_TABLE', $table_prefix.'auth_users');
! define('BANLIST_TABLE', $table_prefix.'banlist');
! define('CONFIG_TABLE', $table_prefix.'config');
! define('CONFIRM_TABLE', $table_prefix.'confirm');
! define('DISALLOW_TABLE', $table_prefix.'disallow'); //
! define('FORUMS_TABLE', $table_prefix.'forums');
! define('FORUMS_WATCH_TABLE', $table_prefix.'forums_watch');
! define('GROUPS_TABLE', $table_prefix.'groups');
! define('GROUPS_MODERATOR_TABLE', $table_prefix.'groups_moderator');
! define('ICONS_TABLE', $table_prefix.'icons');
! define('LASTREAD_TABLE', $table_prefix.'lastread');
! define('LOG_ADMIN_TABLE', $table_prefix.'log_admin');
! define('LOG_MOD_TABLE', $table_prefix.'log_moderator');
! define('MODERATOR_TABLE', $table_prefix.'moderator_cache');
! define('POSTS_TABLE', $table_prefix.'posts');
! define('POSTS_TEXT_TABLE', $table_prefix.'posts_text');
! define('PRIVMSGS_TABLE', $table_prefix.'privmsgs');
! define('PRIVMSGS_TEXT_TABLE', $table_prefix.'privmsgs_text');
! define('RANKS_TABLE', $table_prefix.'ranks');
! define('RATINGS_TABLE', $table_prefix.'ratings');
! define('REPORTS_TABLE', $table_prefix.'reports');
! define('REASONS_TABLE', $table_prefix.'reports_reasons');
! define('SEARCH_TABLE', $table_prefix.'search_results');
! define('SEARCH_WORD_TABLE', $table_prefix.'search_wordlist');
! define('SEARCH_MATCH_TABLE', $table_prefix.'search_wordmatch');
! define('SESSIONS_TABLE', $table_prefix.'sessions');
! define('SMILIES_TABLE', $table_prefix.'smilies');
! define('STYLES_TABLE', $table_prefix.'styles');
! define('STYLES_TPL_TABLE', $table_prefix.'styles_template');
! define('STYLES_CSS_TABLE', $table_prefix.'styles_theme');
! define('STYLES_IMAGE_TABLE', $table_prefix.'styles_imageset');
! define('TOPICS_TABLE', $table_prefix.'topics');
! define('TOPICS_PREFETCH_TABLE', $table_prefix.'topics_prefetch');
! define('TOPICS_WATCH_TABLE', $table_prefix.'topics_watch');
! define('UCP_MODULES_TABLE', $table_prefix.'ucp_modules');
! define('USER_GROUP_TABLE', $table_prefix.'user_group');
! define('USERS_TABLE', $table_prefix.'users');
! define('WORDS_TABLE', $table_prefix.'words');
! define('POLL_OPTIONS_TABLE', $table_prefix.'poll_results');
! define('POLL_VOTES_TABLE', $table_prefix.'poll_voters');
! 
! // Set PHP error handler to ours
! set_error_handler('msg_handler');
! 
! // Instantiate some basic classes
! $user = new user();
! $auth = new auth();
! $cache = new acm();
! $template = new template();
! $db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false);
! 
! // 20030218 Ashe: $dbport is not set by the installer
! 
! // Grab global variables, re-cache if necessary
! if ($config = $cache->get('config'))
! {
! 	$sql = 'SELECT * 
! 		FROM ' . CONFIG_TABLE . '
! 		WHERE is_dynamic = 1';
! 	$result = $db->sql_query($sql);
! 
! 	while ($row = $db->sql_fetchrow($result))
! 	{
! 		$config[$row['config_name']] = $row['config_value'];
! 	}
! }
! else
! {
! 	$config = array();
! 
! 	$sql = 'SELECT * 
! 		FROM ' . CONFIG_TABLE;
! 	$result = $db->sql_query($sql);
! 
! 	while ($row = $db->sql_fetchrow($result))
! 	{
! 		$config[$row['config_name']] = $row['config_value'];
! 	}
! 	$db->sql_freeresult($result);
! 
! 	$cache->put('config', $config);
! }
! 
! if (!($acl_options = $cache->get('acl_options')))
! {
! 	$acl_options = array();
! 
! 	$sql = "SELECT auth_value, is_global, is_local
! 		FROM " . ACL_OPTIONS_TABLE . "
! 		ORDER BY auth_option_id";
! 	$result = $db->sql_query($sql);
! 
! 	$global = $local = 0;
! 	while ($row = $db->sql_fetchrow($result))
! 	{
! 		if (!empty($row['is_global']))
! 		{
! 			$acl_options['global'][$row['auth_value']] = $global++;
! 		}
! 		if (!empty($row['is_local']))
! 		{
! 			$acl_options['local'][$row['auth_value']] = $local++;
! 		}
! 	}
! 	$db->sql_freeresult($result);
! 
! 	$cache->put('acl_options', $acl_options);
! 	$auth->acl_clear_prefetch();
! }
! 
! /*
! if (time() - $config['cache_interval'] >= $config['cache_last_gc'])
! {
! 	$cache->tidy($config['cache_gc']);
! }
! */
! 
! // Show 'Board is disabled' message
! if ($config['board_disable'] && !defined('IN_ADMIN') && !defined('IN_LOGIN'))
! {
! 	$message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE';
! 	trigger_error($message);
! }
! 
! // addslashes to vars if magic_quotes_gpc is off
! function slash_input_data(&$data)
! {
! 	if (is_array($data))
! 	{
! 		foreach ($data as $k => $v)
! 		{
! 			$data[$k] = (is_array($v)) ? slash_input_data($v) : addslashes($v);
! 		}
! 	}
! 	return $data;
! }
! 
  ?>
--- 1,250 ----
! <?php
! /***************************************************************************
!  *                                common.php
!  *                            -------------------
!  *   begin                : Saturday, Feb 23, 2001
!  *   copyright            : (C) 2001 The phpBB Group
!  *   email                : su...@ph...
!  *
!  *   $Id$
!  *
!  ***************************************************************************/
! 
! /***************************************************************************
!  *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU General Public License as published by
!  *   the Free Software Foundation; either version 2 of the License, or
!  *   (at your option) any later version.
!  *
!  ***************************************************************************/
! 
! if (!defined('IN_PHPBB'))
! {
! 	die('Hacking attempt');
! }
! 
! error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! //error_reporting(E_ALL);
! set_magic_quotes_runtime(0);
! 
! // If magic quotes is off, addslashes
! if (!get_magic_quotes_gpc())
! {
! 	$_GET = slash_input_data($_GET);
! 	$_POST = slash_input_data($_POST);
! 	$_COOKIE = slash_input_data($_COOKIE);
! }
! 
! require($phpbb_root_path . 'config.'.$phpEx);
! 
! if (!defined('PHPBB_INSTALLED'))
! {
! 	header('Location: install/install.'.$phpEx);
! 	exit;
! }
! 
! // Load Extensions
! if (!empty($load_extensions))
! {
! 	$load_extensions = explode(',', $load_extensions);
! 
! 	foreach ($load_extensions as $extension)
! 	{
! 		@dl(trim($extension));
! 	}
! }
! 
! // Include files
! require($phpbb_root_path . 'includes/acm/cache_' . $acm_type . '.'.$phpEx);
! require($phpbb_root_path . 'includes/db/' . $dbms . '.'.$phpEx);
! require($phpbb_root_path . 'includes/template.'.$phpEx);
! require($phpbb_root_path . 'includes/session.'.$phpEx);
! require($phpbb_root_path . 'includes/functions.'.$phpEx);
! 
! // User related
! define('ANONYMOUS', 1);
! 
! define('USER_ACTIVATION_NONE', 0);
! define('USER_ACTIVATION_SELF', 1);
! define('USER_ACTIVATION_ADMIN', 2);
! define('USER_ACTIVATION_DISABLE', 3);
! 
! define('USER_AVATAR_NONE', 0);
! define('USER_AVATAR_UPLOAD', 1);
! define('USER_AVATAR_REMOTE', 2);
! define('USER_AVATAR_GALLERY', 3);
! 
! // ACL
! define('ACL_DENY', 0);
! define('ACL_ALLOW', 1);
! define('ACL_INHERIT', 2);
! 
! // Group settings
! define('GROUP_OPEN', 0);
! define('GROUP_CLOSED', 1);
! define('GROUP_HIDDEN', 2);
! define('GROUP_SPECIAL', 3);
! define('GROUP_FREE', 4);
! 
! // Forum/Topic states
! define('ITEM_UNLOCKED', 0);
! define('ITEM_LOCKED', 1);
! define('ITEM_MOVED', 2);
! 
! // Topic types
! define('POST_NORMAL', 0);
! define('POST_STICKY', 1);
! define('POST_ANNOUNCE', 2);
! 
! // Lastread types
! define('LASTREAD_NORMAL', 0); // not used at the moment
! define('LASTREAD_POSTED', 1);
! 
! // Private messaging
! define('PRIVMSGS_READ_MAIL', 0);
! define('PRIVMSGS_NEW_MAIL', 1);
! define('PRIVMSGS_UNREAD_MAIL', 5);
! 
! // Table names
! define('ACL_GROUPS_TABLE', $table_prefix.'auth_groups');
! define('ACL_OPTIONS_TABLE', $table_prefix.'auth_options');
! define('ACL_PRESETS_TABLE', $table_prefix.'auth_presets');
! define('ACL_USERS_TABLE', $table_prefix.'auth_users');
! define('BANLIST_TABLE', $table_prefix.'banlist');
! define('CONFIG_TABLE', $table_prefix.'config');
! define('CONFIRM_TABLE', $table_prefix.'confirm');
! define('DISALLOW_TABLE', $table_prefix.'disallow'); //
! define('FORUMS_TABLE', $table_prefix.'forums');
! define('FORUMS_WATCH_TABLE', $table_prefix.'forums_watch');
! define('GROUPS_TABLE', $table_prefix.'groups');
! define('GROUPS_MODERATOR_TABLE', $table_prefix.'groups_moderator');
! define('ICONS_TABLE', $table_prefix.'icons');
! define('LASTREAD_TABLE', $table_prefix.'lastread');
! define('LOG_ADMIN_TABLE', $table_prefix.'log_admin');
! define('LOG_MOD_TABLE', $table_prefix.'log_moderator');
! define('MODERATOR_TABLE', $table_prefix.'moderator_cache');
! define('POSTS_TABLE', $table_prefix.'posts');
! define('POSTS_TEXT_TABLE', $table_prefix.'posts_text');
! define('PRIVMSGS_TABLE', $table_prefix.'privmsgs');
! define('PRIVMSGS_TEXT_TABLE', $table_prefix.'privmsgs_text');
! define('RANKS_TABLE', $table_prefix.'ranks');
! define('RATINGS_TABLE', $table_prefix.'ratings');
! define('REPORTS_TABLE', $table_prefix.'reports');
! define('REASONS_TABLE', $table_prefix.'reports_reasons');
! define('SEARCH_TABLE', $table_prefix.'search_results');
! define('SEARCH_WORD_TABLE', $table_prefix.'search_wordlist');
! define('SEARCH_MATCH_TABLE', $table_prefix.'search_wordmatch');
! define('SESSIONS_TABLE', $table_prefix.'sessions');
! define('SMILIES_TABLE', $table_prefix.'smilies');
! define('STYLES_TABLE', $table_prefix.'styles');
! define('STYLES_TPL_TABLE', $table_prefix.'styles_template');
! define('STYLES_CSS_TABLE', $table_prefix.'styles_theme');
! define('STYLES_IMAGE_TABLE', $table_prefix.'styles_imageset');
! define('TOPICS_TABLE', $table_prefix.'topics');
! define('TOPICS_PREFETCH_TABLE', $table_prefix.'topics_prefetch');
! define('TOPICS_WATCH_TABLE', $table_prefix.'topics_watch');
! define('UCP_MODULES_TABLE', $table_prefix.'ucp_modules');
! define('USER_GROUP_TABLE', $table_prefix.'user_group');
! define('USERS_TABLE', $table_prefix.'users');
! define('WORDS_TABLE', $table_prefix.'words');
! define('POLL_OPTIONS_TABLE', $table_prefix.'poll_results');
! define('POLL_VOTES_TABLE', $table_prefix.'poll_voters');
! 
! // Set PHP error handler to ours
! set_error_handler('msg_handler');
! 
! // Instantiate some basic classes
! $user = new user();
! $auth = new auth();
! $cache = new acm();
! $template = new template();
! $db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false);
! 
! // 20030218 Ashe: $dbport is not set by the installer
! 
! // Grab global variables, re-cache if necessary
! if ($config = $cache->get('config'))
! {
! 	$sql = 'SELECT * 
! 		FROM ' . CONFIG_TABLE . '
! 		WHERE is_dynamic = 1';
! 	$result = $db->sql_query($sql);
! 
! 	while ($row = $db->sql_fetchrow($result))
! 	{
! 		$config[$row['config_name']] = $row['config_value'];
! 	}
! }
! else
! {
! 	$config = array();
! 
! 	$sql = 'SELECT * 
! 		FROM ' . CONFIG_TABLE;
! 	$result = $db->sql_query($sql);
! 
! 	while ($row = $db->sql_fetchrow($result))
! 	{
! 		$config[$row['config_name']] = $row['config_value'];
! 	}
! 	$db->sql_freeresult($result);
! 
! 	$cache->put('config', $config);
! }
! 
! if (!($acl_options = $cache->get('acl_options')))
! {
! 	$acl_options = array();
! 
! 	$sql = "SELECT auth_value, is_global, is_local
! 		FROM " . ACL_OPTIONS_TABLE . "
! 		ORDER BY auth_option_id";
! 	$result = $db->sql_query($sql);
! 
! 	$global = $local = 0;
! 	while ($row = $db->sql_fetchrow($result))
! 	{
! 		if (!empty($row['is_global']))
! 		{
! 			$acl_options['global'][$row['auth_value']] = $global++;
! 		}
! 		if (!empty($row['is_local']))
! 		{
! 			$acl_options['local'][$row['auth_value']] = $local++;
! 		}
! 	}
! 	$db->sql_freeresult($result);
! 
! 	$cache->put('acl_options', $acl_options);
! 	$auth->acl_clear_prefetch();
! }
! 
! /*
! if (time() - $config['cache_interval'] >= $config['cache_last_gc'])
! {
! 	$cache->tidy($config['cache_gc']);
! }
! */
! 
! // Show 'Board is disabled' message
! if ($config['board_disable'] && !defined('IN_ADMIN') && !defined('IN_LOGIN'))
! {
! 	$message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE';
! 	trigger_error($message);
! }
! 
! // addslashes to vars if magic_quotes_gpc is off
! function slash_input_data(&$data)
! {
! 	if (is_array($data))
! 	{
! 		foreach ($data as $k => $v)
! 		{
! 			$data[$k] = (is_array($v)) ? slash_input_data($v) : addslashes($v);
! 		}
! 	}
! 	return $data;
! }
! 
  ?>