Combine, update, remove various functions ... by committing this various 'things' will stop working, I did warn you not to use 2.1.x ... :)

git-svn-id: file:///svn/phpbb/trunk@2665 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Paul S. Owen <psotfx@users.sourceforge.net> 2002-07-14 14:35:12 +0000
committer: Paul S. Owen <psotfx@users.sourceforge.net> 2002-07-14 14:35:12 +0000
commit: 1811b914f086ebde9bdee4cefa5ae2b71152b190 (patch)
tree: 802539d56b0df82c9ef230e196dd3ed775b19b4c /phpBB/includes/functions.php
parent: 0b285c07f61b2c4be45ff4430fb8b9a0fa6329b2 (diff)
download: forums-1811b914f086ebde9bdee4cefa5ae2b71152b190.tar
forums-1811b914f086ebde9bdee4cefa5ae2b71152b190.tar.gz
forums-1811b914f086ebde9bdee4cefa5ae2b71152b190.tar.bz2
forums-1811b914f086ebde9bdee4cefa5ae2b71152b190.tar.xz
forums-1811b914f086ebde9bdee4cefa5ae2b71152b190.zip
1 files changed, 308 insertions, 339 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 56ce116417..268d76a818 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -8,7 +8,6 @@
  *
  *   $Id$
  *
- *
  ***************************************************************************/
 
 /***************************************************************************
@@ -18,7 +17,6 @@
  *   the Free Software Foundation; either version 2 of the License, or
  *   (at your option) any later version.
  *
- *
  ***************************************************************************/
 
 function get_db_stat($mode)
@@ -28,9 +26,8 @@ function get_db_stat($mode)
 	switch( $mode )
 	{
 		case 'usercount':
-			$sql = "SELECT COUNT(user_id) AS total
-				FROM " . USERS_TABLE . "
-				WHERE user_id <> " . ANONYMOUS;
+			$sql = "SELECT COUNT(user_id) - 1 AS total
+				FROM " . USERS_TABLE;
 			break;
 
 		case 'newestuser':
@@ -48,10 +45,7 @@ function get_db_stat($mode)
 			break;
 	}
 
-	if ( !($result = $db->sql_query($sql)) )
-	{
-		return false;
-	}
+	$result = $db->sql_query($sql);
 
 	$row = $db->sql_fetchrow($result);
 
@@ -82,219 +76,352 @@ function get_userdata($user)
 		FROM " . USERS_TABLE . " 
 		WHERE ";
 	$sql .= ( ( is_integer($user) ) ? "user_id = $user" : "username = '" .  str_replace("\'", "''", $user) . "'" ) . " AND user_id <> " . ANONYMOUS;
-	if ( !($result = $db->sql_query($sql)) )
-	{
-		message_die(GENERAL_ERROR, 'Tried obtaining data for a non-existent user', '', __LINE__, __FILE__, $sql);
-	}
+	$result = $db->sql_query($sql);
 
 	return ( $row = $db->sql_fetchrow($result) ) ? $row : false;
 }
 
-function make_jumpbox($action, $match_forum_id = 0)
+//
+// Obtain list of moderators of each forum
+// First users, then groups ... broken into two queries
+//
+function get_moderators(&$forum_moderators, $forum_id = false)
 {
-	global $template, $lang, $db, $SID, $nav_links, $phpEx;
-
-	$sql = "SELECT c.cat_id, c.cat_title, c.cat_order
-		FROM " . CATEGORIES_TABLE . " c, " . FORUMS_TABLE . " f
-		WHERE f.cat_id = c.cat_id
-		GROUP BY c.cat_id, c.cat_title, c.cat_order
-		ORDER BY c.cat_order";
-	if ( !($result = $db->sql_query($sql)) )
+	global $SID, $db, $phpEx;
+
+	$forum_sql = ( $forum_id ) ? 'AND au.forum_id = ' . $forum_id : '';
+
+	$sql = "SELECT au.forum_id, u.user_id, u.username 
+		FROM phpbb_auth_users au, phpbb_auth_options ao, " . USERS_TABLE . " u
+		WHERE ao.auth_type LIKE 'mod'  
+			AND au.auth_option_id = ao.auth_option_id 
+			$forum_sql 
+			AND u.user_id = au.user_id 
+		GROUP BY au.forum_id 
+		ORDER BY au.forum_id, u.user_id";
+	$result = $db->sql_query($sql);
+
+	while( $row = $db->sql_fetchrow($result) )
 	{
-		message_die(GENERAL_ERROR, "Couldn't obtain category list.", "", __LINE__, __FILE__, $sql);
+		$forum_moderators[$row['forum_id']][] = '<a href="profile.' . $phpEx . $SID . '&amp;mode=viewprofile&amp;u=' . $row['user_id'] . '">' . $row['username'] . '</a>';
 	}
-	
-	$category_rows = array();
-	while ( $row = $db->sql_fetchrow($result) )
+
+	$sql = "SELECT au.forum_id, g.group_id, g.group_name  
+		FROM phpbb_auth_groups au, phpbb_auth_options ao, " . GROUPS_TABLE . " g
+		WHERE ao.auth_type LIKE 'mod' 
+			AND au.auth_option_id = ao.auth_option_id 
+			$forum_sql 
+			AND g.group_id = au.group_id 
+		GROUP BY au.forum_id 
+		ORDER BY au.forum_id, g.group_id";
+	$result = $db->sql_query($sql);
+
+	while( $row = $db->sql_fetchrow($result) )
 	{
-		$category_rows[] = $row;
+		$forum_moderators[$row['forum_id']][] = '<a href="groupcp.' . $phpEx . $SID . '&amp;g=' . $row['group_id'] . '">' . $row['group_name'] . '</a>';
 	}
 
-	if ( $total_categories = count($category_rows) )
+	return;
+}
+
+//
+// User authorisation levels output
+//
+function get_forum_rules($mode, &$rules, &$forum_id)
+{
+	global $SID, $acl, $lang, $phpEx;
+
+	$rules .= ( ( $acl->get_acl($forum_id, 'forum', 'post') ) ? $lang['Rules_post_can'] : $lang['Rules_post_cannot'] ) . '<br />';
+	$rules .= ( ( $acl->get_acl($forum_id, 'forum', 'reply') ) ? $lang['Rules_reply_can'] : $lang['Rules_reply_cannot'] ) . '<br />';
+
+	if ( $mode == 'topic' )
 	{
-		$sql = "SELECT *
-			FROM " . FORUMS_TABLE . "
-			ORDER BY cat_id, forum_order";
-		if ( !($result = $db->sql_query($sql)) )
-		{
-			message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql);
-		}
+		$rules .= ( ( $acl->get_acl($forum_id, 'forum', 'edit') ) ? $lang['Rules_edit_can'] : $lang['Rules_edit_cannot'] ) . '<br />';
+		$rules .= ( ( $acl->get_acl($forum_id, 'forum', 'attach') ) ? $lang['Rules_attach_can'] : $lang['Rules_attach_cannot'] ) . '<br />';
+	}
 
-		$boxstring = '<select name="' . POST_FORUM_URL . '" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"><option value="-1">' . $lang['Select_forum'] . '</option>';
+	$rules .= ( ( $acl->get_acl($forum_id, 'forum', 'delete') || $acl->get_acl($forum_id, 'mod', 'delete') ) ? $lang['Rules_delete_can'] : $lang['Rules_delete_cannot'] ) . '<br />';
 
-		$forum_rows = array();
-		while ( $row = $db->sql_fetchrow($result) )
-		{
-			$forum_rows[] = $row;
-		}
+	if ( $acl->get_acl($forum_id, 'mod') )
+	{
+		$rules .= sprintf($lang['Rules_moderate'], '<a href="modcp.' . $phpEx . $SID . '&amp;f=' . $forum_id . '">', '</a>');
+	}
+
+	return;
+}
+
+function make_jumpbox($action, $match_forum_id = 0)
+{
+	global $SID, $acl, $template, $lang, $db, $nav_links, $phpEx;
+
+	$sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id
+		FROM (( " . FORUMS_TABLE . " f
+		LEFT JOIN " . POSTS_TABLE . " p ON p.post_id = f.forum_last_post_id )
+		LEFT JOIN " . USERS_TABLE . " u ON u.user_id = p.poster_id )
+		ORDER BY f.forum_id";
+	$result = $db->sql_query($sql);
 
-		if ( $total_forums = count($forum_rows) )
+	if ( $row = $db->sql_fetchrow($result) )
+	{
+		$boxstring = '<select name="f" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"><option value="-1">' . $lang['Select_forum'] . '</option>';
+
+		$forum_rows = array();
+		do
 		{
-			for($i = 0; $i < $total_categories; $i++)
+			if ( $row['forum_status'] == 2 )
+			{
+				$boxstring .= '<option value="-1">&nbsp;</option>';
+				$boxstring .= '<option value="' . $row['forum_id'] . '"' . $selected . '>' . $row['forum_name'] . '</option>';
+				$boxstring .= '<option value="-1">----------------</option>';
+			}
+			else
 			{
-				$boxstring_forums = '';
-				for($j = 0; $j < $total_forums; $j++)
+				if ( $row['forum_left_id'] > $last_forum_right_id )
 				{
-					if ( $forum_rows[$j]['cat_id'] == $category_rows[$i]['cat_id'] && $forum_rows[$j]['auth_view'] <= AUTH_REG )
+					if ( $acl->get_acl($row['forum_id'], 'forum', 'list') )
 					{
-						$selected = ( $forum_rows[$j]['forum_id'] == $match_forum_id ) ? 'selected="selected"' : '';
-						$boxstring_forums .=  '<option value="' . $forum_rows[$j]['forum_id'] . '"' . $selected . '>' . $forum_rows[$j]['forum_name'] . '</option>';
+						$selected = ( $row['forum_id'] == $match_forum_id ) ? 'selected="selected"' : '';
+						$boxstring .=  '<option value="' . $row['forum_id'] . '"' . $selected . '>' . $row['forum_name'] . '</option>';
 
 						//
 						// Add an array to $nav_links for the Mozilla navigation bar.
 						// 'chapter' and 'forum' can create multiple items, therefore we are using a nested array.
 						//
-						$nav_links['chapter forum'][$forum_rows[$j]['forum_id']] = array (
-							'url' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $forum_rows[$j]['forum_id']),
-							'title' => $forum_rows[$j]['forum_name']
+						$nav_links['chapter forum'][$row['forum_id']] = array (
+							'url' => "viewforum.$phpEx$SID&f=" . $row['forum_id'],
+							'title' => $row['forum_name']
 						);
-								
 					}
 				}
-
-				if ( $boxstring_forums != '' )
-				{
-					$boxstring .= '<option value="-1">&nbsp;</option>';
-					$boxstring .= '<option value="-1">' . $category_rows[$i]['cat_title'] . '</option>';
-					$boxstring .= '<option value="-1">----------------</option>';
-					$boxstring .= $boxstring_forums;
-				}
 			}
 		}
+		while( $row = $db->sql_fetchrow($result) );
 
 		$boxstring .= '</select>';
+
 	}
 	else
 	{
-		$boxstring .= '<select name="' . POST_FORUM_URL . '" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"></select>';
+		$boxstring .= '<select name="f" onChange="if(this.options[this.selectedIndex].value != -1){ forms[\'jumpbox\'].submit() }"></select>';
 	}
 
-	if ( isset($SID) )
-	{
-		$boxstring .= '<input type="hidden" name="sid" value="' . $SID . '" />';
-	}
+	$boxstring .= '<input type="hidden" name="sid" value="' . $SID . '" />';
 
-	$template->set_filenames(array(
-		'jumpbox' => 'jumpbox.tpl')
-	);
 	$template->assign_vars(array(
 		'L_GO' => $lang['Go'],
 		'L_JUMP_TO' => $lang['Jump_to'],
 		'L_SELECT_FORUM' => $lang['Select_forum'],
 
 		'S_JUMPBOX_SELECT' => $boxstring,
-		'S_JUMPBOX_ACTION' => append_sid($action))
+		'S_JUMPBOX_ACTION' => $action)
 	);
-	$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
 
 	return;
 }
 
 //
-// Initialise user settings on page load
-function init_userprefs($userdata)
+// Pick a language, any language ...
+//
+function language_select($default, $select_name = "language", $dirname="language")
 {
-	global $board_config, $theme, $images;
-	global $template, $lang, $phpEx, $phpbb_root_path;
+	global $phpEx;
+
+	$dir = opendir($dirname);
 
-	if ( $userdata['user_id'] != ANONYMOUS )
+	$lang = array();
+	while ( $file = readdir($dir) )
 	{
-		if ( !empty($userdata['user_lang']))
+		if ( ereg("^lang_", $file) && !is_file($dirname . "/" . $file) && !is_link($dirname . "/" . $file) )
 		{
-			$board_config['default_lang'] = $userdata['user_lang'];
+			$filename = trim(str_replace("lang_", "", $file));
+			$displayname = preg_replace("/^(.*?)_(.*)$/", "\\1 [ \\2 ]", $filename);
+			$displayname = preg_replace("/\[(.*?)_(.*)\]/", "[ \\1 - \\2 ]", $displayname);
+			$lang[$displayname] = $filename;
 		}
+	}
 
-		if ( !empty($userdata['user_dateformat']) )
-		{
-			$board_config['default_dateformat'] = $userdata['user_dateformat'];
-		}
+	closedir($dir);
 
-		if ( isset($userdata['user_timezone']) )
-		{
-			$board_config['board_timezone'] = $userdata['user_timezone'];
-		}
-	}
+	@asort($lang);
+	@reset($lang);
 
-	if ( !file_exists($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx) )
+	$lang_select = '<select name="' . $select_name . '">';
+	while ( list($displayname, $filename) = @each($lang) )
 	{
-		$board_config['default_lang'] = 'english';
+		$selected = ( strtolower($default) == strtolower($filename) ) ? ' selected="selected"' : '';
+		$lang_select .= '<option value="' . $filename . '"' . $selected . '>' . ucwords($displayname) . '</option>';
 	}
+	$lang_select .= '</select>';
 
-	include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
+	return $lang_select;
+}
 
-	if ( defined('IN_ADMIN') )
-	{
-		if( !file_exists($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.'.$phpEx) )
-		{
-			$board_config['default_lang'] = 'english';
-		}
+//
+// Pick a template/theme combo, 
+//
+function style_select($default_style, $select_name = "style", $dirname = "templates")
+{
+	global $db;
 
-		include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
-	}
+	$sql = "SELECT style_id, style_name
+		FROM " . STYLES_TABLE . " 
+		ORDER BY style_name, style_id";
+	$result = $db->sql_query($sql);
 
-	//
-	// Set up style
-	//
-	if ( !$board_config['override_user_style'] )
+	$style_select = '<select name="' . $select_name . '">';
+	while ( $row = $db->sql_fetchrow($result) )
 	{
-		if ( $userdata['user_id'] != ANONYMOUS && $userdata['user_style'] > 0 )
-		{
-			if ( $theme = setup_style($userdata['user_style']) )
-			{
-				return;
-			}
-		}
-	}
+		$selected = ( $row['style_id'] == $default_style ) ? ' selected="selected"' : '';
 
-	$theme = setup_style($board_config['default_style']);
+		$style_select .= '<option value="' . $row['style_id'] . '"' . $selected . '>' . $row['style_name'] . '</option>';
+	}
+	$style_select .= "</select>";
 
-	return;
+	return $style_select;
 }
 
-function setup_style($style)
+//
+// Pick a timezone
+//
+function tz_select($default, $select_name = 'timezone')
 {
-	global $db, $board_config, $template, $images, $phpbb_root_path;
+	global $sys_timezone, $lang;
 
-	$sql = "SELECT *
-		FROM " . THEMES_TABLE . "
-		WHERE themes_id = $style";
-	if ( !($result = $db->sql_query($sql)) )
+	$tz_select = '<select name="' . $select_name . '">';
+	while( list($offset, $zone) = @each($lang['tz']) )
 	{
-		message_die(CRITICAL_ERROR, 'Could not query database for theme info');
+		$selected = ( $offset == $default ) ? ' selected="selected"' : '';
+		$tz_select .= '<option value="' . $offset . '"' . $selected . '>' . $zone . '</option>';
 	}
+	$tz_select .= '</select>';
 
-	if ( !($row = $db->sql_fetchrow($result)) )
-	{
-		message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]");
-	}
+	return $tz_select;
+}
 
-	$template_path = 'templates/' ;
-	$template_name = $row['template_name'] ;
+//
+// Topic and forum watching common code
+//
+function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $match_id)
+{
+	global $template, $db, $lang, $HTTP_GET_VARS, $phpEx, $SID, $start;
 
-	$template = new Template($phpbb_root_path . $template_path . $template_name, $board_config, $db);
+	$table_sql = ( $mode == 'forum' ) ? FORUMS_WATCH_TABLE : TOPICS_WATCH_TABLE;
+	$where_sql = ( $mode == 'forum' ) ? 'forum_id' : 'topic_id';
+	$u_url = ( $mode == 'forum' ) ? 'f' : 't';
 
-	if ( $template )
+	//
+	// Is user watching this thread? 
+	//
+	if ( $user_id != ANONYMOUS )
 	{
-		$current_template_path = $template_path . $template_name;
-		@include($phpbb_root_path . $template_path . $template_name . '/' . $template_name . '.cfg');
+		$can_watch = TRUE;
 
-		if ( !defined('TEMPLATE_CONFIG') )
+		$sql = "SELECT notify_status 
+			FROM " . $table_sql . " 
+			WHERE $where_sql = $match_id
+				AND user_id = $user_id";
+		$result = $db->sql_query($sql);
+
+		if ( $row = $db->sql_fetchrow($result) )
 		{
-			message_die(CRITICAL_ERROR, "Could not open $template_name template config file", '', __LINE__, __FILE__);
+			if ( isset($HTTP_GET_VARS['unwatch']) )
+			{
+				if ( $HTTP_GET_VARS['unwatch'] == $mode )
+				{
+					$is_watching = 0;
+
+					$sql = "DELETE FROM " . $table_sql . "
+						WHERE $where_sql = $match_id 
+							AND user_id = $user_id";
+					$db->sql_query($sql);
+				}
+				
+				$template->assign_vars(array(
+					'META' => '<meta http-equiv="refresh" content="3;url=' . "view$mode.$phpEx$SID&amp;" . $u_url . "=$match_id&amp;start=$start" . '">')
+				);
+
+				$message = $lang['No_longer_watching_' . $mode] . '<br /><br />' . sprintf($lang['Click_return_' . $mode], '<a href="' . "view$mode.$phpEx$SID&amp;" . $u_url . "=$match_id&amp;start=$start" . '">', '</a>');
+				message_die(MESSAGE, $message);
+			}
+			else
+			{
+				$is_watching = TRUE;
+
+				if ( $row['notify_status'] )
+				{
+					$sql = "UPDATE " . $table_sql . "
+						SET notify_status = 0
+						WHERE $where_sql = $match_id
+							AND user_id = $user_id";
+					$db->sql_query($sql);
+				}
+			}
 		}
+		else
+		{
+			if ( isset($HTTP_GET_VARS['watch']) )
+			{
+				if ( $HTTP_GET_VARS['watch'] == $mode )
+				{
+					$is_watching = TRUE;
 
-		$img_lang = ( file_exists($current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english';
+					$sql = "INSERT INTO " . $table_sql . " (user_id, $where_sql, notify_status)
+						VALUES ($user_id, $match_id, 0)";
+					$db->sql_query($sql);
+				}
+
+				$template->assign_vars(array(
+					'META' => '<meta http-equiv="refresh" content="3;url=' . "view$mode.$phpEx$SID&amp;" . $u_url . "=$match_id&amp;start=$start" . '">')
+				);
 
-		while( list($key, $value) = @each($images) )
+				$message = $lang['You_are_watching_' . $mode] . '<br /><br />' . sprintf($lang['Click_return_' . $mode], '<a href="' . "view$mode.$phpEx$SID&amp;" . $u_url . "=$match_id&amp;start=$start" . '">', '</a>');
+				message_die(MESSAGE, $message);
+			}
+			else
+			{
+				$is_watching = 0;
+			}
+		}
+	}
+	else
+	{
+		if ( isset($HTTP_GET_VARS['unwatch']) )
 		{
-			if ( !is_array($value) )
+			if ( $HTTP_GET_VARS['unwatch'] == $mode )
 			{
-				$images[$key] = str_replace('{LANG}', 'lang_' . $img_lang, $value);
+				$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
+				header($header_location . "login.$phpEx$SID&redirect=view$mode.$phpEx&" . $u_url . "=$match_id&unwatch=forum");
+				exit;
 			}
 		}
+		else
+		{
+			$can_watch = 0;
+			$is_watching = 0;
+		}
 	}
 
-	return $row;
+	if ( $can_watch )
+	{
+		if ( $is_watching )
+		{
+			$watch_url = "view$mode." . $phpEx . $SID . '&amp;' . $u_url . "=$match_id&amp;unwatch=$mode&amp;start=$start";
+			$img = ( $mode == 'forum' ) ? $images['Forum_un_watch'] : $images['Topic_un_watch'];
+
+			$s_watching = '<a href="' . $watch_url . '">' . $lang['Stop_watching_' . $mode] . '</a>';
+			$s_watching_img = ( isset($img) ) ? '<a href="' . $watch_url . '"><img src="' . $img . '" alt="' . $lang['Stop_watching_' . $mode] . '" title="' . $lang['Stop_watching_' . $mode] . '" border="0"></a>' : '';
+		}
+		else
+		{
+			$watch_url = "view$mode." . $phpEx . $SID . '&amp;' . $u_url . "=$match_id&amp;watch=$mode&amp;start=$start";
+			$img = ( $mode == 'forum' ) ? $images['Forum_watch'] : $images['Topic_watch'];
+
+			$s_watching = '<a href="' . $watch_url . '">' . $lang['Start_watching_' . $mode] . '</a>';
+			$s_watching_img = ( isset($img) ) ? '<a href="' . $watch_url . '"><img src="' . $img . '" alt="' . $lang['Stop_watching_' . $mode] . '" title="' . $lang['Start_watching_' . $mode] . '" border="0"></a>' : '';
+		}
+	}
+
+	return;
 }
 
 //
@@ -317,6 +444,11 @@ function create_date($format, $gmepoch, $tz)
 	return ( !empty($translate) ) ? strtr(@gmdate($format, $gmepoch + (3600 * $tz)), $translate) : @gmdate($format, $gmepoch + (3600 * $tz));
 }
 
+function create_img($img, $alt = '')
+{
+	return '<img src=' . $img . ' alt="' . $alt . '" title="' . $alt . '" />';
+}
+
 //
 // Pagination routine, generates
 // page number sequence
@@ -341,7 +473,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 
 		for($i = 1; $i < $init_page_max + 1; $i++)
 		{
-			$page_string .= ( $i == $on_page ) ? '<b>' . $i . '</b>' : '<a href="' . append_sid($base_url . "&amp;start=" . ( ( $i - 1 ) * $per_page ) ) . '">' . $i . '</a>';
+			$page_string .= ( $i == $on_page ) ? '<b>' . $i . '</b>' : '<a href="' . $base_url . "&amp;start=" . ( ( $i - 1 ) * $per_page ) . '">' . $i . '</a>';
 			if ( $i <  $init_page_max )
 			{
 				$page_string .= ", ";
@@ -359,7 +491,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 
 				for($i = $init_page_min - 1; $i < $init_page_max + 2; $i++)
 				{
-					$page_string .= ($i == $on_page) ? '<b>' . $i . '</b>' : '<a href="' . append_sid($base_url . "&amp;start=" . ( ( $i - 1 ) * $per_page ) ) . '">' . $i . '</a>';
+					$page_string .= ($i == $on_page) ? '<b>' . $i . '</b>' : '<a href="' . $base_url . "&amp;start=" . ( ( $i - 1 ) * $per_page ) . '">' . $i . '</a>';
 					if ( $i <  $init_page_max + 1 )
 					{
 						$page_string .= ', ';
@@ -375,7 +507,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 
 			for($i = $total_pages - 2; $i < $total_pages + 1; $i++)
 			{
-				$page_string .= ( $i == $on_page ) ? '<b>' . $i . '</b>'  : '<a href="' . append_sid($base_url . "&amp;start=" . ( ( $i - 1 ) * $per_page ) ) . '">' . $i . '</a>';
+				$page_string .= ( $i == $on_page ) ? '<b>' . $i . '</b>'  : '<a href="' . $base_url . "&amp;start=" . ( ( $i - 1 ) * $per_page ) . '">' . $i . '</a>';
 				if( $i <  $total_pages )
 				{
 					$page_string .= ", ";
@@ -387,7 +519,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 	{
 		for($i = 1; $i < $total_pages + 1; $i++)
 		{
-			$page_string .= ( $i == $on_page ) ? '<b>' . $i . '</b>' : '<a href="' . append_sid($base_url . "&amp;start=" . ( ( $i - 1 ) * $per_page ) ) . '">' . $i . '</a>';
+			$page_string .= ( $i == $on_page ) ? '<b>' . $i . '</b>' : '<a href="' . $base_url . "&amp;start=" . ( ( $i - 1 ) * $per_page ) . '">' . $i . '</a>';
 			if ( $i <  $total_pages )
 			{
 				$page_string .= ', ';
@@ -399,12 +531,12 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 	{
 		if ( $on_page > 1 )
 		{
-			$page_string = ' <a href="' . append_sid($base_url . "&amp;start=" . ( ( $on_page - 2 ) * $per_page ) ) . '">' . $lang['Previous'] . '</a>&nbsp;&nbsp;' . $page_string;
+			$page_string = ' <a href="' . $base_url . "&amp;start=" . ( ( $on_page - 2 ) * $per_page ) . '">' . $lang['Previous'] . '</a>&nbsp;&nbsp;' . $page_string;
 		}
 
 		if ( $on_page < $total_pages )
 		{
-			$page_string .= '&nbsp;&nbsp;<a href="' . append_sid($base_url . "&amp;start=" . ( $on_page * $per_page ) ) . '">' . $lang['Next'] . '</a>';
+			$page_string .= '&nbsp;&nbsp;<a href="' . $base_url . "&amp;start=" . ( $on_page * $per_page ) . '">' . $lang['Next'] . '</a>';
 		}
 
 	}
@@ -415,18 +547,6 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 }
 
 //
-// This does exactly what preg_quote() does in PHP 4-ish
-// If you just need the 1-parameter preg_quote call, then don't bother using this.
-//
-function phpbb_preg_quote($str, $delimiter)
-{
-	$text = preg_quote($str);
-	$text = str_replace($delimiter, '\\' . $delimiter, $text);
-	
-	return $text;
-}
-
-//
 // Obtain list of naughty words and build preg style replacement arrays for use by the
 // calling script, note that the vars are passed as references this just makes it easier
 // to return both sets of arrays
@@ -435,21 +555,15 @@ function obtain_word_list(&$orig_word, &$replacement_word)
 {
 	global $db;
 
-	//
-	// Define censored word matches
-	//
 	$sql = "SELECT word, replacement
 		FROM  " . WORDS_TABLE;
-	if( !($result = $db->sql_query($sql)) )
-	{
-		message_die(GENERAL_ERROR, 'Could not get censored words from database', '', __LINE__, __FILE__, $sql);
-	}
+	$result = $db->sql_query($sql);
 
 	if ( $row = $db->sql_fetchrow($result) )
 	{
 		do 
 		{
-			$orig_word[] = '#\b(' . str_replace('\*', '\w*?', phpbb_preg_quote($row['word'], '#')) . ')\b#i';
+			$orig_word[] = '#\b(' . str_replace('\*', '\w*?', preg_quote($row['word'], '#')) . ')\b#i';
 			$replacement_word[] = $row['replacement'];
 		}
 		while ( $row = $db->sql_fetchrow($result) );
@@ -459,200 +573,55 @@ function obtain_word_list(&$orig_word, &$replacement_word)
 }
 
 //
-// This is general replacement for die(), allows templated
-// output in users (or default) language, etc.
+// This is general replacement for die(), allows templated output in users (or default)
+// language, etc. $msg_code can be one of these constants:
 //
-// $msg_code can be one of these constants:
+// -> MESSAGE : Use for any simple text message, eg. results of an operation, authorisation
+//    failures, etc.
+// -> ERROR : Use for any error, a simple page will be output
 //
-// GENERAL_MESSAGE : Use for any simple text message, eg. results 
-// of an operation, authorisation failures, etc.
-//
-// GENERAL ERROR : Use for any error which occurs _AFTER_ the 
-// common.php include and session code, ie. most errors in 
-// pages/functions
-//
-// CRITICAL_MESSAGE : Used when basic config data is available but 
-// a session may not exist, eg. banned users
-//
-// CRITICAL_ERROR : Used when config data cannot be obtained, eg
-// no database connection. Should _not_ be used in 99.5% of cases
-//
-function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '')
+function message_die($msg_code, $msg_text = '', $msg_title = '')
 {
-	global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header;
-	global $userdata, $user_ip, $session_length;
-	global $starttime;
-
-	$sql_store = $sql;
-	
-	//
-	// Get SQL error if we are debugging. Do this as soon as possible to prevent 
-	// subsequent queries from overwriting the status of sql_error()
-	//
-	if ( DEBUG && ( $msg_code == GENERAL_ERROR || $msg_code == CRITICAL_ERROR ) )
-	{
-		$sql_error = $db->sql_error();
-
-		$debug_text = '';
-
-		if ( $sql_error['message'] != '' )
-		{
-			$debug_text .= '<br /><br />SQL Error : ' . $sql_error['code'] . ' ' . $sql_error['message'];
-		}
-
-		if ( $sql_store != '' )
-		{
-			$debug_text .= "<br /><br />$sql_store";
-		}
-
-		if ( $err_line != '' && $err_file != '' )
-		{
-			$debug_text .= '</br /><br />Line : ' . $err_line . '<br />File : ' . $err_file;
-		}
-	}
-
-	if( empty($userdata) && ( $msg_code == GENERAL_MESSAGE || $msg_code == GENERAL_ERROR ) )
-	{
-		$userdata = session_pagestart($user_ip, PAGE_INDEX);
-		init_userprefs($userdata);
-	}
-
-	//
-	// If the header hasn't been output then do it
-	//
-	if ( !defined('HEADER_INC') && $msg_code != CRITICAL_ERROR )
-	{
-		if ( empty($lang) )
-		{
-			if ( !empty($board_config['default_lang']) )
-			{
-				include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx);
-			}
-			else
-			{
-				include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx);
-			}
-		}
+	global $db, $session, $acl, $template, $board_config, $theme, $lang, $userdata, $user_ip;
+	global $phpEx, $phpbb_root_path, $nav_links, $starttime;
 
-		if ( empty($template) )
-		{
-			$template = new Template($phpbb_root_path . 'templates/' . $board_config['board_template']);
-		}
-		if ( empty($theme) )
-		{
-			$theme = setup_style($board_config['default_style']);
-		}
-
-		//
-		// Load the Page Header
-		//
-		if ( !defined('IN_ADMIN') )
-		{
-			include($phpbb_root_path . 'includes/page_header.'.$phpEx);
-		}
-		else
-		{
-			include($phpbb_root_path . 'admin/page_header_admin.'.$phpEx);
-		}
-	}
-
-	switch($msg_code)
+	switch ( $msg_code )
 	{
-		case GENERAL_MESSAGE:
-			if ( $msg_title == '' )
+		case MESSAGE:
+			if ( !defined('HEADER_INC') )
 			{
-				$msg_title = $lang['Information'];
+				$page = ( !defined('IN_ADMIN') ) ? 'includes/page_header.' : 'admin/page_header_admin.';
+				include($phpbb_root_path . $page . $phpEx);
 			}
-			break;
-
-		case CRITICAL_MESSAGE:
-			if ( $msg_title == '' )
-			{
-				$msg_title = $lang['Critical_Information'];
-			}
-			break;
 
-		case GENERAL_ERROR:
-			if ( $msg_text == '' )
-			{
-				$msg_text = $lang['An_error_occured'];
-			}
+			$msg_title = ( $msg_title == '' ) ? $lang['Information'] : $msg_title;
+			$msg_text = ( !empty($lang[$msg_text]) ) ? $lang[$msg_text] : $msg_text;
 
-			if ( $msg_title == '' )
+			if ( defined('IN_ADMIN') )
 			{
-				$msg_title = $lang['General_Error'];
+				page_message($msg_title, $msg_text);
 			}
-
-		case CRITICAL_ERROR:
-			//
-			// Critical errors mean we cannot rely on _ANY_ DB information being
-			// available so we're going to dump out a simple echo'd statement
-			//
-			include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx);
-
-			if ( $msg_text == '' )
+			else
 			{
-				$msg_text = $lang['A_critical_error'];
+				$template->set_filenames(array(
+					'body' => 'message_body.html')
+				);
+
+				$template->assign_vars(array(
+					'MESSAGE_TITLE' => $msg_title,
+					'MESSAGE_TEXT' => $msg_text)
+				);
 			}
 
-			if ( $msg_title == '' )
-			{
-				$msg_title = 'phpBB : <b>' . $lang['Critical_Error'] . '</b>';
-			}
+			$page = ( !defined('IN_ADMIN') ) ? 'includes/page_tail.' : 'admin/page_footer_admin.';
+			include($phpbb_root_path . $page . $phpEx);
 			break;
-	}
-
-	//
-	// Add on DEBUG info if we've enabled debug mode and this is an error. This
-	// prevents debug info being output for general messages should DEBUG be
-	// set TRUE by accident (preventing confusion for the end user!)
-	//
-	if ( DEBUG && ( $msg_code == GENERAL_ERROR || $msg_code == CRITICAL_ERROR ) )
-	{
-		if ( $debug_text != '' )
-		{
-			$msg_text = $msg_text . '<br /><br /><b><u>DEBUG MODE</u></b>' . $debug_text;
-		}
-	}
-
-	if ( $msg_code != CRITICAL_ERROR )
-	{
-		if ( !empty($lang[$msg_text]) )
-		{
-			$msg_text = $lang[$msg_text];
-		}
-
-		if ( !defined('IN_ADMIN') )
-		{
-			$template->set_filenames(array(
-				'message_body' => 'message_body.tpl')
-			);
-		}
-		else
-		{
-			$template->set_filenames(array(
-				'message_body' => 'admin/admin_message_body.tpl')
-			);
-		}
 
-		$template->assign_vars(array(
-			'MESSAGE_TITLE' => $msg_title,
-			'MESSAGE_TEXT' => $msg_text)
-		);
-		$template->pparse('message_body');
-
-		if ( !defined('IN_ADMIN') )
-		{
-			include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
-		}
-		else
-		{
-			include($phpbb_root_path . 'admin/page_footer_admin.'.$phpEx);
-		}
-	}
-	else
-	{
-		echo "<html>\n<body>\n" . $msg_title . "\n<br /><br />\n" . $msg_text . "</body>\n</html>";
+		case ERROR:
+			echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><title>phpBB 2 :: General Error</title></html>' . "\n";
+			echo '<body><h1 style="font-family:Verdana,serif;font-size:18pt;font-weight:bold">phpBB2 :: General Error</h1><hr style="height:2px;border-style:dashed;color:black" /><p style="font-family:Verdana,serif;font-size:10pt">' . $msg_text . '</p><hr style="height:2px;border-style:dashed;color:black" /><p style="font-family:Verdana,serif;font-size:10pt">Contact the site administrator to report this failure</p></body>';
+			$db->sql_close();
+			break;
 	}
 
 	exit;
author	Paul S. Owen <psotfx@users.sourceforge.net>	2002-07-14 14:35:12 +0000
committer	Paul S. Owen <psotfx@users.sourceforge.net>	2002-07-14 14:35:12 +0000
commit	1811b914f086ebde9bdee4cefa5ae2b71152b190 (patch)
tree	802539d56b0df82c9ef230e196dd3ed775b19b4c /phpBB/includes/functions.php
parent	0b285c07f61b2c4be45ff4430fb8b9a0fa6329b2 (diff)
download	forums-1811b914f086ebde9bdee4cefa5ae2b71152b190.tar forums-1811b914f086ebde9bdee4cefa5ae2b71152b190.tar.gz forums-1811b914f086ebde9bdee4cefa5ae2b71152b190.tar.bz2 forums-1811b914f086ebde9bdee4cefa5ae2b71152b190.tar.xz forums-1811b914f086ebde9bdee4cefa5ae2b71152b190.zip