This commit was manufactured by cvs2svn to create tag

'release_2_0_3'.

git-svn-id: file:///svn/phpbb/tags/release_2_0_3@2909 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/admin/admin_board.php

@@ -23,9 +23,10 @@ if( !empty($setmodules) )
 //
 // Let's set the root dir for phpBB
 //
-$phpbb_root_dir = "./../";
-require('pagestart.inc');
-include($phpbb_root_dir . 'includes/functions_selects.'.$phpEx);
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
+include($phpbb_root_path . 'includes/functions_selects.'.$phpEx);
 
 //
 // Pull all config data
@@ -310,6 +311,6 @@ $template->assign_vars(array(
 
 $template->pparse("body");
 
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
 ?>

phpBB/admin/admin_db_utilities.php

@@ -34,15 +34,16 @@ if( !empty($setmodules) )
 {
 	$filename = basename(__FILE__);
 	$module['General']['Backup_DB'] = $filename . "?perform=backup";
-	if(phpversion() >= '4.0.0')
+	if(@phpversion() >= '4.0.0')
 	{	
-		$file_uploads = ini_get('file_uploads');
+		$file_uploads = @ini_get('file_uploads');
 	}
 	else
 	{
-		$file_uploads = get_cfg_var('file_uploads');
+		$file_uploads = @get_cfg_var('file_uploads');
 	}
-	if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (phpversion() != '4.0.4pl1') )
+
+	if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (@phpversion() != '4.0.4pl1') )
 	{
 		$module['General']['Restore_DB'] = $filename . "?perform=restore";
 	}
@@ -53,9 +54,10 @@ if( !empty($setmodules) )
 //
 // Load default header
 //
-$phpbb_root_dir = "./../";
 $no_page_header = TRUE;
-require('pagestart.inc');
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
 include($phpbb_root_path . 'includes/sql_parse.'.$phpEx);
 
 //
@@ -374,7 +376,7 @@ function get_table_def_mysql($table, $crlf)
 	// Ok lets grab the fields...
 	//
 	$result = $db->sql_query($field_query);
-	if(!result)
+	if(!$result)
 	{
 		message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $field_query);
 	}
@@ -488,7 +490,7 @@ function get_table_content_postgresql($table, $handler)
 
 	if (!$result)
 	{
-		message_die(GENERAL_ERROR, "Faild in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
+		message_die(GENERAL_ERROR, "Failed in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
 	}
 
 	$i_num_fields = $db->sql_numfields($result);
@@ -577,7 +579,7 @@ function get_table_content_mysql($table, $handler)
 
 	if (!$result)
 	{
-		message_die(GENERAL_ERROR, "Faild in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
+		message_die(GENERAL_ERROR, "Failed in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table");
 	}
 
 	if($db->sql_numrows($result) > 0)
@@ -694,7 +696,7 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 						break;
 				}
 
-				include('page_header_admin.'.$phpEx);
+				include('./page_header_admin.'.$phpEx);
 
 				$template->set_filenames(array(
 					"body" => "admin/admin_message_body.tpl")
@@ -710,7 +712,7 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 				break;
 			}
 
-			$tables = array('auth_access', 'banlist', 'categories', 'config', 'disallow', 'forums', 'forum_prune', 'groups', 'posts', 'posts_text', 'privmsgs', 'privmsgs_text', 'ranks', 'search_results', 'search_results', 'search_wordlist', 'search_wordmatch', 'sessions', 'smilies', 'themes', 'themes_name', 'topics', 'topics_watch', 'user_group', 'users', 'vote_desc', 'vote_results', 'vote_voters', 'words');
+			$tables = array('auth_access', 'banlist', 'categories', 'config', 'disallow', 'forums', 'forum_prune', 'groups', 'posts', 'posts_text', 'privmsgs', 'privmsgs_text', 'ranks', 'search_results', 'search_wordlist', 'search_wordmatch', 'sessions', 'smilies', 'themes', 'themes_name', 'topics', 'topics_watch', 'user_group', 'users', 'vote_desc', 'vote_results', 'vote_voters', 'words');
 
 
 			$additional_tables = (isset($HTTP_POST_VARS['additional_tables'])) ? $HTTP_POST_VARS['additional_tables'] : ( (isset($HTTP_GET_VARS['additional_tables'])) ? $HTTP_GET_VARS['additional_tables'] : "" );
@@ -739,12 +741,11 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 
 			if( !isset($HTTP_POST_VARS['backupstart']) && !isset($HTTP_GET_VARS['backupstart']))
 			{
-				include('page_header_admin.'.$phpEx);
+				include('./page_header_admin.'.$phpEx);
 
 				$template->set_filenames(array(
 					"body" => "admin/db_utils_backup_body.tpl")
-				);
-				
+				);	
 				$s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"backup\" /><input type=\"hidden\" name=\"drop\" value=\"1\" /><input type=\"hidden\" name=\"perform\" value=\"$perform\" />";
 
 				$template->assign_vars(array(
@@ -770,22 +771,26 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 			}
 			else if( !isset($HTTP_POST_VARS['startdownload']) && !isset($HTTP_GET_VARS['startdownload']) )
 			{
+				if(is_array($additional_tables))
+				{
+					$additional_tables = implode(',', $additional_tables);
+				}
 				$template->set_filenames(array(
 					"body" => "admin/admin_message_body.tpl")
 				);
 
 				$template->assign_vars(array(
-					"META" => "<meta http-equiv=\"refresh\" content=\"0;url=admin_db_utilities.$phpEx?perform=backup&amp;additional_tables=" . quotemeta($additional_tables) . "&amp;backup_type=$backup_type&amp;drop=1&amp;backupstart=1&amp;gzipcompress=$gzipcompress&amp;startdownload=1\">",
+					"META" => "<meta http-equiv=\"refresh\" content=\"2;url=admin_db_utilities.$phpEx?perform=backup&additional_tables=" . quotemeta($additional_tables) . "&backup_type=$backup_type&drop=1&amp;backupstart=1&gzipcompress=$gzipcompress&startdownload=1\">",
 
 					"MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Backup'],
 					"MESSAGE_TEXT" => $lang['Backup_download'])
 				);
 
-				include('page_header_admin.php');
+				include('./page_header_admin.'.$phpEx);
 
 				$template->pparse("body");
 
-				include('page_footer_admin.'.$phpEx);
+				include('./page_footer_admin.'.$phpEx);
 
 			}
 			header("Pragma: no-cache");
@@ -806,7 +811,7 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 			{
 				@ob_start();
 				@ob_implicit_flush(0);
-				header("Content-Type: text/x-delimtext; name=\"phpbb_db_backup.sql.gz\"");
+				header("Content-Type: application/x-gzip; name=\"phpbb_db_backup.sql.gz\"");
 				header("Content-disposition: attachment; filename=phpbb_db_backup.sql.gz");
 			}
 			else
@@ -872,7 +877,7 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 				//
 				// Define Template files...
 				//
-				include('page_header_admin.'.$phpEx);
+				include('./page_header_admin.'.$phpEx);
 
 				$template->set_filenames(array(
 					"body" => "admin/db_utils_restore_body.tpl")
@@ -906,7 +911,6 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 
 				if($backup_file_tmpname == "" || $backup_file_name == "")
 				{
-					include('page_header_admin.'.$phpEx);
 					message_die(GENERAL_MESSAGE, $lang['Restore_Error_no_file']);
 				}
 				//
@@ -942,7 +946,6 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 							}
 							else
 							{
-								include('page_header_admin.'.$phpEx);
 								message_die(GENERAL_ERROR, $lang['Restore_Error_decompress']);
 							}
 						}
@@ -957,13 +960,11 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 					}
 					else
 					{
-						include('page_header_admin.'.$phpEx);
 						message_die(GENERAL_ERROR, $lang['Restore_Error_filename'] ." $backup_file_type $backup_file_name");
 					}
 				}
 				else
 				{
-					include('page_header_admin.'.$phpEx);
 					message_die(GENERAL_ERROR, $lang['Restore_Error_uploading']);
 				}
 
@@ -990,15 +991,13 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 
 							if(!$result && ( !(SQL_LAYER == 'postgresql' && eregi("drop table", $sql) ) ) )
 							{
-								//include('page_header_admin.'.$phpEx);
-								// echo "~~$sql~~";
 								message_die(GENERAL_ERROR, "Error importing backup file", "", __LINE__, __FILE__, $sql);
 							}
 						}
 					}
 				}
 
-				include('page_header_admin.'.$phpEx);
+				include('./page_header_admin.'.$phpEx);
 
 				$template->set_filenames(array(
 					"body" => "admin/admin_message_body.tpl")
@@ -1018,6 +1017,6 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 	}
 }
 
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
 ?>

phpBB/admin/admin_disallow.php

@@ -33,15 +33,15 @@ if( !empty($setmodules) )
 //
 // Include required files, get $phpEx and check permissions
 //
-$phpbb_root_dir = './../';
-require('pagestart.inc');
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
 
 if( isset($HTTP_POST_VARS['add_name']) )
 {
 	include($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
 
 	$disallowed_user = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? $HTTP_POST_VARS['disallowed_user'] : $HTTP_GET_VARS['disallowed_user'];
-	$disallowed_user = preg_replace( '/\*/', '%', $disallowed_user );
 
 	if( !validate_username($disallowed_user) )
 	{
@@ -109,8 +109,6 @@ else
 	$user = array();
 	for( $i = 0; $i < count($disallowed); $i++ )
 	{
-		$disallowed[$i]['disallow_username'] = preg_replace('/%/', '*', $disallowed[$i]['disallow_username']);
-
 		$disallow_select .= '<option value="' . $disallowed[$i]['disallow_id'] . '">' . $disallowed[$i]['disallow_username'] . '</option>';
 	}
 }
@@ -139,4 +137,6 @@ $template->assign_vars(array(
 
 $template->pparse("body");
 
+include('./page_footer_admin.'.$phpEx);
+
 ?>

phpBB/admin/admin_forum_prune.php

@@ -19,9 +19,9 @@
  *
  ***************************************************************************/
 
-define('IN_PHPBB', 1);
+define('IN_PHPBB', true);
 
-if( !empty($setmodules) )
+if ( !empty($setmodules) )
 {
 	$filename = basename(__FILE__);
 	$module['Forums']['Prune'] = $filename;
@@ -32,9 +32,11 @@ if( !empty($setmodules) )
 //
 // Load default header
 //
-$phpbb_root_dir = "./../";
-require('pagestart.inc');
-include($phpbb_root_path . 'includes/prune.'.$phpEx);
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
+require($phpbb_root_path . 'includes/prune.'.$phpEx);
+require($phpbb_root_path . 'includes/functions_admin.'.$phpEx); 
 
 //
 // Get the forum ID for pruning
@@ -45,7 +47,7 @@ if( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_UR
 
 	if( $forum_id == -1 )
 	{
-		$forum_sql = "";
+		$forum_sql = '';
 	}
 	else
 	{
@@ -55,8 +57,8 @@ if( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_UR
 }
 else
 {
-	$forum_id = "";
-	$forum_sql = "";
+	$forum_id = '';
+	$forum_sql = '';
 }
 //
 // Get a list of forum's or the data for the forum that we are pruning.
@@ -68,7 +70,7 @@ $sql = "SELECT f.*
 	ORDER BY c.cat_order ASC, f.forum_order ASC";
 if( !($result = $db->sql_query($sql)) )
 {
-	message_die(GENERAL_ERROR, "Couldn't obtain list of forums for pruning", "", __LINE__, __FILE__, $sql);
+	message_die(GENERAL_ERROR, 'Could not obtain list of forums for pruning', '', __LINE__, __FILE__, $sql);
 }
 
 $forum_rows = array();
@@ -88,7 +90,7 @@ if( isset($HTTP_POST_VARS['doprune']) )
 	$prunedate = time() - ( $prunedays * 86400 );
 
 	$template->set_filenames(array(
-		"body" => "admin/forum_prune_result_body.tpl")
+		'body' => 'admin/forum_prune_result_body.tpl')
 	);
 
 	for($i = 0; $i < count($forum_rows); $i++)
@@ -99,21 +101,21 @@ if( isset($HTTP_POST_VARS['doprune']) )
 		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
 		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
 	
-		$template->assign_block_vars("prune_results", array(
-			"ROW_COLOR" => "#" . $row_color, 
-			"ROW_CLASS" => $row_class, 
-			"FORUM_NAME" => $forum_rows[$i]['forum_name'],
-			"FORUM_TOPICS" => $p_result['topics'],
-			"FORUM_POSTS" => $p_result['posts'])
+		$template->assign_block_vars('prune_results', array(
+			'ROW_COLOR' => '#' . $row_color, 
+			'ROW_CLASS' => $row_class, 
+			'FORUM_NAME' => $forum_rows[$i]['forum_name'],
+			'FORUM_TOPICS' => $p_result['topics'],
+			'FORUM_POSTS' => $p_result['posts'])
 		);
 	}
 
 	$template->assign_vars(array(
-		"L_FORUM_PRUNE" => $lang['Forum_Prune'],
-		"L_FORUM" => $lang['Forum'],
-		"L_TOPICS_PRUNED" => $lang['Topics_pruned'],
-		"L_POSTS_PRUNED" => $lang['Posts_pruned'],
-		"L_PRUNE_RESULT" => $lang['Prune_success'])
+		'L_FORUM_PRUNE' => $lang['Forum_Prune'],
+		'L_FORUM' => $lang['Forum'],
+		'L_TOPICS_PRUNED' => $lang['Topics_pruned'],
+		'L_POSTS_PRUNED' => $lang['Posts_pruned'],
+		'L_PRUNE_RESULT' => $lang['Prune_success'])
 	);
 }
 else
@@ -128,7 +130,7 @@ else
 		// Output a selection table if no forum id has been specified.
 		//
 		$template->set_filenames(array(
-			"body" => "admin/forum_prune_select_body.tpl")
+			'body' => 'admin/forum_prune_select_body.tpl')
 		);
 
 		$select_list = '<select name="' . POST_FORUM_URL . '">';
@@ -144,12 +146,12 @@ else
 		// Assign the template variables.
 		//
 		$template->assign_vars(array(
-			"L_FORUM_PRUNE" => $lang['Forum_Prune'],
-			"L_SELECT_FORUM" => $lang['Select_a_Forum'], 
-			"L_LOOK_UP" => $lang['Look_up_Forum'],
+			'L_FORUM_PRUNE' => $lang['Forum_Prune'],
+			'L_SELECT_FORUM' => $lang['Select_a_Forum'], 
+			'L_LOOK_UP' => $lang['Look_up_Forum'],
 
-			"S_FORUMPRUNE_ACTION" => append_sid("admin_forum_prune.$phpEx"),
-			"S_FORUMS_SELECT" => $select_list)
+			'S_FORUMPRUNE_ACTION' => append_sid("admin_forum_prune.$phpEx"),
+			'S_FORUMS_SELECT' => $select_list)
 		);
 	}
 	else
@@ -160,7 +162,7 @@ else
 		// Output the form to retrieve Prune information.
 		//
 		$template->set_filenames(array(
-			"body" => "admin/forum_prune_body.tpl")
+			'body' => 'admin/forum_prune_body.tpl')
 		);
 
 		$forum_name = ( $forum_id == -1 ) ? $lang['All_Forums'] : $forum_rows[0]['forum_name'];
@@ -174,23 +176,24 @@ else
 		// Assign the template variables.
 		//
 		$template->assign_vars(array(
-			"FORUM_NAME" => $forum_name,
+			'FORUM_NAME' => $forum_name,
 
-			"L_FORUM_PRUNE" => $lang['Forum_Prune'], 
-			"L_FORUM_PRUNE_EXPLAIN" => $lang['Forum_Prune_explain'], 
-			"L_DO_PRUNE" => $lang['Do_Prune'],
+			'L_FORUM' => $lang['Forum'], 
+			'L_FORUM_PRUNE' => $lang['Forum_Prune'], 
+			'L_FORUM_PRUNE_EXPLAIN' => $lang['Forum_Prune_explain'], 
+			'L_DO_PRUNE' => $lang['Do_Prune'],
 
-			"S_FORUMPRUNE_ACTION" => append_sid("admin_forum_prune.$phpEx"),
-			"S_PRUNE_DATA" => $prune_data,
-			"S_HIDDEN_VARS" => $hidden_input)
+			'S_FORUMPRUNE_ACTION' => append_sid("admin_forum_prune.$phpEx"),
+			'S_PRUNE_DATA' => $prune_data,
+			'S_HIDDEN_VARS' => $hidden_input)
 		);
 	}
 }
 //
 // Actually output the page here.
 //
-$template->pparse("body");
+$template->pparse('body');
 
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
 ?>

phpBB/admin/admin_forumauth.php

@@ -33,9 +33,10 @@ if( !empty($setmodules) )
 //
 // Load default header
 //
-$phpbb_root_dir = "./../";
 $no_page_header = TRUE;
-require('pagestart.inc');
+$phpbb_root_path = './../';
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
 
 //
 // Start program - define vars
@@ -51,23 +52,23 @@ $simple_auth_ary = array(
 	6  => array(AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD),
 );
 
-$simple_auth_types = array($lang['Public'], $lang['Registered'], $lang['Registered'] . " [" . $lang['Hidden'] . "]", $lang['Private'], $lang['Private'] . " [" . $lang['Hidden'] . "]", $lang['Moderators'], $lang['Moderators'] . " [" . $lang['Hidden'] . "]");
+$simple_auth_types = array($lang['Public'], $lang['Registered'], $lang['Registered'] . ' [' . $lang['Hidden'] . ']', $lang['Private'], $lang['Private'] . ' [' . $lang['Hidden'] . ']', $lang['Moderators'], $lang['Moderators'] . ' [' . $lang['Hidden'] . ']');
 
-$forum_auth_fields = array("auth_view", "auth_read", "auth_post", "auth_reply", "auth_edit", "auth_delete", "auth_sticky", "auth_announce", "auth_vote", "auth_pollcreate");
+$forum_auth_fields = array('auth_view', 'auth_read', 'auth_post', 'auth_reply', 'auth_edit', 'auth_delete', 'auth_sticky', 'auth_announce', 'auth_vote', 'auth_pollcreate');
 
 $field_names = array(
-	"auth_view" => $lang['View'],
-	"auth_read" => $lang['Read'],
-	"auth_post" => $lang['Post'],
-	"auth_reply" => $lang['Reply'],
-	"auth_edit" => $lang['Edit'],
-	"auth_delete" => $lang['Delete'],
-	"auth_sticky" => $lang['Sticky'],
-	"auth_announce" => $lang['Announce'], 
-	"auth_vote" => $lang['Vote'], 
-	"auth_pollcreate" => $lang['Pollcreate']);
+	'auth_view' => $lang['View'],
+	'auth_read' => $lang['Read'],
+	'auth_post' => $lang['Post'],
+	'auth_reply' => $lang['Reply'],
+	'auth_edit' => $lang['Edit'],
+	'auth_delete' => $lang['Delete'],
+	'auth_sticky' => $lang['Sticky'],
+	'auth_announce' => $lang['Announce'], 
+	'auth_vote' => $lang['Vote'], 
+	'auth_pollcreate' => $lang['Pollcreate']);
 
-$forum_auth_levels = array("ALL", "REG", "PRIVATE", "MOD", "ADMIN");
+$forum_auth_levels = array('ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN');
 $forum_auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN);
 
 if(isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]))
@@ -78,7 +79,7 @@ if(isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL
 else
 {
 	unset($forum_id);
-	$forum_sql = "";
+	$forum_sql = '';
 }
 
 if( isset($HTTP_GET_VARS['adv']) )
@@ -95,26 +96,20 @@ else
 //
 if( isset($HTTP_POST_VARS['submit']) )
 {
-	$sql = "";
+	$sql = '';
 
 	if(!empty($forum_id))
 	{
-		$sql = "UPDATE " . FORUMS_TABLE . " SET ";
-
 		if(isset($HTTP_POST_VARS['simpleauth']))
 		{
 			$simple_ary = $simple_auth_ary[$HTTP_POST_VARS['simpleauth']];
 
 			for($i = 0; $i < count($simple_ary); $i++)
 			{
-				$sql .= $forum_auth_fields[$i] . " = " . $simple_ary[$i];
-				if($i < count($simple_ary) - 1)
-				{
-					$sql .= ", ";
-				}
+				$sql .= ( ( $sql != '' ) ? ', ' : '' ) . $forum_auth_fields[$i] . ' = ' . $simple_ary[$i];
 			}
 
-			$sql .= " WHERE forum_id = $forum_id";
+			$sql = "UPDATE " . FORUMS_TABLE . " SET $sql WHERE forum_id = $forum_id";
 		}
 		else
 		{
@@ -122,39 +117,34 @@ if( isset($HTTP_POST_VARS['submit']) )
 			{
 				$value = $HTTP_POST_VARS[$forum_auth_fields[$i]];
 
-				if($forum_auth_fields[$i] == 'auth_vote')
+				if ( $forum_auth_fields[$i] == 'auth_vote' )
 				{
-					if( $HTTP_POST_VARS['auth_vote'] == AUTH_ALL )
+					if ( $HTTP_POST_VARS['auth_vote'] == AUTH_ALL )
 					{
 						$value = AUTH_REG;
 					}
 				}
 
-				$sql .= $forum_auth_fields[$i] . " = " . $value;
-				if($i < count($forum_auth_fields) - 1)
-				{
-					$sql .= ", ";
-				}
+				$sql .= ( ( $sql != '' ) ? ', ' : '' ) .$forum_auth_fields[$i] . ' = ' . $value;
 			}
 
-			$sql .= " WHERE forum_id = $forum_id";
-
+			$sql = "UPDATE " . FORUMS_TABLE . " SET $sql WHERE forum_id = $forum_id";
 		}
 
-		if($sql != "")
+		if ( $sql != '' )
 		{
-			if(!$db->sql_query($sql))
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't update auth table!", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not update auth table', '', __LINE__, __FILE__, $sql);
 			}
 		}
 
-		$forum_sql = "";
+		$forum_sql = '';
 		$adv = 0;
 	}
 
 	$template->assign_vars(array(
-		"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
+		'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
 	);
 	$message = $lang['Forum_auth_updated'] . '<br /><br />' . sprintf($lang['Click_return_forumauth'],  '<a href="' . append_sid("admin_forumauth.$phpEx") . '">', "</a>");
 	message_die(GENERAL_MESSAGE, $message);
@@ -186,7 +176,7 @@ if( empty($forum_id) )
 	// specified
 	//
 	$template->set_filenames(array(
-		"body" => "admin/auth_select_body.tpl")
+		'body' => 'admin/auth_select_body.tpl')
 	);
 
 	$select_list = '<select name="' . POST_FORUM_URL . '">';
@@ -197,13 +187,13 @@ if( empty($forum_id) )
 	$select_list .= '</select>';
 
 	$template->assign_vars(array(
-		"L_AUTH_TITLE" => $lang['Auth_Control_Forum'],
-		"L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
-		"L_AUTH_SELECT" => $lang['Select_a_Forum'],
-		"L_LOOK_UP" => $lang['Look_up_Forum'],
+		'L_AUTH_TITLE' => $lang['Auth_Control_Forum'],
+		'L_AUTH_EXPLAIN' => $lang['Forum_auth_explain'],
+		'L_AUTH_SELECT' => $lang['Select_a_Forum'],
+		'L_LOOK_UP' => $lang['Look_up_Forum'],
 
-		"S_AUTH_ACTION" => append_sid("admin_forumauth.$phpEx"),
-		"S_AUTH_SELECT" => $select_list)
+		'S_AUTH_ACTION' => append_sid("admin_forumauth.$phpEx"),
+		'S_AUTH_SELECT' => $select_list)
 	);
 
 }
@@ -214,7 +204,7 @@ else
 	// specified
 	//
 	$template->set_filenames(array(
-		"body" => "admin/auth_forum_body.tpl")
+		'body' => 'admin/auth_forum_body.tpl')
 	);
 
 	$forum_name = $forum_rows[0]['forum_name'];
@@ -243,38 +233,30 @@ else
 	// If we didn't get a match above then we
 	// automatically switch into 'advanced' mode
 	//
-	if(!isset($adv) && !$matched)
+	if ( !isset($adv) && !$matched )
 	{
 		$adv = 1;
 	}
 
 	$s_column_span == 0;
 
-	if( empty($adv) )
+	if ( empty($adv) )
 	{
-		$simple_auth = "<select name=\"simpleauth\">";
+		$simple_auth = '<select name="simpleauth">';
 
 		for($j = 0; $j < count($simple_auth_types); $j++)
 		{
-			if($matched_type == $j)
-			{
-				$simple_auth .= "<option value=\"$j\" selected>";
-				$simple_auth .= $simple_auth_types[$j];
-				$simple_auth .= "</option>";
-			}
-			else
-			{
-				$simple_auth .= "<option value=\"$j\">" . $simple_auth_types[$j] . "</option>";
-			}
+			$selected = ( $matched_type == $j ) ? ' selected="selected"' : '';
+			$simple_auth .= '<option value="' . $j . '"' . $selected . '>' . $simple_auth_types[$j] . '</option>';
 		}
 
-		$simple_auth .= "</select>";
+		$simple_auth .= '</select>';
 
-		$template->assign_block_vars("forum_auth_titles", array(
-			"CELL_TITLE" => $lang['Simple_mode'])
+		$template->assign_block_vars('forum_auth_titles', array(
+			'CELL_TITLE' => $lang['Simple_mode'])
 		);
-		$template->assign_block_vars("forum_auth_data", array(
-			"S_AUTH_LEVELS_SELECT" => $simple_auth)
+		$template->assign_block_vars('forum_auth_data', array(
+			'S_AUTH_LEVELS_SELECT' => $simple_auth)
 		);
 
 		$s_column_span++;
@@ -287,37 +269,29 @@ else
 		//
 		for($j = 0; $j < count($forum_auth_fields); $j++)
 		{
-			$custom_auth[$j] = "&nbsp;<select name=\"" . $forum_auth_fields[$j] . "\">";
+			$custom_auth[$j] = '&nbsp;<select name="' . $forum_auth_fields[$j] . '">';
 
 			for($k = 0; $k < count($forum_auth_levels); $k++)
 			{
-				if ( $forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k] )
-				{
-					$custom_auth[$j] .= "<option value=\"" . $forum_auth_const[$k] . "\" selected>";
-					$custom_auth[$j] .= $lang['Forum_' . $forum_auth_levels[$k]];
-					$custom_auth[$j] .= "</option>";
-				}
-				else
-				{
-					$custom_auth[$j] .= "<option value=\"" . $forum_auth_const[$k] . "\">". $lang['Forum_' . $forum_auth_levels[$k]] . "</option>";
-				}
+				$selected = ( $forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k] ) ? ' selected="selected"' : '';
+				$custom_auth[$j] .= '<option value="' . $forum_auth_const[$k] . '"' . $selected . '>' . $lang['Forum_' . $forum_auth_levels[$k]] . '</option>';
 			}
-			$custom_auth[$j] .= "</select>&nbsp;";
+			$custom_auth[$j] .= '</select>&nbsp;';
 
 			$cell_title = $field_names[$forum_auth_fields[$j]];
 
-			$template->assign_block_vars("forum_auth_titles", array(
-				"CELL_TITLE" => $cell_title)
+			$template->assign_block_vars('forum_auth_titles', array(
+				'CELL_TITLE' => $cell_title)
 			);
-			$template->assign_block_vars("forum_auth_data", array(
-				"S_AUTH_LEVELS_SELECT" => $custom_auth[$j])
+			$template->assign_block_vars('forum_auth_data', array(
+				'S_AUTH_LEVELS_SELECT' => $custom_auth[$j])
 			);
 
 			$s_column_span++;
 		}
 	}
 
-	$adv_mode = (empty($adv)) ? "1" : "0";
+	$adv_mode = ( empty($adv) ) ? '1' : '0';
 	$switch_mode = append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&adv=". $adv_mode);
 	$switch_mode_text = ( empty($adv) ) ? $lang['Advanced_mode'] : $lang['Simple_mode'];
 	$u_switch_mode = '<a href="' . $switch_mode . '">' . $switch_mode_text . '</a>';
@@ -325,26 +299,27 @@ else
 	$s_hidden_fields = '<input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '">';
 
 	$template->assign_vars(array(
-		"FORUM_NAME" => $forum_name,
+		'FORUM_NAME' => $forum_name,
 
-		"L_AUTH_TITLE" => $lang['Auth_Control_Forum'],
-		"L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
-		"L_SUBMIT" => $lang['Submit'],
-		"L_RESET" => $lang['Reset'],
+		'L_FORUM' => $lang['Forum'], 
+		'L_AUTH_TITLE' => $lang['Auth_Control_Forum'],
+		'L_AUTH_EXPLAIN' => $lang['Forum_auth_explain'],
+		'L_SUBMIT' => $lang['Submit'],
+		'L_RESET' => $lang['Reset'],
 
-		"U_SWITCH_MODE" => $u_switch_mode,
+		'U_SWITCH_MODE' => $u_switch_mode,
 
-		"S_FORUMAUTH_ACTION" => append_sid("admin_forumauth.$phpEx"),
-		"S_COLUMN_SPAN" => $s_column_span,
-		"S_HIDDEN_FIELDS" => $s_hidden_fields)
+		'S_FORUMAUTH_ACTION' => append_sid("admin_forumauth.$phpEx"),
+		'S_COLUMN_SPAN' => $s_column_span,
+		'S_HIDDEN_FIELDS' => $s_hidden_fields)
 	);
 
 }
 
-include('page_header_admin.'.$phpEx);
+include('./page_header_admin.'.$phpEx);
 
-$template->pparse("body");
+$template->pparse('body');
 
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
 ?>

phpBB/admin/admin_forums.php

@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *										admin_forums.php
+ *                             admin_forums.php
  *                            -------------------
  *   begin                : Thursday, Jul 12, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -8,7 +8,6 @@
  *
  *   $Id$
  *
- *
  ***************************************************************************/
 
 /***************************************************************************
@@ -32,9 +31,10 @@ if( !empty($setmodules) )
 //
 // Load default header
 //
-$phpbb_root_dir = "./../";
-require('pagestart.inc');
-include($phpbb_root_dir . 'includes/functions_admin.'.$phpEx);
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
+include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
 
 $forum_auth_ary = array(
 	"auth_view" => AUTH_ALL, 
@@ -301,8 +301,9 @@ if( !empty($mode) )
 			$catlist = get_list('category', $cat_id, TRUE);
 
 			$forumstatus == ( FORUM_LOCKED ) ? $forumlocked = "selected=\"selected\"" : $forumunlocked = "selected=\"selected\"";
-			$statuslist = "<option value=\"" . FORUM_UNLOCKED . "\" $forumunlocked>Unlocked</option>\n";
-			$statuslist .= "<option value=\"" . FORUM_LOCKED . "\" $forumlocked>Locked</option>\n";
+			$statuslist = "<option value=\"" . FORUM_UNLOCKED . "\" $forumunlocked>" . $lang['Status_unlocked'] . "</option>\n";
+			$statuslist .= "<option value=\"" . FORUM_LOCKED . "\" $forumlocked>" . $lang['Status_locked'] . "</option>\n"; 
+
 
 			$template->set_filenames(array(
 				"body" => "admin/forum_edit_body.tpl")
@@ -492,7 +493,7 @@ if( !empty($mode) )
 			// There is no problem having duplicate forum names so we won't check for it.
 			//
 			$sql = "INSERT INTO " . CATEGORIES_TABLE . " (cat_title, cat_order)
-				VALUES ('" . $HTTP_POST_VARS['categoryname'] . "', $next_order)";
+				VALUES ('" . str_replace("\'", "''", $HTTP_POST_VARS['categoryname']) . "', $next_order)";
 			if( !$result = $db->sql_query($sql) )
 			{
 				message_die(GENERAL_ERROR, "Couldn't insert row in categories table", "", __LINE__, __FILE__, $sql);
@@ -825,7 +826,7 @@ if( !empty($mode) )
 
 	if ($show_index != TRUE)
 	{
-		include('page_footer_admin.'.$phpEx);
+		include('./page_footer_admin.'.$phpEx);
 		exit;
 	}
 }
@@ -930,6 +931,6 @@ if( $total_categories = $db->sql_numrows($q_categories) )
 
 $template->pparse("body");
 
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
 ?>

phpBB/admin/admin_groups.php

@@ -22,7 +22,7 @@
 
 define('IN_PHPBB', 1);
 
-if( !empty($setmodules) )
+if ( !empty($setmodules) )
 {
 	$filename = basename(__FILE__);
 	$module['Groups']['Manage'] = $filename;
@@ -33,38 +33,35 @@ if( !empty($setmodules) )
 //
 // Load default header
 //
-$phpbb_root_dir = "./../";
+$phpbb_root_path = './../';
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
 
-require('pagestart.inc');
-
-if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
+if ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
 {
 	$group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]);
 }
 else
 {
-	$group_id = "";
+	$group_id = '';
 }
 
-//
-// Mode setting
-//
-if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
+if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
 {
 	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
 }
 else
 {
-	$mode = "";
+	$mode = '';
 }
 
-if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
+if ( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
 {
 	//
 	// Ok they are editing a group or creating a new group
 	//
 	$template->set_filenames(array(
-		"body" => "admin/group_edit_body.tpl")
+		'body' => 'admin/group_edit_body.tpl')
 	);
 
 	if ( isset($HTTP_POST_VARS['edit']) )
@@ -76,34 +73,33 @@ if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
 			FROM " . GROUPS_TABLE . "
 			WHERE group_single_user <> " . TRUE . "
 			AND group_id = $group_id";
-		if(!$result = $db->sql_query($sql))
+		if ( !($result = $db->sql_query($sql)) )
 		{
-			message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
+			message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql);
 		}
 
-		if( !$db->sql_numrows($result) )
+		if ( !($group_info = $db->sql_fetchrow($result)) )
 		{
 			message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
 		}
 
-		$group_info = $db->sql_fetchrow($result);
-
-		$mode = "editgroup";
-		$template->assign_block_vars("group_edit", array());
+		$mode = 'editgroup';
+		$template->assign_block_vars('group_edit', array());
 
 	}
-	else if( isset($HTTP_POST_VARS['new']) )
+	else if ( isset($HTTP_POST_VARS['new']) )
 	{
 		$group_info = array (
-			"group_name" => "",
-			"group_description" => "",
-			"group_moderator" => "",
-			"group_type" => GROUP_OPEN);
-		$group_open = "checked=\"checked\"";
+			'group_name' => '',
+			'group_description' => '',
+			'group_moderator' => '',
+			'group_type' => GROUP_OPEN);
+		$group_open = ' checked="checked"';
 
-		$mode = "newgroup";
+		$mode = 'newgroup';
 
 	}
+
 	//
 	// Ok, now we know everything about them, let's show the page.
 	//
@@ -111,111 +107,108 @@ if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
 		FROM " . USERS_TABLE . "
 		WHERE user_id <> " . ANONYMOUS . "
 		ORDER BY username";
-	$u_result = $db->sql_query($sql);
-	if( !$u_result )
+	if ( !($result = $db->sql_query($sql)) )
 	{
-		message_die(GENERAL_ERROR, "Couldn't obtain user info for moderator list", "", __LINE__, __FILE__, $sql);
+		message_die(GENERAL_ERROR, 'Could not obtain user info for moderator list', '', __LINE__, __FILE__, $sql);
 	}
 
-	$user_list = $db->sql_fetchrowset($u_result);
-
-	for($i = 0; $i < count($user_list); $i++)
+	while ( $row = $db->sql_fetchrow($result) )
 	{
-		if( $user_list[$i]['user_id'] == $group_info['group_moderator'] ) 
+		if ( $row['user_id'] == $group_info['group_moderator'] ) 
 		{
-			$group_moderator = $user_list[$i]['username'];
+			$group_moderator = $row['username'];
 		}
 	}
 
-	$group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? "checked=\"checked\"" : "";
-	$group_closed = ( $group_info['group_type'] == GROUP_CLOSED ) ? "checked=\"checked\"" : "";
-	$group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "";
+	$group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? ' checked="checked"' : '';
+	$group_closed = ( $group_info['group_type'] == GROUP_CLOSED ) ? ' checked="checked"' : '';
+	$group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? ' checked="checked"' : '';
 
 	$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
 
 	$template->assign_vars(array(
-		"GROUP_NAME" => $group_info['group_name'],
-		"GROUP_DESCRIPTION" => $group_info['group_description'], 
-		"GROUP_MODERATOR" => $group_moderator, 
+		'GROUP_NAME' => $group_info['group_name'],
+		'GROUP_DESCRIPTION' => $group_info['group_description'], 
+		'GROUP_MODERATOR' => $group_moderator, 
 
-		"L_GROUP_TITLE" => $lang['Group_administration'],
-		"L_GROUP_EDIT_DELETE" => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'], 
-		"L_GROUP_NAME" => $lang['group_name'],
-		"L_GROUP_DESCRIPTION" => $lang['group_description'],
-		"L_GROUP_MODERATOR" => $lang['group_moderator'], 
-		"L_FIND_USERNAME" => $lang['Find_username'], 
-		"L_GROUP_STATUS" => $lang['group_status'],
-		"L_GROUP_OPEN" => $lang['group_open'],
-		"L_GROUP_CLOSED" => $lang['group_closed'],
-		"L_GROUP_HIDDEN" => $lang['group_hidden'],
-		"L_GROUP_DELETE" => $lang['group_delete'],
-		"L_GROUP_DELETE_CHECK" => $lang['group_delete_check'],
-		"L_SUBMIT" => $lang['Submit'],
-		"L_RESET" => $lang['Reset'],
-		"L_DELETE_MODERATOR" => $lang['delete_group_moderator'],
-		"L_DELETE_MODERATOR_EXPLAIN" => $lang['delete_moderator_explain'],
-		"L_YES" => $lang['Yes'],
+		'L_GROUP_TITLE' => $lang['Group_administration'],
+		'L_GROUP_EDIT_DELETE' => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'], 
+		'L_GROUP_NAME' => $lang['group_name'],
+		'L_GROUP_DESCRIPTION' => $lang['group_description'],
+		'L_GROUP_MODERATOR' => $lang['group_moderator'], 
+		'L_FIND_USERNAME' => $lang['Find_username'], 
+		'L_GROUP_STATUS' => $lang['group_status'],
+		'L_GROUP_OPEN' => $lang['group_open'],
+		'L_GROUP_CLOSED' => $lang['group_closed'],
+		'L_GROUP_HIDDEN' => $lang['group_hidden'],
+		'L_GROUP_DELETE' => $lang['group_delete'],
+		'L_GROUP_DELETE_CHECK' => $lang['group_delete_check'],
+		'L_SUBMIT' => $lang['Submit'],
+		'L_RESET' => $lang['Reset'],
+		'L_DELETE_MODERATOR' => $lang['delete_group_moderator'],
+		'L_DELETE_MODERATOR_EXPLAIN' => $lang['delete_moderator_explain'],
+		'L_YES' => $lang['Yes'],
 
-		"U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"), 
+		'U_SEARCH_USER' => append_sid("../search.$phpEx?mode=searchuser"), 
 
-		"S_GROUP_OPEN_TYPE" => GROUP_OPEN,
-		"S_GROUP_CLOSED_TYPE" => GROUP_CLOSED,
-		"S_GROUP_HIDDEN_TYPE" => GROUP_HIDDEN,
-		"S_GROUP_OPEN_CHECKED" => $group_open,
-		"S_GROUP_CLOSED_CHECKED" => $group_closed,
-		"S_GROUP_HIDDEN_CHECKED" => $group_hidden,
-		"S_GROUP_ACTION" => append_sid("admin_groups.$phpEx"),
-		"S_HIDDEN_FIELDS" => $s_hidden_fields)
+		'S_GROUP_OPEN_TYPE' => GROUP_OPEN,
+		'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED,
+		'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN,
+		'S_GROUP_OPEN_CHECKED' => $group_open,
+		'S_GROUP_CLOSED_CHECKED' => $group_closed,
+		'S_GROUP_HIDDEN_CHECKED' => $group_hidden,
+		'S_GROUP_ACTION' => append_sid("admin_groups.$phpEx"),
+		'S_HIDDEN_FIELDS' => $s_hidden_fields)
 	);
 
 	$template->pparse('body');
 
 }
-else if( isset($HTTP_POST_VARS['group_update']) )
+else if ( isset($HTTP_POST_VARS['group_update']) )
 {
 	//
 	// Ok, they are submitting a group, let's save the data based on if it's new or editing
 	//
-	if( isset($HTTP_POST_VARS['group_delete']) )
+	if ( isset($HTTP_POST_VARS['group_delete']) )
 	{
 		$sql = "DELETE FROM " . GROUPS_TABLE . "
 			WHERE group_id = " . $group_id;
-		if ( !$result = $db->sql_query($sql) )
+		if ( !$db->sql_query($sql) )
 		{
-			message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
+			message_die(GENERAL_ERROR, 'Could not update group', '', __LINE__, __FILE__, $sql);
 		}
 
 		$sql = "DELETE FROM " . USER_GROUP_TABLE . "
 			WHERE group_id = " . $group_id;
-		if ( !$result = $db->sql_query($sql) )
+		if ( !$db->sql_query($sql) )
 		{
-			message_die(GENERAL_ERROR, "Couldn't update user_group", "", __LINE__, __FILE__, $sql);
+			message_die(GENERAL_ERROR, 'Could not update user_group', '', __LINE__, __FILE__, $sql);
 		}
 
 		$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
 			WHERE group_id = " . $group_id;
-		if ( !$result = $db->sql_query($sql) )
+		if ( !$db->sql_query($sql) )
 		{
-			message_die(GENERAL_ERROR, "Couldn't update auth_access", "", __LINE__, __FILE__, $sql);
+			message_die(GENERAL_ERROR, 'Could not update auth_access', '', __LINE__, __FILE__, $sql);
 		}
 
-		$message = $lang['Deleted_group'] . "<br /><br />" . sprintf($lang['Click_return_groupsadmin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
+		$message = $lang['Deleted_group'] . '<br /><br />' . sprintf($lang['Click_return_groupsadmin'], '<a href="' . append_sid("admin_groups.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
 
 		message_die(GENERAL_MESSAGE, $message);
 	}
 	else
 	{
 		$group_type = isset($HTTP_POST_VARS['group_type']) ? intval($HTTP_POST_VARS['group_type']) : GROUP_OPEN;
-		$group_name = isset($HTTP_POST_VARS['group_name']) ? trim($HTTP_POST_VARS['group_name']) : "";
-		$group_description = isset($HTTP_POST_VARS['group_description']) ? trim($HTTP_POST_VARS['group_description']) : "";
-		$group_moderator = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : "";
-		$delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? intval($HTTP_POST_VARS['delete_old_moderator']) : "";
+		$group_name = isset($HTTP_POST_VARS['group_name']) ? trim($HTTP_POST_VARS['group_name']) : '';
+		$group_description = isset($HTTP_POST_VARS['group_description']) ? trim($HTTP_POST_VARS['group_description']) : '';
+		$group_moderator = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : '';
+		$delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? true : false;
 
-		if( $group_name == "" )
+		if ( $group_name == '' )
 		{
 			message_die(GENERAL_MESSAGE, $lang['No_group_name']);
 		}
-		else if( $group_moderator == "" )
+		else if ( $group_moderator == '' )
 		{
 			message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
 		}
@@ -223,7 +216,7 @@ else if( isset($HTTP_POST_VARS['group_update']) )
 		$this_userdata = get_userdata($group_moderator);
 		$group_moderator = $this_userdata['user_id'];
 
-		if( !$group_moderator )
+		if ( !$group_moderator )
 		{
 			message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
 		}
@@ -234,81 +227,86 @@ else if( isset($HTTP_POST_VARS['group_update']) )
 				FROM " . GROUPS_TABLE . "
 				WHERE group_single_user <> " . TRUE . "
 				AND group_id = " . $group_id;
-			if(!$result = $db->sql_query($sql))
+			if ( !($result = $db->sql_query($sql)) )
 			{
-				message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql);
 			}
-			if( !$db->sql_numrows($result) )
+
+			if( !($group_info = $db->sql_fetchrow($result)) )
 			{
 				message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
 			}
-			$group_info = $db->sql_fetchrow($result);		
 		
 			if ( $group_info['group_moderator'] != $group_moderator )
 			{
-				if ( $delete_old_moderator != "" )
+				if ( $delete_old_moderator )
 				{
 					$sql = "DELETE FROM " . USER_GROUP_TABLE . "
 						WHERE user_id = " . $group_info['group_moderator'] . " 
 							AND group_id = " . $group_id;
-					if ( !$result = $db->sql_query($sql) )
+					if ( !$db->sql_query($sql) )
 					{
-						message_die(GENERAL_ERROR, "Couldn't update group moderator", "", __LINE__, __FILE__, $sql);
+						message_die(GENERAL_ERROR, 'Could not update group moderator', '', __LINE__, __FILE__, $sql);
 					}
 				}
-				$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
-					VALUES (" . $group_id . ", " . $group_moderator . ", 0)";
-				if ( !$result = $db->sql_query($sql) )
+
+				$sql = "SELECT user_id 
+					FROM " . USER_GROUP_TABLE . " 
+					WHERE user_id = $group_moderator 
+						AND group_id = $group_id";
+				if ( !($result = $db->sql_query($sql)) )
 				{
-					message_die(GENERAL_ERROR, "Couldn't update group moderator", "", __LINE__, __FILE__, $sql);
+					message_die(GENERAL_ERROR, 'Failed to obtain current group moderator info', '', __LINE__, __FILE__, $sql);
+				}
+
+				if ( !($row = $db->sql_fetchrow($result)) )
+				{
+					$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
+						VALUES (" . $group_id . ", " . $group_moderator . ", 0)";
+					if ( !$db->sql_query($sql) )
+					{
+						message_die(GENERAL_ERROR, 'Could not update group moderator', '', __LINE__, __FILE__, $sql);
+					}
 				}
 			}
+
 			$sql = "UPDATE " . GROUPS_TABLE . "
 				SET group_type = $group_type, group_name = '" . str_replace("\'", "''", $group_name) . "', group_description = '" . str_replace("\'", "''", $group_description) . "', group_moderator = $group_moderator 
 				WHERE group_id = $group_id";
-			if ( !$result = $db->sql_query($sql) )
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not update group', '', __LINE__, __FILE__, $sql);
 			}
 	
-			$message = $lang['Updated_group'] . "<br /><br />" . sprintf($lang['Click_return_groupsadmin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
+			$message = $lang['Updated_group'] . '<br /><br />' . sprintf($lang['Click_return_groupsadmin'], '<a href="' . append_sid("admin_groups.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');;
 
 			message_die(GENERAL_MESSAGE, $message);
 		}
-		else if( $mode == "newgroup" )
+		else if( $mode == 'newgroup' )
 		{
-			$sql = "SELECT MAX(group_id) AS new_group_id 
-				FROM " . GROUPS_TABLE;
-			if ( !$result = $db->sql_query($sql) )
+			$sql = "INSERT INTO " . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user) 
+				VALUES ($group_type, '" . str_replace("\'", "''", $group_name) . "', '" . str_replace("\'", "''", $group_description) . "', $group_moderator,	'0')";
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
-			}
-			$row = $db->sql_fetchrow($result);
-
-			$new_group_id = $row['new_group_id'] + 1;
-
-			$sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user) 
-				VALUES ($new_group_id, $group_type, '" . str_replace("\'", "''", $group_name) . "', '" . str_replace("\'", "''", $group_description) . "', $group_moderator,	'0')";
-			if ( !$result = $db->sql_query($sql) )
-			{
-				message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not insert new group', '', __LINE__, __FILE__, $sql);
 			}
+			$new_group_id = $db->sql_nextid();
 
 			$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
 				VALUES ($new_group_id, $group_moderator, 0)";
-			if ( !$result = $db->sql_query($sql) )
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't insert new user-group info", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not insert new user-group info', '', __LINE__, __FILE__, $sql);
 			}
 			
-			$message = $lang['Added_new_group'] . "<br /><br />" . sprintf($lang['Click_return_groupsadmin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
+			$message = $lang['Added_new_group'] . '<br /><br />' . sprintf($lang['Click_return_groupsadmin'], '<a href="' . append_sid("admin_groups.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');;
 
 			message_die(GENERAL_MESSAGE, $message);
 
 		}
 		else
 		{
-			message_die(GENERAL_MESSAGE, $lang['Group_mode_not_selected']);
+			message_die(GENERAL_MESSAGE, $lang['No_group_action']);
 		}
 	}
 }
@@ -318,42 +316,46 @@ else
 		FROM " . GROUPS_TABLE . "
 		WHERE group_single_user <> " . TRUE . "
 		ORDER BY group_name";
-	$g_result = $db->sql_query($sql);
-	$group_list = $db->sql_fetchrowset($g_result);
-
-	$select_list = "<select name=\"" . POST_GROUPS_URL . "\">";
-	for($i = 0; $i < count($group_list); $i++)
+	if ( !($result = $db->sql_query($sql)) )
 	{
-		$select_list .= "<option value=\"" . $group_list[$i]['group_id'] . "\">" . $group_list[$i]['group_name'] . "</option>";
+		message_die(GENERAL_ERROR, 'Could not obtain group list', '', __LINE__, __FILE__, $sql);
+	}
+
+	$select_list = '';
+	if ( $row = $db->sql_fetchrow($result) )
+	{
+		$select_list .= '<select name="' . POST_GROUPS_URL . '">';
+		do
+		{
+			$select_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
+		}
+		while ( $row = $db->sql_fetchrow($result) );
+		$select_list .= '</select>';
 	}
-	$select_list .= "</select>";
 
 	$template->set_filenames(array(
-		"body" => "admin/group_select_body.tpl")
+		'body' => 'admin/group_select_body.tpl')
 	);
 
 	$template->assign_vars(array(
-		"L_GROUP_TITLE" => $lang['Group_administration'],
-		"L_GROUP_EXPLAIN" => $lang['Group_admin_explain'],
-		"L_GROUP_SELECT" => $lang['Select_group'],
-		"L_LOOK_UP" => $lang['Look_up_group'],
-		"L_CREATE_NEW_GROUP" => $lang['New_group'],
+		'L_GROUP_TITLE' => $lang['Group_administration'],
+		'L_GROUP_EXPLAIN' => $lang['Group_admin_explain'],
+		'L_GROUP_SELECT' => $lang['Select_group'],
+		'L_LOOK_UP' => $lang['Look_up_group'],
+		'L_CREATE_NEW_GROUP' => $lang['New_group'],
 
-		"S_GROUP_ACTION" => append_sid("admin_groups.$phpEx"),
-		"S_GROUP_SELECT" => $select_list)
+		'S_GROUP_ACTION' => append_sid("admin_groups.$phpEx"),
+		'S_GROUP_SELECT' => $select_list)
 	);
 
-	//
-	// Faking the IF... ELSE statements again...
-	//
-	if( count($group_list) > 0 )
+	if ( $select_list != '' )
 	{
-		$template->assign_block_vars("select_box", array());
+		$template->assign_block_vars('select_box', array());
 	}
 
 	$template->pparse('body');
 }
 
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
 ?>

phpBB/admin/admin_mass_email.php

@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
-*                             admin_email.php
+*                             admin_mass_email.php
 *                              -------------------
 *     begin                : Thu May 31, 2001
 *     copyright            : (C) 2001 The phpBB Group
@@ -32,9 +32,10 @@ if( !empty($setmodules) )
 //
 // Load default header
 //
-$phpbb_root_dir = "./../";
 $no_page_header = TRUE;
-require('pagestart.inc');
+$phpbb_root_path = './../';
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
 
 //
 // Increase maximum execution time in case of a lot of users, but don't complain about it if it isn't
@@ -42,108 +43,114 @@ require('pagestart.inc');
 //
 @set_time_limit(1200);
 
-$message = "";
-$subject = "";
+$message = '';
+$subject = '';
 
 //
 // Do the job ...
 //
-if( isset($HTTP_POST_VARS['submit']) )
+if ( isset($HTTP_POST_VARS['submit']) )
 {
+	$subject = stripslashes(trim($HTTP_POST_VARS['subject']));
+	$message = stripslashes(trim($HTTP_POST_VARS['message']));
+	
+	$error = FALSE;
+	$error_msg = '';
+
+	if ( empty($subject) )
+	{
+		$error = true;
+		$error_msg .= ( !empty($error_msg) ) ? '<br />' . $lang['Empty_subject'] : $lang['Empty_subject'];
+	}
+
+	if ( empty($message) )
+	{
+		$error = true;
+		$error_msg .= ( !empty($error_msg) ) ? '<br />' . $lang['Empty_message'] : $lang['Empty_message'];
+	}
+
 	$group_id = intval($HTTP_POST_VARS[POST_GROUPS_URL]);
 
-	if( $group_id != -1 )
+	$sql = ( $group_id != -1 ) ? "SELECT u.user_email FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug WHERE ug.group_id = $group_id AND ug.user_pending <> " . TRUE . " AND u.user_id = ug.user_id" : "SELECT user_email FROM " . USERS_TABLE;
+	if ( !($result = $db->sql_query($sql)) )
 	{
-		$sql = "SELECT u.user_email 
-			FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug
-			WHERE ug.group_id = $group_id 
-				AND ug.user_pending <> " . TRUE . "  
-				AND u.user_id = ug.user_id";
+		message_die(GENERAL_ERROR, 'Could not select group members', '', __LINE__, __FILE__, $sql);
+	}
+
+	if ( $row = $db->sql_fetchrow($result) )
+	{
+		$bcc_list = '';
+		do
+		{
+			$bcc_list .= ( ( $bcc_list != '' ) ? ', ' : '' ) . $row['user_email'];
+		}
+		while ( $row = $db->sql_fetchrow($result) );
+
+		$db->sql_freeresult($result);
 	}
 	else
 	{
-		$sql = "SELECT user_email 
-			FROM " . USERS_TABLE;
+		$message = ( $group_id != -1 ) ? $lang['Group_not_exist'] : $lang['No_such_user'];
+
+		$error = true;
+		$error_msg .= ( !empty($error_msg) ) ? '<br />' . $message : $message;
 	}
 
-	if( !$result = $db->sql_query($sql) )
-	{
-		message_die(GENERAL_ERROR, "Coult not select group members!", __LINE__, __FILE__, $sql);
-	}
-
-	if( !$db->sql_numrows($result) )
-	{
-		//
-		// Output a relevant GENERAL_MESSAGE about users/group
-		// not existing
-		//
-	}
-
-	$email_list = $db->sql_fetchrowset($g_result);
-	
-	$subject = stripslashes($HTTP_POST_VARS["subject"]);
-	$message = stripslashes($HTTP_POST_VARS["message"]);
-	
-	//
-	// Error checking needs to go here ... if no subject and/or
-	// no message then skip over the send and return to the form
-	//
-	$error = FALSE;
-
-	if( !$error )
+	if ( !$error )
 	{
 		include($phpbb_root_path . 'includes/emailer.'.$phpEx);
+
 		//
 		// Let's do some checking to make sure that mass mail functions
 		// are working in win32 versions of php.
 		//
-		if( preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$board_config['smtp_delivery'])
+		if ( preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$board_config['smtp_delivery'])
 		{
-			// We are running on windows, force delivery to use
-			// our smtp functions since php's are broken by default
+			$ini_val = ( @phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
+
+			// We are running on windows, force delivery to use our smtp functions
+			// since php's are broken by default
 			$board_config['smtp_delivery'] = 1;
-			$board_config['smtp_host'] = get_cfg_var('SMTP');
+			$board_config['smtp_host'] = @$ini_val('SMTP');
 		}
+
 		$emailer = new emailer($board_config['smtp_delivery']);
 	
-		$email_headers = "From: " . $board_config['board_email'] . "\n";
-
-		$bcc_list = "";
-		for($i = 0; $i < count($email_list); $i++)
-		{
-			if( $bcc_list != "" )
-			{
-				$bcc_list .= ", ";
-			}
-			$bcc_list .= $email_list[$i]['user_email'];
-		}
+		$email_headers = 'Return-Path: ' . $userdata['board_email'] . "\nFrom: " . $board_config['board_email'] . "\n";
+		$email_headers .= 'X-AntiAbuse: Board servername - ' . $board_config['server_name'] . "\n";
+		$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
+		$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
+		$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\n";
 		$email_headers .= "Bcc: $bcc_list\n";
-		
-		$email_headers .= "Return-Path: " . $userdata['board_email'] . "\n";
-		$email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
-		$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
-		$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
-		$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
 
-		$emailer->use_template("admin_send_email");
+		$emailer->use_template('admin_send_email');
 		$emailer->email_address($board_config['board_email']);
 		$emailer->set_subject($subject);
 		$emailer->extra_headers($email_headers);
 
 		$emailer->assign_vars(array(
-			"SITENAME" => $board_config['sitename'], 
-			"BOARD_EMAIL" => $board_config['board_email'], 
-			"MESSAGE" => $message)
+			'SITENAME' => $board_config['sitename'], 
+			'BOARD_EMAIL' => $board_config['board_email'], 
+			'MESSAGE' => $message)
 		);
 		$emailer->send();
 		$emailer->reset();
 
-		$message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_admin_index'],  "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
-
-		message_die(GENERAL_MESSAGE, $message);
+		message_die(GENERAL_MESSAGE, $lang['Email_sent'] . '<br /><br />' . sprintf($lang['Click_return_admin_index'],  '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>'));
 	}
 }	
 
+if ( $error )
+{
+	$template->set_filenames(array(
+		'reg_header' => 'error_body.tpl')
+	);
+	$template->assign_vars(array(
+		'ERROR_MESSAGE' => $error_msg)
+	);
+	$template->assign_var_from_handle('ERROR_BOX', 'reg_header');
+}
+
 //
 // Initial selection
 //
@@ -151,47 +158,50 @@ if( isset($HTTP_POST_VARS['submit']) )
 $sql = "SELECT group_id, group_name 
 	FROM ".GROUPS_TABLE . "  
 	WHERE group_single_user <> 1";
-$g_result = $db->sql_query($sql);
-$group_list = $db->sql_fetchrowset($g_result);
-
-$select_list = '<select name = "' . POST_GROUPS_URL . '">';
-$select_list .= '<option value = "-1">' . $lang['All_users'] . '</option>';
-
-for($i = 0;$i < count($group_list); $i++)
+if ( !($result = $db->sql_query($sql)) ) 
 {
-	$select_list .= "<option value = \"" . $group_list[$i]['group_id'];
-	$select_list .= "\">" . $group_list[$i]['group_name'] . "</option>";
+	message_die(GENERAL_ERROR, 'Could not obtain list of groups', '', __LINE__, __FILE__, $sql);
 }
-$select_list .= "</select>";
+
+$select_list = '<select name = "' . POST_GROUPS_URL . '"><option value = "-1">' . $lang['All_users'] . '</option>';
+if ( $row = $db->sql_fetchrow($result) )
+{
+	do
+	{
+		$select_list .= '<option value = "' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
+	}
+	while ( $row = $db->sql_fetchrow($result) );
+}
+$select_list .= '</select>';
 
 //
 // Generate page
 //
-include('page_header_admin.'.$phpEx);
+include('./page_header_admin.'.$phpEx);
 
 $template->set_filenames(array(
-	"body" => "admin/user_email_body.tpl")
+	'body' => 'admin/user_email_body.tpl')
 );
 
 $template->assign_vars(array(
-	"MESSAGE" => $message,
-	"SUBJECT" => $subject, 
+	'MESSAGE' => $message,
+	'SUBJECT' => $subject, 
 
-	"L_EMAIL_TITLE" => $lang['Email'],
-	"L_EMAIL_EXPLAIN" => $lang['Mass_email_explain'],
-	"L_COMPOSE" => $lang['Compose'],
-	"L_RECIPIENTS" => $lang['Recipients'],
-	"L_EMAIL_SUBJECT" => $lang['Subject'],
-	"L_EMAIL_MSG" => $lang['Message'],
-	"L_EMAIL" => $lang['Email'],
-	"L_NOTICE" => $notice,
+	'L_EMAIL_TITLE' => $lang['Email'],
+	'L_EMAIL_EXPLAIN' => $lang['Mass_email_explain'],
+	'L_COMPOSE' => $lang['Compose'],
+	'L_RECIPIENTS' => $lang['Recipients'],
+	'L_EMAIL_SUBJECT' => $lang['Subject'],
+	'L_EMAIL_MSG' => $lang['Message'],
+	'L_EMAIL' => $lang['Email'],
+	'L_NOTICE' => $notice,
 
-	"S_USER_ACTION" => append_sid('admin_mass_email.'.$phpEx),
-	"S_GROUP_SELECT" => $select_list)
+	'S_USER_ACTION' => append_sid('admin_mass_email.'.$phpEx),
+	'S_GROUP_SELECT' => $select_list)
 );
 
 $template->pparse('body');
 
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
-?>
+?>

phpBB/admin/admin_ranks.php

@@ -32,10 +32,9 @@ if( !empty($setmodules) )
 //
 // Let's set the root dir for phpBB
 //
-$phpbb_root_dir = "./../";
-
-require('pagestart.inc');
-
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
 
 if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 {
@@ -256,7 +255,7 @@ if( $mode != "" )
 		$template->assign_vars(array(
 			"L_RANKS_TITLE" => $lang['Ranks_title'],
 			"L_RANKS_TEXT" => $lang['Ranks_explain'],
-			"L_RANK" => $lang['Rank'],
+			"L_RANK" => $lang['Rank_title'],
 			"L_RANK_MINIMUM" => $lang['Rank_minimum'],
 			"L_SPECIAL_RANK" => $lang['Special_rank'],
 			"L_EDIT" => $lang['Edit'],
@@ -361,6 +360,6 @@ else
 
 $template->pparse("body");
 
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
 ?>

phpBB/admin/admin_smilies.php

@@ -39,8 +39,6 @@ if( !empty($setmodules) )
 //
 // Load default header
 //
-$phpbb_root_dir = "./../";
-
 if( isset($HTTP_GET_VARS['export_pack']) )
 {
 	if ( $HTTP_GET_VARS['export_pack'] == "send" )
@@ -48,8 +46,10 @@ if( isset($HTTP_GET_VARS['export_pack']) )
 		$no_page_header = true;
 	}
 }
-require('pagestart.inc');
 
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
 
 //
 // Check to see what mode we should operate in.
@@ -228,7 +228,7 @@ if( isset($HTTP_GET_VARS['import_pack']) || isset($HTTP_POST_VARS['import_pack']
 		$template->pparse("body");
 	}
 }
-else if( isset($HTTP_GET_VARS['export_pack']) )
+else if( isset($HTTP_POST_VARS['export_pack']) || isset($HTTP_GET_VARS['export_pack']) )
 {
 	//
 	// Export our smiley config as a smiley pak...
@@ -265,7 +265,7 @@ else if( isset($HTTP_GET_VARS['export_pack']) )
 	message_die(GENERAL_MESSAGE, $message);
 
 }
-else if( isset($HTTP_GET_VARS['add']) )
+else if( isset($HTTP_POST_VARS['add']) || isset($HTTP_GET_VARS['add']) )
 {
 	//
 	// Admin has selected to add a smiley.
@@ -286,7 +286,7 @@ else if( isset($HTTP_GET_VARS['add']) )
 	$template->assign_vars(array(
 		"L_SMILEY_TITLE" => $lang['smiley_title'],
 		"L_SMILEY_CONFIG" => $lang['smiley_config'],
-		"L_SMILEY_EXPLAIN" => $lang['smiley_instr'],
+		"L_SMILEY_EXPLAIN" => $lang['smile_desc'],
 		"L_SMILEY_CODE" => $lang['smiley_code'],
 		"L_SMILEY_URL" => $lang['smiley_url'],
 		"L_SMILEY_EMOTION" => $lang['smiley_emot'],
@@ -340,7 +340,7 @@ else if ( $mode != "" )
 			$result = $db->sql_query($sql);
 			if( !$result )
 			{
-				message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not obtain emoticon information', "", __LINE__, __FILE__, $sql);
 			}
 			$smile_data = $db->sql_fetchrow($result);
 
@@ -536,6 +536,6 @@ else
 //
 // Page Footer
 //
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
-?>
+?>

phpBB/admin/admin_styles.php

@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                              admin_words.php
+ *                              admin_styles.php
  *                            -------------------
  *   begin                : Thursday, Jul 12, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -35,23 +35,26 @@ if( !empty($setmodules) )
 //
 // Load default header
 //
-$phpbb_root_dir = "./../";
-
 //
 // Check if the user has cancled a confirmation message.
 //
+$phpbb_root_path = "./../";
+
 $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
 $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
 
 if( empty($HTTP_POST_VARS['send_file']) )
 {
 	$no_page_header = ( $cancel ) ? TRUE : FALSE;
-	require('pagestart.inc');
+	require($phpbb_root_path . 'extension.inc');
+	require('./pagestart.' . $phpEx);
 }
 
 if( $cancel )
 {
-	header("Location: " . append_sid("admin_styles.$phpEx"));
+	$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
+	header($header_location  . append_sid("admin_styles.$phpEx"));
+	exit;
 }
 
 if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
@@ -72,7 +75,7 @@ switch( $mode )
 		if( isset($install_to) )
 		{
 
-			include($phpbb_root_dir . "templates/" . $install_to . "/theme_info.cfg");
+			include($phpbb_root_path. "templates/" . $install_to . "/theme_info.cfg");
 
 			$template_name = $$install_to;
 			$found = FALSE; 
@@ -127,15 +130,15 @@ switch( $mode )
 			
 			$installable_themes = array();
 			
-			if( $dir = @opendir($phpbb_root_dir . "templates/") )
+			if( $dir = @opendir($phpbb_root_path. "templates/") )
 			{
 				while( $sub_dir = @readdir($dir) )
 				{
 					if( !is_file($phpbb_root_path . 'templates/' .$sub_dir) && !is_link($phpbb_root_path . 'templates/' .$sub_dir) && $sub_dir != "." && $sub_dir != ".." && $sub_dir != "CVS" )
 					{
-						if( @file_exists($phpbb_root_dir . "templates/" . $sub_dir . "/theme_info.cfg") )
+						if( @file_exists($phpbb_root_path. "templates/" . $sub_dir . "/theme_info.cfg") )
 						{
-							include($phpbb_root_dir . "templates/" . $sub_dir . "/theme_info.cfg");
+							include($phpbb_root_path. "templates/" . $sub_dir . "/theme_info.cfg");
 							
 							for($i = 0; $i < count($$sub_dir); $i++)
 							{
@@ -560,6 +563,7 @@ switch( $mode )
 						}
 					}
 				}
+				$s_template_select .= '</select>';
 			}
 			else
 			{
@@ -930,7 +934,7 @@ switch( $mode )
 
 if( !$HTTP_POST_VARS['send_file'] )
 {
-	include('page_footer_admin.'.$phpEx);
+	include('./page_footer_admin.'.$phpEx);
 }
 
 ?>

phpBB/admin/admin_ug_auth.php

@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                            admin_userauth.php
+ *                            admin_ug_auth.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -34,9 +34,11 @@ if( !empty($setmodules) )
 //
 // Load default header
 //
-$phpbb_root_dir = "./../";
 $no_page_header = TRUE;
-require('pagestart.inc');
+
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
 
 $params = array('mode' => 'mode', 'user_id' => POST_USERS_URL, 'group_id' => POST_GROUPS_URL, 'adv' => 'adv');
 
@@ -55,31 +57,31 @@ while( list($var, $param) = @each($params) )
 //
 // Start program - define vars
 //
-$forum_auth_fields = array("auth_view", "auth_read", "auth_post", "auth_reply", "auth_edit", "auth_delete", "auth_sticky", "auth_announce", "auth_vote", "auth_pollcreate");
+$forum_auth_fields = array('auth_view', 'auth_read', 'auth_post', 'auth_reply', 'auth_edit', 'auth_delete', 'auth_sticky', 'auth_announce', 'auth_vote', 'auth_pollcreate');
 
 $auth_field_match = array(
-	"auth_view" => AUTH_VIEW,
-	"auth_read" => AUTH_READ,
-	"auth_post" => AUTH_POST,
-	"auth_reply" => AUTH_REPLY,
-	"auth_edit" => AUTH_EDIT,
-	"auth_delete" => AUTH_DELETE,
-	"auth_sticky" => AUTH_STICKY,
-	"auth_announce" => AUTH_ANNOUNCE, 
-	"auth_vote" => AUTH_VOTE, 
-	"auth_pollcreate" => AUTH_POLLCREATE);
+	'auth_view' => AUTH_VIEW,
+	'auth_read' => AUTH_READ,
+	'auth_post' => AUTH_POST,
+	'auth_reply' => AUTH_REPLY,
+	'auth_edit' => AUTH_EDIT,
+	'auth_delete' => AUTH_DELETE,
+	'auth_sticky' => AUTH_STICKY,
+	'auth_announce' => AUTH_ANNOUNCE, 
+	'auth_vote' => AUTH_VOTE, 
+	'auth_pollcreate' => AUTH_POLLCREATE);
 
 $field_names = array(
-	"auth_view" => $lang['View'],
-	"auth_read" => $lang['Read'],
-	"auth_post" => $lang['Post'],
-	"auth_reply" => $lang['Reply'],
-	"auth_edit" => $lang['Edit'],
-	"auth_delete" => $lang['Delete'],
-	"auth_sticky" => $lang['Sticky'],
-	"auth_announce" => $lang['Announce'], 
-	"auth_vote" => $lang['Vote'], 
-	"auth_pollcreate" => $lang['Pollcreate']);
+	'auth_view' => $lang['View'],
+	'auth_read' => $lang['Read'],
+	'auth_post' => $lang['Post'],
+	'auth_reply' => $lang['Reply'],
+	'auth_edit' => $lang['Edit'],
+	'auth_delete' => $lang['Delete'],
+	'auth_sticky' => $lang['Sticky'],
+	'auth_announce' => $lang['Announce'], 
+	'auth_vote' => $lang['Vote'], 
+	'auth_pollcreate' => $lang['Pollcreate']);
 
 // ---------------
 // Start Functions
@@ -120,10 +122,10 @@ function check_auth($type, $key, $u_access, $is_admin)
 // End Functions
 // -------------
 
-if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == "user" && $user_id ) || ( $mode == "group" && $group_id ) ) )
+if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == 'user' && $user_id ) || ( $mode == 'group' && $group_id ) ) )
 {
-	$user_level = "";
-	if ( $mode == "user" )
+	$user_level = '';
+	if ( $mode == 'user' )
 	{
 		//
 		// Get group_id for this user_id
@@ -136,7 +138,7 @@ if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == "user" && $user_id ) || (
 				AND g.group_single_user = " . TRUE;
 		if ( !($result = $db->sql_query($sql)) )
 		{
-			message_die(GENERAL_ERROR, "Couldn't select info from user/user_group table", "", __LINE__, __FILE__, $sql);
+			message_die(GENERAL_ERROR, 'Could not select info from user/user_group table', '', __LINE__, __FILE__, $sql);
 		}
 
 		$row = $db->sql_fetchrow($result);
@@ -150,38 +152,7 @@ if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == "user" && $user_id ) || (
 	//
 	// Carry out requests
 	//
-	if ( $mode == "user" && $HTTP_POST_VARS['userlevel'] == "user" && $user_level == ADMIN )
-	{
-		//
-		// Make admin a user (if already admin) ... ignore if you're trying
-		// to change yourself from an admin to user!
-		//
-		if ( $userdata['user_id'] != $user_id )
-		{
-			$sql = "UPDATE " . AUTH_ACCESS_TABLE . "
-				SET auth_view = 0, auth_read = 0, auth_post = 0, auth_reply = 0, auth_edit = 0, auth_delete = 0, auth_sticky = 0, auth_announce = 0
-				WHERE group_id = $group_id";
-			if ( !($result = $db->sql_query($sql)) )
-			{
-				message_die(GENERAL_ERROR, "Couldn't update auth access", "", __LINE__, __FILE__, $sql);
-			}
-
-			//
-			// Update users level, reset to USER
-			//
-			$sql = "UPDATE " . USERS_TABLE . "
-				SET user_level = " . USER . "
-				WHERE user_id = $user_id";
-			if ( !($result = $db->sql_query($sql)) )
-			{
-				message_die(GENERAL_ERROR, "Couldn't update user level", "", __LINE__, __FILE__, $sql);
-			}
-		}
-
-		header("Location: " . append_sid("admin_ug_auth.$phpEx?" . POST_USERS_URL . "=$user_id", true));
-		exit;
-	}
-	else if ( $mode == "user" && $HTTP_POST_VARS['userlevel'] == "admin" && $user_level != ADMIN )
+	if ( $mode == 'user' && $HTTP_POST_VARS['userlevel'] == 'admin' && $user_level != ADMIN )
 	{
 		//
 		// Make user an admin (if already user)
@@ -193,7 +164,7 @@ if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == "user" && $user_id ) || (
 				WHERE user_id = $user_id";
 			if ( !($result = $db->sql_query($sql)) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't update user level", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql);
 			}
 
 			$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
@@ -217,181 +188,218 @@ if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == "user" && $user_id ) || (
 			}
 		}
 
-		header("Location: " . append_sid("admin_ug_auth.$phpEx?" . POST_USERS_URL . "=$user_id", true));
-		exit;
+		$message = $lang['Auth_updated'] . '<br /><br />' . sprintf($lang['Click_return_userauth'], '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$mode") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
+		message_die(GENERAL_MESSAGE, $message);
 	}
 	else
 	{
-		$change_mod_list = ( isset($HTTP_POST_VARS['moderator']) ) ? $HTTP_POST_VARS['moderator'] : false;
-
-		if ( empty($adv) )
+		if ( $mode == 'user' && $HTTP_POST_VARS['userlevel'] == 'user' && $user_level == ADMIN )
 		{
-			$change_acl_list = ( isset($HTTP_POST_VARS['private']) ) ? $HTTP_POST_VARS['private'] : false;
+			//
+			// Make admin a user (if already admin) ... ignore if you're trying
+			// to change yourself from an admin to user!
+			//
+			if ( $userdata['user_id'] != $user_id )
+			{
+				$sql = "UPDATE " . AUTH_ACCESS_TABLE . "
+					SET auth_view = 0, auth_read = 0, auth_post = 0, auth_reply = 0, auth_edit = 0, auth_delete = 0, auth_sticky = 0, auth_announce = 0
+					WHERE group_id = $group_id";
+				if ( !($result = $db->sql_query($sql)) )
+				{
+					message_die(GENERAL_ERROR, 'Could not update auth access', '', __LINE__, __FILE__, $sql);
+				}
+
+				//
+				// Update users level, reset to USER
+				//
+				$sql = "UPDATE " . USERS_TABLE . "
+					SET user_level = " . USER . "
+					WHERE user_id = $user_id";
+				if ( !($result = $db->sql_query($sql)) )
+				{
+					message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql);
+				}
+			}
+
+			$message = $lang['Auth_updated'] . '<br /><br />' . sprintf($lang['Click_return_userauth'], '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$mode") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
 		}
 		else
 		{
-			$change_acl_list = array();
-			for($j = 0; $j < count($forum_auth_fields); $j++)
-			{
-				$auth_field = $forum_auth_fields[$j];
+	
+			$change_mod_list = ( isset($HTTP_POST_VARS['moderator']) ) ? $HTTP_POST_VARS['moderator'] : false;
 
-				while( list($forum_id, $value) = @each($HTTP_POST_VARS['private_' . $auth_field]) )
-				{
-					$change_acl_list[$forum_id][$auth_field] = $value;
-				}
+			if ( empty($adv) )
+			{
+				$change_acl_list = ( isset($HTTP_POST_VARS['private']) ) ? $HTTP_POST_VARS['private'] : false;
 			}
-		}
-
-		$sql = "SELECT * 
-			FROM " . FORUMS_TABLE . " f
-			ORDER BY forum_order";
-		if ( !($result = $db->sql_query($sql)) )
-		{
-			message_die(GENERAL_ERROR, "Couldn't obtain forum information", "", __LINE__, __FILE__, $sql);
-		}
-
-		$forum_access = array();
-		while( $row = $db->sql_fetchrow($result) )
-		{
-			$forum_access[] = $row;
-		}
-		$db->sql_freeresult($result);
-
-		$sql = ( $mode == 'user' ) ? "SELECT aa.* FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE. " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = " . TRUE : "SELECT * FROM " . AUTH_ACCESS_TABLE . " WHERE group_id = $group_id";
-		if ( !($result = $db->sql_query($sql)) )
-		{
-			message_die(GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql);
-		}
-
-		$auth_access = array();
-		while( $row = $db->sql_fetchrow($result) )
-		{
-			$auth_access[$row['forum_id']] = $row;
-		}
-		$db->sql_freeresult($result);
-
-		$forum_auth_action = array();
-		$update_acl_status = array();
-		$update_mod_status = array();
-
-		for($i = 0; $i < count($forum_access); $i++)
-		{
-			$forum_id = $forum_access[$i]['forum_id'];
-
-			if ( 
-				( isset($auth_access[$forum_id]['auth_mod']) && $change_mod_list[$forum_id]['auth_mod'] != $auth_access[$forum_id]['auth_mod'] ) || 
-				( !isset($auth_access[$forum_id]['auth_mod']) && !empty($change_mod_list[$forum_id]['auth_mod']) ) 
-			)
+			else
 			{
-				$update_mod_status[$forum_id] = $change_mod_list[$forum_id]['auth_mod'];
+				$change_acl_list = array();
+				for($j = 0; $j < count($forum_auth_fields); $j++)
+				{
+					$auth_field = $forum_auth_fields[$j];
 
-				if ( !$update_mod_status[$forum_id] )
-				{
-					$forum_auth_action[$forum_id] = 'delete';
-				}
-				else if ( !isset($auth_access[$forum_id]['auth_mod']) )
-				{
-					$forum_auth_action[$forum_id] = 'insert';
-				}
-				else
-				{
-					$forum_auth_action[$forum_id] = 'update';
-				}
-			}
-
-			for($j = 0; $j < count($forum_auth_fields); $j++)
-			{
-				$auth_field = $forum_auth_fields[$j];
-
-				if( $forum_access[$i][$auth_field] == AUTH_ACL && isset($change_acl_list[$forum_id][$auth_field]) )
-				{
-					if ( ( empty($auth_access[$forum_id]['auth_mod']) && 
-						( isset($auth_access[$forum_id][$auth_field]) && $change_acl_list[$forum_id][$auth_field] != $auth_access[$forum_id][$auth_field] ) || 
-						( !isset($auth_access[$forum_id][$auth_field]) && !empty($change_acl_list[$forum_id][$auth_field]) ) ) ||
-						!empty($update_mod_status[$forum_id])
-					)
+					while( list($forum_id, $value) = @each($HTTP_POST_VARS['private_' . $auth_field]) )
 					{
-						$update_acl_status[$forum_id][$auth_field] = ( !empty($update_mod_status[$forum_id]) ) ? 0 :  $change_acl_list[$forum_id][$auth_field];
-
-						if ( isset($auth_access[$forum_id][$auth_field]) && empty($update_acl_status[$forum_id][$auth_field]) && $forum_auth_action[$forum_id] != 'insert' && $forum_auth_action[$forum_id] != 'update' )
-						{
-							$forum_auth_action[$forum_id] = 'delete';
-						}
-						else if ( !isset($auth_access[$forum_id][$auth_field]) && !( $forum_auth_action[$forum_id] == 'delete' && empty($update_acl_status[$forum_id][$auth_field]) ) )
-						{
-							$forum_auth_action[$forum_id] = 'insert';
-						}
-						else if ( isset($auth_access[$forum_id][$auth_field]) && !empty($update_acl_status[$forum_id][$auth_field]) ) 
-						{
-							$forum_auth_action[$forum_id] = 'update';
-						}
+						$change_acl_list[$forum_id][$auth_field] = $value;
 					}
-					else if ( ( empty($auth_access[$forum_id]['auth_mod']) && 
-						( isset($auth_access[$forum_id][$auth_field]) && $change_acl_list[$forum_id][$auth_field] == $auth_access[$forum_id][$auth_field] ) ) && $forum_auth_action[$forum_id] == 'delete' )
+				}
+			}
+
+			$sql = "SELECT * 
+				FROM " . FORUMS_TABLE . " f
+				ORDER BY forum_order";
+			if ( !($result = $db->sql_query($sql)) )
+			{
+				message_die(GENERAL_ERROR, "Couldn't obtain forum information", "", __LINE__, __FILE__, $sql);
+			}
+
+			$forum_access = array();
+			while( $row = $db->sql_fetchrow($result) )
+			{
+				$forum_access[] = $row;
+			}
+			$db->sql_freeresult($result);
+
+			$sql = ( $mode == 'user' ) ? "SELECT aa.* FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE. " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = " . TRUE : "SELECT * FROM " . AUTH_ACCESS_TABLE . " WHERE group_id = $group_id";
+			if ( !($result = $db->sql_query($sql)) )
+			{
+				message_die(GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql);
+			}
+
+			$auth_access = array();
+			while( $row = $db->sql_fetchrow($result) )
+			{
+				$auth_access[$row['forum_id']] = $row;
+			}
+			$db->sql_freeresult($result);
+
+			$forum_auth_action = array();
+			$update_acl_status = array();
+			$update_mod_status = array();
+
+			for($i = 0; $i < count($forum_access); $i++)
+			{
+				$forum_id = $forum_access[$i]['forum_id'];
+
+				if ( 
+					( isset($auth_access[$forum_id]['auth_mod']) && $change_mod_list[$forum_id]['auth_mod'] != $auth_access[$forum_id]['auth_mod'] ) || 
+					( !isset($auth_access[$forum_id]['auth_mod']) && !empty($change_mod_list[$forum_id]['auth_mod']) ) 
+				)
+				{
+					$update_mod_status[$forum_id] = $change_mod_list[$forum_id]['auth_mod'];
+
+					if ( !$update_mod_status[$forum_id] )
+					{
+						$forum_auth_action[$forum_id] = 'delete';
+					}
+					else if ( !isset($auth_access[$forum_id]['auth_mod']) )
+					{
+						$forum_auth_action[$forum_id] = 'insert';
+					}
+					else
 					{
 						$forum_auth_action[$forum_id] = 'update';
 					}
 				}
-			}
-		}
 
-		//
-		// Checks complete, make updates to DB
-		//
-		$delete_sql = "";
-		while( list($forum_id, $action) = @each($forum_auth_action) )
-		{
-			if ( $action == 'delete' )
-			{
-				$delete_sql .= ( ( $delete_sql != "" ) ? ", " : "" ) . $forum_id;
-			}
-			else
-			{
-				if ( $action == 'insert' )
+				for($j = 0; $j < count($forum_auth_fields); $j++)
 				{
-					$sql_field = "";
-					$sql_value = "";
-					while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) )
-					{
-						$sql_field .= ( ( $sql_field != "" ) ? ", " : "" ) . $auth_type;
-						$sql_value .= ( ( $sql_value != "" ) ? ", " : "" ) . $value;
-					}
-					$sql_field .= ( ( $sql_field != "" ) ? ", " : "" ) . 'auth_mod';
-					$sql_value .= ( ( $sql_value != "" ) ? ", " : "" ) . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]);
+					$auth_field = $forum_auth_fields[$j];
 
-					$sql = "INSERT INTO " . AUTH_ACCESS_TABLE . " (forum_id, group_id, $sql_field) 
-						VALUES ($forum_id, $group_id, $sql_value)";
+					if( $forum_access[$i][$auth_field] == AUTH_ACL && isset($change_acl_list[$forum_id][$auth_field]) )
+					{
+						if ( ( empty($auth_access[$forum_id]['auth_mod']) && 
+							( isset($auth_access[$forum_id][$auth_field]) && $change_acl_list[$forum_id][$auth_field] != $auth_access[$forum_id][$auth_field] ) || 
+							( !isset($auth_access[$forum_id][$auth_field]) && !empty($change_acl_list[$forum_id][$auth_field]) ) ) ||
+							!empty($update_mod_status[$forum_id])
+						)
+						{
+							$update_acl_status[$forum_id][$auth_field] = ( !empty($update_mod_status[$forum_id]) ) ? 0 :  $change_acl_list[$forum_id][$auth_field];
+
+							if ( isset($auth_access[$forum_id][$auth_field]) && empty($update_acl_status[$forum_id][$auth_field]) && $forum_auth_action[$forum_id] != 'insert' && $forum_auth_action[$forum_id] != 'update' )
+							{
+								$forum_auth_action[$forum_id] = 'delete';
+							}
+							else if ( !isset($auth_access[$forum_id][$auth_field]) && !( $forum_auth_action[$forum_id] == 'delete' && empty($update_acl_status[$forum_id][$auth_field]) ) )
+							{
+								$forum_auth_action[$forum_id] = 'insert';
+							}
+							else if ( isset($auth_access[$forum_id][$auth_field]) && !empty($update_acl_status[$forum_id][$auth_field]) ) 
+							{
+								$forum_auth_action[$forum_id] = 'update';
+							}
+						}
+						else if ( ( empty($auth_access[$forum_id]['auth_mod']) && 
+							( isset($auth_access[$forum_id][$auth_field]) && $change_acl_list[$forum_id][$auth_field] == $auth_access[$forum_id][$auth_field] ) ) && $forum_auth_action[$forum_id] == 'delete' )
+						{
+							$forum_auth_action[$forum_id] = 'update';
+						}
+					}
+				}
+			}
+
+			//
+			// Checks complete, make updates to DB
+			//
+			$delete_sql = '';
+			while( list($forum_id, $action) = @each($forum_auth_action) )
+			{
+				if ( $action == 'delete' )
+				{
+					$delete_sql .= ( ( $delete_sql != '' ) ? ', ' : '' ) . $forum_id;
 				}
 				else
 				{
-					$sql_values = "";
-					while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) )
+					if ( $action == 'insert' )
 					{
-						$sql_values .= ( ( $sql_values != "" ) ? ", " : "" ) . $auth_type . " = " . $value;
-					}
-					$sql_values .= ( ( $sql_values != "" ) ? ", " : "" ) . "auth_mod = " . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]);
+						$sql_field = '';
+						$sql_value = '';
+						while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) )
+						{
+							$sql_field .= ( ( $sql_field != '' ) ? ', ' : '' ) . $auth_type;
+							$sql_value .= ( ( $sql_value != '' ) ? ', ' : '' ) . $value;
+						}
+						$sql_field .= ( ( $sql_field != '' ) ? ', ' : '' ) . 'auth_mod';
+						$sql_value .= ( ( $sql_value != '' ) ? ', ' : '' ) . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]);
 
-					$sql = "UPDATE " . AUTH_ACCESS_TABLE . " 
-						SET $sql_values 
-						WHERE group_id = $group_id 
-							AND forum_id = $forum_id";
+						$sql = "INSERT INTO " . AUTH_ACCESS_TABLE . " (forum_id, group_id, $sql_field) 
+							VALUES ($forum_id, $group_id, $sql_value)";
+					}
+					else
+					{
+						$sql_values = '';
+						while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) )
+						{
+							$sql_values .= ( ( $sql_values != '' ) ? ', ' : '' ) . $auth_type . ' = ' . $value;
+						}
+						$sql_values .= ( ( $sql_values != '' ) ? ', ' : '' ) . 'auth_mod = ' . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]);
+
+						$sql = "UPDATE " . AUTH_ACCESS_TABLE . " 
+							SET $sql_values 
+							WHERE group_id = $group_id 
+								AND forum_id = $forum_id";
+					}
+					if( !($result = $db->sql_query($sql)) )
+					{
+						message_die(GENERAL_ERROR, "Couldn't update private forum permissions", "", __LINE__, __FILE__, $sql);
+					}
 				}
+			}
+
+			if ( $delete_sql != '' )
+			{
+				$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . " 
+					WHERE group_id = $group_id 
+						AND forum_id IN ($delete_sql)";
 				if( !($result = $db->sql_query($sql)) )
 				{
-					message_die(GENERAL_ERROR, "Couldn't update private forum permissions", "", __LINE__, __FILE__, $sql);
+					message_die(GENERAL_ERROR, "Couldn't delete permission entries", "", __LINE__, __FILE__, $sql);
 				}
 			}
-		}
 
-		if ( $delete_sql != "" )
-		{
-			$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . " 
-				WHERE group_id = $group_id 
-					AND forum_id IN ($delete_sql)";
-			if( !($result = $db->sql_query($sql)) )
-			{
-				message_die(GENERAL_ERROR, "Couldn't delete permission entries", "", __LINE__, __FILE__, $sql);
-			}
+			$l_auth_return = ( $mode == 'user' ) ? $lang['Click_return_userauth'] : $lang['Click_return_groupauth'];
+			$message = $lang['Auth_updated'] . '<br /><br />' . sprintf($l_auth_return, '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$mode") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
 		}
 
 		//
@@ -409,10 +417,10 @@ if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == "user" && $user_id ) || (
 			message_die(GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql);
 		}
 
-		$set_mod = "";
+		$set_mod = '';
 		while( $row = $db->sql_fetchrow($result) )
 		{
-			$set_mod .= ( ( $set_mod != "" ) ? ", " : "" ) . $row['user_id'];
+			$set_mod .= ( ( $set_mod != '' ) ? ', ' : '' ) . $row['user_id'];
 		}
 		$db->sql_freeresult($result);
 
@@ -469,11 +477,11 @@ if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == "user" && $user_id ) || (
 		$unset_mod = "";
 		while( $row = $db->sql_fetchrow($result) )
 		{
-			$unset_mod .= ( ( $unset_mod != "" ) ? ", " : "" ) . $row['user_id'];
+			$unset_mod .= ( ( $unset_mod != '' ) ? ', ' : '' ) . $row['user_id'];
 		}
 		$db->sql_freeresult($result);
 
-		if ( $set_mod != "" )
+		if ( $set_mod != '' )
 		{
 			$sql = "UPDATE " . USERS_TABLE . " 
 				SET user_level = " . MOD . " 
@@ -484,7 +492,7 @@ if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == "user" && $user_id ) || (
 			}
 		}
 
-		if ( $unset_mod != "" )
+		if ( $unset_mod != '' )
 		{
 			$sql = "UPDATE " . USERS_TABLE . " 
 				SET user_level = " . USER . " 
@@ -495,8 +503,6 @@ if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == "user" && $user_id ) || (
 			}
 		}
 
-		$l_auth_return = ( $mode == 'user' ) ? $lang['Click_return_userauth'] : $lang['Click_return_groupauth'];
-		$message = $lang['Auth_updated'] . '<br /><br />' . sprintf($l_auth_return, '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$mode") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
 		message_die(GENERAL_MESSAGE, $message);
 	}
 }
@@ -540,7 +546,7 @@ else if ( ( $mode == 'user' && ( isset($HTTP_POST_VARS['username']) || $user_id
 
 			for($j = 0; $j < count($forum_auth_fields); $j++)
 			{
-				$forum_access[$i][$forum_auth_fields[$j]] . " :: ";
+				$forum_access[$i][$forum_auth_fields[$j]] . ' :: ';
 				if ( $forum_access[$i][$forum_auth_fields[$j]] == AUTH_ACL )
 				{
 					$forum_auth_level[$forum_id] = AUTH_ACL;
@@ -722,31 +728,31 @@ else if ( ( $mode == 'user' && ( isset($HTTP_POST_VARS['username']) || $user_id
 		$optionlist_mod .= ( $user_ary['auth_mod'] ) ? '<option value="1" selected="selected">' . $lang['Is_Moderator'] . '</option><option value="0">' . $lang['Not_Moderator'] . '</option>' : '<option value="1">' . $lang['Is_Moderator'] . '</option><option value="0" selected="selected">' . $lang['Not_Moderator'] . '</option>';
 		$optionlist_mod .= '</select>';
 
-		$row_class = ( !( $i % 2 ) ) ? "row2" : "row1";
+		$row_class = ( !( $i % 2 ) ) ? 'row2' : 'row1';
 		$row_color = ( !( $i % 2 ) ) ? $theme['td_color1'] : $theme['td_color2'];
 
-		$template->assign_block_vars("forums", array(
-			"ROW_COLOR" => "#" . $row_color,
-			"ROW_CLASS" => $row_class,
-			"FORUM_NAME" => $forum_access[$i]['forum_name'],
+		$template->assign_block_vars('forums', array(
+			'ROW_COLOR' => '#' . $row_color,
+			'ROW_CLASS' => $row_class,
+			'FORUM_NAME' => $forum_access[$i]['forum_name'],
 
-			"U_FORUM_AUTH" => append_sid("admin_forumauth.$phpEx?f=" . $forum_access[$i]['forum_id']),
+			'U_FORUM_AUTH' => append_sid("admin_forumauth.$phpEx?f=" . $forum_access[$i]['forum_id']),
 
-			"S_MOD_SELECT" => $optionlist_mod)
+			'S_MOD_SELECT' => $optionlist_mod)
 		);
 
 		if( !$adv )
 		{
-			$template->assign_block_vars("forums.aclvalues", array(
-				"S_ACL_SELECT" => $optionlist_acl)
+			$template->assign_block_vars('forums.aclvalues', array(
+				'S_ACL_SELECT' => $optionlist_acl)
 			);
 		}
 		else
 		{
 			for($j = 0; $j < count($forum_auth_fields); $j++)
 			{
-				$template->assign_block_vars("forums.aclvalues", array(
-					"S_ACL_SELECT" => $optionlist_acl_adv[$forum_id][$j])
+				$template->assign_block_vars('forums.aclvalues', array(
+					'S_ACL_SELECT' => $optionlist_acl_adv[$forum_id][$j])
 				);
 			}
 		}
@@ -760,22 +766,30 @@ else if ( ( $mode == 'user' && ( isset($HTTP_POST_VARS['username']) || $user_id
 		$t_username = $ug_info[0]['username'];
 		$s_user_type = ( $is_admin ) ? '<select name="userlevel"><option value="admin" selected="selected">' . $lang['Auth_Admin'] . '</option><option value="user">' . $lang['Auth_User'] . '</option></select>' : '<select name="userlevel"><option value="admin">' . $lang['Auth_Admin'] . '</option><option value="user" selected="selected">' . $lang['Auth_User'] . '</option></select>';
 	}
+	else
+	{
+		$t_groupname = $ug_info[0]['group_name'];
+	}
 
+	$name = array();
+	$id = array();
 	for($i = 0; $i < count($ug_info); $i++)
 	{
 		if( ( $mode == 'user' && !$ug_info[$i]['group_single_user'] ) || $mode == 'group' )
 		{
 			$name[] = ( $mode == 'user' ) ? $ug_info[$i]['group_name'] :  $ug_info[$i]['username'];
-			$id[] = ( $mode == 'user' ) ? $ug_info[$i]['group_id'] : $ug_info[$i]['user_id'];
+			$id[] = ( $mode == 'user' ) ? intval($ug_info[$i]['group_id']) : intval($ug_info[$i]['user_id']);
 		}
 	}
 
 	if( count($name) )
 	{
-		$t_usergroup_list = "";
+		$t_usergroup_list = '';
 		for($i = 0; $i < count($ug_info); $i++)
 		{
-			$t_usergroup_list .= ( ( $t_usergroup_list != '' ) ? ', ' : '' ) . '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$mode&amp;" . POST_GROUPS_URL . "=" . $id[$i]) . '">' . $name[$i] . '</a>';
+			$ug = ( $mode == 'user' ) ? 'group&amp;' . POST_GROUPS_URL : 'user&amp;' . POST_USERS_URL;
+
+			$t_usergroup_list .= ( ( $t_usergroup_list != '' ) ? ', ' : '' ) . '<a href="' . append_sid("admin_ug_auth.$phpEx?mode=$ug=" . $id[$i]) . '">' . $name[$i] . '</a>';
 		}
 	}
 	else
@@ -786,8 +800,8 @@ else if ( ( $mode == 'user' && ( isset($HTTP_POST_VARS['username']) || $user_id
 	$s_column_span = 2; // Two columns always present
 	if( !$adv )
 	{
-		$template->assign_block_vars("acltype", array(
-			"L_UG_ACL_TYPE" => $lang['Simple_Permission'])
+		$template->assign_block_vars('acltype', array(
+			'L_UG_ACL_TYPE' => $lang['Simple_Permission'])
 		);
 		$s_column_span++;
 	}
@@ -797,8 +811,8 @@ else if ( ( $mode == 'user' && ( isset($HTTP_POST_VARS['username']) || $user_id
 		{
 			$cell_title = $field_names[$forum_auth_fields[$i]];
 
-			$template->assign_block_vars("acltype", array(
-				"L_UG_ACL_TYPE" => $cell_title)
+			$template->assign_block_vars('acltype', array(
+				'L_UG_ACL_TYPE' => $cell_title)
 			);
 			$s_column_span++;
 		}
@@ -807,10 +821,10 @@ else if ( ( $mode == 'user' && ( isset($HTTP_POST_VARS['username']) || $user_id
 	//
 	// Dump in the page header ...
 	//
-	include('page_header_admin.'.$phpEx);
+	include('./page_header_admin.'.$phpEx);
 
 	$template->set_filenames(array(
-		"body" => "admin/auth_ug_body.tpl")
+		"body" => 'admin/auth_ug_body.tpl')
 	);
 
 	$adv_switch = ( empty($adv) ) ? 1 : 0;
@@ -824,12 +838,12 @@ else if ( ( $mode == 'user' && ( isset($HTTP_POST_VARS['username']) || $user_id
 
 	if ( $mode == 'user' )
 	{
-		$template->assign_block_vars("switch_user_auth", array());
+		$template->assign_block_vars('switch_user_auth', array());
 
 		$template->assign_vars(array(
-			"USERNAME" => $t_username,
-			"USER_LEVEL" => $lang['User_Level'] . " : " . $s_user_type,
-			"USER_GROUP_MEMBERSHIPS" => $lang['Group_memberships'] . " : " . $t_usergroup_list)
+			'USERNAME' => $t_username,
+			'USER_LEVEL' => $lang['User_Level'] . " : " . $s_user_type,
+			'USER_GROUP_MEMBERSHIPS' => $lang['Group_memberships'] . ' : ' . $t_usergroup_list)
 		);
 	}
 	else
@@ -837,28 +851,28 @@ else if ( ( $mode == 'user' && ( isset($HTTP_POST_VARS['username']) || $user_id
 		$template->assign_block_vars("switch_group_auth", array());
 
 		$template->assign_vars(array(
-			"USERNAME" => $t_groupname,
-			"GROUP_MEMBERSHIP" => $lang['Usergroup_members'] . ": " . $t_usergroup_list)
+			'USERNAME' => $t_groupname,
+			'GROUP_MEMBERSHIP' => $lang['Usergroup_members'] . ' : ' . $t_usergroup_list)
 		);
 	}
 
 	$template->assign_vars(array(
-		"L_USER_OR_GROUPNAME" => ( $mode == 'user' ) ? $lang['Username'] : $lang['Group_name'],
-		"L_USER_OR_GROUP" => ( $mode == 'user' ) ? $lang['User'] : $lang['Group'],
+		'L_USER_OR_GROUPNAME' => ( $mode == 'user' ) ? $lang['Username'] : $lang['Group_name'],
 
-		"L_AUTH_TITLE" => ( $mode == 'user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'],
-		"L_AUTH_EXPLAIN" => ( $mode == 'user' ) ? $lang['User_auth_explain'] : $lang['Group_auth_explain'],
-		"L_MODERATOR_STATUS" => $lang['Moderator_status'],
-		"L_PERMISSIONS" => $lang['Permissions'],
-		"L_SUBMIT" => $lang['Submit'],
-		"L_RESET" => $lang['Reset'],
+		'L_AUTH_TITLE' => ( $mode == 'user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'],
+		'L_AUTH_EXPLAIN' => ( $mode == 'user' ) ? $lang['User_auth_explain'] : $lang['Group_auth_explain'],
+		'L_MODERATOR_STATUS' => $lang['Moderator_status'],
+		'L_PERMISSIONS' => $lang['Permissions'],
+		'L_SUBMIT' => $lang['Submit'],
+		'L_RESET' => $lang['Reset'], 
+		'L_FORUM' => $lang['Forum'], 
 
-		"U_USER_OR_GROUP" => append_sid("admin_ug_auth.$phpEx"),
-		"U_SWITCH_MODE" => $u_switch_mode,
+		'U_USER_OR_GROUP' => append_sid("admin_ug_auth.$phpEx"),
+		'U_SWITCH_MODE' => $u_switch_mode,
 
-		"S_COLUMN_SPAN" => $s_column_span,
-		"S_AUTH_ACTION" => append_sid("admin_ug_auth.$phpEx"), 
-		"S_HIDDEN_FIELDS" => $s_hidden_fields)
+		'S_COLUMN_SPAN' => $s_column_span,
+		'S_AUTH_ACTION' => append_sid("admin_ug_auth.$phpEx"), 
+		'S_HIDDEN_FIELDS' => $s_hidden_fields)
 	);
 }
 else
@@ -866,18 +880,18 @@ else
 	//
 	// Select a user/group
 	//
-	include('page_header_admin.'.$phpEx);
+	include('./page_header_admin.'.$phpEx);
 
 	$template->set_filenames(array(
-		"body" => ( $mode == 'user' ) ? "admin/user_select_body.tpl" : "admin/auth_select_body.tpl")
+		'body' => ( $mode == 'user' ) ? 'admin/user_select_body.tpl' : 'admin/auth_select_body.tpl')
 	);
 
 	if ( $mode == 'user' )
 	{
 		$template->assign_vars(array(
-			"L_FIND_USERNAME" => $lang['Find_username'],
+			'L_FIND_USERNAME' => $lang['Find_username'],
 
-			"U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"))
+			'U_SEARCH_USER' => append_sid("../search.$phpEx?mode=searchuser"))
 		);
 	}
 	else
@@ -902,28 +916,28 @@ else
 		}
 
 		$template->assign_vars(array(
-			"S_AUTH_SELECT" => $select_list)
+			'S_AUTH_SELECT' => $select_list)
 		);
 	}
 
 	$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />';
 
-	$l_type = ( $mode == 'user' ) ? "USER" : "AUTH";
+	$l_type = ( $mode == 'user' ) ? 'USER' : 'AUTH';
 
 	$template->assign_vars(array(
-		"L_" . $l_type . "_TITLE" => ( $mode == 'user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'],
-		"L_" . $l_type . "_EXPLAIN" => ( $mode == 'user' ) ? $lang['User_auth_explain'] : $lang['Group_auth_explain'],
-		"L_" . $l_type . "_SELECT" => ( $mode == 'user' ) ? $lang['Select_a_User'] : $lang['Select_a_Group'],
-		"L_LOOK_UP" => ( $mode == 'user' ) ? $lang['Look_up_User'] : $lang['Look_up_Group'],
+		'L_' . $l_type . '_TITLE' => ( $mode == 'user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'],
+		'L_' . $l_type . '_EXPLAIN' => ( $mode == 'user' ) ? $lang['User_auth_explain'] : $lang['Group_auth_explain'],
+		'L_' . $l_type . '_SELECT' => ( $mode == 'user' ) ? $lang['Select_a_User'] : $lang['Select_a_Group'],
+		'L_LOOK_UP' => ( $mode == 'user' ) ? $lang['Look_up_User'] : $lang['Look_up_Group'],
 
-		"S_HIDDEN_FIELDS" => $s_hidden_fields, 
-		"S_" . $l_type . "_ACTION" => append_sid("admin_ug_auth.$phpEx"))
+		'S_HIDDEN_FIELDS' => $s_hidden_fields, 
+		'S_' . $l_type . '_ACTION' => append_sid("admin_ug_auth.$phpEx"))
 	);
 
 }
 
-$template->pparse("body");
+$template->pparse('body');
 
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
 ?>

phpBB/admin/admin_user_ban.php

@@ -22,7 +22,7 @@
 
 define('IN_PHPBB', 1);
 
-if( !empty($setmodules) )
+if ( !empty($setmodules) )
 {
 	$filename = basename(__FILE__);
 	$module['Users']['Ban_Management'] = $filename;
@@ -33,37 +33,39 @@ if( !empty($setmodules) )
 //
 // Load default header
 //
-$phpbb_root_dir = "./../";
-require('pagestart.inc');
+$phpbb_root_path = './../';
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
 
 //
 // Start program
 //
-if( isset($HTTP_POST_VARS['submit']) )
+if ( isset($HTTP_POST_VARS['submit']) )
 {
-	$user_bansql = "";
-	$email_bansql = "";
-	$ip_bansql = "";
+	$user_bansql = '';
+	$email_bansql = '';
+	$ip_bansql = '';
 
 	$user_list = array();
-	if( isset($HTTP_POST_VARS['ban_user']) )
+	if ( !empty($HTTP_POST_VARS['username']) )
 	{
-		$user_list_temp = $HTTP_POST_VARS['ban_user'];
-
-		for($i = 0; $i < count($user_list_temp); $i++)
+		$this_userdata = get_userdata($HTTP_POST_VARS['username']);
+		if( !$this_userdata )
 		{
-			$user_list[] = trim($user_list_temp[$i]);
+			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
 		}
+
+		$user_list[] = $this_userdata['user_id'];
 	}
 
 	$ip_list = array();
-	if( isset($HTTP_POST_VARS['ban_ip']) )
+	if ( isset($HTTP_POST_VARS['ban_ip']) )
 	{
-		$ip_list_temp = explode(",", $HTTP_POST_VARS['ban_ip']);
+		$ip_list_temp = explode(',', $HTTP_POST_VARS['ban_ip']);
 
 		for($i = 0; $i < count($ip_list_temp); $i++)
 		{
-			if( preg_match("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", trim($ip_list_temp[$i]), $ip_range_explode) )
+			if ( preg_match('/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/', trim($ip_list_temp[$i]), $ip_range_explode) )
 			{
 				//
 				// Don't ask about all this, just don't ask ... !
@@ -71,12 +73,12 @@ if( isset($HTTP_POST_VARS['submit']) )
 				$ip_1_counter = $ip_range_explode[1];
 				$ip_1_end = $ip_range_explode[5];
 
-				while($ip_1_counter <= $ip_1_end)
+				while ( $ip_1_counter <= $ip_1_end )
 				{
-					$ip_2_counter = ($ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[2] : 0;
-					$ip_2_end = ($ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[6];
+					$ip_2_counter = ( $ip_1_counter == $ip_range_explode[1] ) ? $ip_range_explode[2] : 0;
+					$ip_2_end = ( $ip_1_counter < $ip_1_end ) ? 254 : $ip_range_explode[6];
 
-					if($ip_2_counter == 0 && $ip_2_end == 254)
+					if ( $ip_2_counter == 0 && $ip_2_end == 254 )
 					{
 						$ip_2_counter = 255;
 						$ip_2_fragment = 255;
@@ -84,12 +86,12 @@ if( isset($HTTP_POST_VARS['submit']) )
 						$ip_list[] = encode_ip("$ip_1_counter.255.255.255");
 					}
 
-					while($ip_2_counter <= $ip_2_end)
+					while ( $ip_2_counter <= $ip_2_end )
 					{
-						$ip_3_counter = ($ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[3] : 0;
-						$ip_3_end = ($ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[7];
+						$ip_3_counter = ( $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1] ) ? $ip_range_explode[3] : 0;
+						$ip_3_end = ( $ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end ) ? 254 : $ip_range_explode[7];
 
-						if($ip_3_counter == 0 && $ip_3_end == 254 )
+						if ( $ip_3_counter == 0 && $ip_3_end == 254 )
 						{
 							$ip_3_counter = 255;
 							$ip_3_fragment = 255;
@@ -97,12 +99,12 @@ if( isset($HTTP_POST_VARS['submit']) )
 							$ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.255.255");
 						}
 
-						while($ip_3_counter <= $ip_3_end)
+						while ( $ip_3_counter <= $ip_3_end )
 						{
-							$ip_4_counter = ($ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[4] : 0;
-							$ip_4_end = ($ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end) ? 254 : $ip_range_explode[8];
+							$ip_4_counter = ( $ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1] ) ? $ip_range_explode[4] : 0;
+							$ip_4_end = ( $ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end ) ? 254 : $ip_range_explode[8];
 
-							if($ip_4_counter == 0 && $ip_4_end == 254)
+							if ( $ip_4_counter == 0 && $ip_4_end == 254 )
 							{
 								$ip_4_counter = 255;
 								$ip_4_fragment = 255;
@@ -110,7 +112,7 @@ if( isset($HTTP_POST_VARS['submit']) )
 								$ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.255");
 							}
 
-							while($ip_4_counter <= $ip_4_end)
+							while ( $ip_4_counter <= $ip_4_end )
 							{
 								$ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter");
 								$ip_4_counter++;
@@ -122,29 +124,29 @@ if( isset($HTTP_POST_VARS['submit']) )
 					$ip_1_counter++;
 				}
 			}
-			else if( preg_match("/^([\w\-_]\.?){2,}$/is", trim($ip_list_temp[$i])) )
+			else if ( preg_match('/^([\w\-_]\.?){2,}$/is', trim($ip_list_temp[$i])) )
 			{
 				$ip = gethostbynamel(trim($ip_list_temp[$i]));
 
 				for($j = 0; $j < count($ip); $j++)
 				{
-					if( !empty($ip[$j]) )
+					if ( !empty($ip[$j]) )
 					{
 						$ip_list[] = encode_ip($ip[$j]);
 					}
 				}
 			}
-			else if( preg_match("/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/", trim($ip_list_temp[$i])) )
+			else if ( preg_match('/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/', trim($ip_list_temp[$i])) )
 			{
-				$ip_list[] = encode_ip(str_replace("*", "255", trim($ip_list_temp[$i])));
+				$ip_list[] = encode_ip(str_replace('*', '255', trim($ip_list_temp[$i])));
 			}
 		}
 	}
 
 	$email_list = array();
-	if(isset($HTTP_POST_VARS['ban_email']))
+	if ( isset($HTTP_POST_VARS['ban_email']) )
 	{
-		$email_list_temp = explode(",", $HTTP_POST_VARS['ban_email']);
+		$email_list_temp = explode(',', $HTTP_POST_VARS['ban_email']);
 
 		for($i = 0; $i < count($email_list_temp); $i++)
 		{
@@ -153,7 +155,7 @@ if( isset($HTTP_POST_VARS['submit']) )
 			// contained in the annotated php manual at php.com (ereg
 			// section)
 			//
-			if( eregi("^(([[:alnum:]\*]+([-_.][[:alnum:]\*]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$", trim($email_list_temp[$i])) )
+			if ( eregi('^(([[:alnum:]\*]+([-_.][[:alnum:]\*]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$', trim($email_list_temp[$i])) )
 			{
 				$email_list[] = trim($email_list_temp[$i]);
 			}
@@ -162,32 +164,33 @@ if( isset($HTTP_POST_VARS['submit']) )
 
 	$sql = "SELECT *
 		FROM " . BANLIST_TABLE;
-	if( !$result = $db->sql_query($sql) )
+	if ( !($result = $db->sql_query($sql)) )
 	{
 		message_die(GENERAL_ERROR, "Couldn't obtain banlist information", "", __LINE__, __FILE__, $sql);
 	}
 
 	$current_banlist = $db->sql_fetchrowset($result);
+	$db->sql_freeresult($result);
 
-	$kill_session_sql = "";
+	$kill_session_sql = '';
 	for($i = 0; $i < count($user_list); $i++)
 	{
 		$in_banlist = false;
 		for($j = 0; $j < count($current_banlist); $j++)
 		{
-			if($user_list[$i] == $current_banlist[$j]['ban_userid'])
+			if ( $user_list[$i] == $current_banlist[$j]['ban_userid'] )
 			{
 				$in_banlist = true;
 			}
 		}
 
-		if(!$in_banlist)
+		if ( !$in_banlist )
 		{
-			$kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . "session_user_id = $user_list[$i]";
+			$kill_session_sql .= ( ( $kill_session_sql != '' ) ? ' OR ' : '' ) . "session_user_id = " . $user_list[$i];
 
 			$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
 				VALUES (" . $user_list[$i] . ")";
-			if( !$result = $db->sql_query($sql) )
+			if ( !$db->sql_query($sql) )
 			{
 				message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql);
 			}
@@ -199,28 +202,28 @@ if( isset($HTTP_POST_VARS['submit']) )
 		$in_banlist = false;
 		for($j = 0; $j < count($current_banlist); $j++)
 		{
-			if($ip_list[$i] == $current_banlist[$j]['ban_ip'])
+			if ( $ip_list[$i] == $current_banlist[$j]['ban_ip'] )
 			{
 				$in_banlist = true;
 			}
 		}
 
-		if(!$in_banlist)
+		if ( !$in_banlist )
 		{
-			if( preg_match("/(ff\.)|(\.ff)/is", chunk_split($ip_list[$i], 2, ".")) )
+			if ( preg_match('/(ff\.)|(\.ff)/is', chunk_split($ip_list[$i], 2, '.')) )
 			{
-				$kill_ip_sql = "session_ip LIKE '" . str_replace(".", "", preg_replace("/(ff\.)|(\.ff)/is", "%", chunk_split($ip_list[$i], 2, "."))) . "'";
+				$kill_ip_sql = "session_ip LIKE '" . str_replace('.', '', preg_replace('/(ff\.)|(\.ff)/is', '%', chunk_split($ip_list[$i], 2, "."))) . "'";
 			}
 			else
 			{
 				$kill_ip_sql = "session_ip = '" . $ip_list[$i] . "'";
 			}
 
-			$kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . $kill_ip_sql;
+			$kill_session_sql .= ( ( $kill_session_sql != '' ) ? ' OR ' : '' ) . $kill_ip_sql;
 
 			$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
 				VALUES ('" . $ip_list[$i] . "')";
-			if( !$result = $db->sql_query($sql) )
+			if ( !$db->sql_query($sql) )
 			{
 				message_die(GENERAL_ERROR, "Couldn't insert ban_ip info into database", "", __LINE__, __FILE__, $sql);
 			}
@@ -228,18 +231,15 @@ if( isset($HTTP_POST_VARS['submit']) )
 	}
 
 	//
-	// Now we'll delete all entries from the
-	// session table with any of the banned
-	// user or IP info just entered into the
-	// ban table ... this will force a session
-	// initialisation resulting in an instant
-	// ban
+	// Now we'll delete all entries from the session table with any of the banned
+	// user or IP info just entered into the ban table ... this will force a session
+	// initialisation resulting in an instant ban
 	//
-	if( $kill_session_sql != "" )
+	if ( $kill_session_sql != '' )
 	{
 		$sql = "DELETE FROM " . SESSIONS_TABLE . "
 			WHERE $kill_session_sql";
-		if( !$result = $db->sql_query($sql) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, "Couldn't delete banned sessions from database", "", __LINE__, __FILE__, $sql);
 		}
@@ -250,87 +250,75 @@ if( isset($HTTP_POST_VARS['submit']) )
 		$in_banlist = false;
 		for($j = 0; $j < count($current_banlist); $j++)
 		{
-			if( $email_list[$i] == $current_banlist[$j]['ban_email'] )
+			if ( $email_list[$i] == $current_banlist[$j]['ban_email'] )
 			{
 				$in_banlist = true;
 			}
 		}
 
-		if( !$in_banlist )
+		if ( !$in_banlist )
 		{
 			$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
 				VALUES ('" . str_replace("\'", "''", $email_list[$i]) . "')";
-			if( !$result = $db->sql_query($sql) )
+			if ( !$db->sql_query($sql) )
 			{
 				message_die(GENERAL_ERROR, "Couldn't insert ban_email info into database", "", __LINE__, __FILE__, $sql);
 			}
 		}
 	}
 
-	$where_sql = "";
+	$where_sql = '';
 
-	if(isset($HTTP_POST_VARS['unban_user']))
+	if ( isset($HTTP_POST_VARS['unban_user']) )
 	{
 		$user_list = $HTTP_POST_VARS['unban_user'];
 
 		for($i = 0; $i < count($user_list); $i++)
 		{
-			if($user_list[$i] != -1)
+			if ( $user_list[$i] != -1 )
 			{
-				if($where_sql != "")
-				{
-					$where_sql .= ", ";
-				}
-				$where_sql .= $user_list[$i];
+				$where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . $user_list[$i];
 			}
 		}
 	}
 
-	if( isset($HTTP_POST_VARS['unban_ip']) )
+	if ( isset($HTTP_POST_VARS['unban_ip']) )
 	{
 		$ip_list = $HTTP_POST_VARS['unban_ip'];
 
 		for($i = 0; $i < count($ip_list); $i++)
 		{
-			if($ip_list[$i] != -1)
+			if ( $ip_list[$i] != -1 )
 			{
-				if($where_sql != "")
-				{
-					$where_sql .= ", ";
-				}
-				$where_sql .= $ip_list[$i];
+				$where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . $ip_list[$i];
 			}
 		}
 	}
 
-	if( isset($HTTP_POST_VARS['unban_email']) )
+	if ( isset($HTTP_POST_VARS['unban_email']) )
 	{
 		$email_list = $HTTP_POST_VARS['unban_email'];
 
 		for($i = 0; $i < count($email_list); $i++)
 		{
-			if($email_list[$i] != -1)
+			if ( $email_list[$i] != -1 )
 			{
-				if($where_sql != "")
-				{
-					$where_sql .= ", ";
-				}
-				$where_sql .= $email_list[$i];
+				$where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . $email_list[$i];
 			}
 		}
 	}
 
-	if( $where_sql != "" )
+	if ( $where_sql != '' )
 	{
 		$sql = "DELETE FROM " . BANLIST_TABLE . "
 			WHERE ban_id IN ($where_sql)";
-		if( !$result = $db->sql_query($sql) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, "Couldn't delete ban info from database", "", __LINE__, __FILE__, $sql);
 		}
 	}
 
-	$message = $lang['Ban_update_sucessful'] . "<br /><br />" . sprintf($lang['Click_return_banadmin'], "<a href=\"" . append_sid("admin_user_ban.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
+	$message = $lang['Ban_update_sucessful'] . '<br /><br />' . sprintf($lang['Click_return_banadmin'], '<a href="' . append_sid("admin_user_ban.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
 
 	message_die(GENERAL_MESSAGE, $message);
 
@@ -353,37 +341,13 @@ else
 		'S_BANLIST_ACTION' => append_sid("admin_user_ban.$phpEx"))
 	);
 
-	$userban_count = 0;
-
-	$sql = "SELECT user_id, username
-		FROM " . USERS_TABLE . "
-		WHERE user_id <> " . ANONYMOUS . "
-		ORDER BY username ASC";
-	if ( !($result = $db->sql_query($sql)) )
-	{
-		message_die(GENERAL_ERROR, 'Could not select current user_id ban list', '', __LINE__, __FILE__, $sql);
-	}
-
-	$user_list = $db->sql_fetchrowset($result);
-	$db->sql_freeresult($result);
-
-	$select_userlist = '';
-	for($i = 0; $i < count($user_list); $i++)
-	{
-		$select_userlist .= '<option value="' . $user_list[$i]['user_id'] . '">' . $user_list[$i]['username'] . '</option>';
-		$userban_count++;
-	}
-	$select_userlist = '<select name="ban_user[]" multiple="multiple" size="5">' . $select_userlist . '</select>';
-
 	$template->assign_vars(array(
 		'L_BAN_USER' => $lang['Ban_username'],
 		'L_BAN_USER_EXPLAIN' => $lang['Ban_username_explain'],
 		'L_BAN_IP' => $lang['Ban_IP'],
 		'L_BAN_IP_EXPLAIN' => $lang['Ban_IP_explain'],
 		'L_BAN_EMAIL' => $lang['Ban_email'],
-		'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain'],
-
-		'S_BAN_USERLIST_SELECT' => $select_userlist)
+		'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain'])
 	);
 
 	$userban_count = 0;
@@ -468,8 +432,12 @@ else
 		'L_UNBAN_IP' => $lang['Unban_IP'],
 		'L_UNBAN_IP_EXPLAIN' => $lang['Unban_IP_explain'],
 		'L_UNBAN_EMAIL' => $lang['Unban_email'],
-		'L_UNBAN_EMAIL_EXPLAIN' => $lang['Unban_email_explain'],
+		'L_UNBAN_EMAIL_EXPLAIN' => $lang['Unban_email_explain'], 
+		'L_USERNAME' => $lang['Username'], 
+		'L_LOOK_UP' => $lang['Look_up_User'],
+		'L_FIND_USERNAME' => $lang['Find_username'],
 
+		'U_SEARCH_USER' => append_sid("./../search.$phpEx?mode=searchuser"), 
 		'S_UNBAN_USERLIST_SELECT' => $select_userlist,
 		'S_UNBAN_IPLIST_SELECT' => $select_iplist,
 		'S_UNBAN_EMAILLIST_SELECT' => $select_emaillist,
@@ -479,6 +447,6 @@ else
 
 $template->pparse('body');
 
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
 ?>

phpBB/admin/admin_users.php

@@ -30,107 +30,103 @@ if( !empty($setmodules) )
 	return;
 }
 
-//
-// Load default header
-//
-$phpbb_root_dir = "./../";
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
+require($phpbb_root_path . 'includes/bbcode.'.$phpEx);
+require($phpbb_root_path . 'includes/functions_post.'.$phpEx);
+require($phpbb_root_path . 'includes/functions_selects.'.$phpEx);
+require($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
 
-require('pagestart.inc');
-include($phpbb_root_dir . 'includes/bbcode.'.$phpEx);
-include($phpbb_root_dir . 'includes/functions_post.'.$phpEx);
-include($phpbb_root_dir . 'includes/functions_selects.'.$phpEx);
-include($phpbb_root_dir . 'includes/functions_validate.'.$phpEx);
 //
+// Set mode
 //
-//
-if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
+if( isset( $HTTP_POST_VARS['mode'] ) || isset( $HTTP_GET_VARS['mode'] ) )
 {
-	$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
+	$mode = ( isset( $HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
 }
 else
 {
-	$mode = "";
+	$mode = '';
 }
 
 //
 // Begin program
 //
-
-if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL]) ) )
+if( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset( $HTTP_POST_VARS[POST_USERS_URL]) ) )
 {
-
 	//
 	// Ok, the profile has been modified and submitted, let's update
 	//
-	if( ( $mode == "save" && isset($HTTP_POST_VARS['submit']) ) || isset($HTTP_POST_VARS['avatargallery']) || isset($HTTP_POST_VARS['submitavatar']) || isset($HTTP_POST_VARS['cancelavatar']) )
+	if( ( $mode == 'save' && isset( $HTTP_POST_VARS['submit'] ) ) || isset( $HTTP_POST_VARS['avatargallery'] ) || isset( $HTTP_POST_VARS['submitavatar'] ) || isset( $HTTP_POST_VARS['cancelavatar'] ) )
 	{
-		$user_id = intval($HTTP_POST_VARS['id']);
+		$user_id = intval( $HTTP_POST_VARS['id'] );
 
 		$this_userdata = get_userdata($user_id);
 		if( !$this_userdata )
 		{
-			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
+			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
 		}
 
-		$username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
-		$email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : "";
+		$username = ( !empty($HTTP_POST_VARS['username']) ) ? trim(strip_tags( $HTTP_POST_VARS['username'] ) ) : '';
+		$email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['email'] ) )) : '';
 
-		$password = (!empty($HTTP_POST_VARS['password'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['password']))) : "";
-		$password_confirm = (!empty($HTTP_POST_VARS['password_confirm'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['password_confirm']))) : "";
+		$password = ( !empty($HTTP_POST_VARS['password']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['password'] ) )) : '';
+		$password_confirm = ( !empty($HTTP_POST_VARS['password_confirm']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['password_confirm'] ) )) : '';
 
-		$icq = (!empty($HTTP_POST_VARS['icq'])) ? trim(strip_tags($HTTP_POST_VARS['icq'])) : "";
-		$aim = (!empty($HTTP_POST_VARS['aim'])) ? trim(strip_tags($HTTP_POST_VARS['aim'])) : "";
-		$msn = (!empty($HTTP_POST_VARS['msn'])) ? trim(strip_tags($HTTP_POST_VARS['msn'])) : "";
-		$yim = (!empty($HTTP_POST_VARS['yim'])) ? trim(strip_tags($HTTP_POST_VARS['yim'])) : "";
+		$icq = ( !empty($HTTP_POST_VARS['icq']) ) ? trim(strip_tags( $HTTP_POST_VARS['icq'] ) ) : '';
+		$aim = ( !empty($HTTP_POST_VARS['aim']) ) ? trim(strip_tags( $HTTP_POST_VARS['aim'] ) ) : '';
+		$msn = ( !empty($HTTP_POST_VARS['msn']) ) ? trim(strip_tags( $HTTP_POST_VARS['msn'] ) ) : '';
+		$yim = ( !empty($HTTP_POST_VARS['yim']) ) ? trim(strip_tags( $HTTP_POST_VARS['yim'] ) ) : '';
 
-		$website = (!empty($HTTP_POST_VARS['website'])) ? trim(strip_tags($HTTP_POST_VARS['website'])) : "";
-		$location = (!empty($HTTP_POST_VARS['location'])) ? trim(strip_tags($HTTP_POST_VARS['location'])) : "";
-		$occupation = (!empty($HTTP_POST_VARS['occupation'])) ? trim(strip_tags($HTTP_POST_VARS['occupation'])) : "";
-		$interests = (!empty($HTTP_POST_VARS['interests'])) ? trim(strip_tags($HTTP_POST_VARS['interests'])) : "";
-		$signature = (!empty($HTTP_POST_VARS['signature'])) ? trim(str_replace("<br />", "\n", $HTTP_POST_VARS['signature'])) : "";
+		$website = ( !empty($HTTP_POST_VARS['website']) ) ? trim(strip_tags( $HTTP_POST_VARS['website'] ) ) : '';
+		$location = ( !empty($HTTP_POST_VARS['location']) ) ? trim(strip_tags( $HTTP_POST_VARS['location'] ) ) : '';
+		$occupation = ( !empty($HTTP_POST_VARS['occupation']) ) ? trim(strip_tags( $HTTP_POST_VARS['occupation'] ) ) : '';
+		$interests = ( !empty($HTTP_POST_VARS['interests']) ) ? trim(strip_tags( $HTTP_POST_VARS['interests'] ) ) : '';
+		$signature = ( !empty($HTTP_POST_VARS['signature']) ) ? trim(str_replace('<br />', "\n", $HTTP_POST_VARS['signature'] ) ) : '';
 
 		validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
 
-		$viewemail = (isset($HTTP_POST_VARS['viewemail'])) ? ( ($HTTP_POST_VARS['viewemail']) ? TRUE : 0 ) : 0;
-		$allowviewonline = (isset($HTTP_POST_VARS['hideonline'])) ? ( ($HTTP_POST_VARS['hideonline']) ? 0 : TRUE ) : TRUE;
-		$notifyreply = (isset($HTTP_POST_VARS['notifyreply'])) ? ( ($HTTP_POST_VARS['notifyreply']) ? TRUE : 0 ) : 0;
-		$notifypm = (isset($HTTP_POST_VARS['notifypm'])) ? ( ($HTTP_POST_VARS['notifypm']) ? TRUE : 0 ) : TRUE;
-		$popuppm = (isset($HTTP_POST_VARS['popup_pm'])) ? ( ($HTTP_POST_VARS['popup_pm']) ? TRUE : 0 ) : TRUE;
-		$attachsig = (isset($HTTP_POST_VARS['attachsig'])) ? ( ($HTTP_POST_VARS['attachsig']) ? TRUE : 0 ) : 0;
+		$viewemail = ( isset( $HTTP_POST_VARS['viewemail']) ) ? ( ( $HTTP_POST_VARS['viewemail'] ) ? TRUE : 0 ) : 0;
+		$allowviewonline = ( isset( $HTTP_POST_VARS['hideonline']) ) ? ( ( $HTTP_POST_VARS['hideonline'] ) ? 0 : TRUE ) : TRUE;
+		$notifyreply = ( isset( $HTTP_POST_VARS['notifyreply']) ) ? ( ( $HTTP_POST_VARS['notifyreply'] ) ? TRUE : 0 ) : 0;
+		$notifypm = ( isset( $HTTP_POST_VARS['notifypm']) ) ? ( ( $HTTP_POST_VARS['notifypm'] ) ? TRUE : 0 ) : TRUE;
+		$popuppm = ( isset( $HTTP_POST_VARS['popup_pm']) ) ? ( ( $HTTP_POST_VARS['popup_pm'] ) ? TRUE : 0 ) : TRUE;
+		$attachsig = ( isset( $HTTP_POST_VARS['attachsig']) ) ? ( ( $HTTP_POST_VARS['attachsig'] ) ? TRUE : 0 ) : 0;
 
-		$allowhtml = (isset($HTTP_POST_VARS['allowhtml'])) ? intval($HTTP_POST_VARS['allowhtml']) : $board_config['allow_html'];
-		$allowbbcode = (isset($HTTP_POST_VARS['allowbbcode'])) ? intval($HTTP_POST_VARS['allowbbcode']) : $board_config['allow_bbcode'];
-		$allowsmilies = (isset($HTTP_POST_VARS['allowsmilies'])) ? intval($HTTP_POST_VARS['allowsmilies']) : $board_config['allow_smilies'];
+		$allowhtml = ( isset( $HTTP_POST_VARS['allowhtml']) ) ? intval( $HTTP_POST_VARS['allowhtml'] ) : $board_config['allow_html'];
+		$allowbbcode = ( isset( $HTTP_POST_VARS['allowbbcode']) ) ? intval( $HTTP_POST_VARS['allowbbcode'] ) : $board_config['allow_bbcode'];
+		$allowsmilies = ( isset( $HTTP_POST_VARS['allowsmilies']) ) ? intval( $HTTP_POST_VARS['allowsmilies'] ) : $board_config['allow_smilies'];
 
-		$user_style = ($HTTP_POST_VARS['style']) ? intval($HTTP_POST_VARS['style']) : $board_config['default_style'];
-		$user_lang = ($HTTP_POST_VARS['language']) ? $HTTP_POST_VARS['language'] : $board_config['default_lang'];
-		$user_timezone = (isset($HTTP_POST_VARS['timezone'])) ? doubleval($HTTP_POST_VARS['timezone']) : $board_config['board_timezone'];
-		$user_template = ($HTTP_POST_VARS['template']) ? $HTTP_POST_VARS['template'] : $board_config['board_template'];
-		$user_dateformat = ($HTTP_POST_VARS['dateformat']) ? trim($HTTP_POST_VARS['dateformat']) : $board_config['default_dateformat'];
+		$user_style = ( $HTTP_POST_VARS['style'] ) ? intval( $HTTP_POST_VARS['style'] ) : $board_config['default_style'];
+		$user_lang = ( $HTTP_POST_VARS['language'] ) ? $HTTP_POST_VARS['language'] : $board_config['default_lang'];
+		$user_timezone = ( isset( $HTTP_POST_VARS['timezone']) ) ? doubleval( $HTTP_POST_VARS['timezone'] ) : $board_config['board_timezone'];
+		$user_template = ( $HTTP_POST_VARS['template'] ) ? $HTTP_POST_VARS['template'] : $board_config['board_template'];
+		$user_dateformat = ( $HTTP_POST_VARS['dateformat'] ) ? trim( $HTTP_POST_VARS['dateformat'] ) : $board_config['default_dateformat'];
 
-		$user_avatar_local = ( isset($HTTP_POST_VARS['avatarselect']) && !empty($HTTP_POST_VARS['submitavatar']) && $board_config['allow_avatar_local'] ) ? $HTTP_POST_VARS['avatarselect'] : ( ( isset($HTTP_POST_VARS['avatarlocal'])  ) ? $HTTP_POST_VARS['avatarlocal'] : "" );
+		$user_avatar_local = ( isset( $HTTP_POST_VARS['avatarselect'] ) && !empty($HTTP_POST_VARS['submitavatar'] ) && $board_config['allow_avatar_local'] ) ? $HTTP_POST_VARS['avatarselect'] : ( ( isset( $HTTP_POST_VARS['avatarlocal'] )  ) ? $HTTP_POST_VARS['avatarlocal'] : '' );
 
-		$user_avatar_remoteurl = (!empty($HTTP_POST_VARS['avatarremoteurl'])) ? trim($HTTP_POST_VARS['avatarremoteurl']) : "";
-		$user_avatar_url = (!empty($HTTP_POST_VARS['avatarurl'])) ? trim($HTTP_POST_VARS['avatarurl']) : "";
-		$user_avatar_loc = ($HTTP_POST_FILES['avatar']['tmp_name'] != "none") ? $HTTP_POST_FILES['avatar']['tmp_name'] : "";
-		$user_avatar_name = (!empty($HTTP_POST_FILES['avatar']['name'])) ? $HTTP_POST_FILES['avatar']['name'] : "";
-		$user_avatar_size = (!empty($HTTP_POST_FILES['avatar']['size'])) ? $HTTP_POST_FILES['avatar']['size'] : 0;
-		$user_avatar_filetype = (!empty($HTTP_POST_FILES['avatar']['type'])) ? $HTTP_POST_FILES['avatar']['type'] : "";
+		$user_avatar_remoteurl = ( !empty($HTTP_POST_VARS['avatarremoteurl']) ) ? trim( $HTTP_POST_VARS['avatarremoteurl'] ) : '';
+		$user_avatar_url = ( !empty($HTTP_POST_VARS['avatarurl']) ) ? trim( $HTTP_POST_VARS['avatarurl'] ) : '';
+		$user_avatar_loc = ( $HTTP_POST_FILES['avatar']['tmp_name'] != "none") ? $HTTP_POST_FILES['avatar']['tmp_name'] : '';
+		$user_avatar_name = ( !empty($HTTP_POST_FILES['avatar']['name']) ) ? $HTTP_POST_FILES['avatar']['name'] : '';
+		$user_avatar_size = ( !empty($HTTP_POST_FILES['avatar']['size']) ) ? $HTTP_POST_FILES['avatar']['size'] : 0;
+		$user_avatar_filetype = ( !empty($HTTP_POST_FILES['avatar']['type']) ) ? $HTTP_POST_FILES['avatar']['type'] : '';
 
-		$user_avatar = ( empty($user_avatar_loc) ) ? $this_userdata['user_avatar'] : "";
-		$user_avatar_type = ( empty($user_avatar_loc) ) ? $this_userdata['user_avatar_type'] : "";		
+		$user_avatar = ( empty($user_avatar_loc) ) ? $this_userdata['user_avatar'] : '';
+		$user_avatar_type = ( empty($user_avatar_loc) ) ? $this_userdata['user_avatar_type'] : '';		
 
-		$user_status = (!empty($HTTP_POST_VARS['user_status'])) ? intval($HTTP_POST_VARS['user_status']) : 0;
-		$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
-		$user_rank = (!empty($HTTP_POST_VARS['user_rank'])) ? intval($HTTP_POST_VARS['user_rank']) : 0;
-		$user_allowavatar = (!empty($HTTP_POST_VARS['user_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
+		$user_status = ( !empty($HTTP_POST_VARS['user_status']) ) ? intval( $HTTP_POST_VARS['user_status'] ) : 0;
+		$user_allowpm = ( !empty($HTTP_POST_VARS['user_allowpm']) ) ? intval( $HTTP_POST_VARS['user_allowpm'] ) : 0;
+		$user_rank = ( !empty($HTTP_POST_VARS['user_rank']) ) ? intval( $HTTP_POST_VARS['user_rank'] ) : 0;
+		$user_allowavatar = ( !empty($HTTP_POST_VARS['user_allowavatar']) ) ? intval( $HTTP_POST_VARS['user_allowavatar'] ) : 0;
 
-		if( isset($HTTP_POST_VARS['avatargallery']) || isset($HTTP_POST_VARS['submitavatar']) || isset($HTTP_POST_VARS['cancelavatar']) )
+		if( isset( $HTTP_POST_VARS['avatargallery'] ) || isset( $HTTP_POST_VARS['submitavatar'] ) || isset( $HTTP_POST_VARS['cancelavatar'] ) )
 		{
 			$username = stripslashes($username);
 			$email = stripslashes($email);
-			$password = "";
-			$password_confirm = "";
+			$password = '';
+			$password_confirm = '';
 
 			$icq = stripslashes($icq);
 			$aim = stripslashes($aim);
@@ -145,24 +141,30 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 
 			$user_lang = stripslashes($user_lang);
 			$user_dateformat = stripslashes($user_dateformat);
+
+			if ( !isset($HTTP_POST_VARS['cancelavatar'])) 
+			{
+				$user_avatar = $user_avatar_local;
+				$user_avatar_type = USER_AVATAR_GALLERY;
+			}
 		}
 	}
 
-	if( isset($HTTP_POST_VARS['submit']) )
+	if( isset( $HTTP_POST_VARS['submit'] ) )
 	{
+		include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx);
+
 		$error = FALSE;
 
 		if( stripslashes($username) != $this_userdata['username'] )
 		{
 			unset($rename_user);
-			if( !validate_username($username) )
+
+			$result = validate_username($username);
+			if ( $result['error'] )
 			{
 				$error = TRUE;
-				if( isset($error_msg) )
-				{
-					$error_msg .= "<br />";
-				}
-				$error_msg .= $lang['Invalid_username'];
+				$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $result['error_msg'];
 			}
 			else
 			{
@@ -180,11 +182,7 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 			if($password != $password_confirm)
 			{
 				$error = TRUE;
-				if( isset($error_msg) )
-				{
-					$error_msg .= "<br />";
-				}
-				$error_msg .= $lang['Password_mismatch'];
+				$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
 			}
 			else
 			{
@@ -195,57 +193,33 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 		else if( $password && !$password_confirm )
 		{
 			$error = TRUE;
-			if( isset($error_msg) )
-			{
-				$error_msg .= "<br />";
-			}
-			$error_msg .= $lang['Password_mismatch'];
+			$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
 		}
 		else if( !$password && $password_confirm )
 		{
 			$error = TRUE;
-			if( isset($error_msg) )
-			{
-				$error_msg .= "<br />";
-			}
-			$error_msg .= $lang['Password_mismatch'];
-		}
-
-		if( $user_status == 0 )
-		{
-			// User is (made) inactive. Delete all their sessions.
-			$sql = "DELETE FROM " . SESSIONS_TABLE . " 
-				WHERE session_user_id = $user_id";
-			if( !$db->sql_query($sql) )
-			{
-				message_die(GENERAL_ERROR, "Couldn't delete this user's sessions", "", __LINE__, __FILE__, $sql);
-			}
+			$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
 		}
 
 		if( $signature != "" )
 		{
-			$sig_length_check = preg_replace("/(\[.*?)(=.*?)\]/is", "\\1]", stripslashes($signature));
+			$sig_length_check = preg_replace('/(\[.*?)(=.*?)\]/is', '\\1]', stripslashes($signature));
 			if ( $allowhtml )
 			{
-				$sig_length_check = preg_replace("/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is", "\\1\\3\\4", $sig_length_check);
+				$sig_length_check = preg_replace('/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is', '\\1\\3\\4', $sig_length_check);
 			}
-			$sig_length_check = preg_replace("/(\[.*?)(=.*?)\]/is", "\\1]", stripslashes($signature));
 
 			// Only create a new bbcode_uid when there was no uid yet.
 			if ( $signature_bbcode_uid == '' )
 			{
-				$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
+				$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : '';
 			}
 			$signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
 
 			if ( strlen($sig_length_check) > $board_config['max_sig_chars'] )
 			{ 
 				$error = TRUE;
-				if ( isset($error_msg) )
-				{
-					$error_msg .= "<br />";
-				}
-				$error_msg .= $lang['Signature_too_long'];
+				$error_msg .=  ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Signature_too_long'];
 			}
 		}
 
@@ -515,7 +489,7 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 		{
 			$avatar_sql = ", user_avatar = '" . str_replace("\'", "''", $user_avatar_local) . "', user_avatar_type = " . USER_AVATAR_GALLERY;
 		}
-
+	
 		//
 		// Update entry in DB
 		//
@@ -530,60 +504,168 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 						AND g.group_single_user = 1";
 				if( !($result = $db->sql_query($sql)) )
 				{
-					message_die(GENERAL_ERROR, "Couldn't obtain group information for this user", "", __LINE__, __FILE__, $sql);
+					message_die(GENERAL_ERROR, 'Could not obtain group information for this user', '', __LINE__, __FILE__, $sql);
 				}
 
 				$row = $db->sql_fetchrow($result);
 				
 				$sql = "UPDATE " . POSTS_TABLE . "
-					SET poster_id = " . ANONYMOUS . ", post_username = '$username' 
+					SET poster_id = " . DELETED . ", post_username = '$username' 
 					WHERE poster_id = $user_id";
 				if( !$db->sql_query($sql) )
 				{
-					message_die(GENERAL_ERROR, "Couldn't update posts for this user", "", __LINE__, __FILE__, $sql);
+					message_die(GENERAL_ERROR, 'Could not update posts for this user', '', __LINE__, __FILE__, $sql);
 				}
 
 				$sql = "UPDATE " . TOPICS_TABLE . "
-					SET topic_poster = " . ANONYMOUS . " 
+					SET topic_poster = " . DELETED . " 
 					WHERE topic_poster = $user_id";
 				if( !$db->sql_query($sql) )
 				{
-					message_die(GENERAL_ERROR, "Couldn't update topics for this user", "", __LINE__, __FILE__, $sql);
+					message_die(GENERAL_ERROR, 'Could not update topics for this user', '', __LINE__, __FILE__, $sql);
+				}
+				
+				$sql = "UPDATE " . VOTE_USERS_TABLE . "
+					SET vote_user_id = " . DELETED . "
+					WHERE vote_user_id = $user_id";
+				if( !$db->sql_query($sql) )
+				{
+					message_die(GENERAL_ERROR, 'Could not update votes for this user', '', __LINE__, __FILE__, $sql);
+				}
+				
+				$sql = "SELECT group_id
+					FROM " . GROUPS_TABLE . "
+					WHERE group_moderator = $user_id";
+				if( !($result = $db->sql_query($sql)) )
+				{
+					message_die(GENERAL_ERROR, 'Could not select groups where user was moderator', '', __LINE__, __FILE__, $sql);
+				}
+				
+				while ( $row_group = $db->sql_fetchrow($result) )
+				{
+					$group_moderator[] = $row_group['group_id'];
+				}
+				
+				if ( count($group_moderator) )
+				{
+					$update_moderator_id = implode(', ', $group_moderator);
+					
+					$sql = "UPDATE " . GROUPS_TABLE . "
+						SET group_moderator = " . $userdata['user_id'] . "
+						WHERE group_moderator IN ($update_moderator_id)";
+					if( !$db->sql_query($sql) )
+					{
+						message_die(GENERAL_ERROR, 'Could not update group moderators', '', __LINE__, __FILE__, $sql);
+					}
 				}
 
 				$sql = "DELETE FROM " . USERS_TABLE . "
 					WHERE user_id = $user_id";
 				if( !$db->sql_query($sql) )
 				{
-					message_die(GENERAL_ERROR, "Couldn't delete user", "", __LINE__, __FILE__, $sql);
+					message_die(GENERAL_ERROR, 'Could not delete user', '', __LINE__, __FILE__, $sql);
 				}
 
 				$sql = "DELETE FROM " . USER_GROUP_TABLE . "
 					WHERE user_id = $user_id";
 				if( !$db->sql_query($sql) )
 				{
-					message_die(GENERAL_ERROR, "Couldn't delete user from user_group table", "", __LINE__, __FILE__, $sql);
+					message_die(GENERAL_ERROR, 'Could not delete user from user_group table', '', __LINE__, __FILE__, $sql);
 				}
 
 				$sql = "DELETE FROM " . GROUPS_TABLE . "
 					WHERE group_id = " . $row['group_id'];
 				if( !$db->sql_query($sql) )
 				{
-					message_die(GENERAL_ERROR, "Couldn't delete group for this user", "", __LINE__, __FILE__, $sql);
+					message_die(GENERAL_ERROR, 'Could not delete group for this user', '', __LINE__, __FILE__, $sql);
 				}
 
 				$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
 					WHERE group_id = " . $row['group_id'];
 				if( !$db->sql_query($sql) )
 				{
-					message_die(GENERAL_ERROR, "Couldn't delete group for this user", "", __LINE__, __FILE__, $sql);
+					message_die(GENERAL_ERROR, 'Could not delete group for this user', '', __LINE__, __FILE__, $sql);
 				}
 
 				$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
 					WHERE user_id = $user_id";
 				if ( !$db->sql_query($sql) )
 				{
-					message_die(GENERAL_ERROR, "Couldn't delete user from topic watch table", "", __LINE__, __FILE__, $sql);
+					message_die(GENERAL_ERROR, 'Could not delete user from topic watch table', '', __LINE__, __FILE__, $sql);
+				}
+
+				$sql = "SELECT privmsgs_id
+					FROM " . PRIVMSGS_TABLE . "
+					WHERE ( ( privmsgs_from_userid = $user_id 
+							AND privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )
+						OR ( privmsgs_from_userid = $user_id
+							AND privmsgs_type = " . PRIVMSGS_SENT_MAIL . " )
+						OR ( privmsgs_to_userid = $user_id
+							AND privmsgs_type = " . PRIVMSGS_READ_MAIL . " )
+						OR ( privmsgs_to_userid = $user_id
+							AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " )
+						OR ( privmsgs_from_userid = $user_id
+							AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " ) )";
+				if ( !($result = $db->sql_query($sql)) )
+				{
+					message_die(GENERAL_ERROR, 'Could not select all user\'s private messages', '', __LINE__, __FILE__, $sql);
+				}
+				
+				//
+				// This little bit of code directly from the private messaging section.
+				// Thanks Paul!
+				//
+				
+				while ( $row_privmsgs = $db->sql_fetchrow($result) )
+				{
+					$mark_list[] = $row_privmsgs['privmsgs_id'];
+				}
+				
+				if ( count($mark_list) )
+				{
+					$delete_sql_id = implode(', ', $mark_list);
+					
+					//
+					// We shouldn't need to worry about updating conters here...
+					// They are already gone!
+					//
+					
+					$delete_text_sql = "DELETE FROM " . PRIVMSGS_TEXT_TABLE . "
+						WHERE privmsgs_text_id IN ($delete_sql_id)";
+					$delete_sql = "DELETE FROM " . PRIVMSGS_TABLE . "
+						WHERE privmsgs_id IN ($delete_sql_id)";
+					
+					//
+					// Shouldn't need the switch statement here, either, as we just want
+					// to take out all of the private messages.  This will not affect
+					// the other messages we want to keep; the ids are unique.
+					//
+					
+					if ( !$db->sql_query($delete_sql) )
+					{
+						message_die(GENERAL_ERROR, 'Could not delete private message info', '', __LINE__, __FILE__, $delete_sql);
+					}
+					
+					if ( !$db->sql_query($delete_text_sql) )
+					{
+						message_die(GENERAL_ERROR, 'Could not delete private message text', '', __LINE__, __FILE__, $delete_text_sql);
+					}
+				}
+				
+				$sql = "UPDATE " . PRIVMSGS_TABLE . "
+					SET privmsgs_to_userid = " . DELETED . "
+					WHERE privmsgs_to_userid = $user_id";
+				if ( !$db->sql_query($sql) )
+				{
+					message_die(GENERAL_ERROR, 'Could not update private messages saved to the user', '', __LINE__, __FILE__, $sql);
+				}
+				
+				$sql = "UPDATE " . PRIVMSGS_TABLE . "
+					SET privmsgs_from_userid = " . DELETED . "
+					WHERE privmsgs_from_userid = $user_id";
+				if ( !$db->sql_query($sql) )
+				{
+					message_die(GENERAL_ERROR, 'Could not update private messages saved from the user', '', __LINE__, __FILE__, $sql);
 				}
 
 				$message = $lang['User_deleted'];
@@ -600,10 +682,10 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 					{
 						$sql = "UPDATE " . GROUPS_TABLE . "
 							SET group_name = '".str_replace("\'", "''", $rename_user)."'
-							WHERE group_name = '".str_replace("\'", "''", $this_userdata['username'])."'";
+							WHERE group_name = '".str_replace("\'", "''", $this_userdata['username'] )."'";
 						if( !$result = $db->sql_query($sql) )
 						{
-							message_die(GENERAL_ERROR, "Couldn't rename user's group.", "", __LINE__, __FILE__, $sql);
+							message_die(GENERAL_ERROR, 'Could not rename users group', '', __LINE__, __FILE__, $sql);
 						}
 					}
 					$message .= $lang['Admin_user_updated'];
@@ -611,11 +693,7 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 				else
 				{
 					$error = TRUE;
-					if( isset($error_msg) )
-					{
-						$error_msg .= "<br />";
-					}
-					$error_msg .= $lang['Admin_user_fail'];
+					$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Admin_user_fail'];
 				}
 			}
 
@@ -626,20 +704,22 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 		else
 		{
 			$template->set_filenames(array(
-				"reg_header" => "error_body.tpl")
+				'reg_header' => 'error_body.tpl')
 			);
+
 			$template->assign_vars(array(
-				"ERROR_MESSAGE" => $error_msg)
+				'ERROR_MESSAGE' => $error_msg)
 			);
-			$template->assign_var_from_handle("ERROR_BOX", "reg_header");
+
+			$template->assign_var_from_handle('ERROR_BOX', 'reg_header');
 
 			$username = stripslashes($username);
 			$email = stripslashes($email);
-			$password = "";
-			$password_confirm = "";
+			$password = '';
+			$password_confirm = '';
 
 			$icq = stripslashes($icq);
-			$aim = stripslashes($aim);
+			$aim = str_replace('+', ' ', stripslashes($aim));
 			$msn = stripslashes($msn);
 			$yim = stripslashes($yim);
 
@@ -653,23 +733,23 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 			$user_dateformat = stripslashes($user_dateformat);
 		}
 	}
-	else if( !isset($HTTP_POST_VARS['submit']) && $mode != "save" && !isset($HTTP_POST_VARS['avatargallery']) && !isset($HTTP_POST_VARS['submitavatar']) && !isset($HTTP_POST_VARS['cancelavatar']))
+	else if( !isset( $HTTP_POST_VARS['submit'] ) && $mode != 'save' && !isset( $HTTP_POST_VARS['avatargallery'] ) && !isset( $HTTP_POST_VARS['submitavatar'] ) && !isset( $HTTP_POST_VARS['cancelavatar'] ) )
 	{
-		if( isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL]) )
+		if( isset( $HTTP_GET_VARS[POST_USERS_URL]) || isset( $HTTP_POST_VARS[POST_USERS_URL]) )
 		{
-			$user_id = ( isset($HTTP_POST_VARS[POST_USERS_URL]) ) ? intval($HTTP_POST_VARS[POST_USERS_URL]) : intval($HTTP_GET_VARS[POST_USERS_URL]);
+			$user_id = ( isset( $HTTP_POST_VARS[POST_USERS_URL]) ) ? intval( $HTTP_POST_VARS[POST_USERS_URL]) : intval( $HTTP_GET_VARS[POST_USERS_URL]);
 			$this_userdata = get_userdata($user_id);
 			if( !$this_userdata )
 			{
-				message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
+				message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
 			}
 		}
 		else
 		{
-			$this_userdata = get_userdata($HTTP_POST_VARS['username']);
+			$this_userdata = get_userdata( $HTTP_POST_VARS['username'] );
 			if( !$this_userdata )
 			{
-				message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
+				message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
 			}
 		}
 
@@ -679,11 +759,11 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 		$user_id = $this_userdata['user_id'];
 		$username = $this_userdata['username'];
 		$email = $this_userdata['user_email'];
-		$password = "";
-		$password_confirm = "";
+		$password = '';
+		$password_confirm = '';
 
 		$icq = $this_userdata['user_icq'];
-		$aim = $this_userdata['user_aim'];
+		$aim = str_replace('+', ' ', $this_userdata['user_aim'] );
 		$msn = $this_userdata['user_msnm'];
 		$yim = $this_userdata['user_yim'];
 
@@ -695,8 +775,8 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 
 		$viewemail = $this_userdata['user_viewemail'];
 		$notifypm = $this_userdata['user_notify_pm'];
-		$popuppm = $userdata['user_popup_pm'];
-		$notifyreply = $userdata['user_notify'];
+		$popuppm = $this_userdata['user_popup_pm'];
+		$notifyreply = $this_userdata['user_notify'];
 		$attachsig = $this_userdata['user_attachsig'];
 		$allowhtml = $this_userdata['user_allowhtml'];
 		$allowbbcode = $this_userdata['user_allowbbcode'];
@@ -716,12 +796,12 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 		
 		$COPPA = false;
 
-		$html_status =  ($this_userdata['user_allowhtml']) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF'];
-		$bbcode_status = ($this_userdata['user_allowbbcode']) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF'];
-		$smilies_status = ($this_userdata['user_allowsmile']) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF'];
+		$html_status =  ($this_userdata['user_allowhtml'] ) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF'];
+		$bbcode_status = ($this_userdata['user_allowbbcode'] ) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF'];
+		$smilies_status = ($this_userdata['user_allowsmile'] ) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF'];
 	}
 
-	if( isset($HTTP_POST_VARS['avatargallery']) )
+	if( isset($HTTP_POST_VARS['avatargallery']) && !$error )
 	{
 		if( !$error )
 		{
@@ -854,7 +934,6 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 	}
 	else
 	{
-
 		$s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />';
 		$s_hidden_fields .= '<input type="hidden" name="id" value="' . $this_userdata['user_id'] . '" />';
 
@@ -888,7 +967,7 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 			ORDER BY rank_title";
 		if ( !($result = $db->sql_query($sql)) )
 		{
-			message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql);
+			message_die(GENERAL_ERROR, 'Could not obtain ranks data', '', __LINE__, __FILE__, $sql);
 		}
 
 		$rank_select_box = '<option value="0">' . $lang['No_assigned_rank'] . '</option>';
@@ -901,7 +980,7 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 			$rank_select_box .= '<option value="' . $rank_id . '"' . $selected . '>' . $rank . '</option>';
 		}
 
-		$signature = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $signature);
+		$signature = preg_replace('/\:[0-9a-z\:]*?\]/si', ']', $signature);
 		
 		$template->set_filenames(array(
 			"body" => "admin/user_edit_body.tpl")
@@ -911,191 +990,171 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
 		// Let's do an overall check for settings/versions which would prevent
 		// us from doing file uploads....
 		//
-		if(phpversion() >= '4.0.0')
-		{
-			$file_uploads = ini_get('file_uploads');
-		}
-		else
-		{
-			$file_uploads = get_cfg_var('file_uploads');
-		}
-		if( ($file_uploads == 0 && !empty($file_uploads)) || (strtolower($file_uploads) == 'off') || (phpversion() == '4.0.4pl1') ||  (!$board_config['allow_avatar_upload']) )
-		{
-			$form_enctype = '';
-		}
-		else
-		{
-			$form_enctype = 'enctype="multipart/form-data"';
-		}
+		$ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
+		$form_enctype = ( !@$ini_val('file_uploads') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && @$ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"';
+
 		$template->assign_vars(array(
-			"USERNAME" => $username,
-			"EMAIL" => $email,
-			"YIM" => $yim,
-			"ICQ" => $icq,
-			"MSN" => $msn,
-			"AIM" => $aim,
-			"OCCUPATION" => $occupation,
-			"INTERESTS" => $interests,
-			"LOCATION" => $location,
-			"WEBSITE" => $website,
-			"SIGNATURE" => str_replace("<br />", "\n", $signature),
-			"VIEW_EMAIL_YES" => ($viewemail) ? 'checked="checked"' : '',
-			"VIEW_EMAIL_NO" => (!$viewemail) ? 'checked="checked"' : '',
-			"HIDE_USER_YES" => (!$allowviewonline) ? 'checked="checked"' : '',
-			"HIDE_USER_NO" => ($allowviewonline) ? 'checked="checked"' : '',
-			"NOTIFY_PM_YES" => ($notifypm) ? 'checked="checked"' : '',
-			"NOTIFY_PM_NO" => (!$notifypm) ? 'checked="checked"' : '',
-			"POPUP_PM_YES" => ($popuppm) ? 'checked="checked"' : '',
-			"POPUP_PM_NO" => (!$popuppm) ? 'checked="checked"' : '',
-			"ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? 'checked="checked"' : '',
-			"ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? 'checked="checked"' : '',
-			"NOTIFY_REPLY_YES" => ($notifyreply) ? 'checked="checked"' : '',
-			"NOTIFY_REPLY_NO" => (!$notifyreply) ? 'checked="checked"' : '',
-			"ALWAYS_ALLOW_BBCODE_YES" => ($allowbbcode) ? 'checked="checked"' : '',
-			"ALWAYS_ALLOW_BBCODE_NO" => (!$allowbbcode) ? 'checked="checked"' : '',
-			"ALWAYS_ALLOW_HTML_YES" => ($allowhtml) ? 'checked="checked"' : '',
-			"ALWAYS_ALLOW_HTML_NO" => (!$allowhtml) ? 'checked="checked"' : '',
-			"ALWAYS_ALLOW_SMILIES_YES" => ($allowsmilies) ? 'checked="checked"' : '',
-			"ALWAYS_ALLOW_SMILIES_NO" => (!$allowsmilies) ? 'checked="checked"' : '',
-			"AVATAR" => $avatar,
-			"LANGUAGE_SELECT" => language_select($user_lang, 'language', '../language'),
-			"TIMEZONE_SELECT" => tz_select($user_timezone),
-			"STYLE_SELECT" => style_select($user_style, 'style'),
-			"DATE_FORMAT" => $user_dateformat,
-			"ALLOW_PM_YES" => ($user_allowpm) ? 'checked="checked"' : '',
-			"ALLOW_PM_NO" => (!$user_allowpm) ? 'checked="checked"' : '',
-			"ALLOW_AVATAR_YES" => ($user_allowavatar) ? 'checked="checked"' : '',
-			"ALLOW_AVATAR_NO" => (!$user_allowavatar) ? 'checked="checked"' : '',
-			"USER_ACTIVE_YES" => ($user_status) ? 'checked="checked"' : '',
-			"USER_ACTIVE_NO" => (!$user_status) ? 'checked="checked"' : '', 
-			"RANK_SELECT_BOX" => $rank_select_box,
+			'USERNAME' => $username,
+			'EMAIL' => $email,
+			'YIM' => $yim,
+			'ICQ' => $icq,
+			'MSN' => $msn,
+			'AIM' => $aim,
+			'OCCUPATION' => $occupation,
+			'INTERESTS' => $interests,
+			'LOCATION' => $location,
+			'WEBSITE' => $website,
+			'SIGNATURE' => str_replace('<br />', "\n", $signature),
+			'VIEW_EMAIL_YES' => ($viewemail) ? 'checked="checked"' : '',
+			'VIEW_EMAIL_NO' => (!$viewemail) ? 'checked="checked"' : '',
+			'HIDE_USER_YES' => (!$allowviewonline) ? 'checked="checked"' : '',
+			'HIDE_USER_NO' => ($allowviewonline) ? 'checked="checked"' : '',
+			'NOTIFY_PM_YES' => ($notifypm) ? 'checked="checked"' : '',
+			'NOTIFY_PM_NO' => (!$notifypm) ? 'checked="checked"' : '',
+			'POPUP_PM_YES' => ($popuppm) ? 'checked="checked"' : '',
+			'POPUP_PM_NO' => (!$popuppm) ? 'checked="checked"' : '',
+			'ALWAYS_ADD_SIGNATURE_YES' => ($attachsig) ? 'checked="checked"' : '',
+			'ALWAYS_ADD_SIGNATURE_NO' => (!$attachsig) ? 'checked="checked"' : '',
+			'NOTIFY_REPLY_YES' => ( $notifyreply ) ? 'checked="checked"' : '',
+			'NOTIFY_REPLY_NO' => ( !$notifyreply ) ? 'checked="checked"' : '',
+			'ALWAYS_ALLOW_BBCODE_YES' => ($allowbbcode) ? 'checked="checked"' : '',
+			'ALWAYS_ALLOW_BBCODE_NO' => (!$allowbbcode) ? 'checked="checked"' : '',
+			'ALWAYS_ALLOW_HTML_YES' => ($allowhtml) ? 'checked="checked"' : '',
+			'ALWAYS_ALLOW_HTML_NO' => (!$allowhtml) ? 'checked="checked"' : '',
+			'ALWAYS_ALLOW_SMILIES_YES' => ($allowsmilies) ? 'checked="checked"' : '',
+			'ALWAYS_ALLOW_SMILIES_NO' => (!$allowsmilies) ? 'checked="checked"' : '',
+			'AVATAR' => $avatar,
+			'LANGUAGE_SELECT' => language_select($user_lang, 'language', '../language'),
+			'TIMEZONE_SELECT' => tz_select($user_timezone),
+			'STYLE_SELECT' => style_select($user_style, 'style'),
+			'DATE_FORMAT' => $user_dateformat,
+			'ALLOW_PM_YES' => ($user_allowpm) ? 'checked="checked"' : '',
+			'ALLOW_PM_NO' => (!$user_allowpm) ? 'checked="checked"' : '',
+			'ALLOW_AVATAR_YES' => ($user_allowavatar) ? 'checked="checked"' : '',
+			'ALLOW_AVATAR_NO' => (!$user_allowavatar) ? 'checked="checked"' : '',
+			'USER_ACTIVE_YES' => ($user_status) ? 'checked="checked"' : '',
+			'USER_ACTIVE_NO' => (!$user_status) ? 'checked="checked"' : '', 
+			'RANK_SELECT_BOX' => $rank_select_box,
 
-			"L_USER_TITLE" => $lang['User_admin'],
-			"L_USER_EXPLAIN" => $lang['User_admin_explain'],
-			"L_PASSWORD_IF_CHANGED" => $lang['password_if_changed'],
-			"L_PASSWORD_CONFIRM_IF_CHANGED" => $lang['password_confirm_if_changed'],
-			"L_SUBMIT" => $lang['Submit'],
-			"L_RESET" => $lang['Reset'],
-			"L_ICQ_NUMBER" => $lang['ICQ'],
-			"L_MESSENGER" => $lang['MSNM'],
-			"L_YAHOO" => $lang['YIM'],
-			"L_WEBSITE" => $lang['Website'],
-			"L_AIM" => $lang['AIM'],
-			"L_LOCATION" => $lang['From'],
-			"L_OCCUPATION" => $lang['Occupation'],
-			"L_BOARD_LANGUAGE" => $lang['Board_lang'],
-			"L_BOARD_STYLE" => $lang['Board_style'],
-			"L_TIMEZONE" => $lang['Timezone'],
-			"L_DATE_FORMAT" => $lang['Date_format'],
-			"L_DATE_FORMAT_EXPLAIN" => $lang['Date_format_explain'],
-			"L_YES" => $lang['Yes'],
-			"L_NO" => $lang['No'],
-			"L_INTERESTS" => $lang['Interests'],
-			"L_ALWAYS_ALLOW_SMILIES" => $lang['Always_smile'],
-			"L_ALWAYS_ALLOW_BBCODE" => $lang['Always_bbcode'],
-			"L_ALWAYS_ALLOW_HTML" => $lang['Always_html'],
-			"L_HIDE_USER" => $lang['Hide_user'],
-			"L_ALWAYS_ADD_SIGNATURE" => $lang['Always_add_sig'],
+			'L_USERNAME' => $lang['Username'],
+			'L_USER_TITLE' => $lang['User_admin'],
+			'L_USER_EXPLAIN' => $lang['User_admin_explain'],
+			'L_NEW_PASSWORD' => $lang['New_password'], 
+			'L_PASSWORD_IF_CHANGED' => $lang['password_if_changed'],
+			'L_CONFIRM_PASSWORD' => $lang['Confirm_password'],
+			'L_PASSWORD_CONFIRM_IF_CHANGED' => $lang['password_confirm_if_changed'],
+			'L_SUBMIT' => $lang['Submit'],
+			'L_RESET' => $lang['Reset'],
+			'L_ICQ_NUMBER' => $lang['ICQ'],
+			'L_MESSENGER' => $lang['MSNM'],
+			'L_YAHOO' => $lang['YIM'],
+			'L_WEBSITE' => $lang['Website'],
+			'L_AIM' => $lang['AIM'],
+			'L_LOCATION' => $lang['Location'],
+			'L_OCCUPATION' => $lang['Occupation'],
+			'L_BOARD_LANGUAGE' => $lang['Board_lang'],
+			'L_BOARD_STYLE' => $lang['Board_style'],
+			'L_TIMEZONE' => $lang['Timezone'],
+			'L_DATE_FORMAT' => $lang['Date_format'],
+			'L_DATE_FORMAT_EXPLAIN' => $lang['Date_format_explain'],
+			'L_YES' => $lang['Yes'],
+			'L_NO' => $lang['No'],
+			'L_INTERESTS' => $lang['Interests'],
+			'L_ALWAYS_ALLOW_SMILIES' => $lang['Always_smile'],
+			'L_ALWAYS_ALLOW_BBCODE' => $lang['Always_bbcode'],
+			'L_ALWAYS_ALLOW_HTML' => $lang['Always_html'],
+			'L_HIDE_USER' => $lang['Hide_user'],
+			'L_ALWAYS_ADD_SIGNATURE' => $lang['Always_add_sig'],
 			
-			"L_SPECIAL" => $lang['User_special'],
-			"L_SPECIAL_EXPLAIN" => $lang['User_specail_explain'],
-			"L_USER_ACTIVE" => $lang['User_status'],
-			"L_ALLOW_PM" => $lang['User_allowpm'],
-			"L_ALLOW_AVATAR" => $lang['User_allowavatar'],
+			'L_SPECIAL' => $lang['User_special'],
+			'L_SPECIAL_EXPLAIN' => $lang['User_special_explain'],
+			'L_USER_ACTIVE' => $lang['User_status'],
+			'L_ALLOW_PM' => $lang['User_allowpm'],
+			'L_ALLOW_AVATAR' => $lang['User_allowavatar'],
 			
-			"L_AVATAR_PANEL" => $lang['Avatar_panel'],
-			"L_AVATAR_EXPLAIN" => $lang['Admin_avatar_explain'],
-			"L_DELETE_AVATAR" => $lang['Delete_Image'],
-			"L_CURRENT_IMAGE" => $lang['Current_Image'],
-			"L_UPLOAD_AVATAR_FILE" => $lang['Upload_Avatar_file'],
-			"L_UPLOAD_AVATAR_URL" => $lang['Upload_Avatar_URL'],
-			"L_AVATAR_GALLERY" => $lang['Select_from_gallery'],
-			"L_SHOW_GALLERY" => $lang['View_avatar_gallery'],
-			"L_LINK_REMOTE_AVATAR" => $lang['Link_remote_Avatar'],
+			'L_AVATAR_PANEL' => $lang['Avatar_panel'],
+			'L_AVATAR_EXPLAIN' => $lang['Admin_avatar_explain'],
+			'L_DELETE_AVATAR' => $lang['Delete_Image'],
+			'L_CURRENT_IMAGE' => $lang['Current_Image'],
+			'L_UPLOAD_AVATAR_FILE' => $lang['Upload_Avatar_file'],
+			'L_UPLOAD_AVATAR_URL' => $lang['Upload_Avatar_URL'],
+			'L_AVATAR_GALLERY' => $lang['Select_from_gallery'],
+			'L_SHOW_GALLERY' => $lang['View_avatar_gallery'],
+			'L_LINK_REMOTE_AVATAR' => $lang['Link_remote_Avatar'],
 
-			"L_SIGNATURE" => $lang['Signature'],
-			"L_SIGNATURE_EXPLAIN" => sprintf($lang['Signature_explain'], $board_config['max_sig_chars']),
-			"L_NOTIFY_ON_PRIVMSG" => $lang['Notify_on_privmsg'],
-			"L_NOTIFY_ON_REPLY" => $lang['Always_notify'],
-			"L_POPUP_ON_PRIVMSG" => $lang['Popup_on_privmsg'],
-			"L_PREFERENCES" => $lang['Preferences'],
-			"L_PUBLIC_VIEW_EMAIL" => $lang['Public_view_email'],
-			"L_ITEMS_REQUIRED" => $lang['Items_required'],
-			"L_REGISTRATION_INFO" => $lang['Registration_info'],
-			"L_PROFILE_INFO" => $lang['Profile_info'],
-			"L_PROFILE_INFO_NOTICE" => $lang['Profile_info_warn'],
-			"L_CONFIRM" => $lang['Confirm'],
-			"L_EMAIL_ADDRESS" => $lang['Email_address'],
-			"S_FORM_ENCTYPE" => $form_enctype,
+			'L_SIGNATURE' => $lang['Signature'],
+			'L_SIGNATURE_EXPLAIN' => sprintf($lang['Signature_explain'], $board_config['max_sig_chars'] ),
+			'L_NOTIFY_ON_PRIVMSG' => $lang['Notify_on_privmsg'],
+			'L_NOTIFY_ON_REPLY' => $lang['Always_notify'],
+			'L_POPUP_ON_PRIVMSG' => $lang['Popup_on_privmsg'],
+			'L_PREFERENCES' => $lang['Preferences'],
+			'L_PUBLIC_VIEW_EMAIL' => $lang['Public_view_email'],
+			'L_ITEMS_REQUIRED' => $lang['Items_required'],
+			'L_REGISTRATION_INFO' => $lang['Registration_info'],
+			'L_PROFILE_INFO' => $lang['Profile_info'],
+			'L_PROFILE_INFO_NOTICE' => $lang['Profile_info_warn'],
+			'L_EMAIL_ADDRESS' => $lang['Email_address'],
+			'S_FORM_ENCTYPE' => $form_enctype,
 
-			"HTML_STATUS" => $html_status,
-			"BBCODE_STATUS" => sprintf($bbcode_status, '<a href="../' . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 
-			"SMILIES_STATUS" => $smilies_status,
+			'HTML_STATUS' => $html_status,
+			'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="../' . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 
+			'SMILIES_STATUS' => $smilies_status,
 
-			"L_DELETE_USER" => $lang['User_delete'],
-			"L_DELETE_USER_EXPLAIN" => $lang['User_delete_explain'],
-			"L_SELECT_RANK" => $lang['Rank_title'],
+			'L_DELETE_USER' => $lang['User_delete'],
+			'L_DELETE_USER_EXPLAIN' => $lang['User_delete_explain'],
+			'L_SELECT_RANK' => $lang['Rank_title'],
 
-			"S_HIDDEN_FIELDS" => $s_hidden_fields,
-			"S_PROFILE_ACTION" => append_sid("admin_users.$phpEx"))
+			'S_HIDDEN_FIELDS' => $s_hidden_fields,
+			'S_PROFILE_ACTION' => append_sid("admin_users.$phpEx"))
 		);
 
-		if( file_exists("./../" . $board_config['avatar_path']) )
+		if( file_exists('./../' . $board_config['avatar_path'] ) && ($board_config['allow_avatar_upload'] == TRUE) )
 		{
-			$template->assign_block_vars("avatarupload", array() );
-			if($form_enctype != '')
+			if ( $form_enctype != '' )
 			{
-				$template->assign_block_vars('avatarupload.fileuploads', array() );
+				$template->assign_block_vars('avatar_local_upload', array() );
 			}
+			$template->assign_block_vars('avatar_remote_upload', array() );
 		}
 
-		if( file_exists("./../" . $board_config['avatar_gallery_path']) )
+		if( file_exists('./../' . $board_config['avatar_gallery_path'] ) && ($board_config['allow_avatar_local'] == TRUE) )
 		{
-			$template->assign_block_vars("avatargallery", array() );
+			$template->assign_block_vars('avatar_local_gallery', array() );
+		}
+		
+		if( $board_config['allow_avatar_remote'] == TRUE )
+		{
+			$template->assign_block_vars('avatar_remote_link', array() );
 		}
 	}
 
-	$template->pparse("body");
-
+	$template->pparse('body');
 }
 else
 {
 	//
 	// Default user selection box
 	//
-	$sql = "SELECT user_id, username
-		FROM " . USERS_TABLE . "
-		WHERE user_id <> " . ANONYMOUS ."
-		ORDER BY username";
-	$result = $db->sql_query($sql);
-
-	$select_list = '<select name="' . POST_USERS_URL . '">';
-	while( $row = $db->sql_fetchrow($result) )
-	{
-		$select_list .= '<option value="' . $row['user_id'] . '">' . $row['username'] . '</option>';
-	}
-	$select_list .= '</select>';
-
 	$template->set_filenames(array(
-		"body" => "admin/user_select_body.tpl")
+		'body' => 'admin/user_select_body.tpl')
 	);
 
 	$template->assign_vars(array(
-		"L_USER_TITLE" => $lang['User_admin'],
-		"L_USER_EXPLAIN" => $lang['User_admin_explain'],
-		"L_USER_SELECT" => $lang['Select_a_User'],
-		"L_LOOK_UP" => $lang['Look_up_user'],
-		"L_FIND_USERNAME" => $lang['Find_username'],
+		'L_USER_TITLE' => $lang['User_admin'],
+		'L_USER_EXPLAIN' => $lang['User_admin_explain'],
+		'L_USER_SELECT' => $lang['Select_a_User'],
+		'L_LOOK_UP' => $lang['Look_up_user'],
+		'L_FIND_USERNAME' => $lang['Find_username'],
 
-		"U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"), 
+		'U_SEARCH_USER' => append_sid("./../search.$phpEx?mode=searchuser"), 
 
-		"S_USER_ACTION" => append_sid("admin_users.$phpEx"),
-		"S_USER_SELECT" => $select_list)
+		'S_USER_ACTION' => append_sid("admin_users.$phpEx"),
+		'S_USER_SELECT' => $select_list)
 	);
 	$template->pparse('body');
 
 }
 
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
 ?>

phpBB/admin/admin_words.php

@@ -32,8 +32,9 @@ if( !empty($setmodules) )
 //
 // Load default header
 //
-$phpbb_root_dir = "./../";
-require('pagestart.inc');
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
 
 if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 {
@@ -108,7 +109,7 @@ if( $mode != "" )
 
 		$template->pparse("body");
 
-		include('page_footer_admin.'.$phpEx);
+		include('./page_footer_admin.'.$phpEx);
 	}
 	else if( $mode == "save" )
 	{
@@ -171,7 +172,7 @@ if( $mode != "" )
 		}
 		else
 		{
-			message_die(GENERAL_MESSAGE, $lang['Must_specify_word']);
+			message_die(GENERAL_MESSAGE, $lang['No_word_selected']);
 		}
 	}
 }
@@ -229,6 +230,6 @@ else
 
 $template->pparse("body");
 
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
 
 ?>

phpBB/admin/index.php

@@ -25,10 +25,10 @@ define('IN_PHPBB', 1);
 //
 // Load default header
 //
-$phpbb_root_dir = "./../";
-
 $no_page_header = TRUE;
-require('pagestart.inc');
+$phpbb_root_path = "./../";
+require($phpbb_root_path . 'extension.inc');
+require('./pagestart.' . $phpEx);
 
 // ---------------
 // Begin functions
@@ -68,7 +68,7 @@ if( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'left' )
 
 	unset($setmodules);
 
-	include('page_header_admin.'.$phpEx);
+	include('./page_header_admin.'.$phpEx);
 
 	$template->set_filenames(array(
 		"body" => "admin/index_navigate.tpl")
@@ -116,12 +116,12 @@ if( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'left' )
 
 	$template->pparse("body");
 
-	include('page_footer_admin.'.$phpEx);
+	include('./page_footer_admin.'.$phpEx);
 }
 elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
 {
 
-	include('page_header_admin.'.$phpEx);
+	include('./page_header_admin.'.$phpEx);
 
 	$template->set_filenames(array(
 		"body" => "admin/index_body.tpl")
@@ -146,6 +146,8 @@ elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
 		"L_BOARD_STARTED" => $lang['Board_started'],
 		"L_AVATAR_DIR_SIZE" => $lang['Avatar_dir_size'],
 		"L_DB_SIZE" => $lang['Database_size'], 
+		"L_FORUM_LOCATION" => $lang['Forum_Location'],
+		"L_STARTED" => $lang['Login'],
 		"L_GZIP_COMPRESSION" => $lang['Gzip_compression'])
 	);
 
@@ -559,7 +561,7 @@ elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
 
 	$template->pparse("body");
 
-	include('page_footer_admin.'.$phpEx);
+	include('./page_footer_admin.'.$phpEx);
 
 }
 else
@@ -581,8 +583,9 @@ else
 
 	$template->pparse("body");
 
+	$db->sql_close();
 	exit;
 
 }
 
-?>
+?>

phpBB/admin/page_footer_admin.php

@@ -28,27 +28,16 @@ if ( !defined('IN_PHPBB') )
 //
 // Show the overall footer.
 //
-$current_time = time();
-
 $template->set_filenames(array(
-	"page_footer" => "admin/page_footer.tpl")
+	'page_footer' => 'admin/page_footer.tpl')
 );
 
 $template->assign_vars(array(
-	"PHPBB_VERSION" => "2.0 " . $board_config['version'], 
-	"TRANSLATION_INFO" => $lang['TRANSLATION_INFO'])
+	'PHPBB_VERSION' => '2' . $board_config['version'], 
+	'TRANSLATION_INFO' => $lang['TRANSLATION_INFO'])
 );
 
-$template->pparse("page_footer");
-
-//
-// Output page creation time
-//
-$mtime = microtime();
-$mtime = explode(" ",$mtime);
-$mtime = $mtime[1] + $mtime[0];
-$endtime = $mtime;
-$totaltime = ($endtime - $starttime);
+$template->pparse('page_footer');
 
 //
 // Close our DB connection.
@@ -75,8 +64,8 @@ if( $do_gzip_compress )
 
 	echo "\x1f\x8b\x08\x00\x00\x00\x00\x00";
 	echo $gzip_contents;
-	echo pack("V", $gzip_crc);
-	echo pack("V", $gzip_size);
+	echo pack('V', $gzip_crc);
+	echo pack('V', $gzip_size);
 }
 
 exit;

phpBB/admin/page_header_admin.php

@@ -31,145 +31,102 @@ define('HEADER_INC', true);
 // gzip_compression
 //
 $do_gzip_compress = FALSE;
-if($board_config['gzip_compress'])
+if ( $board_config['gzip_compress'] )
 {
 	$phpver = phpversion();
 
-	if($phpver >= "4.0.4pl1")
+	if ( $phpver >= '4.0.4pl1' && strstr($HTTP_USER_AGENT,'compatible') )
 	{
-		if(extension_loaded("zlib"))
+		if ( extension_loaded('zlib') )
 		{
-			ob_start("ob_gzhandler");
+			ob_start('ob_gzhandler');
 		}
 	}
-	else if($phpver > "4.0")
+	else if ( $phpver > '4.0' )
 	{
-		if(strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip'))
+		if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') )
 		{
-			if(extension_loaded("zlib"))
+			if ( extension_loaded('zlib') )
 			{
 				$do_gzip_compress = TRUE;
 				ob_start();
 				ob_implicit_flush(0);
 
-				header("Content-Encoding: gzip");
+				header('Content-Encoding: gzip');
 			}
 		}
 	}
 }
 
 $template->set_filenames(array(
-	"header" => "admin/page_header.tpl")
+	'header' => 'admin/page_header.tpl')
 );
 
-//
-// Do timezone text output
-//
-if($board_config['board_timezone'] < 0)
-{
-	$s_timezone = $lang['All_times'] . " " .$lang['GMT'] . " - " . (-$board_config['board_timezone']) . " " . $lang['Hours'];
-}
-else if($board_config['board_timezone'] == 0)
-{
-	$s_timezone = $lang['All_times'] . " " . $lang['GMT'];
-}
-else
-{
-	$s_timezone = $lang['All_times'] . " " . $lang['GMT'] ." + " . $board_config['board_timezone'] . " " . $lang['Hours'];
-}
-
 //
 // The following assigns all _common_ variables that may be used at any point
 // in a template. Note that all URL's should be wrapped in append_sid, as
 // should all S_x_ACTIONS for forms.
 //
 $template->assign_vars(array(
-	"SITENAME" => $board_config['sitename'],
-	"PAGE_TITLE" => $page_title,
+	'SITENAME' => $board_config['sitename'],
+	'PAGE_TITLE' => $page_title,
 
-	"L_ADMIN" => $lang['Admin'], 
-	"L_USERNAME" => $lang['Username'],
-	"L_PASSWORD" => $lang['Password'],
-	"L_INDEX" => $lang['Forum_Index'],
-	"L_REGISTER" => $lang['Register'],
-	"L_PROFILE" => $lang['Profile'],
-	"L_SEARCH" => $lang['Search'],
-	"L_PRIVATEMSGS" => $lang['Private_msgs'],
-	"L_MEMBERLIST" => $lang['Memberlist'],
-	"L_FAQ" => $lang['FAQ'],
-	"L_USERGROUPS" => $lang['Usergroups'],
-	"L_FORUM" => $lang['Forum'],
-	"L_TOPICS" => $lang['Topics'],
-	"L_REPLIES" => $lang['Replies'],
-	"L_VIEWS" => $lang['Views'],
-	"L_POSTS" => $lang['Posts'],
-	"L_LASTPOST" => $lang['Last_Post'],
-	"L_MODERATOR" => $lang['Moderator'],
-	"L_NONEWPOSTS" => $lang['No_new_posts'],
-	"L_NEWPOSTS" => $lang['New_posts'],
-	"L_POSTED" => $lang['Posted'],
-	"L_JOINED" => $lang['Joined'],
-	"L_AUTHOR" => $lang['Author'],
-	"L_MESSAGE" => $lang['Message'],
-	"L_BY" => $lang['by'],
+	'L_ADMIN' => $lang['Admin'], 
+	'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']),
+	'L_FAQ' => $lang['FAQ'],
 
-	"U_INDEX" => append_sid("../index.".$phpEx),
+	'U_INDEX' => append_sid('../index.'.$phpEx),
 
-	"S_TIMEZONE" => $s_timezone,
-	"S_LOGIN_ACTION" => append_sid("../login.$phpEx"),
-	"S_JUMPBOX_ACTION" => append_sid("../viewforum.$phpEx"),
-	"S_CURRENT_TIME" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']), 
-	"S_CONTENT_DIRECTION" => $lang['DIRECTION'], 
-	"S_CONTENT_ENCODING" => $lang['ENCODING'], 
-	"S_CONTENT_DIR_LEFT" => $lang['LEFT'], 
-	"S_CONTENT_DIR_RIGHT" => $lang['RIGHT'], 
+	'S_TIMEZONE' => sprintf($lang['All_times'], $lang[$board_config['board_timezone']]),
+	'S_LOGIN_ACTION' => append_sid('../login.'.$phpEx),
+	'S_JUMPBOX_ACTION' => append_sid('../viewforum.'.$phpEx),
+	'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), 
+	'S_CONTENT_DIRECTION' => $lang['DIRECTION'], 
+	'S_CONTENT_ENCODING' => $lang['ENCODING'], 
+	'S_CONTENT_DIR_LEFT' => $lang['LEFT'], 
+	'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], 
 
-	"T_HEAD_STYLESHEET" => $theme['head_stylesheet'],
-	"T_BODY_BACKGROUND" => $theme['body_background'],
-	"T_BODY_BGCOLOR" => "#".$theme['body_bgcolor'],
-	"T_BODY_TEXT" => "#".$theme['body_text'],
-	"T_BODY_LINK" => "#".$theme['body_link'],
-	"T_BODY_VLINK" => "#".$theme['body_vlink'],
-	"T_BODY_ALINK" => "#".$theme['body_alink'],
-	"T_BODY_HLINK" => "#".$theme['body_hlink'],
-	"T_TR_COLOR1" => "#".$theme['tr_color1'],
-	"T_TR_COLOR2" => "#".$theme['tr_color2'],
-	"T_TR_COLOR3" => "#".$theme['tr_color3'],
-	"T_TR_CLASS1" => $theme['tr_class1'],
-	"T_TR_CLASS2" => $theme['tr_class2'],
-	"T_TR_CLASS3" => $theme['tr_class3'],
-	"T_TH_COLOR1" => "#".$theme['th_color1'],
-	"T_TH_COLOR2" => "#".$theme['th_color2'],
-	"T_TH_COLOR3" => "#".$theme['th_color3'],
-	"T_TH_CLASS1" => $theme['th_class1'],
-	"T_TH_CLASS2" => $theme['th_class2'],
-	"T_TH_CLASS3" => $theme['th_class3'],
-	"T_TD_COLOR1" => "#".$theme['td_color1'],
-	"T_TD_COLOR2" => "#".$theme['td_color2'],
-	"T_TD_COLOR3" => "#".$theme['td_color3'],
-	"T_TD_CLASS1" => $theme['td_class1'],
-	"T_TD_CLASS2" => $theme['td_class2'],
-	"T_TD_CLASS3" => $theme['td_class3'],
-	"T_FONTFACE1" => $theme['fontface1'],
-	"T_FONTFACE2" => $theme['fontface2'],
-	"T_FONTFACE3" => $theme['fontface3'],
-	"T_FONTSIZE1" => $theme['fontsize1'],
-	"T_FONTSIZE2" => $theme['fontsize2'],
-	"T_FONTSIZE3" => $theme['fontsize3'],
-	"T_FONTCOLOR1" => "#".$theme['fontcolor1'],
-	"T_FONTCOLOR2" => "#".$theme['fontcolor2'],
-	"T_FONTCOLOR3" => "#".$theme['fontcolor3'],
-	"T_SPAN_CLASS1" => $theme['span_class1'],
-	"T_SPAN_CLASS2" => $theme['span_class2'],
-	"T_SPAN_CLASS3" => $theme['span_class3'])
+	'T_HEAD_STYLESHEET' => $theme['head_stylesheet'],
+	'T_BODY_BACKGROUND' => $theme['body_background'],
+	'T_BODY_BGCOLOR' => '#'.$theme['body_bgcolor'],
+	'T_BODY_TEXT' => '#'.$theme['body_text'],
+	'T_BODY_LINK' => '#'.$theme['body_link'],
+	'T_BODY_VLINK' => '#'.$theme['body_vlink'],
+	'T_BODY_ALINK' => '#'.$theme['body_alink'],
+	'T_BODY_HLINK' => '#'.$theme['body_hlink'],
+	'T_TR_COLOR1' => '#'.$theme['tr_color1'],
+	'T_TR_COLOR2' => '#'.$theme['tr_color2'],
+	'T_TR_COLOR3' => '#'.$theme['tr_color3'],
+	'T_TR_CLASS1' => $theme['tr_class1'],
+	'T_TR_CLASS2' => $theme['tr_class2'],
+	'T_TR_CLASS3' => $theme['tr_class3'],
+	'T_TH_COLOR1' => '#'.$theme['th_color1'],
+	'T_TH_COLOR2' => '#'.$theme['th_color2'],
+	'T_TH_COLOR3' => '#'.$theme['th_color3'],
+	'T_TH_CLASS1' => $theme['th_class1'],
+	'T_TH_CLASS2' => $theme['th_class2'],
+	'T_TH_CLASS3' => $theme['th_class3'],
+	'T_TD_COLOR1' => '#'.$theme['td_color1'],
+	'T_TD_COLOR2' => '#'.$theme['td_color2'],
+	'T_TD_COLOR3' => '#'.$theme['td_color3'],
+	'T_TD_CLASS1' => $theme['td_class1'],
+	'T_TD_CLASS2' => $theme['td_class2'],
+	'T_TD_CLASS3' => $theme['td_class3'],
+	'T_FONTFACE1' => $theme['fontface1'],
+	'T_FONTFACE2' => $theme['fontface2'],
+	'T_FONTFACE3' => $theme['fontface3'],
+	'T_FONTSIZE1' => $theme['fontsize1'],
+	'T_FONTSIZE2' => $theme['fontsize2'],
+	'T_FONTSIZE3' => $theme['fontsize3'],
+	'T_FONTCOLOR1' => '#'.$theme['fontcolor1'],
+	'T_FONTCOLOR2' => '#'.$theme['fontcolor2'],
+	'T_FONTCOLOR3' => '#'.$theme['fontcolor3'],
+	'T_SPAN_CLASS1' => $theme['span_class1'],
+	'T_SPAN_CLASS2' => $theme['span_class2'],
+	'T_SPAN_CLASS3' => $theme['span_class3'])
 );
 
-header ("Cache-Control: no-store, no-cache, must-revalidate");
-header ("Cache-Control: pre-check=0, post-check=0, max-age=0", false);
-header ("Pragma: no-cache");
-header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
-header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
 
-$template->pparse("header");
+$template->pparse('header');
 
-?>
+?>

phpBB/admin/pagestart.php

@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                               pagestart.inc
+ *                               pagestart.php
  *                            -------------------
  *   begin                : Thursday, Aug 2, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -27,8 +27,6 @@ if ( !defined('IN_PHPBB') )
 
 define('IN_ADMIN', true);
 
-$phpbb_root_path = "../";
-include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
 
 //
@@ -41,7 +39,9 @@ init_userprefs($userdata);
 //
 if( !$userdata['session_logged_in'] )
 {
-	header("Location: ../" . append_sid("login.$phpEx?redirect=admin/"));
+	$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
+	header($header_location . '../' . append_sid("login.$phpEx?redirect=admin/"));
+	exit;
 }
 else if( $userdata['user_level'] != ADMIN )
 {
@@ -52,7 +52,7 @@ if ( empty($no_page_header) )
 {
 	// Not including the pageheader can be neccesarry if META tags are
 	// needed in the calling script.
-	include('page_header_admin.'.$phpEx);
+	include('./page_header_admin.'.$phpEx);
 }
 
 ?>

phpBB/common.php

@@ -101,18 +101,19 @@ if( !get_magic_quotes_gpc() )
 // malicious rewriting of language and otherarray values via
 // URI params
 //
-$board_config = Array();
-$userdata = Array();
-$theme = Array();
-$images = Array();
-$lang = Array();
+$board_config = array();
+$userdata = array();
+$theme = array();
+$images = array();
+$lang = array();
 $gen_simple_header = FALSE;
 
-@include($phpbb_root_path . 'config.'.$phpEx);
+include($phpbb_root_path . 'config.'.$phpEx);
 
 if( !defined("PHPBB_INSTALLED") )
 {
 	header("Location: install.$phpEx");
+	exit;
 }
 
 include($phpbb_root_path . 'includes/constants.'.$phpEx);
@@ -153,7 +154,7 @@ if( getenv('HTTP_X_FORWARDED_FOR') != '' )
 
 	if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip_list) )
 	{
-		$private_ip = array('/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10..*/', '/^224..*/', '/^240..*/');
+		$private_ip = array('/^0\./', '/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10..*/', '/^224..*/', '/^240..*/');
 		$client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
 	}
 }
@@ -170,16 +171,14 @@ $user_ip = encode_ip($client_ip);
 //
 $sql = "SELECT *
 	FROM " . CONFIG_TABLE;
-if(!$result = $db->sql_query($sql))
+if( !($result = $db->sql_query($sql)) )
 {
 	message_die(CRITICAL_ERROR, "Could not query config information", "", __LINE__, __FILE__, $sql);
 }
-else
+
+while ( $row = $db->sql_fetchrow($result) )
 {
-	while($row = $db->sql_fetchrow($result))
-	{
-		$board_config[$row['config_name']] = $row['config_value'];
-	}
+	$board_config[$row['config_name']] = $row['config_value'];
 }
 
 //

phpBB/db/msaccess.php

@@ -117,7 +117,7 @@ class sql_db
 					$query = "TOP " . ( $row_offset + $num_rows ) . $query;
 				}
 
-				$this->result = odbc_exec($this->db_connect_id, "SELECT $query"); 
+				$this->result = odbc_exec($this->db_connect_id, "SELECT $query");
 
 				if( $this->result )
 				{
@@ -134,7 +134,7 @@ class sql_db
 					$this->result_rowset[$this->result] = array();
 
 					$row_outer = ( isset($row_offset) ) ? $row_offset + 1 : 1;
-					$row_outer_max = ( isset($num_rows) ) ? $num_rows + 1 : 1E9;
+					$row_outer_max = ( isset($num_rows) ) ? $row_offset + $num_rows + 1 : 1E9;
 					$row_inner = 0;
 
 					while( odbc_fetch_row($this->result, $row_outer) && $row_outer < $row_outer_max )
@@ -148,7 +148,7 @@ class sql_db
 						$row_inner++;
 					}
 
-					$this->num_rows[$this->result] = count($this->result_rowset[$this->result]);	
+					$this->num_rows[$this->result] = count($this->result_rowset[$this->result]);
 
 					odbc_free_result($this->result);
 				}
@@ -165,7 +165,7 @@ class sql_db
 					{
 						if( odbc_fetch_row($result_id) )
 						{
-							$this->next_id[$this->db_connect_id] = odbc_result($result_id, 1);	
+							$this->next_id[$this->db_connect_id] = odbc_result($result_id, 1);
 							$this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result);
 						}
 					}
@@ -232,7 +232,7 @@ class sql_db
 	//
 	function sql_numrows($query_id = 0)
 	{
-		if( !$query_id ) 
+		if( !$query_id )
 		{
 			$query_id = $this->result;
 		}

phpBB/db/mssql-odbc.php

@@ -131,7 +131,7 @@ class sql_db
 					$this->result_rowset[$this->result] = array();
 
 					$row_outer = ( isset($row_offset) ) ? $row_offset + 1 : 1;
-					$row_outer_max = ( isset($num_rows) ) ? $num_rows + 1 : 1E9;
+					$row_outer_max = ( isset($num_rows) ) ? $row_offset + $num_rows + 1 : 1E9;
 					$row_inner = 0;
 
 					while( odbc_fetch_row($this->result, $row_outer) && $row_outer < $row_outer_max )

phpBB/db/mssql.php

@@ -291,6 +291,7 @@ class sql_db
 			{
 				$row[$key] = stripslashes($value);
 			}
+			@reset($row);
 
 			return $row;
 		}
@@ -320,6 +321,7 @@ class sql_db
 				}
 				$i++;
 			}
+			@reset($rowset);
 
 			return $rowset;
 		}

phpBB/db/mysql4.php

@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                                 mysql.php
+ *                                 mysql4.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -337,4 +337,4 @@ class sql_db
 
 } // if ... define
 
-?>
+?>

phpBB/db/schemas/mssql_basic.sql

@@ -58,16 +58,16 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1'
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_enable','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0'); 
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_users', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_users', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.yourdomain.tld');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 'RC-4');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.3');
 
 /*
   -- Categories
@@ -86,10 +86,10 @@ INSERT INTO phpbb_forums (forum_id, cat_id, forum_name, forum_desc, forum_status
 
 /*
   -- Users
-  Default Admin --> username: admin    
+  Default Admin --> username: admin
                     password: admin (change this or remove it once everything is working!)
 */
-INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 0, 1, 0, 1, 1, NULL, '', '', '', '', '', '', 0, 0);
+INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 0, 1, 0, 1, 1, NULL, '', '', 0, '', '', '', 0, 0);
 INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_popup_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( 2, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, '', 'english', 0, 'd M Y h:i a', '', '', 0, 1);
 
 
@@ -106,9 +106,12 @@ SET IDENTITY_INSERT phpbb_ranks OFF;
 /*
   -- Groups
 */
+SET IDENTITY_INSERT phpbb_groups ON;
+
 INSERT INTO phpbb_groups (group_id, group_type, group_name, group_description, group_moderator, group_single_user) VALUES (1, 1, 'Anonymous', 'Personal User', '', 1);
 INSERT INTO phpbb_groups (group_id, group_type, group_name, group_description, group_moderator, group_single_user) VALUES (2, 1, 'Admin', 'Personal User', '', 1);
 
+SET IDENTITY_INSERT phpbb_groups OFF;
 
 /*
   -- User -> Group
@@ -167,38 +170,36 @@ INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':
 INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_surprised.gif', 'Surprised');
 INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised');
 INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, '8O', 'icon_eek.gif', 'Shocked');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, '8-O', 'icon_eek.gif', 'Shocked');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':shock:', 'icon_eek.gif', 'Shocked');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':?', 'icon_confused.gif', 'Confused');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, ':-?', 'icon_confused.gif', 'Confused');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, ':???:', 'icon_confused.gif', 'Confused');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, '8)', 'icon_cool.gif', 'Cool');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, '8-)', 'icon_cool.gif', 'Cool');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':cool:', 'icon_cool.gif', 'Cool');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':lol:', 'icon_lol.gif', 'Laughing');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':x', 'icon_mad.gif', 'Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':-x', 'icon_mad.gif', 'Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':mad:', 'icon_mad.gif', 'Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':P', 'icon_razz.gif', 'Razz');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':-P', 'icon_razz.gif', 'Razz');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':razz:', 'icon_razz.gif', 'Razz');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':oops:', 'icon_redface.gif', 'Embarassed');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ':wink:', 'icon_wink.gif', 'Wink');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ';)', 'icon_wink.gif', 'Wink');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ';-)', 'icon_wink.gif', 'Wink');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':!:', 'icon_exclaim.gif', 'Exclamation');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':?:', 'icon_question.gif', 'Question');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':idea:', 'icon_idea.gif', 'Idea');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':arrow:', 'icon_arrow.gif', 'Arrow');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':|', 'icon_neutral.gif', 'Neutral');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':-|', 'icon_neutral.gif', 'Neutral');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 43, ':neutral:', 'icon_neutral.gif', 'Neutral');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 44, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':shock:', 'icon_eek.gif', 'Shocked');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':?', 'icon_confused.gif', 'Confused');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':-?', 'icon_confused.gif', 'Confused');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':???:', 'icon_confused.gif', 'Confused');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8)', 'icon_cool.gif', 'Cool');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, '8-)', 'icon_cool.gif', 'Cool');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':cool:', 'icon_cool.gif', 'Cool');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':lol:', 'icon_lol.gif', 'Laughing');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':x', 'icon_mad.gif', 'Mad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':-x', 'icon_mad.gif', 'Mad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':mad:', 'icon_mad.gif', 'Mad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':P', 'icon_razz.gif', 'Razz');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':-P', 'icon_razz.gif', 'Razz');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':razz:', 'icon_razz.gif', 'Razz');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':oops:', 'icon_redface.gif', 'Embarassed');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':wink:', 'icon_wink.gif', 'Wink');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';)', 'icon_wink.gif', 'Wink');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ';-)', 'icon_wink.gif', 'Wink');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':!:', 'icon_exclaim.gif', 'Exclamation');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':?:', 'icon_question.gif', 'Question');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':idea:', 'icon_idea.gif', 'Idea');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':arrow:', 'icon_arrow.gif', 'Arrow');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':|', 'icon_neutral.gif', 'Neutral');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':-|', 'icon_neutral.gif', 'Neutral');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':neutral:', 'icon_neutral.gif', 'Neutral');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
 
 SET IDENTITY_INSERT phpbb_smilies OFF;
 

phpBB/db/schemas/mssql_schema.sql

@@ -89,7 +89,7 @@ CREATE TABLE [phpbb_forums] (
 GO
 
 CREATE TABLE [phpbb_groups] (
-	[group_id] [int] NOT NULL ,
+	[group_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[group_type] [smallint] NULL ,
 	[group_name] [varchar] (50) NOT NULL ,
 	[group_description] [varchar] (255) NOT NULL ,
@@ -318,7 +318,7 @@ CREATE TABLE [phpbb_users] (
 	[user_regdate] [int] NOT NULL ,
 	[user_level] [smallint] NOT NULL ,
 	[user_posts] [int] NOT NULL ,
-	[user_timezone] [smallint] NOT NULL ,
+	[user_timezone] [decimal] (4,2) NOT NULL ,
 	[user_style] [int] NULL ,
 	[user_lang] [varchar] (255) NULL ,
 	[user_dateformat] [varchar] (14) NOT NULL ,

phpBB/db/schemas/mysql_basic.sql

@@ -51,7 +51,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1'
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_enable','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0'); 
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
@@ -60,7 +60,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.myserver.tld');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 'RC-4');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.3');
 
 
 # -- Categories
@@ -72,7 +72,7 @@ INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order,
 
 
 # -- Users
-INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 0, 1, 0, 1, 1, NULL, '', '', '', '', '', '', 0, 0);
+INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 0, 1, 0, 1, 1, NULL, '', '', 0, '', '', '', 0, 0);
 
 # -- username: admin    password: admin (change this or remove it once everything is working!)
 INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_popup_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( 2, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, '', 'english', 0, 'd M Y h:i a', '', '', 0, 1);
@@ -120,38 +120,36 @@ INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':
 INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_surprised.gif', 'Surprised');
 INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised');
 INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, '8O', 'icon_eek.gif', 'Shocked');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, '8-O', 'icon_eek.gif', 'Shocked');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':shock:', 'icon_eek.gif', 'Shocked');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':?', 'icon_confused.gif', 'Confused');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, ':-?', 'icon_confused.gif', 'Confused');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, ':???:', 'icon_confused.gif', 'Confused');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, '8)', 'icon_cool.gif', 'Cool');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, '8-)', 'icon_cool.gif', 'Cool');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':cool:', 'icon_cool.gif', 'Cool');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':lol:', 'icon_lol.gif', 'Laughing');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':x', 'icon_mad.gif', 'Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':-x', 'icon_mad.gif', 'Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':mad:', 'icon_mad.gif', 'Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':P', 'icon_razz.gif', 'Razz');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':-P', 'icon_razz.gif', 'Razz');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':razz:', 'icon_razz.gif', 'Razz');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':oops:', 'icon_redface.gif', 'Embarassed');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ':wink:', 'icon_wink.gif', 'Wink');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ';)', 'icon_wink.gif', 'Wink');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ';-)', 'icon_wink.gif', 'Wink');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':!:', 'icon_exclaim.gif', 'Exclamation');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':?:', 'icon_question.gif', 'Question');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':idea:', 'icon_idea.gif', 'Idea');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':arrow:', 'icon_arrow.gif', 'Arrow');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':|', 'icon_neutral.gif', 'Neutral');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':-|', 'icon_neutral.gif', 'Neutral');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 43, ':neutral:', 'icon_neutral.gif', 'Neutral');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 44, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':shock:', 'icon_eek.gif', 'Shocked');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':?', 'icon_confused.gif', 'Confused');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':-?', 'icon_confused.gif', 'Confused');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':???:', 'icon_confused.gif', 'Confused');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8)', 'icon_cool.gif', 'Cool');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, '8-)', 'icon_cool.gif', 'Cool');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':cool:', 'icon_cool.gif', 'Cool');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':lol:', 'icon_lol.gif', 'Laughing');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':x', 'icon_mad.gif', 'Mad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':-x', 'icon_mad.gif', 'Mad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':mad:', 'icon_mad.gif', 'Mad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':P', 'icon_razz.gif', 'Razz');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':-P', 'icon_razz.gif', 'Razz');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':razz:', 'icon_razz.gif', 'Razz');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':oops:', 'icon_redface.gif', 'Embarassed');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':wink:', 'icon_wink.gif', 'Wink');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';)', 'icon_wink.gif', 'Wink');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ';-)', 'icon_wink.gif', 'Wink');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':!:', 'icon_exclaim.gif', 'Exclamation');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':?:', 'icon_question.gif', 'Question');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':idea:', 'icon_idea.gif', 'Idea');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':arrow:', 'icon_arrow.gif', 'Arrow');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':|', 'icon_neutral.gif', 'Neutral');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':-|', 'icon_neutral.gif', 'Neutral');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':neutral:', 'icon_neutral.gif', 'Neutral');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
 
 
 # -- wordlist

phpBB/db/schemas/mysql_schema.sql

@@ -453,7 +453,7 @@ CREATE TABLE phpbb_topics_watch (
 # Table structure for table 'phpbb_users'
 #
 CREATE TABLE phpbb_users (
-   user_id mediumint(8) NOT NULL auto_increment,
+   user_id mediumint(8) NOT NULL,
    user_active tinyint(1) DEFAULT '1',
    username varchar(25) NOT NULL,
    user_password varchar(32) NOT NULL,
@@ -463,7 +463,7 @@ CREATE TABLE phpbb_users (
    user_regdate int(11) DEFAULT '0' NOT NULL, 
    user_level tinyint(4) DEFAULT '0',
    user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-   user_timezone tinyint(4) DEFAULT '0' NOT NULL,
+   user_timezone decimal(4,2) DEFAULT '0' NOT NULL,
    user_style tinyint(4),
    user_lang varchar(255),
    user_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL,

phpBB/db/schemas/oracle_basic.sql

@@ -1,186 +0,0 @@
-/*
-* Basic DB data for phpBB2 devel
-*
-* $Id$
-*/
-
--- Config
-INSERT INTO phpbb_config VALUES ('board_disable','0');
-INSERT INTO phpbb_config VALUES ('board_startdate','994190324');
-INSERT INTO phpbb_config VALUES ('sitename','yourdomain.com');
-INSERT INTO phpbb_config VALUES ('cookie_name','phpbb2oracle');
-INSERT INTO phpbb_config VALUES ('cookie_path','/');
-INSERT INTO phpbb_config VALUES ('cookie_domain','');
-INSERT INTO phpbb_config VALUES ('cookie_secure','0');
-INSERT INTO phpbb_config VALUES ('session_length','900');
-INSERT INTO phpbb_config VALUES ('allow_html','0');
-INSERT INTO phpbb_config VALUES ('allow_html_tags','b,i,u,pre');
-INSERT INTO phpbb_config VALUES ('allow_bbcode','1');
-INSERT INTO phpbb_config VALUES ('allow_smilies','1');
-INSERT INTO phpbb_config VALUES ('allow_sig','1');
-INSERT INTO phpbb_config VALUES ('allow_namechange','0');
-INSERT INTO phpbb_config VALUES ('allow_theme_create','0');
-INSERT INTO phpbb_config VALUES ('allow_avatar_local','0');
-INSERT INTO phpbb_config VALUES ('allow_avatar_remote','1');
-INSERT INTO phpbb_config VALUES ('allow_avatar_upload','1');
-INSERT INTO phpbb_config VALUES ('override_user_style','0');
-INSERT INTO phpbb_config VALUES ('posts_per_page','15');
-INSERT INTO phpbb_config VALUES ('topics_per_page','50');
-INSERT INTO phpbb_config VALUES ('hot_threshold','25');
-INSERT INTO phpbb_config VALUES ('max_poll_options','10');
-INSERT INTO phpbb_config VALUES ('max_sig_chars','255');
-INSERT INTO phpbb_config VALUES ('max_inbox_privmsgs','50');
-INSERT INTO phpbb_config VALUES ('max_sentbox_privmsgs','25');
-INSERT INTO phpbb_config VALUES ('max_savebox_privmsgs','50');
-INSERT INTO phpbb_config VALUES ('board_email_sig','Thanks, The Management');
-INSERT INTO phpbb_config VALUES ('board_email','youraddress@yourdomain.com');
-INSERT INTO phpbb_config VALUES ('smtp_delivery','0');
-INSERT INTO phpbb_config VALUES ('smtp_host','');
-INSERT INTO phpbb_config VALUES ('require_activation','0');
-INSERT INTO phpbb_config VALUES ('require_admin_activation','0');
-INSERT INTO phpbb_config VALUES ('flood_interval','15');
-INSERT INTO phpbb_config VALUES ('avatar_filesize','6144');
-INSERT INTO phpbb_config VALUES ('avatar_max_width','80');
-INSERT INTO phpbb_config VALUES ('avatar_max_height','80');
-INSERT INTO phpbb_config VALUES ('avatar_path','images/avatars');
-INSERT INTO phpbb_config VALUES ('smilies_path','images/smiles');
-INSERT INTO phpbb_config VALUES ('default_style','8');
-INSERT INTO phpbb_config VALUES ('default_admin_style','2');
-INSERT INTO phpbb_config VALUES ('default_lang','english');
-INSERT INTO phpbb_config VALUES ('default_dateformat','D M d, Y g:i a');
-INSERT INTO phpbb_config VALUES ('board_timezone','0');
-INSERT INTO phpbb_config VALUES ('prune_enable','1');
-INSERT INTO phpbb_config VALUES ('gzip_compress','1');
-INSERT INTO phpbb_config VALUES ('record_online_users','0');
-INSERT INTO phpbb_config VALUES ('record_online_date','0');
-INSERT INTO phpbb_config VALUES ('script_path', '/phpBB2/');
-INSERT INTO phpbb_config VALUES ('version', 'RC-4');
-INSERT INTO phpbb_config VALUES ('server_name', 'www.yourdomain.tld');
-INSERT INTO phpbb_config VALUES ('server_port', '80');
-
--- Categories
-INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test category 1', 1);
-
-
--- Forums
-INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order, forum_posts, forum_topics, forum_last_post_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_pollcreate, auth_vote, auth_attachments) VALUES (1, 'Test Forum 1', 'This is just a test forum, nothing special here.', 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 3, 3, 3, 3, 3);
-
-
--- Users
-INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_autologin_key, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active, user_template) VALUES
-                        ( '-1', 'Anonymous', '0', '972086460', '1', '', '', '', '', '', '', '', '', '0', '0', '', '', '', '0', '', '', '', '0', '0', '1', '1', '', '', '', '-8', 'D M d, Y g:i a', '', '', '0', '0');
-
--- username: admin password: admin (change this or remove it once everything is working!)
-INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_autologin_key, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( '2', 'Admin', '1', '972086460', '21232f297a57a5a743894a0e4a801fc3', '', 'admin@yourdomain.com', '', '', '', '', '', 'A Signature', '1', '2', '', '', '', '0', '0', '1', '0', '1', '1', '1', '1', '1', '', 'english', '-8', 'd M Y h:i a', '', '', '0', '1');
-
-
--- Ranks
-INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '1', 'Site Admin', '-1', '1', '');
-INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '2', 'Newbie', '0', '0', '');
-INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '5', 'Here Often', '10', '0', '');
-INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '6', 'Should Get Out More', '50', '0', '');
-INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( '7', 'Has No Life', '200', '0', '');
-
-
--- Groups
-INSERT INTO phpbb_groups (group_id, group_name, group_description, group_single_user) VALUES (1, 'Anonymous', 'Personal User', 1);
-INSERT INTO phpbb_groups (group_id, group_name, group_description, group_single_user) VALUES (2, 'Admin', 'Personal User', 1);
-
-
--- User -> Group
-INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (1, -1, 0);
-INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (2, 2, 0);
-
-
--- User Access (admin is set as ... an admin)
-INSERT INTO phpbb_auth_access (group_id, forum_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_pollcreate, auth_vote, auth_mod) VALUES (2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1);
-
-
--- Demo Topic
-INSERT INTO phpbb_topics (topic_id, topic_title, topic_poster, topic_time, topic_views, topic_replies, forum_id, topic_status, topic_type, topic_last_post_id) VALUES (1, 'Demo Topic', 2, 972086460, 0, 0, 1, 0, 0, 1);
-
-
--- Demo Post
-INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post_username, poster_ip) VALUES (1, 1, 1, 2, 972086460, '', '7F000001');
-INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, 'This is the subject', 'This is a demo post in the demo topic, what do you think of it?');
-
-
--- Themes
-INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1,'Original default','Default','','','','','','','','','','','','','','','','','','','','','CCCCCC','DDDDDD','','','','','','','',NULL,NULL,NULL,'','','','','','');
-INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (2,'PSO [ Grey ]','PSO', '','','FFFFFF','000000','002266','004411','','','','','','','','','000000','D2D2D2','BCBCBC','','','','EDEDED','DEDEDE','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'','','','','','');
-INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (3,'PSO [ Wheat ] ','PSO','','','FFFFFF','000000','002266','004411','','','','','','','','','001100','E5CCA5','D4A294','','','','EBE4D9','DAD1C4','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'000000','','','','','');
-INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (4,'PSO [ Ocean ]','PSO','','','DFF5FF','000000','011001','2100cc','','','','','','','','','000000','A7C1CB','7897A8','','','','83D7CC','A0CCE0','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'','','','','','');
-INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (6,'PSO [ Blue ]','PSO','','','FFFFFF','000000','417FB9','4E6172','0000AA','','','','','','','','000000','90BAE2','5195D4','','','','cde3f2','daedFd','','row1','row2','','verdana,serif','arial,helvetica','courier',1,2,3,'000000','','','','','');
-INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (7,'PSO [ Cool Midnight ]','PSO', '','','444444','ECECEC','EDF2F2','DDEDED','FFFFFF','EDF2F2','','','','','','','000000','80707F','66555F','','','','60707D','667A80','','row1','row2','','Verdana,serif','Arial,Helvetica,sans-serif','courier',NULL,NULL,NULL,'ECECEC','ECECEC','ECECEC','','','');
-INSERT INTO phpbb_themes (themes_id, style_name, template_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (8,'PSO [ Pastel Purple ]','PSO','','','FFFFFF','000000','445588','337744','','','','','','','','','CCCCDD','CCCCDD','DDDDEE','','','','EFEFEF','FEFEFE','','row1','row2','','Verdana,serif','Arial,Helvetica,sans-serif','courier',1,2,3,'','','0000EE','','','');
-INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (9,'subSilver','subSilver','subSilver','','E5E5E5','000000','006699','5584AA','FF9933','EDF2F2','EFEFEF','DEE3E7','c2cdd6','','','','CBD3D9','BCBCBC','1B7CAD','','','','AEBDC4','006699','FFFFFF','row1','row2','','Verdana,Arial,Helvetica,sans-serif','Verdana,Arial,Helvetica,sans-serif','courier','','','','004c75','004c75','004c75','','','');
-
-
--- Smilies
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '1', ':D', 'icon_biggrin.gif', 'Very Happy');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '2', ':-D', 'icon_biggrin.gif', 'Very Happy');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '3', ':grin:', 'icon_biggrin.gif', 'Very Happy');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '4', ':)', 'icon_smile.gif', 'Smile');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '5', ':-)', 'icon_smile.gif', 'Smile');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '6', ':smile:', 'icon_smile.gif', 'Smile');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '7', ':(', 'icon_sad.gif', 'Sad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '8', ':-(', 'icon_sad.gif', 'Sad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '9', ':sad:', 'icon_sad.gif', 'Sad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '10', ':o', 'icon_eek.gif', 'Surprised');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '11', ':-o', 'icon_eek.gif', 'Surprised');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '12', ':eek:', 'icon_eek.gif', 'Surprised');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '13', ':?', 'icon_confused.gif', 'Confused');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '14', ':-?', 'icon_confused.gif', 'Confused');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '15', ':???:', 'icon_confused.gif', 'Confused');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '16', '8)', 'icon_cool.gif', 'Cool');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '17', '8-)', 'icon_cool.gif', 'Cool');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '18', ':cool:', 'icon_cool.gif', 'Cool');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '19', ':lol:', 'icon_lol.gif', 'Laughing');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '20', ':x', 'icon_mad.gif', 'Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '21', ':-x', 'icon_mad.gif', 'Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '22', ':mad:', 'icon_mad.gif', 'Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '23', ':P', 'icon_razz.gif', 'Razz');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '24', ':-P', 'icon_razz.gif', 'Razz');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '25', ':razz:', 'icon_razz.gif', 'Razz');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '26', ':oops:', 'icon_redface.gif', 'Embarassed');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '27', ':cry:', 'icon_cry.gif', 'Crying or Very sad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '28', ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '29', ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '30', ':wink:', 'icon_wink.gif', 'Wink');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '31', ';)', 'icon_wink.gif', 'Wink');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '32', ';-)', 'icon_wink.gif', 'Wink');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '33', ':!:', 'icon_exclaim.gif', 'Exclamation');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '34', ':?:', 'icon_question.gif', 'Question');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '35', ':idea:', 'icon_idea.gif', 'Idea');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '36', ':arrow:', 'icon_arrow.gif', 'Arrow');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '37', ':|', 'icon_neutral.gif', 'Neutral');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '38', ':-|', 'icon_neutral.gif', 'Neutral');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '39', ':neutral:', 'icon_neutral.gif', 'Neutral');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( '40', ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
-
--- Words
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '1', 'asshole', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '2', 'assram*', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '3', 'asswipe', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '4', 'asstool*', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '5', 'bastard', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '6', 'bitch', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '7', 'bollock*', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '8', 'crap*', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '9', '*crap', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '10', 'cunt*', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '11', 'dickweed', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '12', 'dickwad', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '13', 'dickhead', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '14', '*fuck*', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '15', 'fuk*', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '16', 'masturbat*', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '17', 'piss*', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '18', 'prick', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '19', 'pussy', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '20', '*shit*', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '21', 'slut', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '22', 'tits', '*beep*');
-INSERT INTO phpbb_words (word_id, word, replacement) VALUES ( '23', '*wank*', '*beep*');
-
-COMMIT;

phpBB/db/schemas/oracle_schema.sql

@@ -1,521 +0,0 @@
-/*
- phpBB2 Oracle 8i DB schema - (c) 2001 The phpBB Group
-
- $Id$
-*/
-
-/*
-  This first section is optional, however its probably the best method
-  of running phpBB on Oracle. If you already have a tablespace and user created
-  for phpBB you can leave this section commented out!
-
-  The first set of statements create a phpBB tablespace and a phpBB user,
-  make sure you change the password of the phpBB user befor you run this script!!
-*/
-
-/*
-CREATE TABLESPACE phpbb
-	DATAFILE 'E:/web/Oracle8i/ORADATA/phpbb01.dbf'
-	SIZE 10M
-	AUTOEXTEND ON NEXT 10M
-	MAXSIZE 100M;
-
-CREATE USER phpbb
-	IDENTIFIED BY phpbb_password
-	DEFAULT TABLESPACE phpbb
-	TEMPORARY TABLESPACE temp;
-
-GRANT CREATE SESSION TO phpbb;
-GRANT CREATE TABLE TO phpbb;
-GRANT CREATE SEQUENCE TO phpbb;
-GRANT CREATE TRIGGER TO phpbb;
-
-ALTER USER phpbb QUOTA unlimited ON phpbb;
-
-COMMIT;
-DISCONNECT;
-
-CONNECT phpbb/phpbb_password;
-*/
-
-
-
-CREATE SEQUENCE phpbb_banlist_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_categories_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_config_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_disallow_id_seq  increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_forums_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_posts_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_privmsgs_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_ranks_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_smilies_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_themes_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_topics_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_users_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_words_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_groups_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_forum_prune_id_seq increment by 1 start with 2 minvalue 0;
-CREATE SEQUENCE phpbb_vote_desc_id_seq increment by 1 start with 2 minvalue 0;
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_auth_access
--------------------------------------------------------- */
-CREATE TABLE phpbb_auth_access (
-   group_id number(4) DEFAULT '0' NOT NULL,
-   forum_id number(4) DEFAULT '0' NOT NULL,
-   auth_view number(4) DEFAULT '0' NOT NULL,
-   auth_read number(4) DEFAULT '0' NOT NULL,
-   auth_post number(4) DEFAULT '0' NOT NULL,
-   auth_reply number(4) DEFAULT '0' NOT NULL,
-   auth_edit number(4) DEFAULT '0' NOT NULL,
-   auth_delete number(4) DEFAULT '0' NOT NULL,
-   auth_announce number(4) DEFAULT '0' NOT NULL,
-   auth_sticky number(4) DEFAULT '0' NOT NULL,
-   auth_pollcreate number(4) DEFAULT '0' NOT NULL,
-   auth_attachments number(4) DEFAULT '0' NOT NULL,
-   auth_vote number(4) DEFAULT '0' NOT NULL,
-   auth_mod number(4) DEFAULT '0' NOT NULL,
-   CONSTRAINT phpbb_auth_access_pkey PRIMARY KEY (group_id)
-);
-CREATE  INDEX group_phpbb_auth_access_index ON phpbb_auth_access (forum_id);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_groups
--------------------------------------------------------- */
-CREATE TABLE phpbb_groups (
-   group_id number(4) NOT NULL,
-   group_name varchar(40) NOT NULL,
-   group_type number(2) DEFAULT '1' NOT NULL,
-   group_description varchar(255) NOT NULL,
-   group_moderator number(4) DEFAULT '0' NOT NULL,
-   group_single_user number(4) DEFAULT '0' NOT NULL,
-   CONSTRAINT phpbb_groups_pkey PRIMARY KEY (group_id)
-);
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_banlist
--------------------------------------------------------- */
-CREATE TABLE phpbb_banlist (
-   ban_id number(4) NOT NULL,
-   ban_userid number(4),
-   ban_ip char(8),
-   ban_email varchar(255),
-   CONSTRAINT phpbb_banlist_pkey PRIMARY KEY (ban_id)
-);
-CREATE  INDEX ban_userid_phpbb_banlist_index ON phpbb_banlist (ban_userid);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_categories
--------------------------------------------------------- */
-CREATE TABLE phpbb_categories (
-   cat_id number(4) NOT NULL,
-   cat_title varchar(100),
-   cat_order number(4),
-   CONSTRAINT phpbb_categories_pkey PRIMARY KEY (cat_id)
-);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_config
--------------------------------------------------------- */
-CREATE TABLE phpbb_config (
-   config_name varchar(255) NOT NULL,
-   config_value varchar(255),
-   CONSTRAINT phpbb_config_pkey PRIMARY KEY (config_name)
-);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_disallow
--------------------------------------------------------- */
-CREATE TABLE phpbb_disallow (
-   disallow_id number(4) NOT NULL,
-   disallow_username varchar(25),
-   CONSTRAINT phpbb_disallow_pkey PRIMARY KEY (disallow_id)
-);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_forums
--------------------------------------------------------- */
-CREATE TABLE phpbb_forums (
-   forum_id number(4) NOT NULL,
-   cat_id number(4),
-   forum_name varchar(150),
-   forum_desc varchar(2000),
-   forum_status number(4) DEFAULT '0' NOT NULL,
-   forum_order number(4) DEFAULT '1' NOT NULL,
-   forum_posts number(4) DEFAULT '0' NOT NULL,
-   forum_topics number(4) DEFAULT '0' NOT NULL,
-   forum_last_post_id number(4) DEFAULT '0' NOT NULL,
-   prune_enable number(4) DEFAULT '0' NOT NULL,
-   prune_next number(4),
-   auth_view number(4) DEFAULT '0' NOT NULL,
-   auth_read number(4) DEFAULT '0' NOT NULL,
-   auth_post number(4) DEFAULT '0' NOT NULL,
-   auth_reply number(4) DEFAULT '0' NOT NULL,
-   auth_edit number(4) DEFAULT '0' NOT NULL,
-   auth_delete number(4) DEFAULT '0' NOT NULL,
-   auth_announce number(4) DEFAULT '0' NOT NULL,
-   auth_sticky number(4) DEFAULT '0' NOT NULL,
-   auth_pollcreate number(4) DEFAULT '0' NOT NULL,
-   auth_vote number(4) DEFAULT '0' NOT NULL,
-   auth_attachments number(4) DEFAULT '0' NOT NULL,
-   CONSTRAINT phpbb_forums_pkey PRIMARY KEY (forum_id)
-);
-CREATE  INDEX cat_id_phpbb_forums_index ON phpbb_forums (cat_id);
-CREATE  INDEX forums_order_phpbb_forums ON phpbb_forums (forum_order);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_forum_prune
--------------------------------------------------------- */
-CREATE TABLE phpbb_forum_prune (
-   prune_id number(4) NOT NULL,
-   forum_id number(4) NOT NULL,
-   prune_days number(4) NOT NULL,
-   prune_freq number(4) NOT NULL,
-   CONSTRAINT phpbb_forum_prune_pkey PRIMARY KEY (prune_id)
-);
-CREATE  INDEX forum_id_phpbb_forum_prune ON phpbb_forum_prune (forum_id);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_posts
--------------------------------------------------------- */
-CREATE TABLE phpbb_posts (
-   post_id number(4) NOT NULL,
-   topic_id number(4) DEFAULT '0' NOT NULL,
-   forum_id number(4) DEFAULT '0' NOT NULL,
-   poster_id number(4) DEFAULT '0' NOT NULL,
-   post_time number(11) DEFAULT '0' NOT NULL,
-   post_username varchar(30),
-   poster_ip char(8) DEFAULT '' NOT NULL,
-   enable_bbcode number(4) DEFAULT '1' NOT NULL,
-   enable_html number(4) DEFAULT '0' NOT NULL,
-   enable_smilies number(4) DEFAULT '1' NOT NULL,
-   enable_sig number(4) DEFAULT '1' NOT NULL,
-   post_edit_time number(11),
-   post_edit_count number(4) DEFAULT '0' NOT NULL,
-   CONSTRAINT phpbb_posts_pkey PRIMARY KEY (post_id)
-);
-CREATE  INDEX forum_id_phpbb_posts_index ON phpbb_posts (forum_id);
-CREATE  INDEX post_time_phpbb_posts_index ON phpbb_posts (post_time);
-CREATE  INDEX poster_id_phpbb_posts_index ON phpbb_posts (poster_id);
-CREATE  INDEX topic_id_phpbb_posts_index ON phpbb_posts (topic_id);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_posts_text
--------------------------------------------------------- */
-CREATE TABLE phpbb_posts_text (
-   post_id number(4) DEFAULT '0' NOT NULL,
-   bbcode_uid varchar(10) DEFAULT '',
-   post_subject varchar(255),
-   post_text varchar(2000),
-   CONSTRAINT phpbb_posts_text_pkey PRIMARY KEY (post_id)
-);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_privmsgs
--------------------------------------------------------- */
-CREATE TABLE phpbb_privmsgs (
-   privmsgs_id number(4) NOT NULL,
-   privmsgs_type number(4) DEFAULT '0' NOT NULL,
-   privmsgs_subject varchar(255) DEFAULT '0' NOT NULL,
-   privmsgs_from_userid number(4) DEFAULT '0' NOT NULL,
-   privmsgs_to_userid number(4) DEFAULT '0' NOT NULL,
-   privmsgs_date number(4) DEFAULT '0' NOT NULL,
-   privmsgs_ip char(8) NOT NULL,
-   privmsgs_enable_bbcode number(1) DEFAULT '1' NOT NULL,
-   privmsgs_enable_html number(1) DEFAULT '0' NOT NULL,
-   privmsgs_enable_smilies number(1) DEFAULT '1' NOT NULL, 
-   privmsgs_attach_sig number(1) DEFAULT '1' NOT NULL, 
-   CONSTRAINT phpbb_privmsgs_pkey PRIMARY KEY (privmsgs_id)
-);
-CREATE  INDEX privmsgs_from_userid_index ON phpbb_privmsgs (privmsgs_from_userid);
-CREATE  INDEX privmsgs_to_userid_index ON phpbb_privmsgs (privmsgs_to_userid);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_privmsgs_text
--------------------------------------------------------- */
-CREATE TABLE phpbb_privmsgs_text (
-   privmsgs_text_id number(4) DEFAULT '0' NOT NULL,
-   privmsgs_bbcode_uid char(10) DEFAULT '0' NOT NULL,
-   privmsgs_text varchar(2000),
-   CONSTRAINT phpbb_privmsgs_text_pkey PRIMARY KEY (privmsgs_text_id)
-);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_ranks
--------------------------------------------------------- */
-CREATE TABLE phpbb_ranks (
-   rank_id number(4) NOT NULL,
-   rank_title varchar(50) DEFAULT '' NOT NULL,
-   rank_min number(4) DEFAULT '0' NOT NULL,
-   rank_special number(4) DEFAULT '0',
-   rank_image varchar(255),
-   CONSTRAINT phpbb_ranks_pkey PRIMARY KEY (rank_id)
-);
-CREATE  INDEX rank_max_phpbb_ranks_index ON phpbb_ranks (rank_max);
-CREATE  INDEX rank_min_phpbb_ranks_index ON phpbb_ranks (rank_min);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_session
--------------------------------------------------------- */
-CREATE TABLE phpbb_sessions (
-   session_id char(32) DEFAULT '0' NOT NULL,
-   session_user_id number(11) DEFAULT '0' NOT NULL,
-   session_start number(11) DEFAULT '0' NOT NULL,
-   session_time number(11) DEFAULT '0' NOT NULL,
-   session_last_visit number(11) DEFAULT '0' NOT NULL,
-   session_ip char(8) DEFAULT '0' NOT NULL,
-   session_page number(11) DEFAULT '0' NOT NULL,
-   session_logged_in number(11) DEFAULT '0' NOT NULL,
-   CONSTRAINT phpbb_sessions_pkey PRIMARY KEY (session_id)
-);
-CREATE INDEX session_id_ip_user_id ON phpbb_sessions (session_id, session_ip, session_user_id);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_smilies
--------------------------------------------------------- */
-CREATE TABLE phpbb_smilies (
-   smilies_id number(4) NOT NULL,
-   code varchar(50),
-   smile_url varchar(100),
-   emoticon varchar(75),
-   CONSTRAINT phpbb_smilies_pkey PRIMARY KEY (smilies_id)
-);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_themes
--------------------------------------------------------- */
-CREATE TABLE phpbb_themes (
-   themes_id number(4) NOT NULL,
-   style_name varchar(30),
-   template_name varchar(30) DEFAULT '' NOT NULL,
-   head_stylesheet varchar(100),
-   body_background varchar(100),
-   body_bgcolor char(6),
-   body_text char(6),
-   body_link char(6),
-   body_vlink char(6),
-   body_alink char(6),
-   body_hlink char(6),
-   tr_color1 char(6),
-   tr_color2 char(6),
-   tr_color3 char(6),
-   tr_class1 varchar(25),
-   tr_class2 varchar(25),
-   tr_class3 varchar(25),
-   th_color1 char(6),
-   th_color2 char(6),
-   th_color3 char(6),
-   th_class1 varchar(25),
-   th_class2 varchar(25),
-   th_class3 varchar(25),
-   td_color1 char(6),
-   td_color2 char(6),
-   td_color3 char(6),
-   td_class1 varchar(25),
-   td_class2 varchar(25),
-   td_class3 varchar(25),
-   fontface1 varchar(25),
-   fontface2 varchar(25),
-   fontface3 varchar(25),
-   fontsize1 number(4),
-   fontsize2 number(4),
-   fontsize3 number(4),
-   fontcolor1 char(6),
-   fontcolor2 char(6),
-   fontcolor3 char(6),
-   span_class1 varchar(25),
-   span_class2 varchar(25),
-   span_class3 varchar(25),
-   CONSTRAINT phpbb_themes_pkey PRIMARY KEY (themes_id)
-);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_themes_name
--------------------------------------------------------- */
-CREATE TABLE phpbb_themes_name (
-   themes_id number(4) DEFAULT '0' NOT NULL,
-   tr_color1_name varchar(50),
-   tr_color2_name varchar(50),
-   tr_color3_name varchar(50),
-   tr_class1_name varchar(50),
-   tr_class2_name varchar(50),
-   tr_class3_name varchar(50),
-   th_color1_name varchar(50),
-   th_color2_name varchar(50),
-   th_color3_name varchar(50),
-   th_class1_name varchar(50),
-   th_class2_name varchar(50),
-   th_class3_name varchar(50),
-   td_color1_name varchar(50),
-   td_color2_name varchar(50),
-   td_color3_name varchar(50),
-   td_class1_name varchar(50),
-   td_class2_name varchar(50),
-   td_class3_name varchar(50),
-   fontface1_name varchar(50),
-   fontface2_name varchar(50),
-   fontface3_name varchar(50),
-   fontsize1_name varchar(50),
-   fontsize2_name varchar(50),
-   fontsize3_name varchar(50),
-   fontcolor1_name varchar(50),
-   fontcolor2_name varchar(50),
-   fontcolor3_name varchar(50),
-   span_class1_name varchar(50),
-   span_class2_name varchar(50),
-   span_class3_name varchar(50),
-   CONSTRAINT phpbb_themes_name_pkey PRIMARY KEY (themes_id)
-);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_topics
--------------------------------------------------------- */
-CREATE TABLE phpbb_topics (
-   topic_id number(4) NOT NULL,
-   topic_title varchar(100) DEFAULT '' NOT NULL,
-   topic_poster number(4) DEFAULT '0' NOT NULL,
-   topic_time number(11) DEFAULT '0' NOT NULL,
-   topic_views number(4) DEFAULT '0' NOT NULL,
-   topic_replies number(4) DEFAULT '0' NOT NULL,
-   forum_id number(4) DEFAULT '0' NOT NULL,
-   topic_status number(4) DEFAULT '0' NOT NULL,
-	topic_vote number(4) DEFAULT '0' NOT NULL,
-   topic_type number(4) DEFAULT '0' NOT NULL,
-	topic_moved_id number(4),
-   topic_last_post_id number(4) DEFAULT '0' NOT NULL,
-   CONSTRAINT phpbb_topics_pkey PRIMARY KEY (topic_id)
-);
-CREATE  INDEX phpbb_topics_index ON phpbb_topics (forum_id, topic_id);
-CREATE  INDEX forum_id_phpbb_topics_index ON phpbb_topics (forum_id);
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_topics_watch
--------------------------------------------------------- */
-CREATE TABLE phpbb_topics_watch (
-  topic_id number(4),
-  user_id number(4),
-  notify_status number(4) DEFAULT '0' NOT NULL
-);
-CREATE  INDEX phpbb_topics_watch_index ON phpbb_topics_watch (topic_id, user_id);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_user_group
--------------------------------------------------------- */
-CREATE TABLE phpbb_user_group (
-   group_id number(4) DEFAULT '0' NOT NULL,
-   user_id number(4) DEFAULT '0' NOT NULL,
-   user_pending number(4)
-);
-CREATE  INDEX group_id_phpbb_user_group ON phpbb_user_group (group_id);
-CREATE  INDEX user_id_phpbb_user_group_index ON phpbb_user_group (user_id);
-
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_users
--------------------------------------------------------- */
-CREATE TABLE phpbb_users (
-   user_id number(4) NOT NULL,
-   user_active number(4),
-   username varchar(25) DEFAULT '' NOT NULL,
-   user_regdate number(11) DEFAULT '0' NOT NULL,
-   user_password varchar(32) DEFAULT '' NOT NULL,
-   user_autologin_key varchar(32),
-   user_email varchar(255),
-   user_icq varchar(15),
-   user_website varchar(100),
-   user_occ varchar(100),
-   user_from varchar(100),
-   user_interests varchar(255),
-   user_sig varchar(2000),
-   user_sig_bbcode_uid char(10),
-   user_style number(4),
-   user_aim varchar(255),
-   user_yim varchar(255),
-   user_msnm varchar(255),
-   user_posts number(4) DEFAULT '0' NOT NULL,
-   user_viewemail number(4),
-   user_attachsig number(4),
-   user_allowhtml number(4) DEFAULT '1',
-   user_allowbbcode number(4) DEFAULT '1',
-   user_allowsmile number(4) DEFAULT '1',
-   user_allow_pm number(4) DEFAULT '1' NOT NULL,
-   user_allowavatar number(4) DEFAULT '1' NOT NULL,
-   user_allow_viewonline number(4) DEFAULT '1' NOT NULL,
-   user_rank number(4) DEFAULT '0',
-   user_avatar varchar(100),
-   user_level number(4) DEFAULT '1',
-   user_lang varchar(255),
-   user_timezone number(4) DEFAULT '0' NOT NULL,
-   user_dateformat varchar(14) DEFAULT 'd M Y H:m' NOT NULL,
-   user_notify_pm number(4) DEFAULT '1' NOT NULL,
-   user_notify number(4),
-   user_actkey varchar(32),
-   user_newpasswd varchar(32),
-   CONSTRAINT phpbb_users_pkey PRIMARY KEY (user_id)
-);
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_vote_desc
--------------------------------------------------------- */
-CREATE TABLE phpbb_vote_desc (
-  vote_id number(4) NOT NULL,
-  topic_id number(4) DEFAULT '0' NOT NULL,
-  vote_text varchar2(4000) NOT NULL,
-  vote_start number(4) DEFAULT '0' NOT NULL,
-  vote_length number(4) DEFAULT '0' NOT NULL,
-  CONSTRAINT phpbb_vote_dsc_pkey PRIMARY KEY (vote_id)
-);
-CREATE INDEX topic_id_phpbb_vote_desc_index ON phpbb_vote_desc (topic_id);
-
-/* --------------------------------------------------------
- Table structure for table phpbb_vote_results
--------------------------------------------------------- */
-CREATE TABLE phpbb_vote_results (
-  vote_id number(4) DEFAULT '0' NOT NULL,
-  vote_option_id number(4) DEFAULT '0' NOT NULL,
-  vote_option_text varchar(255) NOT NULL,
-  vote_result number(4) DEFAULT '0' NOT NULL
-);
-CREATE INDEX option_id_vote_results_index ON phpbb_vote_results (vote_option_id);
-
-/* --------------------------------------------------------
- Table structure for table phpbb_vote_voters
--------------------------------------------------------- */
-CREATE TABLE phpbb_vote_voters (
-  vote_id number(4) DEFAULT '0' NOT NULL,
-  vote_user_id number(4) DEFAULT '0' NOT NULL,
-  vote_user_ip char(8) NOT NULL
-);
-CREATE INDEX vote_id_vote_voters_index ON phpbb_vote_voters (vote_id);
-CREATE INDEX vote_user_id_vote_voters_index ON phpbb_vote_voters (vote_user_id);
-CREATE INDEX vote_user_ip_vote_voters_index ON phpbb_vote_voters (vote_user_ip);
-
-/* --------------------------------------------------------
-  Table structure for table phpbb_words
--------------------------------------------------------- */
-CREATE TABLE phpbb_words (
-   word_id number(4) NOT NULL,
-   word varchar(100) DEFAULT '' NOT NULL,
-   replacement varchar(100) DEFAULT '' NOT NULL,
-   CONSTRAINT phpbb_words_pkey PRIMARY KEY (word_id)
-);
-
-COMMIT;

phpBB/db/schemas/oracle_triggers.sql

@@ -1,217 +0,0 @@
-/*
-  phpBB2 Oracle 8i Triggers File - (c) 2001 The phpBB Group
-
-  $Id$
- */
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_groups
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_PHPBB_GROUPS_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "GROUP_ID" ON "PHPBB"."PHPBB_GROUPS"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_GROUPS_ID_SEQ.NEXTVAL
-INTO :NEW.group_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_banlist
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_PHPBB_BANLIST_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "BAN_ID" ON "PHPBB"."PHPBB_BANLIST"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_BANLIST_ID_SEQ.NEXTVAL
-INTO :NEW.ban_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_categories
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_CATEGORIES_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "CAT_ID" ON "PHPBB"."PHPBB_CATEGORIES"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_CATEGORIES_ID_SEQ.NEXTVAL
-INTO :NEW.cat_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_disallow
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_DISALLOW_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "DISALLOW_ID" ON "PHPBB"."PHPBB_DISALLOW"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_DISALLOW_ID_SEQ.NEXTVAL
-INTO :NEW.disallow_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_forums
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_FORUMS_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "FORUM_ID" ON "PHPBB"."PHPBB_FORUMS"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_FORUMS_ID_SEQ.NEXTVAL
-INTO :NEW.forum_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_forum_prune
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_FORUM_PRUNE_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "PRUNE_ID" ON "PHPBB"."PHPBB_FORUM_PRUNE"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_FORUM_PRUNE_ID_SEQ.NEXTVAL
-INTO :NEW.prune_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_posts
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_POSTS_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "POST_ID" ON "PHPBB"."PHPBB_POSTS"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_POSTS_ID_SEQ.NEXTVAL
-INTO :NEW.post_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_privmsgs
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_PRIVMSGS_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "PRIVMSGS_ID" ON "PHPBB"."PHPBB_PRIVMSGS"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_PRIVMSGS_ID_SEQ.NEXTVAL
-INTO :NEW.privmsgs_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_ranks
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_RANK_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "RANK_ID" ON "PHPBB"."PHPBB_RANKS"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_RANKS_ID_SEQ.NEXTVAL
-INTO :NEW.rank_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_smilies
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_SMILIES_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "SMILIES_ID" ON "PHPBB"."PHPBB_SMILIES"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_SMILIES_ID_SEQ.NEXTVAL
-INTO :NEW.smilies_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_themes
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_THEMES_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "THEMES_ID" ON "PHPBB"."PHPBB_THEMES"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_THEMES_ID_SEQ.NEXTVAL
-INTO :NEW.themes_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_topics
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_TOPICS_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "TOPIC_ID" ON "PHPBB"."PHPBB_TOPICS"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_TOPICS_ID_SEQ.NEXTVAL
-INTO :NEW.topic_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_users
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_USERS_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "USER_ID" ON "PHPBB"."PHPBB_USERS"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_USERS_ID_SEQ.NEXTVAL
-INTO :NEW.user_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_vote_desc
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_VOTE_DESC_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "VOTE_ID" ON "PHPBB"."PHPBB_VOTE_DESC"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_VOTE_DESC_ID_SEQ.NEXTVAL
-INTO :NEW.vote_id
-FROM DUAL;
-END;
-/
-
-/* --------------------------------------------------------
-  Trigger structure for table phpbb_words
--------------------------------------------------------- */
-CREATE OR REPLACE TRIGGER "PHPBB"."SET_WORDS_ID_SEQ"
-BEFORE INSERT OR UPDATE OF "WORD_ID" ON "PHPBB"."PHPBB_WORDS"
-REFERENCING OLD AS OLD NEW AS NEW
-FOR EACH ROW
-BEGIN
-SELECT PHPBB_WORDS_ID_SEQ.NEXTVAL
-INTO :NEW.word_id
-FROM DUAL;
-END;
-/
-
-COMMIT;

phpBB/db/schemas/postgres_basic.sql

@@ -52,7 +52,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1'
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_enable','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0'); 
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
@@ -61,7 +61,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.yourdomain.tld');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 'RC-4');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.3');
 
 -- Categories
 INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test category 1', 10);
@@ -71,7 +71,7 @@ INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test cat
 INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order, forum_posts, forum_topics, forum_last_post_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_pollcreate, auth_vote, auth_attachments) VALUES (1, 'Test Forum 1', 'This is just a test forum.', 1, 10, 1, 1, 1, 0, 0, 0, 0, 1, 1, 3, 1, 1, 1, 3);
 
 -- Users
-INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 0, 1, 0, 1, 1, NULL, '', '', '', '', '', '', 0, 0);
+INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 0, 1, 0, 1, 1, NULL, '', '', 0, '', '', '', 0, 0);
 
 -- username: admin    password: admin (change this or remove it once everything is working!)
 INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_popup_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( 2, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, '', 'english', 0, 'd M Y h:i a', '', '', 0, 1);
@@ -119,38 +119,36 @@ INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':
 INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_surprised.gif', 'Surprised');
 INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised');
 INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, '8O', 'icon_eek.gif', 'Shocked');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, '8-O', 'icon_eek.gif', 'Shocked');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':shock:', 'icon_eek.gif', 'Shocked');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':?', 'icon_confused.gif', 'Confused');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, ':-?', 'icon_confused.gif', 'Confused');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, ':???:', 'icon_confused.gif', 'Confused');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, '8)', 'icon_cool.gif', 'Cool');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, '8-)', 'icon_cool.gif', 'Cool');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':cool:', 'icon_cool.gif', 'Cool');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':lol:', 'icon_lol.gif', 'Laughing');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':x', 'icon_mad.gif', 'Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':-x', 'icon_mad.gif', 'Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':mad:', 'icon_mad.gif', 'Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':P', 'icon_razz.gif', 'Razz');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':-P', 'icon_razz.gif', 'Razz');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':razz:', 'icon_razz.gif', 'Razz');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':oops:', 'icon_redface.gif', 'Embarassed');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ':wink:', 'icon_wink.gif', 'Wink');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ';)', 'icon_wink.gif', 'Wink');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ';-)', 'icon_wink.gif', 'Wink');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':!:', 'icon_exclaim.gif', 'Exclamation');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':?:', 'icon_question.gif', 'Question');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':idea:', 'icon_idea.gif', 'Idea');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':arrow:', 'icon_arrow.gif', 'Arrow');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':|', 'icon_neutral.gif', 'Neutral');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':-|', 'icon_neutral.gif', 'Neutral');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 43, ':neutral:', 'icon_neutral.gif', 'Neutral');
-INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 44, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':shock:', 'icon_eek.gif', 'Shocked');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':?', 'icon_confused.gif', 'Confused');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':-?', 'icon_confused.gif', 'Confused');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':???:', 'icon_confused.gif', 'Confused');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8)', 'icon_cool.gif', 'Cool');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, '8-)', 'icon_cool.gif', 'Cool');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':cool:', 'icon_cool.gif', 'Cool');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':lol:', 'icon_lol.gif', 'Laughing');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':x', 'icon_mad.gif', 'Mad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':-x', 'icon_mad.gif', 'Mad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':mad:', 'icon_mad.gif', 'Mad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':P', 'icon_razz.gif', 'Razz');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':-P', 'icon_razz.gif', 'Razz');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':razz:', 'icon_razz.gif', 'Razz');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':oops:', 'icon_redface.gif', 'Embarassed');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':cry:', 'icon_cry.gif', 'Crying or Very sad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':evil:', 'icon_evil.gif', 'Evil or Very Mad');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':twisted:', 'icon_twisted.gif', 'Twisted Evil');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':wink:', 'icon_wink.gif', 'Wink');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';)', 'icon_wink.gif', 'Wink');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ';-)', 'icon_wink.gif', 'Wink');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':!:', 'icon_exclaim.gif', 'Exclamation');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':?:', 'icon_question.gif', 'Question');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':idea:', 'icon_idea.gif', 'Idea');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':arrow:', 'icon_arrow.gif', 'Arrow');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':|', 'icon_neutral.gif', 'Neutral');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':-|', 'icon_neutral.gif', 'Neutral');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':neutral:', 'icon_neutral.gif', 'Neutral');
+INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green');
 
 
 -- wordlist

phpBB/db/schemas/postgres_schema.sql

@@ -478,7 +478,7 @@ CREATE TABLE phpbb_users (
    user_avatar_type int2 DEFAULT '0' NOT NULL, 
    user_level int4 DEFAULT '1',
    user_lang varchar(255),
-   user_timezone int4 DEFAULT '0' NOT NULL,
+   user_timezone decimal(4) DEFAULT '0' NOT NULL,
    user_dateformat varchar(14) DEFAULT 'd M Y H:m' NOT NULL,
    user_notify_pm int2 DEFAULT '1' NOT NULL,
    user_popup_pm int2 DEFAULT '0' NOT NULL, 

phpBB/develop/benchmark.php

@@ -417,22 +417,6 @@ function make_user($username)
 		message_die(GENERAL_ERROR, "Couldn't obtained next user_id information.", "", __LINE__, __FILE__, $sql);
 	}
 
-	$sql = "SELECT MAX(group_id) AS total
-		FROM " . GROUPS_TABLE;
-	if($result = $db->sql_query($sql))
-	{
-		$row = $db->sql_fetchrow($result);
-		$new_group_id = $row['total'] + 1;
-
-		unset($result);
-		unset($row);
-	}
-	else
-	{
-		message_die(GENERAL_ERROR, "Couldn't obtained next user_id information.", "", __LINE__, __FILE__, $sql);
-	}
-
-
 	$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
 		VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', '$msn', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";
 
@@ -441,12 +425,14 @@ function make_user($username)
 	
 	if($result = $db->sql_query($sql, BEGIN_TRANSACTION))
 	{
-		$sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_name, group_description, group_single_user, group_moderator)
-			VALUES ($new_group_id, '', 'Personal User', 1, 0)";
+		$sql = "INSERT INTO " . GROUPS_TABLE . " (group_name, group_description, group_single_user, group_moderator)
+			VALUES ('', 'Personal User', 1, 0)";
 		if($result = $db->sql_query($sql))
 		{
+			$group_id = $db->sql_nextid();
+			
 			$sql = "INSERT INTO " . USER_GROUP_TABLE . " (user_id, group_id, user_pending)
-				VALUES ($new_user_id, $new_group_id, 0)";
+				VALUES ($new_user_id, $group_id, 0)";
 			if($result = $db->sql_query($sql, END_TRANSACTION))
 			{
 				

phpBB/develop/encoding_emails.php

@@ -0,0 +1,73 @@
+<?php
+/***************************************************************************
+ *                            revar_lang_files.php
+ *                            -------------------
+ *   begin                : Saturday, Feb 13, 2001
+ *   copyright            : (C) 2001 The phpBB Group
+ *   email                : support@phpbb.com
+ *
+ *   $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.
+ *
+ ***************************************************************************/
+
+//
+// Security message:
+//
+// This script is potentially dangerous.
+// Remove or comment the next line (die(".... ) to enable this script.
+// Do NOT FORGET to either remove this script or disable it after you have used it.
+//
+die("Please read the first lines of this script for instructions on how to enable it");
+
+$dirname = "./../language";
+$dir = opendir($dirname);
+
+while ( $file = readdir($dir) )
+{
+	if ( ereg('^lang_', $file) && !is_file($dirname . '/' . $file) && !is_link($dirname . '/' . $file) )
+	{
+		include($dirname . '/' . $file . '/lang_main.php');
+
+		$lang_dir = opendir($dirname . '/' . $file . '/email');
+
+		while ( $email = readdir($lang_dir) )
+		{
+			if ( ereg('\.tpl$', $email) && is_file($dirname . '/' . $file . '/email/' . $email) )
+			{
+				$fp = fopen($dirname . '/' . $file . '/email/' . $email, 'r+');
+
+				$email_file = "";
+				while ( $line = fread($fp, 100000) )
+				{
+					$email_file .= $line;
+				}
+
+				if ( !preg_match('/^Charset: .*?$/m', $email_file) )
+				{
+					$email_file = preg_replace('/^((Subject: .*?\n)(\n))?/i', "\\2Charset: " . $lang['ENCODING'] . "\n\n", $email_file);
+				}
+		
+				echo '<b>' . $dirname . '/' . $file . '/email/' . $email . "</b><br />\n";
+				echo nl2br($email_file);
+				echo "\n\n<br /><br />\n\n";
+
+				fseek($fp, 0);
+				fwrite($fp, $email_file);
+				fclose($fp);
+			}
+		}
+		echo "\n\n<hr />\n\n";
+	}
+}
+
+?>

phpBB/extension.inc

@@ -21,12 +21,6 @@ if ( !defined('IN_PHPBB') )
 //
 $phpEx = "php";
 
-//
-// For debug timing
-// 
-$mtime = microtime();
-$mtime = explode(" ",$mtime);
-$mtime = $mtime[1] + $mtime[0];
-$starttime = $mtime;
+$starttime = 0;
 
 ?>

phpBB/faq.php

@@ -21,7 +21,7 @@
  ***************************************************************************/
 
 define('IN_PHPBB', true);
-$phpbb_root_path = "./";
+$phpbb_root_path = './';
 include($phpbb_root_path . 'extension.inc');
 include($phpbb_root_path . 'common.'.$phpEx);
 
@@ -37,24 +37,23 @@ init_userprefs($userdata);
 //
 // Load the appropriate faq file
 //
-
 if( isset($HTTP_GET_VARS['mode']) )
 {
 	switch( $HTTP_GET_VARS['mode'] )
 	{
 		case 'bbcode':
-			$lang_file = "lang_bbcode";
+			$lang_file = 'lang_bbcode';
 			$l_title = $lang['BBCode_guide'];
 			break;
 		default:
-			$lang_file = "lang_faq";
+			$lang_file = 'lang_faq';
 			$l_title = $lang['FAQ'];
 			break;
 	}
 }
 else
 {
-	$lang_file = "lang_faq";
+	$lang_file = 'lang_faq';
 	$l_title = $lang['FAQ'];
 }
 include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/' . $lang_file . '.' . $phpEx);
@@ -70,7 +69,7 @@ $faq_block_titles = array();
 
 for($i = 0; $i < count($faq); $i++)
 {
-	if( $faq[$i][0] != "--" )
+	if( $faq[$i][0] != '--' )
 	{
 		$faq_block[$j][$counter]['id'] = $counter_2;
 		$faq_block[$j][$counter]['question'] = $faq[$i][0];
@@ -96,35 +95,24 @@ $page_title = $l_title;
 include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
 $template->set_filenames(array(
-	"body" => "faq_body.tpl",
-	"jumpbox" => "jumpbox.tpl")
+	'body' => 'faq_body.tpl')
 );
-
-$jumpbox = make_jumpbox($forum_id);
-$template->assign_vars(array(
-	"L_GO" => $lang['Go'],
-	"L_JUMP_TO" => $lang['Jump_to'],
-	"L_SELECT_FORUM" => $lang['Select_forum'],
-
-	"S_JUMPBOX_LIST" => $jumpbox,
-	"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
-);
-$template->assign_var_from_handle("JUMPBOX", "jumpbox");
+make_jumpbox('viewforum.'.$phpEx, $forum_id);
 
 $template->assign_vars(array(
-	"L_FAQ_TITLE" => $l_title, 
-	"L_BACK_TO_TOP" => $lang['Back_to_top'])
+	'L_FAQ_TITLE' => $l_title, 
+	'L_BACK_TO_TOP' => $lang['Back_to_top'])
 );
 
 for($i = 0; $i < count($faq_block); $i++)
 {
 	if( count($faq_block[$i]) )
 	{
-		$template->assign_block_vars("faq_block", array(
-			"BLOCK_TITLE" => $faq_block_titles[$i])
+		$template->assign_block_vars('faq_block', array(
+			'BLOCK_TITLE' => $faq_block_titles[$i])
 		);
-		$template->assign_block_vars("faq_block_link", array( 
-			"BLOCK_TITLE" => $faq_block_titles[$i])
+		$template->assign_block_vars('faq_block_link', array( 
+			'BLOCK_TITLE' => $faq_block_titles[$i])
 		);
 
 		for($j = 0; $j < count($faq_block[$i]); $j++)
@@ -132,27 +120,27 @@ for($i = 0; $i < count($faq_block); $i++)
 			$row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
 			$row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
 
-			$template->assign_block_vars("faq_block.faq_row", array(
-				"ROW_COLOR" => "#" . $row_color,
-				"ROW_CLASS" => $row_class,
-				"FAQ_QUESTION" => $faq_block[$i][$j]['question'], 
-				"FAQ_ANSWER" => $faq_block[$i][$j]['answer'], 
+			$template->assign_block_vars('faq_block.faq_row', array(
+				'ROW_COLOR' => '#' . $row_color,
+				'ROW_CLASS' => $row_class,
+				'FAQ_QUESTION' => $faq_block[$i][$j]['question'], 
+				'FAQ_ANSWER' => $faq_block[$i][$j]['answer'], 
 
-				"U_FAQ_ID" => $faq_block[$i][$j]['id'])
+				'U_FAQ_ID' => $faq_block[$i][$j]['id'])
 			);
 
-			$template->assign_block_vars("faq_block_link.faq_row_link", array(
-				"ROW_COLOR" => "#" . $row_color,
-				"ROW_CLASS" => $row_class,
-				"FAQ_LINK" => $faq_block[$i][$j]['question'], 
+			$template->assign_block_vars('faq_block_link.faq_row_link', array(
+				'ROW_COLOR' => '#' . $row_color,
+				'ROW_CLASS' => $row_class,
+				'FAQ_LINK' => $faq_block[$i][$j]['question'], 
 
-				"U_FAQ_LINK" => "#" . $faq_block[$i][$j]['id'])
+				'U_FAQ_LINK' => '#' . $faq_block[$i][$j]['id'])
 			);
 		}
 	}
 }
 
-$template->pparse("body");
+$template->pparse('body');
 
 include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 

phpBB/includes/auth.php

@@ -22,11 +22,7 @@
 
 /*
 	$type's accepted (pre-pend with AUTH_):
-	VIEW, READ, POST, REPLY, EDIT, DELETE, STICKY, ANNOUNCE, VOTE, VOTECREATE,
-	ATTACH
-
-	$types pending (for future versions, pre-pend with AUTH_):
-	ALLOW_HTML, ALLOW_BBCODE, ALLOW_SMILIES
+	VIEW, READ, POST, REPLY, EDIT, DELETE, STICKY, ANNOUNCE, VOTE, POLLCREATE
 
 	Possible options ($type/forum_id combinations):
 
@@ -52,70 +48,63 @@
 	forum auth levels, this will prevent the auth function having to do its own
 	lookup
 */
-function auth($type, $forum_id, $userdata, $f_access = -1)
+function auth($type, $forum_id, $userdata, $f_access = '')
 {
 	global $db, $lang;
 
 	switch( $type )
 	{
 		case AUTH_ALL:
-			$a_sql = "a.auth_view, a.auth_read, a.auth_post, a.auth_reply, a.auth_edit, a.auth_delete, a.auth_sticky, a.auth_announce, a.auth_vote, a.auth_pollcreate";
-			$auth_fields = array("auth_view", "auth_read", "auth_post", "auth_reply", "auth_edit", "auth_delete", "auth_sticky", "auth_announce", "auth_vote", "auth_pollcreate");
+			$a_sql = 'a.auth_view, a.auth_read, a.auth_post, a.auth_reply, a.auth_edit, a.auth_delete, a.auth_sticky, a.auth_announce, a.auth_vote, a.auth_pollcreate';
+			$auth_fields = array('auth_view', 'auth_read', 'auth_post', 'auth_reply', 'auth_edit', 'auth_delete', 'auth_sticky', 'auth_announce', 'auth_vote', 'auth_pollcreate');
 			break;
 
 		case AUTH_VIEW:
-			$a_sql = "a.auth_view";
-			$auth_fields = array("auth_view");
+			$a_sql = 'a.auth_view';
+			$auth_fields = array('auth_view');
 			break;
 
 		case AUTH_READ:
-			$a_sql = "a.auth_read";
-			$auth_fields = array("auth_read");
+			$a_sql = 'a.auth_read';
+			$auth_fields = array('auth_read');
 			break;
 		case AUTH_POST:
-			$a_sql = "a.auth_post";
-			$auth_fields = array("auth_post");
+			$a_sql = 'a.auth_post';
+			$auth_fields = array('auth_post');
 			break;
 		case AUTH_REPLY:
-			$a_sql = "a.auth_reply";
-			$auth_fields = array("auth_reply");
+			$a_sql = 'a.auth_reply';
+			$auth_fields = array('auth_reply');
 			break;
 		case AUTH_EDIT:
-			$a_sql = "a.auth_edit";
-			$auth_fields = array("auth_edit");
+			$a_sql = 'a.auth_edit';
+			$auth_fields = array('auth_edit');
 			break;
 		case AUTH_DELETE:
-			$a_sql = "a.auth_delete";
-			$auth_fields = array("auth_delete");
+			$a_sql = 'a.auth_delete';
+			$auth_fields = array('auth_delete');
 			break;
 
 		case AUTH_ANNOUNCE:
-			$a_sql = "a.auth_announce";
-			$auth_fields = array("auth_announce");
+			$a_sql = 'a.auth_announce';
+			$auth_fields = array('auth_announce');
 			break;
 		case AUTH_STICKY:
-			$a_sql = "a.auth_sticky";
-			$auth_fields = array("auth_sticky");
+			$a_sql = 'a.auth_sticky';
+			$auth_fields = array('auth_sticky');
 			break;
 
 		case AUTH_POLLCREATE:
-			$a_sql = "a.auth_pollcreate";
-			$auth_fields = array("auth_pollcreate");
+			$a_sql = 'a.auth_pollcreate';
+			$auth_fields = array('auth_pollcreate');
 			break;
 		case AUTH_VOTE:
-			$a_sql = "a.auth_vote";
-			$auth_fields = array("auth_vote");
+			$a_sql = 'a.auth_vote';
+			$auth_fields = array('auth_vote');
 			break;
 		case AUTH_ATTACH:
 			break;
 
-		case AUTH_ALLOW_HTML:
-			break;
-		case AUTH_ALLOW_BBCODE:
-			break;
-		case AUTH_ALLOW_SMILIES:
-			break;
-
 		default:
 			break;
 	}
@@ -124,30 +113,26 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
 	// If f_access has been passed, or auth is needed to return an array of forums
 	// then we need to pull the auth information on the given forum (or all forums)
 	//
-	if( $f_access == -1 )
+	if ( empty($f_access) )
 	{
-		$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "WHERE a.forum_id = $forum_id" : "";
+		$forum_match_sql = ( $forum_id != AUTH_LIST_ALL ) ? "WHERE a.forum_id = $forum_id" : '';
 
 		$sql = "SELECT a.forum_id, $a_sql
 			FROM " . FORUMS_TABLE . " a
 			$forum_match_sql";
-		$af_result = $db->sql_query($sql);
+		if ( !($result = $db->sql_query($sql)) )
+		{
+			message_die(GENERAL_ERROR, 'Failed obtaining forum access control lists', '', __LINE__, __FILE__, $sql);
+		}
 
-		if(!$af_result)
+		$sql_fetchrow = ( $forum_id != AUTH_LIST_ALL ) ? 'sql_fetchrow' : 'sql_fetchrowset';
+
+		if ( !($f_access = $db->$sql_fetchrow($result)) )
 		{
-			message_die(GENERAL_ERROR, "Failed obtaining forum access control lists", "", __LINE__, __FILE__, $sql);
-		}
-		else
-		{
-			if( !$db->sql_numrows($af_result) )
-			{
-				message_die(GENERAL_ERROR, "No forum access control lists exist!", "", __LINE__, __FILE__, $sql);
-			}
-			else
-			{
-				$f_access = ($forum_id != AUTH_LIST_ALL) ? $db->sql_fetchrow($af_result) : $db->sql_fetchrowset($af_result);
-			}
+			message_die(GENERAL_ERROR, 'No forum access control lists exist', '', __LINE__, __FILE__, $sql);
 		}
+
+		$db->sql_freeresult($result);
 	}
 
 	//
@@ -155,11 +140,10 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
 	// has the type set to ALL, if yes they are good to go, if not then they
 	// are denied access
 	//
-	$auth_user = array();
-
-	if( $userdata['session_logged_in'] )
+	$u_access = array();
+	if ( $userdata['session_logged_in'] )
 	{
-		$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "AND a.forum_id = $forum_id" : "";
+		$forum_match_sql = ( $forum_id != AUTH_LIST_ALL ) ? "AND a.forum_id = $forum_id" : '';
 
 		$sql = "SELECT a.forum_id, $a_sql, a.auth_mod 
 			FROM " . AUTH_ACCESS_TABLE . " a, " . USER_GROUP_TABLE . " ug 
@@ -167,33 +151,31 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
 				AND ug.user_pending = 0 
 				AND a.group_id = ug.group_id
 				$forum_match_sql";
-		$a_result = $db->sql_query($sql);
-		if( !$a_result )
+		if ( !($result = $db->sql_query($sql)) )
 		{
-			message_die(GENERAL_ERROR, "Failed obtaining forum access control lists", "", __LINE__, __FILE__, $sql);
+			message_die(GENERAL_ERROR, 'Failed obtaining forum access control lists', '', __LINE__, __FILE__, $sql);
 		}
 
-		$num_u_access = $db->sql_numrows($a_result);
-		if( $num_u_access )
+		if ( $row = $db->sql_fetchrow($result) )
 		{
-			if($forum_id != AUTH_LIST_ALL)
+			do
 			{
-				$u_access = $db->sql_fetchrowset($a_result);
-			}
-			else
-			{
-				while( $u_row = $db->sql_fetchrow($a_result) )
+				if ( $forum_id != AUTH_LIST_ALL)
 				{
-					$u_access[$u_row['forum_id']][] = $u_row;
+					$u_access[] = $row;
+				}
+				else
+				{
+					$u_access[$row['forum_id']][] = $row;
 				}
 			}
+			while( $row = $db->sql_fetchrow($result) );
 		}
 	}
 
 	$is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0;
 
 	$auth_user = array();
-
 	for($i = 0; $i < count($auth_fields); $i++)
 	{
 		$key = $auth_fields[$i];
@@ -209,18 +191,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
 		// and admin automatically have access to an ACL forum, similarly we assume admins meet an
 		// auth requirement of MOD
 		//
-		// The access level assigned to a single user automatically takes precedence over any levels
-		// granted by that user being a member of a multi-user usergroup, eg. a user who is banned
-		// from a forum won't gain access to it even if they belong to a group which has access (and
-		// vice versa). This check is done via the single_user check
-		//
-		// PS : I appologise for the fantastically clear and hugely readable code here ;) Simple gist
-		// is, if this row of auth_access doesn't represent a single user then OR the  contents of
-		// relevant auth_access levels against the current level (allows maximum group privileges to
-		// be assigned). If the row does represent a single user then forget any previous group results
-		// and instead set the auth to whatever the OR'd contents of the access levels are.
-		//
-		if( $forum_id != AUTH_LIST_ALL )
+		if ( $forum_id != AUTH_LIST_ALL )
 		{
 			$value = $f_access[$key];
 
@@ -301,7 +272,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
 	//
 	// Is user a moderator?
 	//
-	if( $forum_id != AUTH_LIST_ALL )
+	if ( $forum_id != AUTH_LIST_ALL )
 	{
 		$auth_user['auth_mod'] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0;
 	}
@@ -322,7 +293,7 @@ function auth_check_user($type, $key, $u_access, $is_admin)
 {
 	$auth_user = 0;
 
-	if( count($u_access) )
+	if ( count($u_access) )
 	{
 		for($j = 0; $j < count($u_access); $j++)
 		{

phpBB/includes/bbcode.php

@@ -198,19 +198,19 @@ function bbencode_second_pass($text, $uid)
 	$replacements[0] = $bbcode_tpl['img'];
 	
 	// [url]xxxx://www.phpbb.com[/url] code..
-	$patterns[1] = "#\[url\]([a-z]+?://){1}([a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+]+)\[/url\]#si";
+	$patterns[1] = "#\[url\]([a-z]+?://){1}([a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+\(\)]+)\[/url\]#si";
 	$replacements[1] = $bbcode_tpl['url1'];
 
 	// [url]www.phpbb.com[/url] code.. (no xxxx:// prefix).
-	$patterns[2] = "#\[url\]([a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+]+)\[/url\]#si";
+	$patterns[2] = "#\[url\]([a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+\(\)]+)\[/url\]#si";
 	$replacements[2] = $bbcode_tpl['url2'];
 
 	// [url=xxxx://www.phpbb.com]phpBB[/url] code..
-	$patterns[3] = "#\[url=([a-z]+?://){1}([a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+]+)\](.*?)\[/url\]#si";
+	$patterns[3] = "#\[url=([a-z]+?://){1}([a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+\(\)]+)\](.*?)\[/url\]#si";
 	$replacements[3] = $bbcode_tpl['url3'];
 
 	// [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix).
-	$patterns[4] = "#\[url=([a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+]+)\](.*?)\[/url\]#si";
+	$patterns[4] = "#\[url=([a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+\(\)]+)\](.*?)\[/url\]#si";
 	$replacements[4] = $bbcode_tpl['url4'];
 
 	// [email]user@domain.tld[/email] code..
@@ -251,7 +251,7 @@ function bbencode_first_pass($text, $uid)
 	// [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff.
 	$text = bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, '');
 	
-	$text = bbencode_first_pass_pda($text, $uid, '/\[quote=(\\\\".*?\\\\")\]/is', '[/quote]', '', false, '', "[quote:$uid=\\1]");
+	$text = bbencode_first_pass_pda($text, $uid, '/\[quote=(\\\\"[^"]*?\\\\")\]/is', '[/quote]', '', false, '', "[quote:$uid=\\1]");
 
 	// [list] and [list=x] for (un)ordered lists.
 	$open_tag = array();
@@ -282,7 +282,7 @@ function bbencode_first_pass($text, $uid)
 	$text = preg_replace("#\[i\](.*?)\[/i\]#si", "[i:$uid]\\1[/i:$uid]", $text);
 
 	// [img]image_url_here[/img] code..
-	$text = preg_replace("#\[img\](([a-z]+?)://([^ \n\r]+?))\[/img\]#si", "[img:$uid]\\1[/img:$uid]", $text);
+	$text = preg_replace("#\[img\](http(s)?://)([a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+]+)\[/img\]#si", "[img:$uid]\\1\\3[/img:$uid]", $text);
 
 	// Remove our padding from the string..
 	$text = substr($text, 1);
@@ -433,7 +433,13 @@ function bbencode_first_pass_pda($text, $uid, $open_tag, $close_tag, $close_tag_
 				// Push its position, the text we matched, and its index in the open_tag array on to the stack, and then keep going to the right.
 				$match = array("pos" => $curr_pos, "tag" => $which_start_tag, "index" => $start_tag_index);
 				bbcode_array_push($stack, $match);
-				++$curr_pos;
+				//
+            // Rather than just increment $curr_pos
+            // Set it to the ending of the tag we just found
+            // Keeps error in nested tag from breaking out
+            // of table structure..
+            //
+            $curr_pos = $curr_pos + strlen($possible_start);	
 			}
 			else
 			{
@@ -477,20 +483,34 @@ function bbencode_first_pass_pda($text, $uid, $open_tag, $close_tag, $close_tag_
 						// Mark the lowest nesting level if needed.
 						if ($mark_lowest_level && ($curr_nesting_depth == 1))
 						{
+							if ($open_tag[0] == '[code]')
+							{
+								$code_entities_match = array('#<#', '#>#', '#"#', '#:#', '#\[#', '#\]#', '#\(#', '#\)#', '#\{#', '#\}#');
+								$code_entities_replace = array('&lt;', '&gt;', '&quot;', '&#58;', '&#91;', '&#93;', '&#40;', '&#41;', '&#123;', '&#125;');
+								$between_tags = preg_replace($code_entities_match, $code_entities_replace, $between_tags);
+							}
 							$text = $before_start_tag . substr($start_tag, 0, $start_length - 1) . ":$curr_nesting_depth:$uid]";
 							$text .= $between_tags . substr($close_tag_new, 0, $close_tag_new_length - 1) . ":$curr_nesting_depth:$uid]";
 						}
 						else
 						{
-							if ($open_is_regexp)
+							if ($open_tag[0] == '[code]')
 							{
-								$text = $before_start_tag . $start_tag;
+								$text = $before_start_tag . '&#91;code&#93;';
+								$text .= $between_tags . '&#91;/code&#93;';
 							}
 							else
 							{
-								$text = $before_start_tag . substr($start_tag, 0, $start_length - 1) . ":$uid]";
+								if ($open_is_regexp)
+								{
+									$text = $before_start_tag . $start_tag;
+								}
+								else
+								{
+									$text = $before_start_tag . substr($start_tag, 0, $start_length - 1) . ":$uid]";
+								}
+								$text .= $between_tags . substr($close_tag_new, 0, $close_tag_new_length - 1) . ":$uid]";
 							}
-							$text .= $between_tags . substr($close_tag_new, 0, $close_tag_new_length - 1) . ":$uid]";
 						}
 
 						$text .= $after_end_tag;
@@ -600,7 +620,7 @@ function make_clickable($text)
 	// matches an "xxxx://yyyy" URL at the start of a line, or after a space.
 	// xxxx can only be alpha characters.
 	// yyyy is anything up to the first space, newline, or comma.
-	$ret = preg_replace("#([\n ])([a-z]+?)://([^,\t \n\r]+)#i", "\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", $ret);
+	$ret = preg_replace("#([\n ])([a-z]+?)://([a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+]+)#i", "\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", $ret);
 
 	// matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
 	// Must contain at least 2 dots. xxxx contains either alphanum, or "-"
@@ -608,7 +628,7 @@ function make_clickable($text)
 	// zzzz is optional.. will contain everything up to the first space, newline, or comma.
 	// This is slightly restrictive - it's not going to match stuff like "forums.foo.com"
 	// This is to keep it from getting annoying and matching stuff that's not meant to be a link.
-	$ret = preg_replace("#([\n ])www\.([a-z0-9\-]+)\.([a-z0-9\-.\~]+)((?:/[^,\t \n\r]*)?)#i", "\\1<a href=\"http://www.\\2.\\3\\4\" target=\"_blank\">www.\\2.\\3\\4</a>", $ret);
+	$ret = preg_replace("#([\n ])www\.([a-z0-9\-]+)\.([a-z0-9\-.\~]+)((?:/[a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+]*)?)#i", "\\1<a href=\"http://www.\\2.\\3\\4\" target=\"_blank\">www.\\2.\\3\\4</a>", $ret);
 
 	// matches an email@domain type address at the start of a line, or after a space.
 	// Note: Only the followed chars are valid; alphanums, "-", "_" and or ".".
@@ -716,42 +736,36 @@ function bbcode_array_pop(&$stack)
 // Smilies code ... would this be better tagged on to the end of bbcode.php?
 // Probably so and I'll move it before B2
 //
-function smilies_pass($message)
-{
-	global $db, $board_config;
-	static $smilies;
+function smilies_pass($message) 
+{ 
+   static $orig, $repl; 
 
-	if( empty($smilies) )
-	{
-		$sql = "SELECT code, smile_url
-			FROM " . SMILIES_TABLE;
-		if( !$result = $db->sql_query($sql) )
-		{
-			message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql);
-		}
+   if (!isset($orig)) 
+   { 
+      global $db, $board_config; 
+      $orig = $repl = array(); 
 
-		if( !$db->sql_numrows($result) )
-		{
-			return $message;
-		}
+      $sql = 'SELECT code, smile_url FROM ' . SMILIES_TABLE; 
+      if( !$result = $db->sql_query($sql) ) 
+      { 
+         message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql); 
+      } 
+      $smilies = $db->sql_fetchrowset($result); 
 
-		$smilies = $db->sql_fetchrowset($result);
-	}
+      usort($smilies, 'smiley_sort'); 
+      for($i = 0; $i < count($smilies); $i++) 
+      { 
+         $orig[] = "/(?<=.\W|\W.|^\W)" . phpbb_preg_quote($smilies[$i]['code'], "/") . "(?=.\W|\W.|\W$)/"; 
+         $repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0" />'; 
+      } 
+   } 
 
-	usort($smilies, 'smiley_sort');
-	for($i = 0; $i < count($smilies); $i++)
-	{
-		$orig[] = "/(?<=.\\W|\\W.|^\\W)" . phpbb_preg_quote($smilies[$i]['code'], "/") . "(?=.\\W|\\W.|\\W$)/";
-		$repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0" />';
-	}
-
-	if( $i > 0 )
-	{
-		$message = preg_replace($orig, $repl, ' ' . $message . ' ');
-		$message = substr($message, 1, -1);
-	}
-
-	return $message;
+   if (count($orig)) 
+   { 
+      $message = preg_replace($orig, $repl, ' ' . $message . ' '); 
+      $message = substr($message, 1, -1); 
+   } 
+   return $message; 
 }
 
 function smiley_sort($a, $b)
@@ -764,22 +778,5 @@ function smiley_sort($a, $b)
 	return ( strlen($a['code']) > strlen($b['code']) ) ? -1 : 1;
 }
 
-//
-// this does exactly what preg_quote() does in PHP 4-ish: 
-// http://www.php.net/manual/en/function.preg-quote.php
-//
-// This function is here because the 2nd paramter to preg_quote was added in some
-// version of php 4.0.x.. So we use this in order to maintain compatibility with
-// earlier versions of PHP.
-// 
-// 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;
-}
 
 ?>

phpBB/includes/constants.php

@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                               includes.php
+ *                               constants.php
  *                            -------------------
  *   begin                : Saturday', Feb 13', 2001
  *   copyright            : ('C) 2001 The phpBB Group
@@ -26,8 +26,8 @@ if ( !defined('IN_PHPBB') )
 }
 
 // Debug Level
-define('DEBUG', 1); // Debugging on
-//define('DEBUG', 0); // Debugging off
+//define('DEBUG', 1); // Debugging on
+define('DEBUG', 0); // Debugging off
 
 
 // User Levels <- Do not change the values of USER or ADMIN
@@ -178,4 +178,4 @@ define('VOTE_DESC_TABLE', $table_prefix.'vote_desc');
 define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results');
 define('VOTE_USERS_TABLE', $table_prefix.'vote_voters');
 
-?>
+?>

phpBB/includes/emailer.php

@@ -38,8 +38,8 @@ class emailer
 		$this->use_smtp = $use_smtp;
 		$this->tpl_file = NULL;
 		$this->address = NULL;
- 		$this->msg = "";
-	   $this->mimeOut = "";
+ 		$this->msg = '';
+		$this->mimeOut = '';
 	}
 
 	//
@@ -47,11 +47,11 @@ class emailer
 	//
 	function reset()
 	{
-		$this->tpl_file = "";
-		$this->address = "";
-		$this->msg = "";
-		$this->memOut = "";
-		$this->vars = "";
+		$this->tpl_file = '';
+		$this->address = '';
+		$this->msg = '';
+		$this->memOut = '';
+		$this->vars = '';
 	}
 
 	//
@@ -59,13 +59,8 @@ class emailer
 	//
 	function email_address($address)
 	{
-
-		$success = true;
-
 		$this->address = '';
 		$this->address .= $address;
-
-		return $success;
 	}
 
 	//
@@ -84,30 +79,27 @@ class emailer
 		$this->extra_headers = $headers;
 	}
 
-	function use_template($template_file, $template_lang = "")
+	function use_template($template_file, $template_lang = '')
 	{
 		global $board_config, $phpbb_root_path;
 
-		if( $template_lang == "" )
+		if ( $template_lang == '' )
 		{
 			$template_lang = $board_config['default_lang'];
 		}
 
-		$template_file = $phpbb_root_path . "language/lang_" . $template_lang . "/email/" . $template_file . ".tpl";
-		if( !file_exists($template_file) )
+		$this->tpl_file = $phpbb_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl';
+		if ( !file_exists($this->tpl_file) )
 		{
-			message_die(GENERAL_ERROR, "Couldn't find template file: $template_file", "", __LINE__, __FILE__);
-		}
-		else
-		{
-			$this->tpl_file = $template_file;
-			if( !$this->load_msg() )
-			{
-				message_die(GENERAL_ERROR, "Couldn't load template file: $template_file", "", __LINE__, __FILE__);
-			}
+			message_die(GENERAL_ERROR, 'Could not find email template file ' . $template_file, '', __LINE__, __FILE__);
 		}
 
-		return TRUE;
+		if ( !$this->load_msg() )
+		{
+			message_die(GENERAL_ERROR, 'Could not load email template file ' . $template_file, '', __LINE__, __FILE__);
+		}
+
+		return true;
 	}
 
 	//
@@ -115,65 +107,54 @@ class emailer
 	//
 	function load_msg()
 	{
-		if ($this->tpl_file == NULL)
+		if ( $this->tpl_file == NULL )
 		{
-			message_die(GENERAL_ERROR, "No template file set", "", __LINE__, __FILE__);
+			message_die(GENERAL_ERROR, 'No template file set', '', __LINE__, __FILE__);
 		}
-		else
+
+		if ( !($fd = fopen($this->tpl_file, 'r')) )
 		{
-			if(!($fd = fopen($this->tpl_file, 'r')))
-			{
-				message_die(GENERAL_ERROR, "fopen failed opening template file", "", __LINE__, __FILE__);
-			}
-			else
-			{
-				$this->msg .= fread($fd, filesize($this->tpl_file));
-				fclose($fd);
-			}
+			message_die(GENERAL_ERROR, 'Failed opening template file', '', __LINE__, __FILE__);
 		}
-		return TRUE;
+
+		$this->msg .= fread($fd, filesize($this->tpl_file));
+		fclose($fd);
+
+		return true;
 	}
 
 	function assign_vars($vars)
 	{
-		if(empty($this->vars))
-		{
-			$this->vars = $vars;
-		}
-		else
-		{
-			$this->vars .= $vars;
-		}
+		$this->vars = ( empty($this->vars) ) ? $vars : $this->vars . $vars;
 	}
 
 	function parse_email()
 	{
+		global $lang;
 		@reset($this->vars);
 		while (list($key, $val) = @each($this->vars))
 		{
 			$$key = $val;
 		}
 
-		//$this->mailMsg = ereg_replace("<!!( )*([^>]*)( )*!!>", '$this->arrPlaceHolders['."\\2".']', $this->mailMsg);
-		// $this->msg = ereg_replace("{( )*([^>]*)( )*}", '$'."\\2", $this->msg);
-		$this->msg = preg_replace('#\{([a-z0-9\-_]*?)\}#is', '$'."\\1", $this->msg);
-
     	// Escape all quotes, else the eval will fail.
-		$this->msg = str_replace ("\"", "\\\"", $this->msg);
+		$this->msg = str_replace ("'", "\'", $this->msg);
+		$this->msg = preg_replace('#\{([a-z0-9\-_]*?)\}#is', "' . $\\1 . '", $this->msg);
 
-		eval("\$this->msg = \"$this->msg\";");
+		eval("\$this->msg = '$this->msg';");
 
 		//
 		// We now try and pull a subject from the email body ... if it exists,
 		// do this here because the subject may contain a variable
 		//
 		$match = array();
-		preg_match("/^(Subject:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match);
+		preg_match("/^(Subject:(.*?)[\r\n]+?)?(Charset:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match);
 
-		$this->msg = ( isset($match[3]) ) ? trim($match[3]) : "";
+		$this->msg = ( isset($match[5]) ) ? trim($match[5]) : '';
 		$this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]);
+		$this->encoding = ( trim($match[4]) != '' ) ? trim($match[4]) : $lang['ENCODING'];
 
-		return TRUE;
+		return true;
 	}
 
 	//
@@ -181,57 +162,56 @@ class emailer
 	//
 	function send()
 	{
-		global $phpEx, $phpbb_root_dir;
+		global $phpEx, $phpbb_root_path;
 
-		if (isset($phpbb_root_dir))
+		if ( $this->address == NULL )
 		{
-			// we must be in the admin section.
-			$phpbb_root_path = $phpbb_root_dir;
+			message_die(GENERAL_ERROR, 'No email address set', '', __LINE__, __FILE__);
+		}
+
+		if ( !$this->parse_email() )
+		{
+			return false;
+		}
+
+		//
+		// Add date and encoding type
+		//
+		$universal_extra = "MIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . gmdate('D, d M Y H:i:s', time()) . " UT\n";
+		$this->extra_headers = $universal_extra . $this->extra_headers; 
+
+		if ( $this->use_smtp )
+		{
+			if ( !defined('SMTP_INCLUDED') ) 
+			{
+				include($phpbb_root_path . 'includes/smtp.' . $phpEx);
+			}
+
+			$result = smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers);
 		}
 		else
 		{
-			$phpbb_root_path = "./";
+			$result = @mail($this->address, $this->subject, $this->msg, $this->extra_headers);
 		}
 
-		if ($this->address == NULL)
+		if ( !$result )
 		{
-			message_die(GENERAL_ERROR, "No email address set", "", __LINE__, __FILE__);
-		}
-		else
-		{
-			if(!$this->parse_email())
-			{
-				return FALSE;
-			}
-			if($this->use_smtp)
-			{
-				if(!defined('SMTP_INCLUDED')) 
-				{
-					include($phpbb_root_path . "includes/smtp.".$phpEx);
-				}
-				if(!smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers))
-				{
-					message_die(GENERAL_ERROR, "Sending via SMTP failed", "", __LINE__, __FILE__);
-				}
-			}
-			else
-			{
-				@mail($this->address, $this->subject, $this->msg, $this->extra_headers);
-			}
+			message_die(GENERAL_ERROR, 'Failed sending email', '', __LINE__, __FILE__);
 		}
 
-		return TRUE;
+		return true;
 	}
 
 
 	//
-   // Attach files via MIME.
+	// Attach files via MIME.
 	//
-	function attachFile($filename, $mimetype="application/octet-stream", $szFromAddress, $szFilenameToDisplay)
+	function attachFile($filename, $mimetype = "application/octet-stream", $szFromAddress, $szFilenameToDisplay)
 	{
+		global $lang;
 		$mime_boundary = "--==================_846811060==_";
 
-		$this->mailMsg = "--".$mime_boundary."\nContent-Type: text/plain;\n\tcharset=\"iso-8859-1\"\n\n".$this->mailMsg;
+		$this->mailMsg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"" . $lang['ENCODING'] . "\"\n\n" . $this->mailMsg;
 
 		if ($mime_filename)
 		{
@@ -247,11 +227,11 @@ class emailer
 		$this->mimeOut .= "Content-Transfer-Encoding: quoted-printable\n";
 		$this->mimeOut .= "Content-Disposition: attachment;\n\tfilename=\"$szFilenameToDisplay\"\n\n";
 
-		if ($mimetype == "message/rfc822")
+		if ( $mimetype == "message/rfc822" )
 		{
 			$this->mimeOut .= "From: ".$szFromAddress."\n";
 			$this->mimeOut .= "To: ".$this->emailAddress."\n";
-			$this->mimeOut .= "Date: ".date("D, d M Y G:i:s ").$this->getTimeZoneInEmailFormat()."\n";
+			$this->mimeOut .= "Date: ".date("D, d M Y H:i:s") . " UT\n";
 			$this->mimeOut .= "Reply-To:".$szFromAddress."\n";
 			$this->mimeOut .= "Subject: ".$this->mailSubject."\n";
 			$this->mimeOut .= "X-Mailer: PHP/".phpversion()."\n";
@@ -327,4 +307,4 @@ class emailer
 
 } // class emailer
 
-?>
+?>

phpBB/includes/functions.php

@@ -90,9 +90,11 @@ function get_userdata($user)
 	return ( $row = $db->sql_fetchrow($result) ) ? $row : false;
 }
 
-function make_jumpbox($match_forum_id = 0)
+function make_jumpbox($action, $match_forum_id = 0)
 {
-	global $lang, $db, $SID, $nav_links, $phpEx;
+	global $template, $lang, $db, $SID, $nav_links, $phpEx;
+
+//	$is_auth = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata);
 
 	$sql = "SELECT c.cat_id, c.cat_title, c.cat_order
 		FROM " . CATEGORIES_TABLE . " c, " . FORUMS_TABLE . " f
@@ -137,6 +139,9 @@ function make_jumpbox($match_forum_id = 0)
 				{
 					if ( $forum_rows[$j]['cat_id'] == $category_rows[$i]['cat_id'] && $forum_rows[$j]['auth_view'] <= AUTH_REG )
 					{
+
+//					if ( $forum_rows[$j]['cat_id'] == $category_rows[$i]['cat_id'] && $is_auth[$forum_rows[$j]['forum_id']]['auth_view'] )
+//					{
 						$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>';
 
@@ -174,7 +179,20 @@ function make_jumpbox($match_forum_id = 0)
 		$boxstring .= '<input type="hidden" name="sid" value="' . $SID . '" />';
 	}
 
-	return $boxstring;
+	$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))
+	);
+	$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
+
+	return;
 }
 
 //
@@ -196,20 +214,11 @@ function init_userprefs($userdata)
 			$board_config['default_dateformat'] = $userdata['user_dateformat'];
 		}
 
-		if ( !empty($userdata['user_timezone']) )
+		if ( isset($userdata['user_timezone']) )
 		{
 			$board_config['board_timezone'] = $userdata['user_timezone'];
 		}
 	}
-		/*switch( getenv('HTTP_ACCEPT_LANGUAGE') )
-		{
-			case 'en-gb':
-				$board_config['default_lang'] = 'english';
-				break;
-			case 'fr':
-				$board_config['default_lang'] = 'french';
-				break;
-		}*/
 
 	if ( !file_exists($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx) )
 	{
@@ -301,8 +310,8 @@ function encode_ip($dotquad_ip)
 
 function decode_ip($int_ip)
 {
-	$hexipbang = explode('.',chunk_split($int_ip, 2, '.'));
-	return hexdec($hexipbang[0]).'.'.hexdec($hexipbang[1]).'.'.hexdec($hexipbang[2]).'.'.hexdec($hexipbang[3]);
+	$hexipbang = explode('.', chunk_split($int_ip, 2, '.'));
+	return hexdec($hexipbang[0]). '.' . hexdec($hexipbang[1]) . '.' . hexdec($hexipbang[2]) . '.' . hexdec($hexipbang[3]);
 }
 
 //
@@ -337,7 +346,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 
 	if ( $total_pages == 1 )
 	{
-		return "";
+		return '';
 	}
 
 	$on_page = floor($start_item / $per_page) + 1;
@@ -422,6 +431,18 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 	return $page_string;
 }
 
+//
+// 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
@@ -445,8 +466,8 @@ function obtain_word_list(&$orig_word, &$replacement_word)
 	{
 		do 
 		{
-			$orig_word[] = '#(\W)' . str_replace('\*', '\w*?', preg_quote($row['word']) ) . '(\W)#is';
-			$replacement_word[] = '\1' . $row['replacement'] . '\2';
+			$orig_word[] = '#\b(' . str_replace('\*', '\w*?', phpbb_preg_quote($row['word'], '#')) . ')\b#i';
+			$replacement_word[] = $row['replacement'];
 		}
 		while ( $row = $db->sql_fetchrow($result) );
 	}
@@ -475,7 +496,7 @@ function obtain_word_list(&$orig_word, &$replacement_word)
 //
 function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '')
 {
-	global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links;
+	global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header;
 	global $userdata, $user_ip, $session_length;
 	global $starttime;
 
@@ -578,6 +599,7 @@ function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '',
 			{
 				$msg_title = $lang['General_Error'];
 			}
+			break;
 
 		case CRITICAL_ERROR:
 			//
@@ -653,5 +675,4 @@ function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '',
 
 	exit;
 }
-
 ?>

phpBB/includes/functions_admin.php

@@ -24,7 +24,7 @@
 //
 // Simple version of jumpbox, just lists authed forums
 //
-function make_forum_select($box_name, $ignore_forum = false)
+function make_forum_select($box_name, $ignore_forum = false, $select_forum = '')
 {
 	global $db, $userdata;
 
@@ -43,7 +43,8 @@ function make_forum_select($box_name, $ignore_forum = false)
 	{
 		if ( $is_auth_ary[$row['forum_id']]['auth_read'] && $ignore_forum != $row['forum_id'] )
 		{
-			$forum_list .= '<option value="' . $row['forum_id'] . '">' . $row['forum_name'] . '</option>';
+			$selected = ( $select_forum == $row['forum_id'] ) ? ' selected="selected"' : '';
+			$forum_list .= '<option value="' . $row['forum_id'] . '"' . $selected .'>' . $row['forum_name'] . '</option>';
 		}
 	}
 
@@ -55,7 +56,7 @@ function make_forum_select($box_name, $ignore_forum = false)
 //
 // Synchronise functions for forums/topics
 //
-function sync($type, $id)
+function sync($type, $id = false)
 {
 	global $db;
 
@@ -64,36 +65,36 @@ function sync($type, $id)
 		case 'all forums':
 			$sql = "SELECT forum_id
 				FROM " . FORUMS_TABLE;
-			if ( !$result = $db->sql_query($sql) )
+			if ( !($result = $db->sql_query($sql)) )
 			{
 				message_die(GENERAL_ERROR, 'Could not get forum IDs', '', __LINE__, __FILE__, $sql);
 			}
 
 			while( $row = $db->sql_fetchrow($result) )
 			{
-				sync("forum", $row['forum_id']);
+				sync('forum', $row['forum_id']);
 			}
 		   	break;
 
 		case 'all topics':
 			$sql = "SELECT topic_id
 				FROM " . TOPICS_TABLE;
-			if ( !$result = $db->sql_query($sql) )
+			if ( !($result = $db->sql_query($sql)) )
 			{
 				message_die(GENERAL_ERROR, 'Could not get topic ID', '', __LINE__, __FILE__, $sql);
 			}
 
 			while( $row = $db->sql_fetchrow($result) )
 			{
-				sync("topic", $row['topic_id']);
+				sync('topic', $row['topic_id']);
 			}
 			break;
 
 	  	case 'forum':
 			$sql = "SELECT MAX(post_id) AS last_post, COUNT(post_id) AS total 
-				FROM " . POSTS_TABLE . " 
+				FROM " . POSTS_TABLE . "  
 				WHERE forum_id = $id";
-			if ( !$result = $db->sql_query($sql) )
+			if ( !($result = $db->sql_query($sql)) )
 			{
 				message_die(GENERAL_ERROR, 'Could not get post ID', '', __LINE__, __FILE__, $sql);
 			}
@@ -111,28 +112,20 @@ function sync($type, $id)
 
 			$sql = "SELECT COUNT(topic_id) AS total
 				FROM " . TOPICS_TABLE . "
-				WHERE forum_id = $id 
-					AND topic_status <> " . TOPIC_MOVED;
-			if ( !$result = $db->sql_query($sql) )
+				WHERE forum_id = $id";
+			if ( !($result = $db->sql_query($sql)) )
 			{
 				message_die(GENERAL_ERROR, 'Could not get topic count', '', __LINE__, __FILE__, $sql);
 			}
 
-			if ( $row = $db->sql_fetchrow($result) )
-			{
-				$total_topics = ($row['total']) ? $row['total'] : 0;
-			}
-			else
-			{
-				$total_topics = 0;
-			}
+			$total_topics = ( $row = $db->sql_fetchrow($result) ) ? ( ( $row['total'] ) ? $row['total'] : 0 ) : 0;
 
 			$sql = "UPDATE " . FORUMS_TABLE . "
 				SET forum_last_post_id = $last_post, forum_posts = $total_posts, forum_topics = $total_topics
 				WHERE forum_id = $id";
-			if ( !$result = $db->sql_query($sql) )
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Could not update forum $id", '', __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not update forum', '', __LINE__, __FILE__, $sql);
 			}
 			break;
 
@@ -140,22 +133,19 @@ function sync($type, $id)
 			$sql = "SELECT MAX(post_id) AS last_post, MIN(post_id) AS first_post, COUNT(post_id) AS total_posts
 				FROM " . POSTS_TABLE . "
 				WHERE topic_id = $id";
-			if ( !$result = $db->sql_query($sql) )
+			if ( !($result = $db->sql_query($sql)) )
 			{
-				message_die(GENERAL_ERROR, "Could not get post ID", '', __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not get post ID', '', __LINE__, __FILE__, $sql);
 			}
 
 			if ( $row = $db->sql_fetchrow($result) )
 			{
-				$sql = "UPDATE " . TOPICS_TABLE . "
-					SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " 
-					WHERE topic_id = $id";
-				if ( !($result = $db->sql_query($sql)) )
+				$sql = ( $row['total_posts'] ) ? "UPDATE " . TOPICS_TABLE . " SET topic_replies = " . ( $row['total_posts'] - 1 ) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " WHERE topic_id = $id" : "DELETE FROM " . TOPICS_TABLE . " WHERE topic_id = $id";
+				if ( !$db->sql_query($sql) )
 				{
-					message_die(GENERAL_ERROR, "Could not update topic $id", '', __LINE__, __FILE__, $sql);
+					message_die(GENERAL_ERROR, 'Could not update topic', '', __LINE__, __FILE__, $sql);
 				}
 			}
-
 			break;
 	}
 	

phpBB/includes/functions_post.php

@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                                 post.php
+ *                            functions_post.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -22,7 +22,7 @@
 
 if ( !defined('IN_PHPBB') )
 {
-	die("Hacking attempt");
+	die('Hacking attempt');
 }
 
 $html_entities_match = array('#&#', '#<#', '#>#');
@@ -74,8 +74,7 @@ function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid
 				for($i = 0; $i < sizeof($allowed_html_tags); $i++)
 				{
 					$match_tag = trim($allowed_html_tags[$i]);
-
-					if ( preg_match('/^<\/?' . $match_tag . '\W/i', $hold_string) )
+					if ( preg_match('/^<\/?' . $match_tag . '(?!(\s*)style(\s*)\\=)/i', $hold_string) )
 					{
 						$tagallowed = true;
 					}
@@ -90,6 +89,7 @@ function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid
 				$tmp_message .= preg_replace($html_entities_match, $html_entities_replace, substr($message, $start_html, strlen($message)));
 
 				$start_html = strlen($message);
+				$end_html = $start_html;
 			}
 		}
 
@@ -107,23 +107,6 @@ function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid
 
 	if( $bbcode_on && $bbcode_uid != '' )
 	{
-		$tmp_message = $message;
-		if ( ($match_count = preg_match_all('#^(.*?)\[code\](.*?)\[\/code\](.*?)$#is', $tmp_message, $match)) )
-		{
-			$code_entities_match = array('#<#', '#>#', '#"#', '#:#', '#\[#', '#\]#', '#\(#', '#\)#', '#\{#', '#\}#');
-			$code_entities_replace = array('&lt;', '&gt;', '&quot;', '&#58;', '&#91;', '&#93;', '&#40;', '&#41;', '&#123;', '&#125;');
-
-			$message = '';
-			
-			for($i = 0; $i < $match_count; $i++)
-			{
-				$message .= $match[1][$i] . '[code]' . preg_replace($code_entities_match, $code_entities_replace, $match[2][$i]) . '[/code]';
-				$tmp_message = $match[3][$i];
-			}
-
-			$message .= $tmp_message;
-		}
-		
 		$message = bbencode_first_pass($message, $bbcode_uid);
 	}
 
@@ -142,7 +125,7 @@ function unprepare_message($message)
 // 
 function prepare_post(&$mode, &$post_data, &$bbcode_on, &$html_on, &$smilies_on, &$error_msg, &$username, &$bbcode_uid, &$subject, &$message, &$poll_title, &$poll_options, &$poll_length)
 {
-	global $board_config, $userdata, $lang, $phpEx;
+	global $board_config, $userdata, $lang, $phpEx, $phpbb_root_path;
 
 	// Check username
 	if ( !empty($username) )
@@ -248,7 +231,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 			WHERE $where_sql";
 		if ( $result = $db->sql_query($sql) )
 		{
-			if( $row = $db->sql_fetchrow($result) )
+			if ( $row = $db->sql_fetchrow($result) )
 			{
 				if ( $row['last_post_time'] > 0 && ( $current_time - $row['last_post_time'] ) < $board_config['flood_interval'] )
 				{
@@ -266,12 +249,12 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 	{
 		$topic_vote = ( !empty($poll_title) && count($poll_options) >= 2 ) ? 1 : 0;
 		$sql  = ( $mode != "editpost" ) ? "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote) VALUES ('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)" : "UPDATE " . TOPICS_TABLE . " SET topic_title = '$post_subject', topic_type = $topic_type, topic_vote = $topic_vote WHERE topic_id = $topic_id";
-		if ( !($result = $db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 		}
 
-		if( $mode == 'newtopic' )
+		if ( $mode == 'newtopic' )
 		{
 			$topic_id = $db->sql_nextid();
 		}
@@ -279,18 +262,18 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 
 	$edited_sql = ( $mode == 'editpost' && !$post_data['last_post'] && $post_data['poster_post'] ) ? ", post_edit_time = $current_time, post_edit_count = post_edit_count + 1 " : "";
 	$sql = ( $mode != "editpost" ) ? "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig) VALUES ($topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)" : "UPDATE " . POSTS_TABLE . " SET enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . " WHERE post_id = $post_id";
-	if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
+	if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
 	{
 		message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 	}
 
-	if( $mode != 'editpost' )
+	if ( $mode != 'editpost' )
 	{
 		$post_id = $db->sql_nextid();
 	}
 
 	$sql = ( $mode != 'editpost' ) ? "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text) VALUES ($post_id, '$post_subject', '$bbcode_uid', '$post_message')" : "UPDATE " . POSTS_TEXT_TABLE . " SET post_text = '$post_message',  bbcode_uid = '$bbcode_uid', post_subject = '$post_subject' WHERE post_id = $post_id";
-	if ( !($result = $db->sql_query($sql)) )
+	if ( !$db->sql_query($sql) )
 	{
 		message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 	}
@@ -303,7 +286,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 	if ( ( $mode == 'newtopic' || $mode == 'editpost' ) && !empty($poll_title) && count($poll_options) >= 2 )
 	{
 		$sql = ( !$post_data['has_poll'] ) ? "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) VALUES ($topic_id, '$poll_title', $current_time, " . ( $poll_length * 86400 ) . ")" : "UPDATE " . VOTE_DESC_TABLE . " SET vote_text = '$poll_title', vote_length = " . ( $poll_length * 86400 ) . " WHERE topic_id = $topic_id";
-		if ( !($result = $db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 		}
@@ -325,7 +308,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 			{
 				$old_poll_result[$row['vote_option_id']] = $row['vote_result'];
 
-				if( !isset($poll_options[$row['vote_option_id']]) )
+				if ( !isset($poll_options[$row['vote_option_id']]) )
 				{
 					$delete_option_sql .= ( $delete_option_sql != '' ) ? ', ' . $row['vote_option_id'] : $row['vote_option_id'];
 				}
@@ -341,13 +324,13 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 		$poll_option_id = 1;
 		while ( list($option_id, $option_text) = each($poll_options) )
 		{
-			if( !empty($option_text) )
+			if ( !empty($option_text) )
 			{
 				$option_text = str_replace("\'", "''", $option_text);
 				$poll_result = ( $mode == "editpost" && isset($old_poll_result[$option_id]) ) ? $old_poll_result[$option_id] : 0;
 
 				$sql = ( $mode != "editpost" || !isset($old_poll_result[$option_id]) ) ? "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result) VALUES ($poll_id, $poll_option_id, '$option_text', $poll_result)" : "UPDATE " . VOTE_RESULTS_TABLE . " SET vote_option_text = '$option_text', vote_result = $poll_result WHERE vote_option_id = $option_id AND vote_id = $poll_id";
-				if ( !($result = $db->sql_query($sql)) )
+				if ( !$db->sql_query($sql) )
 				{
 					message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 				}
@@ -355,11 +338,12 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 			}
 		}
 
-		if( $delete_option_sql != '' )
+		if ( $delete_option_sql != '' )
 		{
 			$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " 
-				WHERE vote_option_id IN ($delete_option_sql)";
-			if ( !($result = $db->sql_query($sql)) )
+				WHERE vote_option_id IN ($delete_option_sql) 
+					AND vote_id = $poll_id";
+			if ( !$db->sql_query($sql) )
 			{
 				message_die(GENERAL_ERROR, 'Error deleting pruned poll options', '', __LINE__, __FILE__, $sql);
 			}
@@ -379,7 +363,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 {
 	global $db;
 
-	$sign = ( $mode == 'delete' ) ? "- 1" : "+ 1";
+	$sign = ( $mode == 'delete' ) ? '- 1' : '+ 1';
 	$forum_update_sql = "forum_posts = forum_posts $sign";
 	$topic_update_sql = '';
 
@@ -394,53 +378,57 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 			else
 			{
 
-				$topic_update_sql = "topic_replies = topic_replies - 1";
+				$topic_update_sql .= 'topic_replies = topic_replies - 1';
 
-				$sql = "SELECT MAX(post_id) AS post_id
+				$sql = "SELECT MAX(post_id) AS last_post_id
 					FROM " . POSTS_TABLE . " 
 					WHERE topic_id = $topic_id";
-				if ( !($db->sql_query($sql)) )
+				if ( !($result = $db->sql_query($sql)) )
 				{
 					message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 				}
 
 				if ( $row = $db->sql_fetchrow($result) )
 				{
-					$topic_update_sql .= ', topic_last_post_id = ' . $row['post_id'];
+					$topic_update_sql .= ', topic_last_post_id = ' . $row['last_post_id'];
 				}
 			}
 
 			if ( $post_data['last_topic'] )
 			{
-				$sql = "SELECT MAX(post_id) AS post_id
+				$sql = "SELECT MAX(post_id) AS last_post_id
 					FROM " . POSTS_TABLE . " 
 					WHERE forum_id = $forum_id"; 
-				if ( !($db->sql_query($sql)) )
+				if ( !($result = $db->sql_query($sql)) )
 				{
 					message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 				}
 
 				if ( $row = $db->sql_fetchrow($result) )
 				{
-					$forum_update_sql .= ( $row['post_id'] ) ? ', forum_last_post_id = ' . $row['post_id'] : ', forum_last_post_id = 0';
+					$forum_update_sql .= ( $row['last_post_id'] ) ? ', forum_last_post_id = ' . $row['last_post_id'] : ', forum_last_post_id = 0';
 				}
 			}
 		}
 		else if ( $post_data['first_post'] ) 
 		{
-			$sql = "SELECT MIN(post_id) AS post_id
+			$sql = "SELECT MIN(post_id) AS first_post_id
 				FROM " . POSTS_TABLE . " 
 				WHERE topic_id = $topic_id";
-			if ( !($db->sql_query($sql)) )
+			if ( !($result = $db->sql_query($sql)) )
 			{
 				message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 			}
 
 			if ( $row = $db->sql_fetchrow($result) )
 			{
-				$topic_update_sql = 'topic_first_post_id = ' . $row['post_id'];
+				$topic_update_sql .= 'topic_replies = topic_replies - 1, topic_first_post_id = ' . $row['first_post_id'];
 			}
 		}
+		else
+		{
+			$topic_update_sql .= 'topic_replies = topic_replies - 1';
+		}
 	}
 	else if ( $mode != 'poll_delete' )
 	{
@@ -455,7 +443,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 	$sql = "UPDATE " . FORUMS_TABLE . " SET 
 		$forum_update_sql 
 		WHERE forum_id = $forum_id";
-	if ( !($result = $db->sql_query($sql)) )
+	if ( !$db->sql_query($sql) )
 	{
 		message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 	}
@@ -464,8 +452,9 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 	{
 		$sql = "UPDATE " . TOPICS_TABLE . " SET 
 			$topic_update_sql 
-			WHERE topic_id = $topic_id";
-		if ( !($result = $db->sql_query($sql)) )
+			WHERE topic_id = $topic_id 
+				OR topic_moved_id = $topic_id";
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 		}
@@ -476,7 +465,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 		$sql = "UPDATE " . USERS_TABLE . "
 			SET user_posts = user_posts $sign 
 			WHERE user_id = $user_id";
-		if ( !($result = $db->sql_query($sql, END_TRANSACTION)) )
+		if ( !$db->sql_query($sql, END_TRANSACTION) )
 		{
 			message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 		}
@@ -495,88 +484,80 @@ function delete_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 
 	include($phpbb_root_path . 'includes/functions_search.'.$phpEx);
 
-	$topic_update_sql = '';
 	if ( $mode != 'poll_delete' )
 	{
 		$sql = "DELETE FROM " . POSTS_TABLE . " 
 			WHERE post_id = $post_id";
-		if ( !($db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 		}
 
 		$sql = "DELETE FROM " . POSTS_TEXT_TABLE . " 
 			WHERE post_id = $post_id";
-		if ( !($db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 		}
 
-		$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "  
-			WHERE post_id = $post_id";
-		if ( !($db->sql_query($sql)) )
-		{
-			message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
-		}
-
-		$forum_update_sql = 'forum_posts = forum_posts - 1'; 
-		$topic_update_sql .= 'topic_replies = topic_replies - 1';
 		if ( $post_data['last_post'] )
 		{
 			if ( $post_data['first_post'] )
 			{
+				$forum_update_sql .= ', forum_topics = forum_topics - 1';
 				$sql = "DELETE FROM " . TOPICS_TABLE . " 
-					WHERE topic_id = $topic_id";
-				if ( !($db->sql_query($sql)) )
+					WHERE topic_id = $topic_id 
+						OR topic_moved_id = $topic_id";
+				if ( !$db->sql_query($sql) )
 				{
 					message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 				}
 
 				$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
 					WHERE topic_id = $topic_id";
-				if ( !($db->sql_query($sql)) )
+				if ( !$db->sql_query($sql) )
 				{
 					message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 				}
 			}
 		}
+
+		remove_search_post($post_id);
 	}
 
-	if( $mode == 'poll_delete' || ( $mode == 'delete' && $post_data['first_post'] && $post_data['last_post'] ) && $post_data['has_poll'] && $post_data['edit_poll'] )
+	if ( $mode == 'poll_delete' || ( $mode == 'delete' && $post_data['first_post'] && $post_data['last_post'] ) && $post_data['has_poll'] && $post_data['edit_poll'] )
 	{
 		$sql = "DELETE FROM " . VOTE_DESC_TABLE . " 
-			WHERE vote_id = $poll_id";
-		if ( !($db->sql_query($sql)) )
+			WHERE topic_id = $topic_id";
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
 		}
 
 		$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " 
 			WHERE vote_id = $poll_id";
-		if ( !($db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
 		}
 
 		$sql = "DELETE FROM " . VOTE_USERS_TABLE . " 
 			WHERE vote_id = $poll_id";
-		if ( !($db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
 		}
 	}
 
-	remove_search_post($post_id);
-
 	if ( $mode == 'delete' && $post_data['first_post'] && $post_data['last_post'] )
 	{
-		$meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_TOPIC_URL . "=" . $forum_id) . '">';
+		$meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $forum_id) . '">';
 		$message = $lang['Deleted'];
 	}
 	else
 	{
-		$meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id) . '">';
-		$message = ( ( $mode == "poll_delete" ) ? $lang['Poll_delete'] : $lang['Deleted'] ) . '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>');
+		$meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . '=' . $topic_id) . '">';
+		$message = ( ( $mode == 'poll_delete' ) ? $lang['Poll_delete'] : $lang['Deleted'] ) . '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>');
 	}
 
 	$message .=  '<br /><br />' . sprintf($lang['Click_return_forum'], '<a href="' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a>');
@@ -596,9 +577,9 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id
 
 	if ( $mode == 'delete' )
 	{
-		$delete_sql = ( !$post_data['first_post'] && !$post_data['last_post'] ) ? " AND user_id = " . $userdata['user_id'] : "";
+		$delete_sql = ( !$post_data['first_post'] && !$post_data['last_post'] ) ? " AND user_id = " . $userdata['user_id'] : '';
 		$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id" . $delete_sql;
-		if ( !($result = $db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Could not change topic notify data', '', __LINE__, __FILE__, $sql);
 		}
@@ -648,11 +629,13 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id
 			$server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://';
 			$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
 
-			$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+			$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
 			$update_watched_sql = '';
 			if ( $row = $db->sql_fetchrow($result) )
 			{
+				@set_time_limit(120);
+
 				$topic_title = preg_replace($orig_word, $replacement_word, unprepare_message($row['topic_title']));
 
 				do
@@ -661,7 +644,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id
 					{
 						$emailer->use_template('topic_notify', $row['user_lang']);
 						$emailer->email_address($row['user_email']);
-						$emailer->set_subject();//$lang['Topic_reply_notification']
+						$emailer->set_subject();
 						$emailer->extra_headers($email_headers);
 
 						$emailer->assign_vars(array(
@@ -709,7 +692,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id
 			$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
 				WHERE topic_id = $topic_id
 					AND user_id = " . $userdata['user_id'];
-			if ( !$result = $db->sql_query($sql) )
+			if ( !$db->sql_query($sql) )
 			{
 				message_die(GENERAL_ERROR, 'Could not delete topic watch information', '', __LINE__, __FILE__, $sql);
 			}
@@ -718,7 +701,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id
 		{
 			$sql = "INSERT INTO " . TOPICS_WATCH_TABLE . " (user_id, topic_id, notify_status)
 				VALUES (" . $userdata['user_id'] . ", $topic_id, 0)";
-			if ( !($result = $db->sql_query($sql)) )
+			if ( !$db->sql_query($sql) )
 			{
 				message_die(GENERAL_ERROR, 'Could not insert topic watch information', '', __LINE__, __FILE__, $sql);
 			}
@@ -837,4 +820,4 @@ function generate_smilies($mode, $page_id)
 	}
 }
 
-?>
+?>

phpBB/includes/functions_search.php

@@ -21,42 +21,30 @@
 
 function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)
 {
-	// Weird, $init_match doesn't work with static when double quotes (") are used...
-	static $drop_char_match =   array('^', '$', '&', '(', ')', '<', '>', '`', "'", '|', ',', '@', '_', '?', '%', '-', '~', '+', '.', '[', ']', '{', '}', ':', '\\', '/', '=', '#', '\'', ';', '!');
-	static $drop_char_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "",  " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " " , " ", " ", " ", " ",  " ", " ");
+	static $drop_char_match =   array('^', '$', '&', '(', ')', '<', '>', '`', '\'', '"', '|', ',', '@', '_', '?', '%', '-', '~', '+', '.', '[', ']', '{', '}', ':', '\\', '/', '=', '#', '\'', ';', '!');
+	static $drop_char_replace = array(' ', ' ', ' ', ' ', ' ', ' ', ' ', '',  '',   ' ', ' ', ' ', ' ', '',  ' ', ' ', '',  ' ',  ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' , ' ', ' ', ' ', ' ',  ' ', ' ');
 
-//	static $accent_match = array("<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>", "<22>");
-//	static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
+	$entry = ' ' . strip_tags(strtolower($entry)) . ' ';
 
-	$entry = " " . strip_tags(strtolower($entry)) . " ";
-
-	for($i = 0; $i < count($accent_match); $i++)
-	{
-		$entry = str_replace($accent_match[$i], $accent_replace[$i], $entry);
-	}
-
-	if( $mode == "post" )
+	if ( $mode == 'post' )
 	{
 		// Replace line endings by a space
-		$entry = preg_replace("/[\n\r]/is", " ", $entry); 
+		$entry = preg_replace('/[\n\r]/is', ' ', $entry); 
 		// HTML entities like &nbsp;
-		$entry = preg_replace("/\b&[a-z]+;\b/", " ", $entry); 
+		$entry = preg_replace('/\b&[a-z]+;\b/', ' ', $entry); 
 		// Remove URL's
-		$entry = preg_replace("/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/", " ", $entry); 
+		$entry = preg_replace('/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/', ' ', $entry); 
 		// Quickly remove BBcode.
-		$entry = preg_replace("/\[img:[a-z0-9]{10,}\].*?\[\/img:[a-z0-9]{10,}\]/", " ", $entry); 
-		$entry = preg_replace("/\[\/?url(=.*?)?\]/", " ", $entry);
-		$entry = preg_replace("/\[\/?[a-z\*=\+\-]+(\:?[0-9a-z]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/", " ", $entry);
+		$entry = preg_replace('/\[img:[a-z0-9]{10,}\].*?\[\/img:[a-z0-9]{10,}\]/', ' ', $entry); 
+		$entry = preg_replace('/\[\/?url(=.*?)?\]/', ' ', $entry);
+		$entry = preg_replace('/\[\/?[a-z\*=\+\-]+(\:?[0-9a-z]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/', ' ', $entry);
 	}
-	else if( $mode == "search" ) 
+	else if ( $mode == 'search' ) 
 	{
-		$entry = str_replace("+", " and ", $entry);
-		$entry = str_replace("-", " not ", $entry);
+		$entry = str_replace(' +', ' and ', $entry);
+		$entry = str_replace(' -', ' not ', $entry);
 	}
 
-	// Replace numbers on their own
-	$entry = preg_replace("/\b[0-9]+\b/", " ", $entry); 
-
 	//
 	// Filter out strange characters like ^, $, &, change "it's" to "its"
 	//
@@ -65,35 +53,35 @@ function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)
 		$entry =  str_replace($drop_char_match[$i], $drop_char_replace[$i], $entry);
 	}
 
-	if( $mode == "post" )
+	if ( $mode == 'post' )
 	{
-		$entry = str_replace("*", " ", $entry);
+		$entry = str_replace('*', ' ', $entry);
 
-		// 'words' that consist of <=3 or >=25 characters are removed.
-		$entry = preg_replace("/\b([a-z0-9]{1,3}|[a-z0-9]{25,})\b/", " ", $entry); 
+		// 'words' that consist of <3 or >20 characters are removed.
+		$entry = preg_replace('/\b([a-z0-9]{1,2}|[a-z0-9]{21,})\b/',' ', $entry); 
 	}
 
-	if( !empty($stopword_list) )
+	if ( !empty($stopword_list) )
 	{
 		for ($j = 0; $j < count($stopword_list); $j++)
 		{
 			$stopword = trim($stopword_list[$j]);
 
-			if ( $mode == "post" || ( $stopword != "not" && $stopword != "and" && $stopword != "or" ) )
+			if ( $mode == 'post' || ( $stopword != 'not' && $stopword != 'and' && $stopword != 'or' ) )
 			{
-				$entry =  preg_replace("/\b" . $stopword . "\b/", " ", $entry);
+				$entry =  preg_replace('#\b' . preg_quote($stopword) . '\b#', ' ', $entry);
 			}
 		}
 	}
 
-	if( !empty($synonym_list) )
+	if ( !empty($synonym_list) )
 	{
 		for ($j = 0; $j < count($synonym_list); $j++)
 		{
-			list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j])));
-			if ( $mode == "post" || ( $match_synonym != "not" && $match_synonym != "and" && $match_synonym != "or" ) )
+			list($replace_synonym, $match_synonym) = split(' ', trim(strtolower($synonym_list[$j])));
+			if ( $mode == 'post' || ( $match_synonym != 'not' && $match_synonym != 'and' && $match_synonym != 'or' ) )
 			{
-				$entry =  preg_replace("/\b" . trim($match_synonym) . "\b/", " " . trim($replace_synonym) . " ", $entry);
+				$entry =  preg_replace('#\b' . trim($match_synonym) . '\b#', ' ' . trim($replace_synonym) . ' ', $entry);
 			}
 		}
 	}
@@ -101,26 +89,20 @@ function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)
 	return $entry;
 }
 
-function split_words(&$entry, $mode = "post")
+function split_words(&$entry, $mode = 'post')
 {
-	if( $mode == "post" )
-	{
-		preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
-	}
-	else
-	{
-		preg_match_all("/(\*?[a-z0-9]+\*?)|\b([a-z0-9]+)\b/", $entry, $split_entries);
-	}
+	$rex = ( $mode == 'post' ) ? "/\b(\w[\w']*\w+|\w+?)\b/" : '/(\*?[<5B>-<2D>a-z0-9]+\*?)|\b([<5B>-<2D>a-z0-9]+)\b/';
+	preg_match_all($rex, $entry, $split_entries);
 
 	return $split_entries[1];
 }
 
-function add_search_words($post_id, $post_text, $post_title = "")
+function add_search_words($post_id, $post_text, $post_title = '')
 {
 	global $db, $phpbb_root_path, $board_config, $lang;
 
-	$stopwords_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_stopwords.txt"); 
-	$synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt"); 
+	$stopwords_array = @file($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . "/search_stopwords.txt"); 
+	$synonym_array = @file($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . "/search_synonyms.txt"); 
 
 	$search_raw_words = array();
 	$search_raw_words['text'] = split_words(clean_words('post', $post_text, $stopword_array, $synonym_array));
@@ -128,16 +110,16 @@ function add_search_words($post_id, $post_text, $post_title = "")
 
 	$word = array();
 	$word_insert_sql = array();
-	while( list($word_in, $search_matches) = @each($search_raw_words) )
+	while ( list($word_in, $search_matches) = @each($search_raw_words) )
 	{
-		$word_insert_sql[$word_in] = "";
-		if( !empty($search_matches) )
+		$word_insert_sql[$word_in] = '';
+		if ( !empty($search_matches) )
 		{
 			for ($i = 0; $i < count($search_matches); $i++)
 			{ 
 				$search_matches[$i] = trim($search_matches[$i]);
 
-				if( $search_matches[$i] != "" ) 
+				if( $search_matches[$i] != '' ) 
 				{
 					$word[] = $search_matches[$i];
 					if ( !strstr($word_insert_sql[$word_in], "'" . $search_matches[$i] . "'") )
@@ -149,19 +131,19 @@ function add_search_words($post_id, $post_text, $post_title = "")
 		}
 	}
 
-	if( count($word) )
+	if ( count($word) )
 	{
 		sort($word);
 
-		$prev_word = "";
-		$word_text_sql = "";
+		$prev_word = '';
+		$word_text_sql = '';
 		$temp_word = array();
 		for($i = 0; $i < count($word); $i++)
 		{
 			if ( $word[$i] != $prev_word )
 			{
 				$temp_word[] = $word[$i];
-				$word_text_sql .= ( ( $word_text_sql != "" ) ? ", " : "" ) . "'" . $word[$i] . "'";
+				$word_text_sql .= ( ( $word_text_sql != '' ) ? ', ' : '' ) . "'" . $word[$i] . "'";
 			}
 			$prev_word = $word[$i];
 		}
@@ -178,69 +160,69 @@ function add_search_words($post_id, $post_text, $post_title = "")
 				$sql = "SELECT word_id, word_text     
 					FROM " . SEARCH_WORD_TABLE . " 
 					WHERE word_text IN ($word_text_sql)";
-				if( !($result = $db->sql_query($sql)) )
+				if ( !($result = $db->sql_query($sql)) )
 				{
-					message_die(GENERAL_ERROR, "Couldn't select words", "", __LINE__, __FILE__, $sql);
+					message_die(GENERAL_ERROR, 'Could not select words', '', __LINE__, __FILE__, $sql);
 				}
 
-				while( $row = $db->sql_fetchrow($result) )
+				while ( $row = $db->sql_fetchrow($result) )
 				{
 					$check_words[$row['word_text']] = $row['word_id'];
 				}
 				break;
 		}
 
-		$value_sql = "";
+		$value_sql = '';
 		$match_word = array();
 		for ($i = 0; $i < count($word); $i++)
 		{ 
 			$new_match = true;
-			if( isset($check_words[$word[$i]]) )
+			if ( isset($check_words[$word[$i]]) )
 			{
 				$new_match = false;
 			}
 
-			if( $new_match )
+			if ( $new_match )
 			{
 				switch( SQL_LAYER )
 				{
 					case 'mysql':
 					case 'mysql4':
-						$value_sql .= ( ( $value_sql != "" ) ? ", " : "" ) . "('" . $word[$i] . "')";
+						$value_sql .= ( ( $value_sql != '' ) ? ', ' : '' ) . '(\'' . $word[$i] . '\', 0)';
 						break;
 					case 'mssql':
-						$value_sql .= ( ( $value_sql != "" ) ? " UNION ALL " : "" ) . "SELECT '" . $word[$i] . "'";
+						$value_sql .= ( ( $value_sql != '' ) ? ' UNION ALL ' : '' ) . "SELECT '" . $word[$i] . "', 0";
 						break;
 					default:
-						$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text) 
-							VALUES ('" . $word[$i] . "')"; 
-						if( !($result = $db->sql_query($sql)) )
+						$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common) 
+							VALUES ('" . $word[$i] . "', 0)"; 
+						if( !$db->sql_query($sql) )
 						{
-							message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
+							message_die(GENERAL_ERROR, 'Could not insert new word', '', __LINE__, __FILE__, $sql);
 						}
 						break;
 				}
 			}
 		}
 
-		if ( $value_sql != "" )
+		if ( $value_sql != '' )
 		{
 			switch ( SQL_LAYER )
 			{
 				case 'mysql':
 				case 'mysql4':
-					$sql = "INSERT IGNORE INTO " . SEARCH_WORD_TABLE . " (word_text) 
+					$sql = "INSERT IGNORE INTO " . SEARCH_WORD_TABLE . " (word_text, word_common) 
 						VALUES $value_sql"; 
 					break;
 				case 'mssql':
-					$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text) 
+					$sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common) 
 						$value_sql"; 
 					break;
 			}
 
-			if( !($result = $db->sql_query($sql)) )
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't insert new word", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not insert new word', '', __LINE__, __FILE__, $sql);
 			}
 		}
 	}
@@ -249,15 +231,15 @@ function add_search_words($post_id, $post_text, $post_title = "")
 	{
 		$title_match = ( $word_in == 'title' ) ? 1 : 0;
 
-		if ( $match_sql != "" )
+		if ( $match_sql != '' )
 		{
 			$sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match) 
 				SELECT $post_id, word_id, $title_match  
 					FROM " . SEARCH_WORD_TABLE . " 
 					WHERE word_text IN ($match_sql)"; 
-			if( !($result = $db->sql_query($sql)) )
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't insert new word matches", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not insert new word matches', '', __LINE__, __FILE__, $sql);
 			}
 		}
 	}
@@ -277,24 +259,24 @@ function remove_common($mode, $fraction, $word_id_list = array())
 {
 	global $db;
 
-	$sql = ( $mode == "global" ) ? "SELECT COUNT(post_id) AS total_posts FROM " . SEARCH_MATCH_TABLE . " GROUP BY post_id" : "SELECT SUM(forum_posts) AS total_posts FROM " . FORUMS_TABLE;
-	if( !($result = $db->sql_query($sql)) )
+	$sql = ( $mode == 'global' ) ? "SELECT COUNT(post_id) AS total_posts FROM " . SEARCH_MATCH_TABLE . " GROUP BY post_id" : "SELECT SUM(forum_posts) AS total_posts FROM " . FORUMS_TABLE;
+	if ( !($result = $db->sql_query($sql)) )
 	{
-		message_die(GENERAL_ERROR, "Couldn't obtain post count", "", __LINE__, __FILE__, $sql);
+		message_die(GENERAL_ERROR, 'Could not obtain post count', '', __LINE__, __FILE__, $sql);
 	}
 
 	$row = $db->sql_fetchrow($result);
 
-	if( $row['total_posts'] >= 100 )
+	if ( $row['total_posts'] >= 100 )
 	{
 		$common_threshold = floor($row['total_posts'] * $fraction);
 
-		if( $mode == "single" && count($word_id_list) )
+		if ( $mode == 'single' && count($word_id_list) )
 		{
-			$word_id_sql = "";
+			$word_id_sql = '';
 			for($i = 0; $i < count($word_id_list); $i++)
 			{
-				$word_id_sql .= ( ( $word_id_sql != "" ) ? ", " : "" ) . "'" . $word_id_list[$i] . "'";
+				$word_id_sql .= ( ( $word_id_sql != '' ) ? ', ' : '' ) . "'" . $word_id_list[$i] . "'";
 			}
 
 			$sql = "SELECT m.word_id 
@@ -312,34 +294,33 @@ function remove_common($mode, $fraction, $word_id_list = array())
 				HAVING COUNT(word_id) > $common_threshold";
 		}
 
-		if( !($result = $db->sql_query($sql)) )
+		if ( !($result = $db->sql_query($sql)) )
 		{
-			message_die(GENERAL_ERROR, "Couldn't obtain common word list", "", __LINE__, __FILE__, $sql);
+			message_die(GENERAL_ERROR, 'Could not obtain common word list', '', __LINE__, __FILE__, $sql);
 		}
 
-		$common_word_id = "";
-		while( $row = $db->sql_fetchrow($result) )
+		$common_word_id = '';
+		while ( $row = $db->sql_fetchrow($result) )
 		{
-			$common_word_id .= ( $common_word_id != "" ) ? ", " . $row['word_id'] : $row['word_id'];
+			$common_word_id .= ( ( $common_word_id != '' ) ? ', ' : '' ) . $row['word_id'];
 		}
-
 		$db->sql_freeresult($result);
 
-		if( $common_word_id != "" )
+		if ( $common_word_id != '' )
 		{
 			$sql = "UPDATE " . SEARCH_WORD_TABLE . "
 				SET word_common = " . TRUE . " 
 				WHERE word_id IN ($common_word_id)";
-			if( !($result = $db->sql_query($sql)) )
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not delete word list entry', '', __LINE__, __FILE__, $sql);
 			}
 
 			$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "  
 				WHERE word_id IN ($common_word_id)";
-			if( !($result = $db->sql_query($sql)) )
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not delete word match entry', '', __LINE__, __FILE__, $sql);
 			}
 		}
 	}
@@ -353,7 +334,7 @@ function remove_search_post($post_id_sql)
 
 	$words_removed = false;
 
-	switch( SQL_LAYER )
+	switch ( SQL_LAYER )
 	{
 		case 'mysql':
 		case 'mysql4':
@@ -364,7 +345,7 @@ function remove_search_post($post_id_sql)
 			if ( $result = $db->sql_query($sql) )
 			{
 				$word_id_sql = '';
-				while( $row = $db->sql_fetchrow($result) )
+				while ( $row = $db->sql_fetchrow($result) )
 				{
 					$word_id_sql .= ( $word_id_sql != '' ) ? ', ' . $row['word_id'] : $row['word_id']; 
 				}
@@ -377,7 +358,7 @@ function remove_search_post($post_id_sql)
 				if ( $result = $db->sql_query($sql) )
 				{
 					$word_id_sql = '';
-					while( $row = $db->sql_fetchrow($result) )
+					while ( $row = $db->sql_fetchrow($result) )
 					{
 						$word_id_sql .= ( $word_id_sql != '' ) ? ', ' . $row['word_id'] : $row['word_id']; 
 					}
@@ -386,7 +367,7 @@ function remove_search_post($post_id_sql)
 					{
 						$sql = "DELETE FROM " . SEARCH_WORD_TABLE . " 
 							WHERE word_id IN ($word_id_sql)";
-						if ( !($result = $db->sql_query($sql, END_TRANSACTION)) )
+						if ( !$db->sql_query($sql) )
 						{
 							message_die(GENERAL_ERROR, 'Could not delete word list entry', '', __LINE__, __FILE__, $sql);
 						}
@@ -411,7 +392,7 @@ function remove_search_post($post_id_sql)
 					GROUP BY word_id 
 					HAVING COUNT(word_id) = 1
 				)"; 
-			if ( !($result = $db->sql_query($sql, END_TRANSACTION)) )
+			if ( !$db->sql_query($sql) )
 			{
 				message_die(GENERAL_ERROR, 'Could not delete old words from word table', '', __LINE__, __FILE__, $sql);
 			}
@@ -423,7 +404,7 @@ function remove_search_post($post_id_sql)
 
 	$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "  
 		WHERE post_id IN ($post_id_sql)";
-	if ( !($db->sql_query($sql)) )
+	if ( !$db->sql_query($sql) )
 	{
 		message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 	}
@@ -434,15 +415,17 @@ function remove_search_post($post_id_sql)
 //
 // Username search
 //
-function username_search($search_match, $is_inline_review = 0, $default_list = "")
+function username_search($search_match)
 {
 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path;
-	global $starttime;
+	global $starttime, $gen_simple_header;
+	
+	$gen_simple_header = TRUE;
 
-	$author_list = '';
+	$username_list = '';
 	if ( !empty($search_match) )
 	{
-		$username_search = preg_replace("/\*/", "%", trim(strip_tags($search_match)));
+		$username_search = preg_replace('/\*/', '%', trim(strip_tags($search_match)));
 
 		$sql = "SELECT username 
 			FROM " . USERS_TABLE . " 
@@ -450,62 +433,56 @@ function username_search($search_match, $is_inline_review = 0, $default_list = "
 			ORDER BY username";
 		if ( !($result = $db->sql_query($sql)) )
 		{
-			message_die(GENERAL_ERROR, "Couldn't obtain search results", "", __LINE__, __FILE__, $sql);
+			message_die(GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql);
 		}
 
 		if ( $row = $db->sql_fetchrow($result) )
 		{
 			do
 			{
-				$author_list .= '<option value="' . $row['username'] . '">' .$row['username'] . '</option>';
+				$username_list .= '<option value="' . $row['username'] . '">' . $row['username'] . '</option>';
 			}
 			while ( $row = $db->sql_fetchrow($result) );
 		}
 		else
 		{
-			$author_list = '<option>' . $lang['No_match']. '</option>';
+			$username_list .= '<option>' . $lang['No_match']. '</option>';
 		}
-
+		$db->sql_freeresult($result);
 	}
 
-	if ( !$is_inline_review )
+	$page_title = $lang['Search'];
+	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+
+	$template->set_filenames(array(
+		'search_user_body' => 'search_username.tpl')
+	);
+
+	$template->assign_vars(array(
+		'USERNAME' => ( !empty($search_match) ) ? $search_match : '', 
+
+		'L_CLOSE_WINDOW' => $lang['Close_window'], 
+		'L_SEARCH_USERNAME' => $lang['Find_username'], 
+		'L_UPDATE_USERNAME' => $lang['Select_username'], 
+		'L_SELECT' => $lang['Select'], 
+		'L_SEARCH' => $lang['Search'], 
+		'L_SEARCH_EXPLAIN' => $lang['Search_author_explain'], 
+		'L_CLOSE_WINDOW' => $lang['Close_window'], 
+
+		'S_USERNAME_OPTIONS' => $username_list, 
+		'S_SEARCH_ACTION' => append_sid("search.$phpEx?mode=searchuser"))
+	);
+
+	if ( $username_list != '' )
 	{
-		$gen_simple_header = TRUE;
-		$page_title = $lang['Search'];
-		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
-
-		$template->set_filenames(array(
-			"search_user_body" => "search_username.tpl")
-		);
-
-		$template->assign_vars(array(
-			"L_CLOSE_WINDOW" => $lang['Close_window'], 
-			"L_SEARCH_USERNAME" => $lang['Find_username'], 
-			"L_UPDATE_USERNAME" => $lang['Select_username'], 
-			"L_SELECT" => $lang['Select'], 
-			"L_SEARCH" => $lang['Search'], 
-			"L_SEARCH_EXPLAIN" => $lang['Search_author_explain'], 
-			"L_CLOSE_WINDOW" => $lang['Close_window'], 
-
-			"S_AUTHOR_OPTIONS" => $author_list, 
-			"S_SEARCH_ACTION" => append_sid("search.$phpEx?mode=searchuser"))
-		);
-
-		//
-		// If we have results then dump them out and enable
-		// the appropriate switch block
-		//
-		if ( !empty($author_list) )
-		{
-			$template->assign_block_vars("switch_select_name", array());
-		}
-
-		$template->pparse("search_user_body");
-
-		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+		$template->assign_block_vars('switch_select_name', array());
 	}
 
-	return($author_list);
+	$template->pparse('search_user_body');
+
+	include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+
+	return;
 }
 
 ?>

phpBB/includes/functions_validate.php

@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                             user_selects.php
+ *                          functions_validate.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -58,13 +58,15 @@ function validate_username($username)
 	}
 
 	$sql = "SELECT disallow_username
-		FROM " . DISALLOW_TABLE . "
-		WHERE disallow_username LIKE '$username'";
+		FROM " . DISALLOW_TABLE;
 	if ( $result = $db->sql_query($sql) )
 	{
-		if ( $db->sql_fetchrow($result) )
+		while( $row = $db->sql_fetchrow($result) )
 		{
-			return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
+			if ( preg_match("#\b(" . str_replace("\*", ".*?", phpbb_preg_quote($row['disallow_username'], '#')) . ")\b#i", $username) )
+			{
+				return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
+			}
 		}
 	}
 
@@ -74,7 +76,7 @@ function validate_username($username)
 	{
 		while( $row = $db->sql_fetchrow($result) )
 		{
-			if ( preg_match("#\b(" . str_replace("\*", "\w*?", preg_quote($row['word'])) . ")\b#i", $username) )
+			if ( preg_match("#\b(" . str_replace("\*", ".*?", phpbb_preg_quote($row['word'], '#')) . ")\b#i", $username) )
 			{
 				return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
 			}
@@ -100,7 +102,7 @@ function validate_email($email)
 
 	if ( $email != '' )
 	{
-		if ( preg_match('/^[a-z0-9\.\-_]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is', $email) )
+		if ( preg_match('/^[a-z0-9\.\-_\+]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is', $email) )
 		{
 			$sql = "SELECT ban_email
 				FROM " . BANLIST_TABLE;
@@ -108,7 +110,7 @@ function validate_email($email)
 			{
 				while( $row = $db->sql_fetchrow($result) )
 				{
-					$match_email = str_replace('*', '.*', $row['ban_email']);
+					$match_email = str_replace('*', '.*?', $row['ban_email']);
 					if ( preg_match('/^' . $match_email . '$/is', $email) )
 					{
 						return array('error' => true, 'error_msg' => $lang['Email_banned']);

phpBB/includes/page_header.php

@@ -31,28 +31,28 @@ define('HEADER_INC', TRUE);
 // gzip_compression
 //
 $do_gzip_compress = FALSE;
-if($board_config['gzip_compress'])
+if ( $board_config['gzip_compress'] )
 {
 	$phpver = phpversion();
 
-	if($phpver >= "4.0.4pl1")
+	if ( $phpver >= '4.0.4pl1' && strstr($HTTP_USER_AGENT,'compatible') )
 	{
-		if(extension_loaded("zlib"))
+		if ( extension_loaded('zlib') )
 		{
-			ob_start("ob_gzhandler");
+			ob_start('ob_gzhandler');
 		}
 	}
-	else if($phpver > "4.0")
+	else if ( $phpver > '4.0' )
 	{
-		if(strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip'))
+		if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') )
 		{
-			if(extension_loaded("zlib"))
+			if ( extension_loaded('zlib') )
 			{
 				$do_gzip_compress = TRUE;
 				ob_start();
 				ob_implicit_flush(0);
 
-				header("Content-Encoding: gzip");
+				header('Content-Encoding: gzip');
 			}
 		}
 	}
@@ -61,53 +61,40 @@ if($board_config['gzip_compress'])
 //
 // Parse and show the overall header.
 //
-if( empty($gen_simple_header) )
-{
-	$template->set_filenames(array(
-		"overall_header" => "overall_header.tpl")
-	);
-}
-else
-{
-	$template->set_filenames(array(
-		"overall_header" => "simple_header.tpl")
-	);
-}
+$template->set_filenames(array(
+	'overall_header' => ( empty($gen_simple_header) ) ? 'overall_header.tpl' : 'simple_header.tpl')
+);
 
 //
 // Generate logged in/logged out status
 //
-if($userdata['session_logged_in'])
+if ( $userdata['session_logged_in'] )
 {
-	$u_login_logout = "login.$phpEx?logout=true";
-	$l_login_logout = $lang['Logout'] . " [ " . $userdata["username"] . " ]";
+	$u_login_logout = 'login.'.$phpEx.'?logout=true';
+	$l_login_logout = $lang['Logout'] . ' [ ' . $userdata['username'] . ' ]';
 }
 else
 {
-	$u_login_logout = "login.$phpEx";
+	$u_login_logout = 'login.'.$phpEx;
 	$l_login_logout = $lang['Login'];
 }
 
-$s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : "";
+$s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : '';
 
 //
 // Get basic (usernames + totals) online
 // situation
 //
-$user_forum_sql = ( !empty($forum_id) ) ? "AND ( u.user_session_page = $forum_id 
-	OR s.session_page = $forum_id)" : "";
-
+$user_forum_sql = ( !empty($forum_id) ) ? "AND s.session_page = " . intval($forum_id) : '';
 $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip
 	FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
 	WHERE u.user_id = s.session_user_id
-		AND ( s.session_time >= ".( time() - 300 ) . " 
-			OR u.user_session_time >= " . ( time() - 300 ) . " )
-		$user_forum_sql 
+		AND s.session_time >= ".( time() - 300 ) . "
+		$user_forum_sql
 	ORDER BY u.username ASC, s.session_ip ASC";
-$result = $db->sql_query($sql);
-if(!$result)
+if( !($result = $db->sql_query($sql)) )
 {
-	message_die(GENERAL_ERROR, "Couldn't obtain user/online information.", "", __LINE__, __FILE__, $sql);
+	message_die(GENERAL_ERROR, 'Could not obtain user/online information', '', __LINE__, __FILE__, $sql);
 }
 
 $userlist_ary = array();
@@ -116,7 +103,7 @@ $userlist_visible = array();
 $logged_visible_online = 0;
 $logged_hidden_online = 0;
 $guests_online = 0;
-$online_userlist = "";
+$online_userlist = '';
 
 $prev_user_id = 0;
 $prev_user_ip = '';
@@ -124,24 +111,24 @@ $prev_user_ip = '';
 while( $row = $db->sql_fetchrow($result) )
 {
 	// User is logged in and therefor not a guest
-	if( $row['session_logged_in'] )
+	if ( $row['session_logged_in'] )
 	{
 		// Skip multiple sessions for one user
-		if( $row['user_id'] != $prev_user_id )
+		if ( $row['user_id'] != $prev_user_id )
 		{
-			$style_color = "";
-			if( $row['user_level'] == ADMIN )
+			$style_color = '';
+			if ( $row['user_level'] == ADMIN )
 			{
 				$row['username'] = '<b>' . $row['username'] . '</b>';
 				$style_color = 'style="color:#' . $theme['fontcolor3'] . '"';
 			}
-			else if( $row['user_level'] == MOD )
+			else if ( $row['user_level'] == MOD )
 			{
 				$row['username'] = '<b>' . $row['username'] . '</b>';
 				$style_color = 'style="color:#' . $theme['fontcolor2'] . '"';
 			}
 
-			if( $row['user_allow_viewonline'] )
+			if ( $row['user_allow_viewonline'] )
 			{
 				$user_online_link = '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'>' . $row['username'] . '</a>';
 				$logged_visible_online++;
@@ -151,61 +138,62 @@ while( $row = $db->sql_fetchrow($result) )
 				$user_online_link = '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'><i>' . $row['username'] . '</i></a>';
 				$logged_hidden_online++;
 			}
-			
-			if( $row['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
+
+			if ( $row['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
 			{
-				$online_userlist .= ( $online_userlist != "" ) ? ", " . $user_online_link : $user_online_link;
+				$online_userlist .= ( $online_userlist != '' ) ? ', ' . $user_online_link : $user_online_link;
 			}
 		}
+
+		$prev_user_id = $row['user_id'];
 	}
 	else
 	{
 		// Skip multiple sessions for one user
-		if( $row['session_ip'] != $prev_session_ip )
+		if ( $row['session_ip'] != $prev_session_ip )
 		{
 			$guests_online++;
 		}
 	}
 
 	$prev_session_ip = $row['session_ip'];
-	$prev_user_id = $row['user_id'];
 }
 
-if( empty($online_userlist) )
+if ( empty($online_userlist) )
 {
 	$online_userlist = $lang['None'];
 }
-$online_userlist = ( ( isset($forum_id) ) ? $lang['Browsing_forum'] : $lang['Registered_users'] ) . " " . $online_userlist;
+$online_userlist = ( ( isset($forum_id) ) ? $lang['Browsing_forum'] : $lang['Registered_users'] ) . ' ' . $online_userlist;
 
 $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
 
-if($total_online_users > $board_config['record_online_users'])
+if ( $total_online_users > $board_config['record_online_users'])
 {
+	$board_config['record_online_users'] = $total_online_users;
+	$board_config['record_online_date'] = time();
+
 	$sql = "UPDATE " . CONFIG_TABLE . "
 		SET config_value = '$total_online_users'
 		WHERE config_name = 'record_online_users'";
-	if( !$result = $db->sql_query($sql) )
+	if ( !$db->sql_query($sql) )
 	{
-		message_die(GENERAL_ERROR, "Couldn't update online user record (nr of users)", "", __LINE__, __FILE__, $sql);
+		message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql);
 	}
 
 	$sql = "UPDATE " . CONFIG_TABLE . "
-		SET config_value = '" . time() . "'
+		SET config_value = '" . $board_config['record_online_date'] . "'
 		WHERE config_name = 'record_online_date'";
-	if( !$result = $db->sql_query($sql) )
+	if ( !$db->sql_query($sql) )
 	{
-		message_die(GENERAL_ERROR, "Couldn't update online user record (date)", "", __LINE__, __FILE__, $sql);
+		message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql);
 	}
-
-	$board_config['record_online_users'] = $total_online_users;
-	$board_config['record_online_date'] = time();
 }
 
-if( $total_online_users == 0 )
+if ( $total_online_users == 0 )
 {
 	$l_t_user_s = $lang['Online_users_zero_total'];
 }
-else if( $total_online_users == 1 )
+else if ( $total_online_users == 1 )
 {
 	$l_t_user_s = $lang['Online_user_total'];
 }
@@ -214,11 +202,11 @@ else
 	$l_t_user_s = $lang['Online_users_total'];
 }
 
-if( $logged_visible_online == 0 )
+if ( $logged_visible_online == 0 )
 {
 	$l_r_user_s = $lang['Reg_users_zero_total'];
 }
-else if( $logged_visible_online == 1 )
+else if ( $logged_visible_online == 1 )
 {
 	$l_r_user_s = $lang['Reg_user_total'];
 }
@@ -227,11 +215,11 @@ else
 	$l_r_user_s = $lang['Reg_users_total'];
 }
 
-if( $logged_hidden_online == 0 )
+if ( $logged_hidden_online == 0 )
 {
 	$l_h_user_s = $lang['Hidden_users_zero_total'];
 }
-else if( $logged_hidden_online == 1 )
+else if ( $logged_hidden_online == 1 )
 {
 	$l_h_user_s = $lang['Hidden_user_total'];
 }
@@ -240,11 +228,11 @@ else
 	$l_h_user_s = $lang['Hidden_users_total'];
 }
 
-if( $guests_online == 0 )
+if ( $guests_online == 0 )
 {
 	$l_g_user_s = $lang['Guest_users_zero_total'];
 }
-else if( $guests_online == 1 )
+else if ( $guests_online == 1 )
 {
 	$l_g_user_s = $lang['Guest_user_total'];
 }
@@ -254,29 +242,29 @@ else
 }
 
 $l_online_users = sprintf($l_t_user_s, $total_online_users);
-$l_online_users .= sprintf($l_r_user_s, $logged_visible_online); 
-$l_online_users .= sprintf($l_h_user_s, $logged_hidden_online); 
-$l_online_users .= sprintf($l_g_user_s, $guests_online); 
+$l_online_users .= sprintf($l_r_user_s, $logged_visible_online);
+$l_online_users .= sprintf($l_h_user_s, $logged_hidden_online);
+$l_online_users .= sprintf($l_g_user_s, $guests_online);
 
 //
 // Obtain number of new private messages
 // if user is logged in
 //
-if( $userdata['session_logged_in'] )
+if ( $userdata['session_logged_in'] )
 {
-	if( $userdata['user_new_privmsg'] )
+	if ( $userdata['user_new_privmsg'] )
 	{
-		$l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms']; 
-		$l_privmsgs_text = sprintf($l_message_new, $userdata['user_new_privmsg']); 
+		$l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms'];
+		$l_privmsgs_text = sprintf($l_message_new, $userdata['user_new_privmsg']);
 
-		if( $userdata['user_last_privmsg'] > $userdata['user_lastvisit'] )
+		if ( $userdata['user_last_privmsg'] > $userdata['user_lastvisit'] )
 		{
 			$sql = "UPDATE " . USERS_TABLE . "
-				SET user_last_privmsg = " . $userdata['user_lastvisit'] . " 
+				SET user_last_privmsg = " . $userdata['user_lastvisit'] . "
 				WHERE user_id = " . $userdata['user_id'];
-			if( !$status = $db->sql_query($sql) )
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Could not update private message new/read time for user.", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not update private message new/read time for user', '', __LINE__, __FILE__, $sql);
 			}
 
 			$s_privmsg_new = 1;
@@ -296,10 +284,10 @@ if( $userdata['session_logged_in'] )
 		$icon_pm = $images['pm_no_new_msg'];
 	}
 
-	if( $userdata['user_unread_privmsg'] )
+	if ( $userdata['user_unread_privmsg'] )
 	{
-		$l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms']; 
-		$l_privmsgs_text_unread = sprintf($l_message_unread, $userdata['user_unread_privmsg']); 
+		$l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms'];
+		$l_privmsgs_text_unread = sprintf($l_message_unread, $userdata['user_unread_privmsg']);
 	}
 	else
 	{
@@ -310,7 +298,7 @@ else
 {
 	$icon_pm = $images['pm_no_new_msg'];
 	$l_privmsgs_text = $lang['Login_check_pm'];
-	$l_privmsgs_text_unread = "";
+	$l_privmsgs_text_unread = '';
 	$s_privmsg_new = 0;
 }
 
@@ -319,170 +307,149 @@ else
 //
 $nav_links_html = '';
 $nav_link_proto = '<link rel="%s" href="%s" title="%s" />' . "\n";
-while(list($nav_item, $nav_array) = @each($nav_links) )
+while( list($nav_item, $nav_array) = @each($nav_links) )
 {
-	if( !empty($nav_array['url']) )
+	if ( !empty($nav_array['url']) )
 	{
 		$nav_links_html .= sprintf($nav_link_proto, $nav_item, $nav_array['url'], $nav_array['title']);
 	}
 	else
 	{
 		// We have a nested array, used for items like <link rel='chapter'> that can occur more than once.
-		while(list(,$nested_array) = each($nav_array) )
-		{  
+		while( list(,$nested_array) = each($nav_array) )
+		{
 			$nav_links_html .= sprintf($nav_link_proto, $nav_item, $nested_array['url'], $nested_array['title']);
 		}
 	}
-}	
+}
 
 //
 // The following assigns all _common_ variables that may be used at any point
-// in a template. Note that all URL's should be wrapped in append_sid, as
-// should all S_x_ACTIONS for forms.
+// in a template.
 //
 $template->assign_vars(array(
-	"SITENAME" => $board_config['sitename'], 
-	"SITE_DESCRIPTION" => $board_config['site_desc'], 
-	"PAGE_TITLE" => $page_title,
-	"TOTAL_USERS_ONLINE" => $l_online_users,
-	"LOGGED_IN_USER_LIST" => $online_userlist,
-	"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
-	"PRIVATE_MESSAGE_INFO_UNREAD" => $l_privmsgs_text_unread,
-	"PRIVATE_MESSAGE_NEW_FLAG" => $s_privmsg_new, 
-	"LAST_VISIT_DATE" => sprintf($lang['You_last_visit'], $s_last_visit), 
-	"CURRENT_TIME" => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),  
+	'SITENAME' => $board_config['sitename'],
+	'SITE_DESCRIPTION' => $board_config['site_desc'],
+	'PAGE_TITLE' => $page_title,
+	'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit),
+	'CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
+	'TOTAL_USERS_ONLINE' => $l_online_users,
+	'LOGGED_IN_USER_LIST' => $online_userlist,
+	'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])),
+	'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text,
+	'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread,
+	'PRIVATE_MESSAGE_NEW_FLAG' => $s_privmsg_new,
 
-	"PRIVMSG_IMG" => $icon_pm,
+	'PRIVMSG_IMG' => $icon_pm,
 
-	"L_USERNAME" => $lang['Username'],
-	"L_PASSWORD" => $lang['Password'],
-	"L_LOGIN" => $lang['Login'],
-	"L_LOG_ME_IN" => $lang['Log_me_in'],
-	"L_INDEX" => sprintf($lang['Forum_Index'], $board_config['sitename']),
-	"L_REGISTER" => $lang['Register'],
-	"L_PROFILE" => $lang['Profile'],
-	"L_SEARCH" => $lang['Search'],
-	"L_PRIVATEMSGS" => $lang['Private_Messages'],
-	"L_WHO_IS_ONLINE" => $lang['Who_is_Online'],
-	"L_MEMBERLIST" => $lang['Memberlist'],
-	"L_FAQ" => $lang['FAQ'],
-	"L_USERGROUPS" => $lang['Usergroups'],
-	"L_FORUM" => $lang['Forum'],
-	"L_TOPICS" => $lang['Topics'],
-	"L_REPLIES" => $lang['Replies'],
-	"L_VIEWS" => $lang['Views'],
-	"L_POSTS" => $lang['Posts'],
-	"L_LASTPOST" => $lang['Last_Post'],
-	"L_NO_NEW_POSTS" => $lang['No_new_posts'],
-	"L_NEW_POSTS" => $lang['New_posts'],
-	"L_NO_NEW_POSTS_HOT" => $lang['No_new_posts_hot'],
-	"L_NEW_POSTS_HOT" => $lang['New_posts_hot'],
-	"L_NO_NEW_POSTS_LOCKED" => $lang['No_new_posts_locked'], 
-	"L_NEW_POSTS_LOCKED" => $lang['New_posts_locked'], 
-	"L_ANNOUNCEMENT" => $lang['Post_Announcement'], 
-	"L_STICKY" => $lang['Post_Sticky'], 
-	"L_POSTED" => $lang['Posted'],
-	"L_JOINED" => $lang['Joined'],
-	"L_AUTO_LOGIN" => $lang['Log_me_in'],
-	"L_AUTHOR" => $lang['Author'],
-	"L_SUBJECT" => $lang['Subject'],
-	"L_MESSAGE" => $lang['Message'],
-	"L_LOGIN_LOGOUT" => $l_login_logout,
-	"L_SEARCH_NEW" => $lang['Search_new'], 
-	"L_SEARCH_UNANSWERED" => $lang['Search_unanswered'],
-	"L_SEARCH_SELF" => $lang['Search_your_posts'], 
-	"L_WHOSONLINE_ADMIN" => sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>'), 
-	"L_WHOSONLINE_MOD" => sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>'), 
-	"L_RECORD_USERS" => sprintf($lang['Record_online_users'], $board_config['record_online_users'], create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])),
+	'L_USERNAME' => $lang['Username'],
+	'L_PASSWORD' => $lang['Password'],
+	'L_LOGIN_LOGOUT' => $l_login_logout,
+	'L_LOGIN' => $lang['Login'],
+	'L_LOG_ME_IN' => $lang['Log_me_in'],
+	'L_AUTO_LOGIN' => $lang['Log_me_in'],
+	'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']),
+	'L_REGISTER' => $lang['Register'],
+	'L_PROFILE' => $lang['Profile'],
+	'L_SEARCH' => $lang['Search'],
+	'L_PRIVATEMSGS' => $lang['Private_Messages'],
+	'L_WHO_IS_ONLINE' => $lang['Who_is_Online'],
+	'L_MEMBERLIST' => $lang['Memberlist'],
+	'L_FAQ' => $lang['FAQ'],
+	'L_USERGROUPS' => $lang['Usergroups'],
+	'L_SEARCH_NEW' => $lang['Search_new'],
+	'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'],
+	'L_SEARCH_SELF' => $lang['Search_your_posts'],
+	'L_WHOSONLINE_ADMIN' => sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>'),
+	'L_WHOSONLINE_MOD' => sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>'),
 
-	"U_SEARCH_UNANSWERED" => append_sid("search.".$phpEx."?search_id=unanswered"),
-	"U_SEARCH_SELF" => append_sid("search.".$phpEx."?search_id=egosearch"), 
-	"U_SEARCH_NEW" => append_sid("search.$phpEx?search_id=newposts"), 
-	"U_INDEX" => append_sid("index.".$phpEx),
-	"U_REGISTER" => append_sid("profile.".$phpEx."?mode=register"),
-	"U_PROFILE" => append_sid("profile.".$phpEx."?mode=editprofile"),
-	"U_PRIVATEMSGS" => append_sid("privmsg.".$phpEx."?folder=inbox"), 
-	"U_PRIVATEMSGS_POPUP" => append_sid("privmsg.".$phpEx."?mode=newpm"), 
-	"U_SEARCH" => append_sid("search.".$phpEx),
-	"U_MEMBERLIST" => append_sid("memberlist.".$phpEx), 
-	"U_MODCP" => append_sid("modcp.".$phpEx), 
-	"U_FAQ" => append_sid("faq.".$phpEx),
-	"U_VIEWONLINE" => append_sid("viewonline.$phpEx"),
-	"U_LOGIN_LOGOUT" => append_sid($u_login_logout),
-	"U_MEMBERSLIST" => append_sid("memberlist.".$phpEx),
-	"U_GROUP_CP" => append_sid("groupcp.".$phpEx),
+	'U_SEARCH_UNANSWERED' => append_sid('search.'.$phpEx.'?search_id=unanswered'),
+	'U_SEARCH_SELF' => append_sid('search.'.$phpEx.'?search_id=egosearch'),
+	'U_SEARCH_NEW' => append_sid('search.'.$phpEx.'?search_id=newposts'),
+	'U_INDEX' => append_sid('index.'.$phpEx),
+	'U_REGISTER' => append_sid('profile.'.$phpEx.'?mode=register'),
+	'U_PROFILE' => append_sid('profile.'.$phpEx.'?mode=editprofile'),
+	'U_PRIVATEMSGS' => append_sid('privmsg.'.$phpEx.'?folder=inbox'),
+	'U_PRIVATEMSGS_POPUP' => append_sid('privmsg.'.$phpEx.'?mode=newpm'),
+	'U_SEARCH' => append_sid('search.'.$phpEx),
+	'U_MEMBERLIST' => append_sid('memberlist.'.$phpEx),
+	'U_MODCP' => append_sid('modcp.'.$phpEx),
+	'U_FAQ' => append_sid('faq.'.$phpEx),
+	'U_VIEWONLINE' => append_sid('viewonline.'.$phpEx),
+	'U_LOGIN_LOGOUT' => append_sid($u_login_logout),
+	'U_MEMBERSLIST' => append_sid('memberlist.'.$phpEx),
+	'U_GROUP_CP' => append_sid('groupcp.'.$phpEx),
 
-	"S_CONTENT_DIRECTION" => $lang['DIRECTION'], 
-	"S_CONTENT_ENCODING" => $lang['ENCODING'], 
-	"S_CONTENT_DIR_LEFT" => $lang['LEFT'], 
-	"S_CONTENT_DIR_RIGHT" => $lang['RIGHT'], 
-	"S_TIMEZONE" => sprintf($lang['All_times'], $lang[$board_config['board_timezone']]),
-	"S_LOGIN_ACTION" => append_sid("login.$phpEx"),
+	'S_CONTENT_DIRECTION' => $lang['DIRECTION'],
+	'S_CONTENT_ENCODING' => $lang['ENCODING'],
+	'S_CONTENT_DIR_LEFT' => $lang['LEFT'],
+	'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],
+	'S_TIMEZONE' => sprintf($lang['All_times'], $lang[number_format($board_config['board_timezone'])]),
+	'S_LOGIN_ACTION' => append_sid('login.'.$phpEx),
 
-	"T_HEAD_STYLESHEET" => $theme['head_stylesheet'],
-	"T_BODY_BACKGROUND" => $theme['body_background'],
-	"T_BODY_BGCOLOR" => "#".$theme['body_bgcolor'],
-	"T_BODY_TEXT" => "#".$theme['body_text'],
-	"T_BODY_LINK" => "#".$theme['body_link'],
-	"T_BODY_VLINK" => "#".$theme['body_vlink'],
-	"T_BODY_ALINK" => "#".$theme['body_alink'],
-	"T_BODY_HLINK" => "#".$theme['body_hlink'],
-	"T_TR_COLOR1" => "#".$theme['tr_color1'],
-	"T_TR_COLOR2" => "#".$theme['tr_color2'],
-	"T_TR_COLOR3" => "#".$theme['tr_color3'],
-	"T_TR_CLASS1" => $theme['tr_class1'],
-	"T_TR_CLASS2" => $theme['tr_class2'],
-	"T_TR_CLASS3" => $theme['tr_class3'],
-	"T_TH_COLOR1" => "#".$theme['th_color1'],
-	"T_TH_COLOR2" => "#".$theme['th_color2'],
-	"T_TH_COLOR3" => "#".$theme['th_color3'],
-	"T_TH_CLASS1" => $theme['th_class1'],
-	"T_TH_CLASS2" => $theme['th_class2'],
-	"T_TH_CLASS3" => $theme['th_class3'],
-	"T_TD_COLOR1" => "#".$theme['td_color1'],
-	"T_TD_COLOR2" => "#".$theme['td_color2'],
-	"T_TD_COLOR3" => "#".$theme['td_color3'],
-	"T_TD_CLASS1" => $theme['td_class1'],
-	"T_TD_CLASS2" => $theme['td_class2'],
-	"T_TD_CLASS3" => $theme['td_class3'],
-	"T_FONTFACE1" => $theme['fontface1'],
-	"T_FONTFACE2" => $theme['fontface2'],
-	"T_FONTFACE3" => $theme['fontface3'],
-	"T_FONTSIZE1" => $theme['fontsize1'],
-	"T_FONTSIZE2" => $theme['fontsize2'],
-	"T_FONTSIZE3" => $theme['fontsize3'],
-	"T_FONTCOLOR1" => "#".$theme['fontcolor1'],
-	"T_FONTCOLOR2" => "#".$theme['fontcolor2'],
-	"T_FONTCOLOR3" => "#".$theme['fontcolor3'],
-	"T_SPAN_CLASS1" => $theme['span_class1'],
-	"T_SPAN_CLASS2" => $theme['span_class2'],
-	"T_SPAN_CLASS3" => $theme['span_class3'],
-	
-	"NAV_LINKS" => $nav_links_html)
+	'T_HEAD_STYLESHEET' => $theme['head_stylesheet'],
+	'T_BODY_BACKGROUND' => $theme['body_background'],
+	'T_BODY_BGCOLOR' => '#'.$theme['body_bgcolor'],
+	'T_BODY_TEXT' => '#'.$theme['body_text'],
+	'T_BODY_LINK' => '#'.$theme['body_link'],
+	'T_BODY_VLINK' => '#'.$theme['body_vlink'],
+	'T_BODY_ALINK' => '#'.$theme['body_alink'],
+	'T_BODY_HLINK' => '#'.$theme['body_hlink'],
+	'T_TR_COLOR1' => '#'.$theme['tr_color1'],
+	'T_TR_COLOR2' => '#'.$theme['tr_color2'],
+	'T_TR_COLOR3' => '#'.$theme['tr_color3'],
+	'T_TR_CLASS1' => $theme['tr_class1'],
+	'T_TR_CLASS2' => $theme['tr_class2'],
+	'T_TR_CLASS3' => $theme['tr_class3'],
+	'T_TH_COLOR1' => '#'.$theme['th_color1'],
+	'T_TH_COLOR2' => '#'.$theme['th_color2'],
+	'T_TH_COLOR3' => '#'.$theme['th_color3'],
+	'T_TH_CLASS1' => $theme['th_class1'],
+	'T_TH_CLASS2' => $theme['th_class2'],
+	'T_TH_CLASS3' => $theme['th_class3'],
+	'T_TD_COLOR1' => '#'.$theme['td_color1'],
+	'T_TD_COLOR2' => '#'.$theme['td_color2'],
+	'T_TD_COLOR3' => '#'.$theme['td_color3'],
+	'T_TD_CLASS1' => $theme['td_class1'],
+	'T_TD_CLASS2' => $theme['td_class2'],
+	'T_TD_CLASS3' => $theme['td_class3'],
+	'T_FONTFACE1' => $theme['fontface1'],
+	'T_FONTFACE2' => $theme['fontface2'],
+	'T_FONTFACE3' => $theme['fontface3'],
+	'T_FONTSIZE1' => $theme['fontsize1'],
+	'T_FONTSIZE2' => $theme['fontsize2'],
+	'T_FONTSIZE3' => $theme['fontsize3'],
+	'T_FONTCOLOR1' => '#'.$theme['fontcolor1'],
+	'T_FONTCOLOR2' => '#'.$theme['fontcolor2'],
+	'T_FONTCOLOR3' => '#'.$theme['fontcolor3'],
+	'T_SPAN_CLASS1' => $theme['span_class1'],
+	'T_SPAN_CLASS2' => $theme['span_class2'],
+	'T_SPAN_CLASS3' => $theme['span_class3'],
+
+	'NAV_LINKS' => $nav_links_html)
 );
 
 //
 // Login box?
 //
-if( !$userdata['session_logged_in'] )
+if ( !$userdata['session_logged_in'] )
 {
-	$template->assign_block_vars("switch_user_logged_out", array());
+	$template->assign_block_vars('switch_user_logged_out', array());
 }
 else
 {
-	$template->assign_block_vars("switch_user_logged_in", array());
+	$template->assign_block_vars('switch_user_logged_in', array());
 
-	if( !empty($userdata['user_popup_pm']) )
+	if ( !empty($userdata['user_popup_pm']) )
 	{
-		$template->assign_block_vars("switch_enable_pm_popup", array());
+		$template->assign_block_vars('switch_enable_pm_popup', array());
 	}
 }
 
-header ("Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0");
-header ("Pragma: no-cache");
-header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
-header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header ('Cache-Control: private, pre-check=0, post-check=0, max-age=0');
+header ('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
+header ('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-$template->pparse("overall_header");
+$template->pparse('overall_header');
 
-?>
+?>

phpBB/includes/page_tail.php

@@ -22,70 +22,35 @@
 
 if ( !defined('IN_PHPBB') )
 {
-	die("Hacking attempt");
+	die('Hacking attempt');
 }
 
 //
 // Show the overall footer.
 //
-if($userdata['user_level'] == ADMIN)
-{
-	$admin_link = "<a href=\"" . append_sid("admin/index.$phpEx") . "\">" . $lang['Admin_panel'] . "</a><br /><br />";
-}
-else
-{
-	$admin_link = "";
-}
-$current_time = time();
+$admin_link = ( $userdata['user_level'] == ADMIN ) ? '<a href="' . append_sid("admin/index.$phpEx") . '">' . $lang['Admin_panel'] . '</a><br /><br />' : '';
 
-if( empty($gen_simple_header) )
-{
-	$template->set_filenames(array(
-		"overall_footer" => "overall_footer.tpl")
-	);
-}
-else
-{
-	$template->set_filenames(array(
-		"overall_footer" => "simple_footer.tpl")
-	);
-}
-
-$template->assign_vars(array(
-	"PHPBB_VERSION" => "2.0 " . $board_config['version'],
-	"TRANSLATION_INFO" => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : "", 
-	"ADMIN_LINK" => $admin_link)
+$template->set_filenames(array(
+	'overall_footer' => ( empty($gen_simple_header) ) ? 'overall_footer.tpl' : 'simple_footer.tpl')
 );
 
-$template->pparse("overall_footer");
+$template->assign_vars(array(
+	'PHPBB_VERSION' => '2' . $board_config['version'],
+	'TRANSLATION_INFO' => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : '', 
+	'ADMIN_LINK' => $admin_link)
+);
 
-//
-// Output page creation time
-//
-$mtime = microtime();
-$mtime = explode(" ",$mtime);
-$mtime = $mtime[1] + $mtime[0];
-$endtime = $mtime;
-$totaltime = ($endtime - $starttime);
-
-$gzip_text = ($board_config['gzip_compress']) ? "GZIP compression enabled" : "GZIP compression disabled";
-$debug_mode = (DEBUG) ? " : Debug Mode" : "";
-
-printf("<br /><center><font size=\"-2\">phpBB Created this page in %f seconds : " . $db->num_queries . " queries executed : $gzip_text".$debug_mode."</font></center>", $totaltime);
+$template->pparse('overall_footer');
 
 //
 // Close our DB connection.
 //
 $db->sql_close();
 
-//for($i=0;$i<count($db->query_array);$i++)
-//	echo $db->query_array[$i] . "<BR>";
-
 //
-// Compress buffered output if required
-// and send to browser
+// Compress buffered output if required and send to browser
 //
-if($do_gzip_compress)
+if ( $do_gzip_compress )
 {
 	//
 	// Borrowed from php.net!
@@ -101,10 +66,10 @@ if($do_gzip_compress)
 
 	echo "\x1f\x8b\x08\x00\x00\x00\x00\x00";
 	echo $gzip_contents;
-	echo pack("V", $gzip_crc);
-	echo pack("V", $gzip_size);
+	echo pack('V', $gzip_crc);
+	echo pack('V', $gzip_size);
 }
 
 exit;
 
-?>
+?>

phpBB/includes/prune.php

@@ -20,6 +20,11 @@
  *
  ***************************************************************************/
 
+if ( !defined('IN_PHPBB') )
+{
+   die("Hacking attempt");
+}
+
 require($phpbb_root_path . 'includes/functions_search.'.$phpEx);
 
 function prune($forum_id, $prune_date)
@@ -33,24 +38,26 @@ function prune($forum_id, $prune_date)
 		FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t
 		WHERE t.forum_id = $forum_id
 			AND t.topic_vote = 0 
-			AND t.topic_type <> " . POST_ANNOUNCE . "
-			AND p.post_id = t.topic_last_post_id";
-	if ( $prune_date != "" )
+			AND t.topic_type <> " . POST_ANNOUNCE . " 
+			AND ( p.post_id = t.topic_last_post_id 
+				OR t.topic_last_post_id = 0 )";
+	if ( $prune_date != '' )
 	{
 		$sql .= " AND p.post_time < $prune_date";
 	}
+
 	if ( !($result = $db->sql_query($sql)) )
 	{
-		message_die(GENERAL_ERROR, "Couldn't obtain lists of topics to prune.", "", __LINE__, __FILE__, $sql);
+		message_die(GENERAL_ERROR, 'Could not obtain lists of topics to prune', '', __LINE__, __FILE__, $sql);
 	}
 
-	$sql_topics = "";
+	$sql_topics = '';
 	while( $row = $db->sql_fetchrow($result) )
 	{
-		$sql_topics .= ( ( $sql_topics != "" ) ? ", " : "" ) . $row['topic_id'];
+		$sql_topics .= ( ( $sql_topics != '' ) ? ', ' : '' ) . $row['topic_id'];
 	}
 		
-	if( $sql_topics != "" )
+	if( $sql_topics != '' )
 	{
 		$sql = "SELECT post_id
 			FROM " . POSTS_TABLE . " 
@@ -58,72 +65,62 @@ function prune($forum_id, $prune_date)
 				AND topic_id IN ($sql_topics)";
 		if ( !($result = $db->sql_query($sql)) )
 		{
-			message_die(GENERAL_ERROR, "Couldn't obtain list of posts to prune.", "", __LINE__, __FILE__, $sql);
+			message_die(GENERAL_ERROR, 'Could not obtain list of posts to prune', '', __LINE__, __FILE__, $sql);
 		}
 
-		$sql_post = "";
+		$sql_post = '';
 		while ( $row = $db->sql_fetchrow($result) )
 		{
-			$sql_post .= ( ( $sql_post != "" ) ? ", " : "" ) . $row['post_id'];
+			$sql_post .= ( ( $sql_post != '' ) ? ', ' : '' ) . $row['post_id'];
 		}
 
-		if ( $sql_post != "" )
+		if ( $sql_post != '' )
 		{
 			$sql = "DELETE FROM " . TOPICS_TABLE . " 
 				WHERE topic_id IN ($sql_topics)";
-			if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
+			if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't delete topics during prune.", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not delete topics during prune', '', __LINE__, __FILE__, $sql);
 			}
 
 			$pruned_topics = $db->sql_affectedrows();
 
 			$sql = "DELETE FROM " . POSTS_TABLE . " 
 				WHERE post_id IN ($sql_post)";
-			if ( !($result = $db->sql_query($sql)) )
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't delete post_text during prune.", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not delete post_text during prune', '', __LINE__, __FILE__, $sql);
 			}
 
 			$pruned_posts = $db->sql_affectedrows();
 
 			$sql = "DELETE FROM " . POSTS_TEXT_TABLE . " 
 				WHERE post_id IN ($sql_post)";
-			if ( !($result = $db->sql_query($sql)) )
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't delete post during prune.", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not delete post during prune', '', __LINE__, __FILE__, $sql);
 			}
 
 			$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . " 
 				WHERE post_id IN ($sql_post)";
-			if ( !($result = $db->sql_query($sql)) )
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't delete search matches", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not delete search matches', '', __LINE__, __FILE__, $sql);
 			}
 
-			remove_unmatched_words();
+			remove_search_post($sql_post);
 
-			$sql = "UPDATE " . FORUMS_TABLE . "
-				SET forum_topics = forum_topics - $pruned_topics, forum_posts = forum_posts - $pruned_posts
-				WHERE forum_id = $forum_id";
-			if ( !($result = $db->sql_query($sql)) )
-			{
-				message_die(GENERAL_ERROR, "Couldn't update forum data after prune.", "", __LINE__, __FILE__, $sql);
-			}
-
-			return array ("topics" => $pruned_topics, "posts" => $pruned_posts);
+			return array ('topics' => $pruned_topics, 'posts' => $pruned_posts);
 		}
 	}
 
-	return array("topics" => 0, "posts" => 0);
+	return array('topics' => 0, 'posts' => 0);
 }
 
-/***************************************************************************\
-*
-*	Function auto_prune(), this function will read the configuration data from
-* 	the auto_prune table and call the prune function with the necessary info.
-*
-****************************************************************************/
+//
+// Function auto_prune(), this function will read the configuration data from
+// the auto_prune table and call the prune function with the necessary info.
+//
 function auto_prune($forum_id = 0)
 {
 	global $db, $lang;
@@ -131,10 +128,9 @@ function auto_prune($forum_id = 0)
 	$sql = "SELECT *
 		FROM " . PRUNE_TABLE . "
 		WHERE forum_id = $forum_id";
-
 	if ( !($result = $db->sql_query($sql)) )
 	{
-		message_die(GENERAL_ERROR, "Auto-Prune: Couldn't read auto_prune table.", __LINE__, __FILE__);
+		message_die(GENERAL_ERROR, 'Could not read auto_prune table', '', __LINE__, __FILE__, $sql);
 	}
 
 	if ( $row = $db->sql_fetchrow($result) )
@@ -142,16 +138,17 @@ function auto_prune($forum_id = 0)
 		if ( $row['prune_freq'] && $row['prune_days'] )
 		{
 			$prune_date = time() - ( $row['prune_days'] * 86400 );
-			prune($forum_id, $prune_date);
-
 			$next_prune = time() + ( $row['prune_freq'] * 86400 );
 
+			prune($forum_id, $prune_date);
+			sync('forum', $forum_id);
+
 			$sql = "UPDATE " . FORUMS_TABLE . " 
-				SET prune_next = $next_prune
+				SET prune_next = $next_prune 
 				WHERE forum_id = $forum_id";
 			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Auto-Prune: Couldn't update forum table.", __LINE__, __FILE__);
+				message_die(GENERAL_ERROR, 'Could not update forum table', '', __LINE__, __FILE__, $sql);
 			}
 		}
 	}

phpBB/includes/sessions.php

@@ -20,8 +20,6 @@
  *
  ***************************************************************************/
 
-//
-// session_begin()
 //
 // Adds/updates a new session to the database for the given userid.
 // Returns the new session ID on success.
@@ -54,8 +52,7 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
 	$expiry_time = $current_time - $board_config['session_length'];
 
 	//
-	// Try and pull the last time stored
-	// in a cookie, if it exists
+	// Try and pull the last time stored in a cookie, if it exists
 	//
 	$sql = "SELECT * 
 		FROM " . USERS_TABLE . " 
@@ -81,8 +78,6 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
 					// autologinid matches password
 					$login = 1;
 					$enable_autologin = 1;
-
-					$last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time;
 				}
 				else
 				{
@@ -102,7 +97,6 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
 		}
 		else
 		{
-			$last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time;
 			$login = 1;
 		}
 	}
@@ -123,8 +117,8 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
 			OR ban_userid = $user_id";
 	if ( $user_id != ANONYMOUS )
 	{
-		$sql .= " OR ban_email LIKE '" . str_replace("\'", "''", $row['user_email']) . "' 
-			OR ban_email LIKE '" . substr(str_replace("\'", "''", $row['user_email']), strpos(str_replace("\'", "''", $row['user_email']), "@")) . "'";
+		$sql .= " OR ban_email LIKE '" . str_replace("\'", "''", $userdata['user_email']) . "' 
+			OR ban_email LIKE '" . substr(str_replace("\'", "''", $userdata['user_email']), strpos(str_replace("\'", "''", $userdata['user_email']), "@")) . "'";
 	}
 	if ( !($result = $db->sql_query($sql)) )
 	{
@@ -146,27 +140,29 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
 		SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login
 		WHERE session_id = '" . $session_id . "' 
 			AND session_ip = '$user_ip'";
-	if ( !($result = $db->sql_query($sql)) || !$db->sql_affectedrows() )
+	if ( !$db->sql_query($sql) || !$db->sql_affectedrows() )
 	{
 		$session_id = md5(uniqid($user_ip));
 
 		$sql = "INSERT INTO " . SESSIONS_TABLE . "
 			(session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in)
 			VALUES ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login)";
-		if ( !($result = $db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
-			message_die(CRITICAL_ERROR, 'Error creating new session : session_begin', '', __LINE__, __FILE__, $sql);
+			message_die(CRITICAL_ERROR, 'Error creating new session', '', __LINE__, __FILE__, $sql);
 		}
 	}
 
 	if ( $user_id != ANONYMOUS )
-	{
+	{// ( $userdata['user_session_time'] > $expiry_time && $auto_create ) ? $userdata['user_lastvisit'] : ( 
+		$last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time; 
+
 		$sql = "UPDATE " . USERS_TABLE . " 
 			SET user_session_time = $current_time, user_session_page = $page_id, user_lastvisit = $last_visit
 			WHERE user_id = $user_id";
 		if ( !$db->sql_query($sql) )
 		{
-			message_die(CRITICAL_ERROR, 'Error updating last visit time : session_begin', '', __LINE__, __FILE__, $sql);
+			message_die(CRITICAL_ERROR, 'Error updating last visit time', '', __LINE__, __FILE__, $sql);
 		}
 
 		$userdata['user_lastvisit'] = $last_visit;
@@ -185,8 +181,6 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
 
 	setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure);
 	setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
-//	header('Set-cookie: ' . $cookiename . '_data=' . urlencode(serialize($sessiondata)) . '; expires=' . gmdate("l, d-M-Y H:i:s", $current_time + 31536000) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
-//	header('Set-cookie: ' . $cookiename . '_sid=' . $session_id . '; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
 
 	$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? 'sid=' . $session_id : '';
 
@@ -194,8 +188,8 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
 }
 
 //
-// Checks for a given user session, tidies session
-// table and updates user sessions at each page refresh
+// Checks for a given user session, tidies session table and updates user
+// sessions at each page refresh
 //
 function session_pagestart($user_ip, $thispage_id)
 {
@@ -206,7 +200,6 @@ function session_pagestart($user_ip, $thispage_id)
 	$cookiepath = $board_config['cookie_path'];
 	$cookiedomain = $board_config['cookie_domain'];
 	$cookiesecure = $board_config['cookie_secure'];
-	$cookiesecure = ( $board_config['cookie_secure'] ) ? '; secure' : '';
 
 	$current_time = time();
 	unset($userdata);
@@ -219,7 +212,7 @@ function session_pagestart($user_ip, $thispage_id)
 	}
 	else
 	{
-		$session_data = '';
+		$sessiondata = '';
 		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : '';
 		$sessionmethod = SESSION_METHOD_GET;
 	}
@@ -236,11 +229,10 @@ function session_pagestart($user_ip, $thispage_id)
 		$sql = "SELECT u.*, s.*
 			FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
 			WHERE s.session_id = '$session_id'
-				AND u.user_id = s.session_user_id 
-				AND s.session_ip = '$user_ip'";
+				AND u.user_id = s.session_user_id";
 		if ( !($result = $db->sql_query($sql)) )
 		{
-			message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch : session_pagestart', '', __LINE__, __FILE__, $sql);
+			message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch', '', __LINE__, __FILE__, $sql);
 		}
 
 		$userdata = $db->sql_fetchrow($result);
@@ -250,40 +242,60 @@ function session_pagestart($user_ip, $thispage_id)
 		//
 		if ( isset($userdata['user_id']) )
 		{
-			$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? 'sid=' . $session_id : '';
-
 			//
-			// Only update session DB a minute or so after last update
+			// Do not check IP assuming equivalence, if IPv4 we'll check only first 24
+			// bits ... I've been told (by vHiker) this should alleviate problems with 
+			// load balanced et al proxies while retaining some reliance on IP security.
 			//
-			$last_update = ( $userdata['user_id'] == ANONYMOUS ) ? $userdata['session_time'] : $userdata['user_session_time'];
+			$ip_check_s = substr($userdata['session_ip'], 0, 6);
+			$ip_check_u = substr($user_ip, 0, 6);
 
-			if ( $current_time - $last_update > 60 )
-			{ // || $userdata['user_session_page'] != $thispage_id
-				$sql = ( $userdata['user_id'] == ANONYMOUS ) ? "UPDATE " . SESSIONS_TABLE . " SET session_time = $current_time, session_page = $thispage_id WHERE session_id = '" . $userdata['session_id'] . "' AND session_ip = '$user_ip'" : "UPDATE " . USERS_TABLE . " SET user_session_time = $current_time, user_session_page = $thispage_id WHERE user_id = " . $userdata['user_id'];
-				if ( !$db->sql_query($sql) )
-				{
-					message_die(CRITICAL_ERROR, 'Error updating sessions table : session_pagestart', '', __LINE__, __FILE__, $sql);
-				}
+			if ( $ip_check_s == $ip_check_u )
+			{
+				$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? 'sid=' . $session_id : '';
 
 				//
-				// Delete expired sessions
+				// Only update session DB a minute or so after last update
 				//
-				$expiry_time = $current_time - $board_config['session_length'];
-				$sql = "DELETE FROM " . SESSIONS_TABLE . " 
-					WHERE session_time < $expiry_time 
-						AND session_id <> '$session_id'";
-				if ( !($result = $db->sql_query($sql)) )
+				if ( $current_time - $userdata['session_time'] > 60 )
 				{
-					message_die(CRITICAL_ERROR, 'Error clearing sessions table : session_pagestart', '', __LINE__, __FILE__, $sql);
+					$sql = "UPDATE " . SESSIONS_TABLE . " 
+						SET session_time = $current_time, session_page = $thispage_id 
+						WHERE session_id = '" . $userdata['session_id'] . "'";
+					if ( !$db->sql_query($sql) )
+					{
+						message_die(CRITICAL_ERROR, 'Error updating sessions table', '', __LINE__, __FILE__, $sql);
+					}
+
+					if ( $userdata['user_id'] != ANONYMOUS )
+					{
+						$sql = "UPDATE " . USERS_TABLE . " 
+							SET user_session_time = $current_time, user_session_page = $thispage_id 
+							WHERE user_id = " . $userdata['user_id'];
+						if ( !$db->sql_query($sql) )
+						{
+							message_die(CRITICAL_ERROR, 'Error updating sessions table', '', __LINE__, __FILE__, $sql);
+						}
+					}
+
+					//
+					// Delete expired sessions
+					//
+					$expiry_time = $current_time - $board_config['session_length'];
+					$sql = "DELETE FROM " . SESSIONS_TABLE . " 
+						WHERE session_time < $expiry_time 
+							AND session_id <> '$session_id'";
+					if ( !$db->sql_query($sql) )
+					{
+						message_die(CRITICAL_ERROR, 'Error clearing sessions table', '', __LINE__, __FILE__, $sql);
+					}
+
+					setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure);
+					setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
 				}
 
-				setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure);
-				setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
-//				header('Set-cookie: ' . $cookiename . '_data=' . urlencode(serialize($sessiondata)) . '; expires=' . gmdate("l, d-M-Y H:i:s", $current_time + 31536000) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
-//				header('Set-cookie: ' . $cookiename . '_sid=' . $session_id . '; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
+				return $userdata;
 			}
-
-			return $userdata;
 		}
 	}
 
@@ -291,11 +303,11 @@ function session_pagestart($user_ip, $thispage_id)
 	// If we reach here then no (valid) session exists. So we'll create a new one,
 	// using the cookie user_id if available to pull basic user prefs.
 	//
-	$user_id = ( isset($sessiondata['userid']) ) ? $sessiondata['userid'] : ANONYMOUS;
+	$user_id = ( isset($sessiondata['userid']) ) ? intval($sessiondata['userid']) : ANONYMOUS;
 
 	if ( !($userdata = session_begin($user_id, $user_ip, $thispage_id, TRUE)) )
 	{
-		message_die(CRITICAL_ERROR, 'Error creating user session : session_pagestart', '', __LINE__, __FILE__, $sql);
+		message_die(CRITICAL_ERROR, 'Error creating user session', '', __LINE__, __FILE__, $sql);
 	}
 
 	return $userdata;
@@ -316,7 +328,6 @@ function session_end($session_id, $user_id)
 	$cookiepath = $board_config['cookie_path'];
 	$cookiedomain = $board_config['cookie_domain'];
 	$cookiesecure = $board_config['cookie_secure'];
-//	$cookiesecure = ( $board_config['cookie_secure'] ) ? '; secure' : '';
 
 	//
 	// Pull cookiedata or grab the URI propagated sid
@@ -338,20 +349,15 @@ function session_end($session_id, $user_id)
 	$sql = "DELETE FROM " . SESSIONS_TABLE . " 
 		WHERE session_id = '$session_id' 
 			AND session_user_id = $user_id";
-	if ( !($result = $db->sql_query($sql)) )
+	if ( !$db->sql_query($sql) )
 	{
-		message_die(CRITICAL_ERROR, 'Error removing user session : session_end', '', __LINE__, __FILE__, $sql);
+		message_die(CRITICAL_ERROR, 'Error removing user session', '', __LINE__, __FILE__, $sql);
 	}
 
 	setcookie($cookiename . '_data', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
 	setcookie($cookiename . '_sid', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
-//	header('Set-cookie: ' . $cookiename . '_data=0; expires=' . gmdate("l, d-M-Y H:i:s", 0) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath. $cookiesecure);
-//	header('Set-cookie: ' . $cookiename . '_sid=0; expires=' . gmdate("l, d-M-Y H:i:s", 0) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
-
-	$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? 'sid=' . $session_id : '';
-
-	return TRUE;
 
+	return true;
 }
 
 //
@@ -372,4 +378,4 @@ function append_sid($url, $non_html_amp = false)
 	return($url);
 }
 
-?>
+?>

phpBB/includes/smtp.php

@@ -1,13 +1,13 @@
 <?php
 /***************************************************************************
-                                smtp.php
-						  -------------------
-    begin                : Wed May 09 2001
-    copyright            : (C) 2001 The phpBB Group
-    email                : support@phpbb.com
-
-    $Id$
-
+ *                              smtp.php
+ *                       -------------------
+ *   begin                : Wed May 09 2001
+ *   copyright            : (C) 2001 The phpBB Group
+ *   email                : support@phpbb.com
+ *
+ *   $Id$
+ *
  ***************************************************************************/
 
 /***************************************************************************
@@ -170,7 +170,7 @@ function smtpmail($mail_to, $subject, $message, $headers = "")
 			fputs( $socket, "RCPT TO: <$mail_to_address>\r\n" );
 			server_parse( $socket, "250" );
 		}
-		$to_header .= "<$mail_to_address>, ";
+		$to_header .= ( ( $mail_to_address != '' ) ? ', ' : '' ) . "<$mail_to_address>";
 	}
 	// Ok now do the CC and BCC fields...
 	@reset( $bcc );
@@ -228,4 +228,4 @@ function smtpmail($mail_to, $subject, $message, $headers = "")
 	return TRUE;
 }
 
-?>
+?>

phpBB/includes/template.php

@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                              template.inc
+ *                              template.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -475,4 +475,4 @@ class Template {
 
 }
 
-?>
+?>

phpBB/includes/topic_review.php

@@ -28,9 +28,9 @@ function topic_review($topic_id, $is_inline_review)
 	global $orig_word, $replacement_word;
 	global $starttime;
 
-	if( !$is_inline_review )
+	if ( !$is_inline_review )
 	{
-		if( !isset($topic_id) )
+		if ( !isset($topic_id) )
 		{
 			message_die(GENERAL_MESSAGE, 'Topic_not_exist');
 		}
@@ -42,12 +42,12 @@ function topic_review($topic_id, $is_inline_review)
 			FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f 
 			WHERE t.topic_id = $topic_id
 				AND f.forum_id = t.forum_id";
-		if( !($result = $db->sql_query($sql)) )
+		if ( !($result = $db->sql_query($sql)) )
 		{
-			message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql);
+			message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql);
 		}
 
-		if( !($forum_row = $db->sql_fetchrow($result)) )
+		if ( !($forum_row = $db->sql_fetchrow($result)) )
 		{
 			message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
 		}
@@ -76,7 +76,7 @@ function topic_review($topic_id, $is_inline_review)
 	//
 	// Define censored word matches
 	//
-	if( empty($orig_word) && empty($replacement_word) )
+	if ( empty($orig_word) && empty($replacement_word) )
 	{
 		$orig_word = array();
 		$replacement_word = array();
@@ -87,15 +87,15 @@ function topic_review($topic_id, $is_inline_review)
 	//
 	// Dump out the page header and load viewtopic body template
 	//
-	if( !$is_inline_review )
+	if ( !$is_inline_review )
 	{
 		$gen_simple_header = TRUE;
 
-		$page_title = $lang['Topic_review'] ." - $topic_title";
+		$page_title = $lang['Topic_review'] . ' - ' . $topic_title;
 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
 		$template->set_filenames(array(
-			"reviewbody" => "posting_topic_review.tpl")
+			'reviewbody' => 'posting_topic_review.tpl')
 		);
 	}
 
@@ -109,9 +109,9 @@ function topic_review($topic_id, $is_inline_review)
 			AND p.post_id = pt.post_id
 		ORDER BY p.post_time DESC
 		LIMIT " . $board_config['posts_per_page'];
-	if( !($result = $db->sql_query($sql)) )
+	if ( !($result = $db->sql_query($sql)) )
 	{
-		message_die(GENERAL_ERROR, "Couldn't obtain post/user information.", "", __LINE__, __FILE__, $sql);
+		message_die(GENERAL_ERROR, 'Could not obtain post/user information', '', __LINE__, __FILE__, $sql);
 	}
 
 	//
@@ -120,6 +120,9 @@ function topic_review($topic_id, $is_inline_review)
 	//
 	if ( $row = $db->sql_fetchrow($result) )
 	{
+		$mini_post_img = $images['icon_minipost'];
+		$mini_post_alt = $lang['Post'];
+
 		$i = 0;
 		do
 		{
@@ -128,8 +131,6 @@ function topic_review($topic_id, $is_inline_review)
 
 			$post_date = create_date($board_config['default_dateformat'], $row['post_time'], $board_config['board_timezone']);
 
-			$mini_post_img = '<img src="' . $images['icon_minipost'] . '" alt="' . $lang['Post'] . '" />';
-
 			//
 			// Handle anon users posting with usernames
 			//
@@ -138,8 +139,13 @@ function topic_review($topic_id, $is_inline_review)
 				$poster = $row['post_username'];
 				$poster_rank = $lang['Guest'];
 			}
+			elseif ( $poster_id == ANONYMOUS )
+			{
+				$poster = $lang['Guest'];
+				$poster_rank = '';
+			}
 
-			$post_subject = ( $row['post_subject'] != "" ) ? $row['post_subject'] : "";
+			$post_subject = ( $row['post_subject'] != '' ) ? $row['post_subject'] : '';
 
 			$message = $row['post_text'];
 			$bbcode_uid = $row['bbcode_uid'];
@@ -150,12 +156,12 @@ function topic_review($topic_id, $is_inline_review)
 			//
 			if ( !$board_config['allow_html'] && $row['enable_html'] )
 			{
-				$message = preg_replace("#(<)([\/]?.*?)(>)#is", "&lt;\\2&gt;", $message);
+				$message = preg_replace('#(<)([\/]?.*?)(>)#is', '&lt;\2&gt;', $message);
 			}
 
 			if ( $bbcode_uid != "" )
 			{
-				$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
+				$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $message);
 			}
 
 			$message = make_clickable($message);
@@ -171,7 +177,7 @@ function topic_review($topic_id, $is_inline_review)
 				$message = smilies_pass($message);
 			}
 
-			$message = str_replace("\n", "<br />", $message);
+			$message = str_replace("\n", '<br />', $message);
 
 			//
 			// Again this will be handled by the templating
@@ -180,15 +186,17 @@ function topic_review($topic_id, $is_inline_review)
 			$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
 			$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
 
-			$template->assign_block_vars("postrow", array(
-				"ROW_COLOR" => "#" . $row_color, 
-				"ROW_CLASS" => $row_class, 
+			$template->assign_block_vars('postrow', array(
+				'ROW_COLOR' => '#' . $row_color, 
+				'ROW_CLASS' => $row_class, 
 
-				"MINI_POST_IMG" => $mini_post_img, 
-				"POSTER_NAME" => $poster, 
-				"POST_DATE" => $post_date, 
-				"POST_SUBJECT" => $post_subject, 
-				"MESSAGE" => $message)
+				'MINI_POST_IMG' => $mini_post_img, 
+				'POSTER_NAME' => $poster, 
+				'POST_DATE' => $post_date, 
+				'POST_SUBJECT' => $post_subject, 
+				'MESSAGE' => $message,
+					
+				'L_MINI_POST_ALT' => $mini_post_alt)
 			);
 
 			$i++;
@@ -197,20 +205,22 @@ function topic_review($topic_id, $is_inline_review)
 	}
 	else
 	{
-		message_die(GENERAL_MESSAGE, 'Topic_post_not_exist', "", __LINE__, __FILE__, $sql);
+		message_die(GENERAL_MESSAGE, 'Topic_post_not_exist', '', __LINE__, __FILE__, $sql);
 	}
 
 	$template->assign_vars(array(
-		"L_POSTED" => $lang['Posted'],
-		"L_POST_SUBJECT" => $lang['Post_subject'], 
-		"L_TOPIC_REVIEW" => $lang['Topic_review'])
+		'L_AUTHOR' => $lang['Author'],
+		'L_MESSAGE' => $lang['Message'],
+		'L_POSTED' => $lang['Posted'],
+		'L_POST_SUBJECT' => $lang['Post_subject'], 
+		'L_TOPIC_REVIEW' => $lang['Topic_review'])
 	);
 
 	if ( !$is_inline_review )
 	{
-		$template->pparse("reviewbody");
+		$template->pparse('reviewbody');
 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 	}
 }
 
-?>
+?>

phpBB/includes/usercp_activate.php

@@ -23,74 +23,85 @@
 
 if ( !defined('IN_PHPBB') )
 {
-	die("Hacking attempt");
+	die('Hacking attempt');
 	exit;
 }
 
-$sql = "SELECT user_id, user_email, user_newpasswd, user_lang  
+$sql = "SELECT user_active, user_id, user_email, user_newpasswd, user_lang, user_actkey 
 	FROM " . USERS_TABLE . "
-	WHERE user_actkey = '" . str_replace("\'", "''", $HTTP_GET_VARS['act_key']) . "'";
-if ( $result = $db->sql_query($sql) )
+	WHERE user_id = " . intval($HTTP_GET_VARS[POST_USERS_URL]);
+if ( !($result = $db->sql_query($sql)) )
 {
-	if ( $row = $db->sql_fetchrow($result) )
+	message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql);
+}
+
+if ( $row = $db->sql_fetchrow($result) )
+{
+	if ( $row['user_active'] && $row['user_actkey'] == '' )
 	{
-		$sql_update_pass = ( $row['user_newpasswd'] != "" ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : "";
+		$template->assign_vars(array(
+			'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
+		);
+
+		message_die(GENERAL_MESSAGE, $lang['Already_activated']);
+	}
+	else if ( $row['user_actkey'] == $HTTP_GET_VARS['act_key'] )
+	{
+		$sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : '';
 
 		$sql = "UPDATE " . USERS_TABLE . "
 			SET user_active = 1, user_actkey = ''" . $sql_update_pass . " 
-			WHERE user_id = " . $row['user_id'];
-		if ( $result = $db->sql_query($sql) )
+			WHERE user_id = " . $row['user_id']; 
+		if ( !($result = $db->sql_query($sql)) )
 		{
-			if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN && $sql_update_pass == '' )
-			{
-				include($phpbb_root_path . 'includes/emailer.'.$phpEx);
-				$emailer = new emailer($board_config['smtp_delivery']);
+			message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql_update);
+		}
 
-				$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+		if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN && $sql_update_pass == '' )
+		{
+			include($phpbb_root_path . 'includes/emailer.'.$phpEx);
+			$emailer = new emailer($board_config['smtp_delivery']);
 
-				$emailer->use_template("admin_welcome_activated", $row['user_lang']);
-				$emailer->email_address($row['user_email']);
-				$emailer->set_subject();//$lang['Account_activated_subject']
-				$emailer->extra_headers($email_headers);
+			$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
-				$emailer->assign_vars(array(
-					"SITENAME" => $board_config['sitename'], 
-					"USERNAME" => $username,
-					"PASSWORD" => $password_confirm,
-					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']))
-				);
-				$emailer->send();
-				$emailer->reset();
+			$emailer->use_template('admin_welcome_activated', $row['user_lang']);
+			$emailer->email_address($row['user_email']);
+			$emailer->set_subject();//$lang['Account_activated_subject']
+			$emailer->extra_headers($email_headers);
 
-				$template->assign_vars(array(
-					"META" => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
-				);
+			$emailer->assign_vars(array(
+				'SITENAME' => $board_config['sitename'], 
+				'USERNAME' => $username,
+				'PASSWORD' => $password_confirm,
+				'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']))
+			);
+			$emailer->send();
+			$emailer->reset();
 
-				message_die(GENERAL_MESSAGE, $lang['Account_active_admin']);
-			}
-			else
-			{
-				$template->assign_vars(array(
-					"META" => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
-				);
+			$template->assign_vars(array(
+				'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
+			);
 
-				$message = ( $sql_update_pass == "" ) ? $lang['Account_active'] : $lang['Password_activated']; 
-				message_die(GENERAL_MESSAGE, $message);
-			}
+			message_die(GENERAL_MESSAGE, $lang['Account_active_admin']);
 		}
 		else
 		{
-			message_die(GENERAL_ERROR, "Couldn't update users table", "", __LINE__, __FILE__, $sql_update);
+			$template->assign_vars(array(
+				'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
+			);
+
+			$message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; 
+			message_die(GENERAL_MESSAGE, $message);
 		}
 	}
 	else
 	{
-		message_die(GENERAL_ERROR, $lang['Wrong_activation']); //wrongactiv
+		message_die(GENERAL_MESSAGE, $lang['Wrong_activation']);
 	}
 }
 else
 {
-	message_die(GENERAL_ERROR, "Couldn't obtain user information", "", __LINE__, __FILE__, $sql);
+	message_die(GENERAL_MESSAGE, $lang['No_such_user']);
 }
 
-?>
+?>

phpBB/includes/usercp_avatar.php

@@ -64,17 +64,26 @@ function user_avatar_delete($avatar_type, $avatar_file)
 
 function user_avatar_gallery($mode, &$error, &$error_msg, $avatar_filename)
 {
-	return ( $mode == 'editprofile' ) ? ", user_avatar = '" . str_replace("\'", "''", $avatar_filename) . "', user_avatar_type = " . USER_AVATAR_GALLERY : '';
+	global $board_config;
+	if ( file_exists($board_config['avatar_gallery_path'] . '/' . $avatar_filename) && ($mode == 'editprofile') )
+	{
+		$return = ", user_avatar = '" . str_replace("\'", "''", $avatar_filename) . "', user_avatar_type = " . USER_AVATAR_GALLERY;
+	}
+	else
+	{
+		$return = '';
+	}
+	return $return;
 }
 
 function user_avatar_url($mode, &$error, &$error_msg, $avatar_filename)
 {
-	if ( !preg_match('#^http:\/\/#i', $avatar_filename) )
+	if ( !preg_match('#^(http)|(ftp):\/\/#i', $avatar_filename) )
 	{
 		$avatar_filename = 'http://' . $avatar_filename;
 	}
 
-	if ( !preg_match('#^(http:\/\/[a-z0-9\-]+?\.([a-z0-9\-]+\.)*[a-z]+(:[0-9]+)*\/.*?\.(gif|jpg|jpeg|png)$)#is', $avatar_filename) )
+	if ( !preg_match('#^((http)|(ftp):\/\/[a-z0-9\-]+?\.([a-z0-9\-]+\.)+[a-z]+(:[0-9]+)*\/.*?\.(gif|jpg|jpeg|png)$)#is', $avatar_filename) )
 	{
 		$error = true;
 		$error_msg = ( !empty($error_msg) ) ? $error_msg . '<br />' . $lang['Wrong_remote_avatar_format'] : $lang['Wrong_remote_avatar_format'];
@@ -85,11 +94,11 @@ function user_avatar_url($mode, &$error, &$error_msg, $avatar_filename)
 
 }
 
-function user_avatar_upload($mode, $avatar_mode, $user_id, &$error, &$error_msg, $avatar_filename, $avatar_realname, $avatar_filesize, $avatar_filetype)
+function user_avatar_upload($mode, $avatar_mode, &$current_avatar, &$current_type, &$error, &$error_msg, $avatar_filename, $avatar_realname, $avatar_filesize, $avatar_filetype)
 {
-	global $board_config, $db, $lang, $images;
+	global $board_config, $user_ip, $db, $lang;
 
-	$ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
+	$ini_val = ( @phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
 
 	if ( $avatar_mode == 'remote' && preg_match('/^(http:\/\/)?([\w\-\.]+)\:?([0-9]*)\/(.*)$/', $avatar_filename, $url_ary) )
 	{
@@ -135,8 +144,8 @@ function user_avatar_upload($mode, $avatar_mode, $user_id, &$error, &$error_msg,
 		{
 			$avatar_data = substr($avatar_data, strlen($avatar_data) - $avatar_filesize, $avatar_filesize);
 
-			$tmp_path = ( !$ini_val('safe_mode') ) ? '/tmp' : './' . $board_config['avatar_path'] . "/tmp";
-			$tmp_filename = tempnam($tmp_path, $userdata['user_id'] . '-');
+			$tmp_path = ( !@$ini_val('safe_mode') ) ? '/tmp' : './' . $board_config['avatar_path'] . '/tmp';
+			$tmp_filename = tempnam($tmp_path, uniqid($user_ip) . '-');
 
 			$fptr = @fopen($tmp_filename, 'wb');
 			$bytes_written = @fwrite($fptr, $avatar_data, $avatar_filesize);
@@ -162,10 +171,7 @@ function user_avatar_upload($mode, $avatar_mode, $user_id, &$error, &$error_msg,
 	{
 		if ( $avatar_filesize <= $board_config['avatar_filesize'] && $avatar_filesize > 0 )
 		{
-			//
-			// Opera appends the image name after the type, not big, not clever!
-			//
-			preg_match("'image\/[x\-]*([a-z]+)'", $avatar_filetype, $avatar_filetype);
+			preg_match('#image\/[x\-]*([a-z]+)#', $avatar_filetype, $avatar_filetype);
 			$avatar_filetype = $avatar_filetype[1];
 		}
 		else
@@ -176,6 +182,8 @@ function user_avatar_upload($mode, $avatar_mode, $user_id, &$error, &$error_msg,
 			$error_msg = ( !empty($error_msg) ) ? $error_msg . '<br />' . $l_avatar_size : $l_avatar_size;
 			return;
 		}
+
+		list($width, $height) = @getimagesize($avatar_filename);
 	}
 
 	if ( !($imgtype = check_image_type($avatar_filetype, $error, $error_msg)) )
@@ -185,13 +193,13 @@ function user_avatar_upload($mode, $avatar_mode, $user_id, &$error, &$error_msg,
 
 	if ( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
 	{
-		$new_filename = $user_id . $imgtype;
+		$new_filename = uniqid($user_ip) . $imgtype;
 
-		if ( $mode == 'editprofile' && $userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $userdata['user_avatar'] != '')
+		if ( $mode == 'editprofile' && $current_type == USER_AVATAR_UPLOAD && $current_avatar != '' )
 		{
-			if ( file_exists('./' . $board_config['avatar_path'] . '/' . $userdata['user_avatar']) )
+			if ( file_exists('./' . $board_config['avatar_path'] . '/' . $current_avatar) )
 			{
-				@unlink('./' . $board_config['avatar_path'] . '/' . $userdata['user_avatar']);
+				@unlink('./' . $board_config['avatar_path'] . '/' . $current_avatar);
 			}
 		}
 
@@ -202,9 +210,9 @@ function user_avatar_upload($mode, $avatar_mode, $user_id, &$error, &$error_msg,
 		}
 		else
 		{
-			if ( $ini_val('open_basedir') != '' )
+			if ( @$ini_val('open_basedir') != '' )
 			{
-				if ( phpversion() < '4.0.3' )
+				if ( @phpversion() < '4.0.3' )
 				{
 					message_die(GENERAL_ERROR, 'open_basedir is set and your PHP version does not allow move_uploaded_file', '', __LINE__, __FILE__);
 				}
@@ -221,7 +229,7 @@ function user_avatar_upload($mode, $avatar_mode, $user_id, &$error, &$error_msg,
 
 		@chmod('./' . $board_config['avatar_path'] . "/$new_filename", 0777);
 
-		$avatar_sql = ( $mode == 'editprofile' ) ? ", user_avatar = '$new_filename', user_avatar_type = " . USER_AVATAR_UPLOAD : "'$avatar_filename', " . USER_AVATAR_UPLOAD;
+		$avatar_sql = ( $mode == 'editprofile' ) ? ", user_avatar = '$new_filename', user_avatar_type = " . USER_AVATAR_UPLOAD : "'$new_filename', " . USER_AVATAR_UPLOAD;
 	}
 	else
 	{
@@ -234,7 +242,7 @@ function user_avatar_upload($mode, $avatar_mode, $user_id, &$error, &$error_msg,
 	return $avatar_sql;
 }
 
-function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current_email, &$coppa, &$username, &$email, &$icq, &$aim, &$msn, &$yim, &$website, &$location, &$occupation, &$interests, &$signature, &$viewemail, &$notifypm, &$popuppm, &$notifyreply, &$attachsig, &$allowhtml, &$allowbbcode, &$allowsmilies, &$hideonline, &$style, &$language, &$timezone, &$dateformat)
+function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current_email, &$coppa, &$username, &$email, &$new_password, &$cur_password, &$password_confirm, &$icq, &$aim, &$msn, &$yim, &$website, &$location, &$occupation, &$interests, &$signature, &$viewemail, &$notifypm, &$popuppm, &$notifyreply, &$attachsig, &$allowhtml, &$allowbbcode, &$allowsmilies, &$hideonline, &$style, &$language, &$timezone, &$dateformat)
 {
 	global $board_config, $db, $template, $lang, $images, $theme;
 	global $phpbb_root_path, $phpEx;
@@ -279,7 +287,7 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current
 	}
 	@reset($avatar_images);
 
-	$s_categories = '';
+	$s_categories = '<select name="avatarcategory">';
 	while( list($key) = each($avatar_images) )
 	{
 		$selected = ( $key == $category ) ? ' selected="selected"' : '';
@@ -288,6 +296,7 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current
 			$s_categories .= '<option value="' . $key . '"' . $selected . '>' . ucfirst($key) . '</option>';
 		}
 	}
+	$s_categories .= '</select>';
 
 	$s_colspan = 0;
 	for($i = 0; $i < count($avatar_images[$category]); $i++)
@@ -309,7 +318,7 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current
 		}
 	}
 
-	$params = array('coppa', 'user_id', 'username', 'email', 'current_email', 'icq', 'aim', 'msn', 'yim', 'website', 'location', 'occupation', 'interests', 'signature', 'viewemail', 'notifypm', 'popuppm', 'notifyreply', 'attachsig', 'allowhtml', 'allowbbcode', 'allowsmilies', 'hideonline', 'style', 'language', 'timezone', 'dateformat');
+	$params = array('coppa', 'user_id', 'username', 'email', 'current_email', 'cur_password', 'new_password', 'password_confirm', 'icq', 'aim', 'msn', 'yim', 'website', 'location', 'occupation', 'interests', 'signature', 'viewemail', 'notifypm', 'popuppm', 'notifyreply', 'attachsig', 'allowhtml', 'allowbbcode', 'allowsmilies', 'hideonline', 'style', 'language', 'timezone', 'dateformat');
 
 	$s_hidden_vars = '<input type="hidden" name="agreed" value="true" />';
 
@@ -324,7 +333,7 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current
 		'L_RETURN_PROFILE' => $lang['Return_profile'], 
 		'L_CATEGORY' => $lang['Select_category'], 
 
-		'S_OPTIONS_CATEGORIES' => $s_categories, 
+		'S_CATEGORY_SELECT' => $s_categories, 
 		'S_COLSPAN' => $s_colspan, 
 		'S_PROFILE_ACTION' => append_sid("profile.$phpEx?mode=$mode"), 
 		'S_HIDDEN_FIELDS' => $s_hidden_vars)

phpBB/includes/usercp_email.php

@@ -27,21 +27,21 @@ if ( !defined('IN_PHPBB') )
 	exit;
 }
 
-if ( !$userdata['session_logged_in'] )
-{
-	header('Location: ' . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true));
-	exit;
-}
-
 if ( !empty($HTTP_GET_VARS[POST_USERS_URL]) || !empty($HTTP_POST_VARS[POST_USERS_URL]) )
 {
-	$user_id = ( !empty($HTTP_GET_VARS[POST_USERS_URL]) ) ? $HTTP_GET_VARS[POST_USERS_URL] : $HTTP_POST_VARS[POST_USERS_URL];
+	$user_id = ( !empty($HTTP_GET_VARS[POST_USERS_URL]) ) ? intval($HTTP_GET_VARS[POST_USERS_URL]) : intval($HTTP_POST_VARS[POST_USERS_URL]);
 }
 else
 {
 	message_die(GENERAL_MESSAGE, $lang['No_user_specified']);
 }
 
+if ( !$userdata['session_logged_in'] )
+{
+	header('Location: ' . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true));
+	exit;
+}
+
 $sql = "SELECT username, user_email, user_viewemail, user_lang  
 	FROM " . USERS_TABLE . " 
 	WHERE user_id = $user_id";
@@ -66,7 +66,7 @@ if ( $result = $db->sql_query($sql) )
 
 			if ( !empty($HTTP_POST_VARS['subject']) )
 			{
-				$subject = trim(strip_tags(stripslashes($HTTP_POST_VARS['subject'])));
+				$subject = trim(stripslashes($HTTP_POST_VARS['subject']));
 			}
 			else
 			{
@@ -76,7 +76,7 @@ if ( $result = $db->sql_query($sql) )
 
 			if ( !empty($HTTP_POST_VARS['message']) )
 			{
-				$message = trim(strip_tags(stripslashes($HTTP_POST_VARS['message'])));
+				$message = trim(stripslashes($HTTP_POST_VARS['message']));
 			}
 			else
 			{
@@ -94,16 +94,11 @@ if ( $result = $db->sql_query($sql) )
 					include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 					$emailer = new emailer($board_config['smtp_delivery']);
 
-					$email_headers = "From: " . $userdata['user_email'] . "\n";
-					if ( !empty($HTTP_POST_VARS['cc_email']) )
-					{
-						$email_headers .= "Cc: " . $userdata['user_email'] . "\n";
-					}
-					$email_headers .= "Return-Path: " . $userdata['user_email'] . "\n";
-					$email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
-					$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
-					$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
-					$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
+					$email_headers = 'Return-Path: ' . $userdata['user_email'] . "\nFrom: " . $userdata['user_email'] . "\n";
+					$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
+					$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
+					$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
+					$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\n";
 
 					$emailer->use_template('profile_send_email', $user_lang);
 					$emailer->email_address($user_email);
@@ -120,6 +115,25 @@ if ( $result = $db->sql_query($sql) )
 					$emailer->send();
 					$emailer->reset();
 
+					if ( !empty($HTTP_POST_VARS['cc_email']) )
+					{
+						$email_headers = 'Return-Path: ' . $userdata['user_email'] . "\nFrom: " . $userdata['user_email'] . "\n";
+						$emailer->use_template('profile_send_email');
+						$emailer->email_address($userdata['user_email']);
+						$emailer->set_subject($subject);
+						$emailer->extra_headers($email_headers);
+
+						$emailer->assign_vars(array(
+							'SITENAME' => $board_config['sitename'], 
+							'BOARD_EMAIL' => $board_config['board_email'], 
+							'FROM_USERNAME' => $userdata['username'], 
+							'TO_USERNAME' => $username, 
+							'MESSAGE' => $message)
+						);
+						$emailer->send();
+						$emailer->reset();
+					}
+
 					$template->assign_vars(array(
 						'META' => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
 					);
@@ -138,20 +152,9 @@ if ( $result = $db->sql_query($sql) )
 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
 		$template->set_filenames(array(
-			'body' => 'profile_send_email.tpl',
-			'jumpbox' => 'jumpbox.tpl')
+			'body' => 'profile_send_email.tpl')
 		);
-
-		$jumpbox = make_jumpbox();
-		$template->assign_vars(array(
-			'L_GO' => $lang['Go'],
-			'L_JUMP_TO' => $lang['Jump_to'],
-			'L_SELECT_FORUM' => $lang['Select_forum'],
-
-			'S_JUMPBOX_LIST' => $jumpbox,
-			'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
-		);
-		$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
+		make_jumpbox('viewforum.'.$phpEx);
 
 		if ( $error )
 		{
@@ -164,15 +167,9 @@ if ( $result = $db->sql_query($sql) )
 			$template->assign_var_from_handle('ERROR_BOX', 'reg_header');
 		}
 
-		if ( $userdata['user_sig'] != '' )
-		{
-			$template->assign_block_vars('signature_checkbox', array());
-		}
-
 		$template->assign_vars(array(
 			'USERNAME' => $username,
 
-			'S_SIGNATURE_CHECKED' => ( $attach_sig ) ? 'checked="checked"' : '', 
 			'S_POST_ACTION' => append_sid("profile.$phpEx?&amp;mode=email&amp;" . POST_USERS_URL . "=$user_id"), 
 
 			'L_SEND_EMAIL_MSG' => $lang['Send_email_msg'], 
@@ -184,7 +181,6 @@ if ( $result = $db->sql_query($sql) )
 			'L_EMPTY_MESSAGE_EMAIL' => $lang['Empty_message_email'],
 			'L_OPTIONS' => $lang['Options'],
 			'L_CC_EMAIL' => $lang['CC_email'], 
-			'L_NOTIFY_ON_REPLY' => $lang['Notify'], 
 			'L_SPELLCHECK' => $lang['Spellcheck'],
 			'L_SEND_EMAIL' => $lang['Send_email'])
 		);
@@ -203,4 +199,4 @@ else
 	message_die(GENERAL_MESSAGE, $lang['User_not_exist']);
 }
 
-?>
+?>

phpBB/includes/usercp_register.php

@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                            usercp_register.php 
+ *                            usercp_register.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -27,11 +27,11 @@ if ( !defined('IN_PHPBB') )
 	exit;
 }
 
-//
+// ---------------------------------------
 // Load agreement template since user has not yet
 // agreed to registration conditions/coppa
 //
-function show_coppa(&$coppa)
+function show_coppa()
 {
 	global $template, $lang, $phpbb_root_path, $phpEx;
 
@@ -40,12 +40,11 @@ function show_coppa(&$coppa)
 	);
 
 	$template->assign_vars(array(
-		'COPPA' => $coppa,
-		'REGISTRATION' => $lang['Registration'], 
-		'AGREEMENT' => $lang['Reg_agreement'], 
-		"AGREE_OVER_13" => $lang['Agree_over_13'], 
-		"AGREE_UNDER_13" => $lang['Agree_under_13'], 
-		'DO_NOT_AGREE' => $lang['Agree_not'], 
+		'REGISTRATION' => $lang['Registration'],
+		'AGREEMENT' => $lang['Reg_agreement'],
+		"AGREE_OVER_13" => $lang['Agree_over_13'],
+		"AGREE_UNDER_13" => $lang['Agree_under_13'],
+		'DO_NOT_AGREE' => $lang['Agree_not'],
 
 		"U_AGREE_OVER13" => append_sid("profile.$phpEx?mode=register&amp;agreed=true"),
 		"U_AGREE_UNDER13" => append_sid("profile.$phpEx?mode=register&amp;agreed=true&amp;coppa=true"))
@@ -53,46 +52,33 @@ function show_coppa(&$coppa)
 
 	$template->pparse('body');
 
-}
-
-function parse_variables()
-{
-
-}
-
-function process_data()
-{
-
-}
-
-function show_profile_page()
-{
-
 }
 //
-//
-//
-
+// ---------------------------------------
 
+$error = FALSE;
 $page_title = ( $mode == 'editprofile' ) ? $lang['Edit_profile'] : $lang['Register'];
 
 if ( $mode == 'register' && !isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']) )
 {
-	if ( !isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']) )
-	{
-		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+	include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
-		show_coppa($coppa);
+	show_coppa();
 
-		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
-
-	}
+	include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 }
 
+$coppa = ( empty($HTTP_POST_VARS['coppa']) && empty($HTTP_GET_VARS['coppa']) ) ? 0 : TRUE;
 
-$coppa = ( ( !$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa'] ) || $mode == 'register' ) ? 0 : TRUE;
-
-if ( isset($HTTP_POST_VARS['submit']) || isset($HTTP_POST_VARS['avatargallery']) || isset($HTTP_POST_VARS['submitavatar']) || isset($HTTP_POST_VARS['cancelavatar']) || $mode == 'register' )
+//
+// Check and initialize some variables if needed
+//
+if (
+	isset($HTTP_POST_VARS['submit']) ||
+	isset($HTTP_POST_VARS['avatargallery']) ||
+	isset($HTTP_POST_VARS['submitavatar']) ||
+	isset($HTTP_POST_VARS['cancelavatar']) ||
+	$mode == 'register' )
 {
 	include($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
 	include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
@@ -114,7 +100,7 @@ if ( isset($HTTP_POST_VARS['submit']) || isset($HTTP_POST_VARS['avatargallery'])
 		}
 	}
 
-	$trim_var_list = array('password_current' => 'cur_password', 'password' => 'new_password', 'password_confirm' => 'password_confirm', 'signature' => 'signature');
+	$trim_var_list = array('cur_password' => 'cur_password', 'new_password' => 'new_password', 'password_confirm' => 'password_confirm', 'signature' => 'signature');
 
 	while( list($var, $param) = @each($trim_var_list) )
 	{
@@ -126,9 +112,9 @@ if ( isset($HTTP_POST_VARS['submit']) || isset($HTTP_POST_VARS['avatargallery'])
 
 	$username = str_replace('&nbsp;', '', $username);
 	$email = htmlspecialchars($email);
-	$signature = str_replace('<br />', '\n', $signature);
+	$signature = str_replace('<br />', "\n", $signature);
 
-	// Run some validation on the optional fields. These are pass-by-ref, so they'll be changed to 
+	// Run some validation on the optional fields. These are pass-by-ref, so they'll be changed to
 	// empty strings if they fail.
 	validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
 
@@ -157,15 +143,30 @@ if ( isset($HTTP_POST_VARS['submit']) || isset($HTTP_POST_VARS['avatargallery'])
 
 	$user_style = ( isset($HTTP_POST_VARS['style']) ) ? intval($HTTP_POST_VARS['style']) : $board_config['default_style'];
 
-	$user_lang = ( !empty($HTTP_POST_VARS['language']) ) ? $HTTP_POST_VARS['language'] : $board_config['default_lang'];
+	if ( !empty($HTTP_POST_VARS['language']) )
+	{
+		if ( preg_match('/^[a-z_]+$/i', $HTTP_POST_VARS['language']) )
+		{
+			$user_lang = $HTTP_POST_VARS['language'];
+		}
+		else
+		{
+			$error = true;
+			$error_msg = $lang['Fields_empty'];
+		}
+	}
+	else
+	{
+		$user_lang = $board_config['default_lang'];
+	}
+
 	$user_timezone = ( isset($HTTP_POST_VARS['timezone']) ) ? doubleval($HTTP_POST_VARS['timezone']) : $board_config['board_timezone'];
 	$user_dateformat = ( !empty($HTTP_POST_VARS['dateformat']) ) ? trim($HTTP_POST_VARS['dateformat']) : $board_config['default_dateformat'];
 
-	$user_avatar_local = ( isset($HTTP_POST_VARS['avatarselect']) && !empty($HTTP_POST_VARS['submitavatar']) && $board_config['allow_avatar_local'] ) ? $HTTP_POST_VARS['avatarselect'] : ( ( isset($HTTP_POST_VARS['avatarlocal'])  ) ? $HTTP_POST_VARS['avatarlocal'] : '' );
+	$user_avatar_local = ( isset($HTTP_POST_VARS['avatarselect']) && !empty($HTTP_POST_VARS['submitavatar']) && $board_config['allow_avatar_local'] ) ? $HTTP_POST_VARS['avatarselect'] : ( ( isset($HTTP_POST_VARS['avatarlocal'])  ) ? htmlspecialchars($HTTP_POST_VARS['avatarlocal']) : '' );
 
-	$user_avatar_remoteurl = ( !empty($HTTP_POST_VARS['avatarremoteurl']) ) ? trim($HTTP_POST_VARS['avatarremoteurl']) : '';
-	$user_avatar_url = ( !empty($HTTP_POST_VARS['avatarurl']) ) ? trim($HTTP_POST_VARS['avatarurl']) : '';
-	$user_avatar_loc = ( $HTTP_POST_FILES['avatar']['tmp_name'] != "none") ? $HTTP_POST_FILES['avatar']['tmp_name'] : '';
+	$user_avatar_remoteurl = ( !empty($HTTP_POST_VARS['avatarremoteurl']) ) ? trim(htmlspecialchars($HTTP_POST_VARS['avatarremoteurl'])) : '';
+	$user_avatar_upload = ( !empty($HTTP_POST_VARS['avatarurl']) ) ? trim($HTTP_POST_VARS['avatarurl']) : ( ( $HTTP_POST_FILES['avatar']['tmp_name'] != "none") ? $HTTP_POST_FILES['avatar']['tmp_name'] : '' );
 	$user_avatar_name = ( !empty($HTTP_POST_FILES['avatar']['name']) ) ? $HTTP_POST_FILES['avatar']['name'] : '';
 	$user_avatar_size = ( !empty($HTTP_POST_FILES['avatar']['size']) ) ? $HTTP_POST_FILES['avatar']['size'] : 0;
 	$user_avatar_filetype = ( !empty($HTTP_POST_FILES['avatar']['type']) ) ? $HTTP_POST_FILES['avatar']['type'] : '';
@@ -173,12 +174,13 @@ if ( isset($HTTP_POST_VARS['submit']) || isset($HTTP_POST_VARS['avatargallery'])
 	$user_avatar = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar'] : '';
 	$user_avatar_type = ( empty($user_avatar_loc) && $mode == 'editprofile' ) ? $userdata['user_avatar_type'] : '';
 
-	if ( isset($HTTP_POST_VARS['avatargallery']) || isset($HTTP_POST_VARS['submitavatar']) || isset($HTTP_POST_VARS['cancelavatar']) )
+	if ( (isset($HTTP_POST_VARS['avatargallery']) || isset($HTTP_POST_VARS['submitavatar']) || isset($HTTP_POST_VARS['cancelavatar'])) && (!isset($HTTP_POST_VARS['submit'])) )
 	{
 		$username = stripslashes($username);
 		$email = stripslashes($email);
-		$password = '';
-		$password_confirm = '';
+		$cur_password = stripslashes($cur_password);
+		$new_password = stripslashes($new_password);
+		$password_confirm = stripslashes($password_confirm);
 
 		$icq = stripslashes($icq);
 		$aim = stripslashes($aim);
@@ -194,28 +196,36 @@ if ( isset($HTTP_POST_VARS['submit']) || isset($HTTP_POST_VARS['avatargallery'])
 		$user_lang = stripslashes($user_lang);
 		$user_dateformat = stripslashes($user_dateformat);
 
-		if ( !isset($HTTP_POST_VARS['cancelavatar'])) 
+		if ( !isset($HTTP_POST_VARS['cancelavatar']))
 		{
 			$user_avatar = $user_avatar_local;
 			$user_avatar_type = USER_AVATAR_GALLERY;
+
+			if ( $userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && @file_exists('./' . $board_config['avatar_path'] . '/' . $userdata['user_avatar']) )
+			{
+				@unlink('./' . $board_config['avatar_path'] . '/' . $userdata['user_avatar']);
+			}
+
 		}
 	}
 }
+//
+// Let's make sure the user isn't logged in while registering,
+// and ensure that they were trying to register a second time
+// (Prevents double registrations)
+//
+if ( $userdata['session_logged_in'] && $mode =="register" && $username == $userdata['username'])
+{
+	message_die(GENERAL_MESSAGE, $lang['Username_taken'], '', __LINE__, __FILE__);
+}
 
 
-
-
-
-
-
-
-
-
-
-
+//
+// Did the user submit? In this case build a query to update the users profile in the DB
+//
 if ( isset($HTTP_POST_VARS['submit']) )
 {
-	$error = FALSE;
+	include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx);
 
 	$passwd_sql = '';
 	if ( $mode == 'editprofile' )
@@ -228,25 +238,23 @@ if ( isset($HTTP_POST_VARS['submit']) )
 	}
 	else if ( $mode == 'register' )
 	{
-		$coppa = (!$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa']) ? 0 : TRUE;
-
-		if ( empty($username) || empty($password) || empty($password_confirm) || empty($email) )
+		if ( empty($username) || empty($new_password) || empty($password_confirm) || empty($email) )
 		{
 			$error = TRUE;
-			$error_ms .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Fields_empty'];
+			$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Fields_empty'];
 		}
-		
+
 	}
 
 	$passwd_sql = '';
-	if ( !empty($password) && !empty($password_confirm) )
+	if ( !empty($new_password) && !empty($password_confirm) )
 	{
-		if ( $password != $password_confirm )
+		if ( $new_password != $password_confirm )
 		{
 			$error = TRUE;
 			$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
 		}
-		else if ( strlen($password) > 32 )
+		else if ( strlen($new_password) > 32 )
 		{
 			$error = TRUE;
 			$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_long'];
@@ -255,8 +263,8 @@ if ( isset($HTTP_POST_VARS['submit']) )
 		{
 			if ( $mode == 'editprofile' )
 			{
-				$sql = "SELECT user_password 
-					FROM " . USERS_TABLE . " 
+				$sql = "SELECT user_password
+					FROM " . USERS_TABLE . "
 					WHERE user_id = $user_id";
 				if ( !($result = $db->sql_query($sql)) )
 				{
@@ -265,21 +273,21 @@ if ( isset($HTTP_POST_VARS['submit']) )
 
 				$row = $db->sql_fetchrow($result);
 
-				if ( $row['user_password'] != md5($password_current) )
+				if ( $row['user_password'] != md5($cur_password) )
 				{
 					$error = TRUE;
 					$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Current_password_mismatch'];
 				}
 			}
-			
+
 			if ( !$error )
 			{
-				$password = md5($password);
-				$passwd_sql = "user_password = '$password', ";
+				$new_password = md5($new_password);
+				$passwd_sql = "user_password = '$new_password', ";
 			}
 		}
 	}
-	else if ( ( $password && !$password_confirm ) || ( !$password && $password_confirm ) )
+	else if ( ( empty($new_password) && !empty($password_confirm) ) || ( !empty($new_password) && empty($password_confirm) ) )
 	{
 		$error = TRUE;
 		$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
@@ -298,11 +306,11 @@ if ( isset($HTTP_POST_VARS['submit']) )
 			$error = TRUE;
 			$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $result['error_msg'];
 		}
-			
+
 		if ( $mode == 'editprofile' )
 		{
-			$sql = "SELECT user_password 
-				FROM " . USERS_TABLE . " 
+			$sql = "SELECT user_password
+				FROM " . USERS_TABLE . "
 				WHERE user_id = $user_id";
 			if ( !($result = $db->sql_query($sql)) )
 			{
@@ -311,7 +319,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
 
 			$row = $db->sql_fetchrow($result);
 
-			if ( $row['user_password'] != md5($password_current) )
+			if ( $row['user_password'] != md5($cur_password) )
 			{
 				$email = $userdata['user_email'];
 
@@ -324,7 +332,12 @@ if ( isset($HTTP_POST_VARS['submit']) )
 	$username_sql = '';
 	if ( $board_config['allow_namechange'] || $mode == 'register' )
 	{
-		if ( $username != $userdata['username'] || $mode == 'register' )
+		if ( empty($username) )
+		{
+			$error = TRUE;
+			$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Username_disallowed'];
+		}
+		else if ( $username != $userdata['username'] || $mode == 'register' )
 		{
 			$result = validate_username($username);
 			if ( $result['error'] )
@@ -354,47 +367,42 @@ if ( isset($HTTP_POST_VARS['submit']) )
 		$signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
 	}
 
-		include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx);
+	if ( $website != '' )
+	{
+		rawurlencode($website);
+	}
 
-		if ( isset($HTTP_POST_VARS['avatardel']) && $mode == 'editprofile' )
+	if ( isset($HTTP_POST_VARS['avatardel']) && $mode == 'editprofile' )
+	{
+		$avatar_sql = user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']);
+	}
+	else if ( ( !empty($user_avatar_upload) || !empty($user_avatar_name) ) && $board_config['allow_avatar_upload'] )
+	{
+		if ( !empty($user_avatar_upload) )
 		{
-			$avatar_sql = user_avatar_delete($userdata['avatar_type'], $userdata['avatar_file']);
+			$avatar_mode = ( !empty($user_avatar_name) ) ? 'local' : 'remote';
+			$avatar_sql = user_avatar_upload($mode, $avatar_mode, $userdata['user_avatar'], $userdata['user_avatar_type'], $error, $error_msg, $user_avatar_upload, $user_avatar_name, $user_avatar_size, $user_avatar_filetype);
 		}
-		else if ( ( $user_avatar_loc != '' || !empty($user_avatar_url) ) && $board_config['allow_avatar_upload'] )
+		else if ( !empty($user_avatar_name) )
 		{
-			if ( !empty($user_avatar_loc) && !empty($user_avatar_url) )
-			{
-				$error = true;
-				$error_msg .= ( ( !empty($error_msg) ) ? '<br />' : '' ) . $lang['Only_one_avatar'];
-			}
+			$l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024));
 
-			$id = ( $mode == 'register' ) ? $new_user_id : $userdata['user_id'];
-
-			if ( !empty($user_avatar_loc) )
-			{
-				$avatar_sql = user_avatar_upload($mode, 'local', $id, $error, $error_msg, $user_avatar_loc, $user_avatar_name, $user_avatar_size, $user_avatar_filetype);
-			}
-			else if ( !empty($user_avatar_url) )
-			{
-				$avatar_sql = user_avatar_upload($mode, 'remote', $id, $error, $error_msg, $user_avatar_url, $user_avatar_name, $user_avatar_size, $user_avatar_filetype);
-			}
-			else if ( !empty($user_avatar_name) )
-			{
-				$l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024));
-
-				$error = true;
-				$error_msg = ( ( !empty($error_msg) ) ? '<br />' : '' ) . $l_avatar_size;
-			}
+			$error = true;
+			$error_msg .= ( ( !empty($error_msg) ) ? '<br />' : '' ) . $l_avatar_size;
 		}
-		else if ( $user_avatar_remoteurl != '' && $board_config['allow_avatar_remote'] )
-		{
-			$avatar_sql = user_avatar_url($mode, $error, $error_msg, $user_avatar_remoteurl);
-		}
-		else if ( $user_avatar_local != '' && $board_config['allow_avatar_local'] )
-		{
-			$avatar_sql = user_avatar_gallery($mode, $error, $error_msg, $user_avatar_local);
-		}
-
+	}
+	else if ( $user_avatar_remoteurl != '' && $board_config['allow_avatar_remote'] )
+	{
+		$avatar_sql = user_avatar_url($mode, $error, $error_msg, $user_avatar_remoteurl);
+	}
+	else if ( $user_avatar_local != '' && $board_config['allow_avatar_local'] )
+	{
+		$avatar_sql = user_avatar_gallery($mode, $error, $error_msg, $user_avatar_local);
+	}
+	else
+	{
+		$avatar_sql = '';
+	}
 
 	if ( !$error )
 	{
@@ -405,14 +413,15 @@ if ( isset($HTTP_POST_VARS['submit']) )
 
 		if ( $mode == 'editprofile' )
 		{
-			if ( $email != $current_email && ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) && $userdata['user_level'] != ADMIN )
+			if ( $email != $userdata['user_email'] && $board_config['require_activation'] != USER_ACTIVATION_NONE && $userdata['user_level'] != ADMIN )
 			{
 				$user_active = 0;
-				$user_actkey = gen_rand_string(true);
 
-				//
-				// The user is inactive, remove their session forcing them to login again before they can post.
-				//
+				$user_actkey = gen_rand_string(true);
+				$key_len = 54 - ( strlen($server_url) );
+				$key_len = ( $key_len > 6 ) ? $key_len : 6;
+				$user_actkey = substr($user_actkey, 0, $key_len);
+
 				if ( $userdata['session_logged_in'] )
 				{
 					session_end($userdata['session_id'], $userdata['user_id']);
@@ -425,7 +434,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
 			}
 
 			$sql = "UPDATE " . USERS_TABLE . "
-				SET " . $username_sql . $passwd_sql . "user_email = '" . str_replace("\'", "''", $email) ."', user_icq = '" . str_replace("\'", "''", $icq) . "', user_website = '" . str_replace("\'", "''", $website) . "', user_occ = '" . str_replace("\'", "''", $occupation) . "', user_from = '" . str_replace("\'", "''", $location) . "', user_interests = '" . str_replace("\'", "''", $interests) . "', user_sig = '" . str_replace("\'", "''", $signature) . "', user_sig_bbcode_uid = '$signature_bbcode_uid', user_viewemail = $viewemail, user_aim = '" . str_replace("\'", "''", $aim) . "', user_yim = '" . str_replace("\'", "''", $yim) . "', user_msnm = '" . str_replace("\'", "''", $msn) . "', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_notify_pm = $notifypm, user_popup_pm = $popuppm, user_timezone = $user_timezone, user_dateformat = '" . str_replace("\'", "''", $user_dateformat) . "', user_lang = '" . str_replace("\'", "''", $user_lang) . "', user_style = $user_style, user_active = $user_active, user_actkey = '" . str_replace("\'", "''", $user_actkey) . "'" . $avatar_sql . "
+				SET " . $username_sql . $passwd_sql . "user_email = '" . str_replace("\'", "''", $email) ."', user_icq = '" . str_replace("\'", "''", $icq) . "', user_website = '" . str_replace("\'", "''", $website) . "', user_occ = '" . str_replace("\'", "''", $occupation) . "', user_from = '" . str_replace("\'", "''", $location) . "', user_interests = '" . str_replace("\'", "''", $interests) . "', user_sig = '" . str_replace("\'", "''", $signature) . "', user_sig_bbcode_uid = '$signature_bbcode_uid', user_viewemail = $viewemail, user_aim = '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', user_yim = '" . str_replace("\'", "''", $yim) . "', user_msnm = '" . str_replace("\'", "''", $msn) . "', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_notify_pm = $notifypm, user_popup_pm = $popuppm, user_timezone = $user_timezone, user_dateformat = '" . str_replace("\'", "''", $user_dateformat) . "', user_lang = '" . str_replace("\'", "''", $user_lang) . "', user_style = $user_style, user_active = $user_active, user_actkey = '" . str_replace("\'", "''", $user_actkey) . "'" . $avatar_sql . "
 				WHERE user_id = $user_id";
 			if ( !($result = $db->sql_query($sql)) )
 			{
@@ -440,7 +449,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
 				include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 				$emailer = new emailer($board_config['smtp_delivery']);
 
-				$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+				$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
 				$emailer->use_template('user_activate', stripslashes($user_lang));
 				$emailer->email_address($email);
@@ -450,9 +459,9 @@ if ( isset($HTTP_POST_VARS['submit']) )
 				$emailer->assign_vars(array(
 					'SITENAME' => $board_config['sitename'],
 					'USERNAME' => $username,
-					'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']), 
+					'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
 
-					'U_ACTIVATE' => $server_url . '?mode=activate&act_key=' . $user_actkey)
+					'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
 				);
 				$emailer->send();
 				$emailer->reset();
@@ -485,27 +494,17 @@ if ( isset($HTTP_POST_VARS['submit']) )
 			}
 			$user_id = $row['total'] + 1;
 
-			$sql = "SELECT MAX(group_id) AS total
-				FROM " . GROUPS_TABLE;
-			if ( !($result = $db->sql_query($sql)) )
-			{
-				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
-			}
-
-			if ( !($row = $db->sql_fetchrow($result)) )
-			{
-				message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql);
-			}
-			$group_id = $row['total'] + 1;
-
 			//
 			// Get current date
 			//
 			$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
-				VALUES ($user_id, '" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $password) . "', '" . str_replace("\'", "''", $email) . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '$signature_bbcode_uid', $avatar_sql, $viewemail, '" . str_replace("\'", "''", $aim) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popuppm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', $user_style, 0, 1, ";
+				VALUES ($user_id, '" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $new_password) . "', '" . str_replace("\'", "''", $email) . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '$signature_bbcode_uid', $avatar_sql, $viewemail, '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popuppm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', $user_style, 0, 1, ";
 			if ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa )
 			{
 				$user_actkey = gen_rand_string(true);
+				$key_len = 54 - (strlen($server_url));
+				$key_len = ( $key_len > 6 ) ? $key_len : 6;
+				$user_actkey = substr($user_actkey, 0, $key_len);
 				$sql .= "0, '" . str_replace("\'", "''", $user_actkey) . "')";
 			}
 			else
@@ -518,13 +517,15 @@ if ( isset($HTTP_POST_VARS['submit']) )
 				message_die(GENERAL_ERROR, 'Could not insert data into users table', '', __LINE__, __FILE__, $sql);
 			}
 
-			$sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_name, group_description, group_single_user, group_moderator)
-				VALUES ($group_id, '', 'Personal User', 1, 0)";
+			$sql = "INSERT INTO " . GROUPS_TABLE . " (group_name, group_description, group_single_user, group_moderator)
+				VALUES ('', 'Personal User', 1, 0)";
 			if ( !($result = $db->sql_query($sql)) )
 			{
 				message_die(GENERAL_ERROR, 'Could not insert data into groups table', '', __LINE__, __FILE__, $sql);
 			}
 
+			$group_id = $db->sql_nextid();
+
 			$sql = "INSERT INTO " . USER_GROUP_TABLE . " (user_id, group_id, user_pending)
 				VALUES ($user_id, $group_id, 0)";
 			if( !($result = $db->sql_query($sql, END_TRANSACTION)) )
@@ -556,7 +557,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
 			include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 			$emailer = new emailer($board_config['smtp_delivery']);
 
-			$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+			$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
 			$emailer->use_template($email_template, stripslashes($user_lang));
 			$emailer->email_address($email);
@@ -566,14 +567,12 @@ if ( isset($HTTP_POST_VARS['submit']) )
 			if( $coppa )
 			{
 				$emailer->assign_vars(array(
-					'SITENAME' => $board_config['sitename'], 
+					'SITENAME' => $board_config['sitename'],
 					'WELCOME_MSG' => sprintf($lang['Welcome_subject'], $board_config['sitename']),
 					'USERNAME' => $username,
 					'PASSWORD' => $password_confirm,
 					'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
 
-					'U_ACTIVATE' => $server_url . '?mode=activate&act_key=' . $user_actkey,
-
 					'FAX_INFO' => $board_config['coppa_fax'],
 					'MAIL_INFO' => $board_config['coppa_mail'],
 					'EMAIL_ADDRESS' => $email,
@@ -590,13 +589,13 @@ if ( isset($HTTP_POST_VARS['submit']) )
 			else
 			{
 				$emailer->assign_vars(array(
-					'SITENAME' => $board_config['sitename'], 
+					'SITENAME' => $board_config['sitename'],
 					'WELCOME_MSG' => sprintf($lang['Welcome_subject'], $board_config['sitename']),
 					'USERNAME' => $username,
 					'PASSWORD' => $password_confirm,
 					'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
 
-					'U_ACTIVATE' => $server_url . '?mode=activate&act_key=' . $user_actkey)
+					'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
 				);
 			}
 
@@ -605,7 +604,8 @@ if ( isset($HTTP_POST_VARS['submit']) )
 
 			if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN )
 			{
-				$emailer->use_template("admin_activate", stripslashes($user_lang));
+				//$emailer->use_template("admin_activate", stripslashes($user_lang));
+				$emailer->use_template("admin_activate", $board_config['default_lang']);
 				$emailer->email_address($board_config['board_email']);
 				$emailer->set_subject(); //$lang['New_account_subject']
 				$emailer->extra_headers($email_headers);
@@ -614,7 +614,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
 					'USERNAME' => $username,
 					'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
 
-					'U_ACTIVATE' => $server_url . '?mode=activate&act_key=' . $user_actkey)
+					'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
 				);
 				$emailer->send();
 				$emailer->reset();
@@ -625,37 +625,30 @@ if ( isset($HTTP_POST_VARS['submit']) )
 			message_die(GENERAL_MESSAGE, $message);
 		} // if mode == register
 	}
-}
-
-
-
-
-
-
-
-
+} // End of submit
 
 
 if ( $error )
 {
 	//
 	// If an error occured we need to stripslashes on returned data
-	// 
+	//
 	$username = stripslashes($username);
 	$email = stripslashes($email);
-	$password = '';
+	$new_password = '';
 	$password_confirm = '';
 
 	$icq = stripslashes($icq);
-	$aim = stripslashes($aim);
-	$msn = stripslashes($msn);
-	$yim = stripslashes($yim);
+	$aim = htmlspecialchars(str_replace('+', ' ', stripslashes($aim)));
+	$msn = htmlspecialchars(stripslashes($msn));
+	$yim = htmlspecialchars(stripslashes($yim));
 
-	$website = stripslashes($website);
-	$location = stripslashes($location);
-	$occupation = stripslashes($occupation);
-	$interests = stripslashes($interests);
+	$website = htmlspecialchars(stripslashes($website));
+	$location = htmlspecialchars(stripslashes($location));
+	$occupation = htmlspecialchars(stripslashes($occupation));
+	$interests = htmlspecialchars(stripslashes($interests));
 	$signature = stripslashes($signature);
+	$signature = ( $signature_bbcode_uid != '' ) ? preg_replace("/:(([a-z0-9]+:)?)$signature_bbcode_uid\]/si", ']', $signature) : $signature;
 
 	$user_lang = stripslashes($user_lang);
 	$user_dateformat = stripslashes($user_dateformat);
@@ -664,22 +657,22 @@ if ( $error )
 else if ( $mode == 'editprofile' && !isset($HTTP_POST_VARS['avatargallery']) && !isset($HTTP_POST_VARS['submitavatar']) && !isset($HTTP_POST_VARS['cancelavatar']) )
 {
 	$user_id = $userdata['user_id'];
-	$username = $userdata['username'];
+	$username = htmlspecialchars($userdata['username']);
 	$email = $userdata['user_email'];
-	$password = "";
-	$password_confirm = "";
+	$new_password = '';
+	$password_confirm = '';
 
 	$icq = $userdata['user_icq'];
-	$aim = $userdata['user_aim'];
-	$msn = $userdata['user_msnm'];
-	$yim = $userdata['user_yim'];
+	$aim = htmlspecialchars(str_replace('+', ' ', $userdata['user_aim']));
+	$msn = htmlspecialchars($userdata['user_msnm']);
+	$yim = htmlspecialchars($userdata['user_yim']);
 
-	$website = $userdata['user_website'];
-	$location = $userdata['user_from'];
-	$occupation = $userdata['user_occ'];
-	$interests = $userdata['user_interests'];
+	$website = htmlspecialchars($userdata['user_website']);
+	$location = htmlspecialchars($userdata['user_from']);
+	$occupation = htmlspecialchars($userdata['user_occ']);
+	$interests = htmlspecialchars($userdata['user_interests']);
 	$signature_bbcode_uid = $userdata['user_sig_bbcode_uid'];
-	$signature = ( $signature_bbcode_uid != "" ) ? preg_replace("/\:(([a-z0-9]:)?)$signature_bbcode_uid/si", '', $userdata['user_sig']) : $userdata['user_sig'];
+	$signature = ( $signature_bbcode_uid != '' ) ? preg_replace("/:(([a-z0-9]+:)?)$signature_bbcode_uid\]/si", ']', $userdata['user_sig']) : $userdata['user_sig'];
 
 	$viewemail = $userdata['user_viewemail'];
 	$notifypm = $userdata['user_notify_pm'];
@@ -700,37 +693,12 @@ else if ( $mode == 'editprofile' && !isset($HTTP_POST_VARS['avatargallery']) &&
 	$user_dateformat = $userdata['user_dateformat'];
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+//
+// Default pages
+//
 include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
-$template->set_filenames(array(
-	"jumpbox" => "jumpbox.tpl")
-);
-
-$jumpbox = make_jumpbox();
-$template->assign_vars(array(
-	'L_GO' => $lang['Go'],
-	'L_JUMP_TO' => $lang['Jump_to'],
-	'L_SELECT_FORUM' => $lang['Select_forum'],
-
-	'S_JUMPBOX_LIST' => $jumpbox,
-	'S_JUMPBOX_ACTION' => append_sid('viewforum.$phpEx'))
-);
-$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
+make_jumpbox('viewforum.'.$phpEx);
 
 if ( $mode == 'editprofile' )
 {
@@ -748,10 +716,12 @@ if( isset($HTTP_POST_VARS['avatargallery']) && !$error )
 	$avatar_category = ( !empty($HTTP_POST_VARS['avatarcategory']) ) ? $HTTP_POST_VARS['avatarcategory'] : '';
 
 	$template->set_filenames(array(
-		"body" => "profile_avatar_gallery.tpl")
+		'body' => 'profile_avatar_gallery.tpl')
 	);
 
-	display_avatar_gallery($mode, $avatar_category, $user_id, $email, $current_email, $coppa, $username, $email, $icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature, $viewemail, $notifypm, $popuppm, $notifyreply, $attachsig, $allowhtml, $allowbbcode, $allowsmilies, $allowviewonline, $user_style, $user_lang, $user_timezone, $user_dateformat);
+	$allowviewonline = !$allowviewonline;
+
+	display_avatar_gallery($mode, $avatar_category, $user_id, $email, $current_email, $coppa, $username, $email, &$new_password, &$cur_password, $password_confirm, $icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature, $viewemail, $notifypm, $popuppm, $notifyreply, $attachsig, $allowhtml, $allowbbcode, $allowsmilies, $allowviewonline, $user_style, $user_lang, $user_timezone, $user_dateformat);
 }
 else
 {
@@ -767,8 +737,6 @@ else
 		$selected_template = $board_config['system_template'];
 	}
 
-	$signature = preg_replace('/\:[0-9a-z\:]*?\]/si', ']', $signature);
-
 	$avatar_img = '';
 	if ( $user_avatar_type )
 	{
@@ -823,7 +791,7 @@ else
 
 	if ( $mode == 'editprofile' )
 	{
-		$template->assign_block_vars('edit_profile', array());
+		$template->assign_block_vars('switch_edit_profile', array());
 	}
 
 	//
@@ -831,10 +799,13 @@ else
 	// us from doing file uploads....
 	//
 	$ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
-	$form_enctype = ( !$ini_val('file_uploads') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && $ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"';
-	
+	$form_enctype = ( @$ini_val('file_uploads') == '0' || strtolower(@$ini_val('file_uploads') == 'off') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && @$ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"';
+
 	$template->assign_vars(array(
 		'USERNAME' => $username,
+		'CUR_PASSWORD' => $cur_password,
+		'NEW_PASSWORD' => $new_password,
+		'PASSWORD_CONFIRM' => $password_confirm,
 		'EMAIL' => $email,
 		'YIM' => $yim,
 		'ICQ' => $icq,
@@ -871,11 +842,11 @@ else
 		'TIMEZONE_SELECT' => tz_select($user_timezone, 'timezone'),
 		'DATE_FORMAT' => $user_dateformat,
 		'HTML_STATUS' => $html_status,
-		'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 
+		'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'),
 		'SMILIES_STATUS' => $smilies_status,
 
-		'L_CURRENT_PASSWORD' => $lang['Current_password'], 
-		'L_NEW_PASSWORD' => ( $mode == 'register' ) ? $lang['Password'] : $lang['New_password'], 
+		'L_CURRENT_PASSWORD' => $lang['Current_password'],
+		'L_NEW_PASSWORD' => ( $mode == 'register' ) ? $lang['Password'] : $lang['New_password'],
 		'L_CONFIRM_PASSWORD' => $lang['Confirm_password'],
 		'L_CONFIRM_PASSWORD_EXPLAIN' => ( $mode == 'editprofile' ) ? $lang['Confirm_password_explain'] : '',
 		'L_PASSWORD_IF_CHANGED' => ( $mode == 'editprofile' ) ? $lang['password_if_changed'] : '',
@@ -943,27 +914,30 @@ else
 	// of the templates to 'fake' an IF...ELSE...ENDIF solution
 	// it works well :)
 	//
-	if ( $userdata['user_allowavatar'] && ( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] ) )
+	if ( $mode != 'register' )
 	{
-		$template->assign_block_vars('avatar_block', array() );
-
-		if ( $board_config['allow_avatar_upload'] && file_exists('./' . $board_config['avatar_path']) )
+		if ( $userdata['user_allowavatar'] && ( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] ) )
 		{
-			if ( $form_enctype != '' )
+			$template->assign_block_vars('switch_avatar_block', array() );
+
+			if ( $board_config['allow_avatar_upload'] && file_exists('./' . $board_config['avatar_path']) )
 			{
-				$template->assign_block_vars('avatar_block.avatar_local_upload', array() );
+				if ( $form_enctype != '' )
+				{
+					$template->assign_block_vars('switch_avatar_block.switch_avatar_local_upload', array() );
+				}
+				$template->assign_block_vars('switch_avatar_block.switch_avatar_remote_upload', array() );
 			}
-			$template->assign_block_vars('avatar_block.avatar_remote_upload', array() );
-		}
 
-		if ( $board_config['allow_avatar_remote'] )
-		{
-			$template->assign_block_vars('avatar_block.avatar_remote_link', array() );
-		}
+			if ( $board_config['allow_avatar_remote'] )
+			{
+				$template->assign_block_vars('switch_avatar_block.switch_avatar_remote_link', array() );
+			}
 
-		if ( $board_config['allow_avatar_local'] && file_exists('./' . $board_config['avatar_gallery_path']) )
-		{
-			$template->assign_block_vars('avatar_block.avatar_local_gallery', array() );
+			if ( $board_config['allow_avatar_local'] && file_exists('./' . $board_config['avatar_gallery_path']) )
+			{
+				$template->assign_block_vars('switch_avatar_block.switch_avatar_local_gallery', array() );
+			}
 		}
 	}
 }

phpBB/includes/usercp_sendpasswd.php

@@ -23,14 +23,14 @@
 
 if ( !defined('IN_PHPBB') )
 {
-	die("Hacking attempt");
+	die('Hacking attempt');
 	exit;
 }
 
 if ( isset($HTTP_POST_VARS['submit']) )
 {
-	$username = ( !empty($HTTP_POST_VARS['username']) ) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
-	$email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : "";
+	$username = ( !empty($HTTP_POST_VARS['username']) ) ? trim(strip_tags($HTTP_POST_VARS['username'])) : '';
+	$email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : '';
 
 	$sql = "SELECT user_id, username, user_email, user_active, user_lang 
 		FROM " . USERS_TABLE . " 
@@ -40,50 +40,54 @@ if ( isset($HTTP_POST_VARS['submit']) )
 	{
 		if ( $row = $db->sql_fetchrow($result) )
 		{
-			if ( $row['user_active'] == 0 )
+			if ( !$row['user_active'] )
 			{
 				message_die(GENERAL_MESSAGE, $lang['No_send_account_inactive']);
 			}
 
 			$username = $row['username'];
+			$user_id = $row['user_id'];
 
 			$user_actkey = gen_rand_string(true);
+			$key_len = 54 - strlen($server_url);
+			$key_len = ( $str_len > 6 ) ? $key_len : 6;
+			$user_actkey = substr($user_actkey, 0, $key_len);
 			$user_password = gen_rand_string(false);
 			
 			$sql = "UPDATE " . USERS_TABLE . " 
-				SET user_newpasswd = '" .md5($user_password) . "', user_actkey = '$user_actkey' 
+				SET user_newpasswd = '" . md5($user_password) . "', user_actkey = '$user_actkey'  
 				WHERE user_id = " . $row['user_id'];
-			if ( !$result = $db->sql_query($sql) )
+			if ( !$db->sql_query($sql) )
 			{
-				message_die(GENERAL_ERROR, "Couldn't update new password information", "", __LINE__, __FILE__, $sql);
+				message_die(GENERAL_ERROR, 'Could not update new password information', '', __LINE__, __FILE__, $sql);
 			}
 
 			include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 			$emailer = new emailer($board_config['smtp_delivery']);
 
-			$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+			$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n";
 
-			$emailer->use_template("user_activate_passwd", $row['user_lang']);
+			$emailer->use_template('user_activate_passwd', $row['user_lang']);
 			$emailer->email_address($row['user_email']);
 			$emailer->set_subject();//$lang['New_password_activation']
 			$emailer->extra_headers($email_headers);
 
 			$emailer->assign_vars(array(
-				"SITENAME" => $board_config['sitename'], 
-				"USERNAME" => $username,
-				"PASSWORD" => $user_password,
-				"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
+				'SITENAME' => $board_config['sitename'], 
+				'USERNAME' => $username,
+				'PASSWORD' => $user_password,
+				'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']), 
 
-				"U_ACTIVATE" => $server_url . "?mode=activate&act_key=$user_actkey")
+				'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey)
 			);
 			$emailer->send();
 			$emailer->reset();
 
 			$template->assign_vars(array(
-				"META" => '<meta http-equiv="refresh" content="15;url=' . append_sid("index.$phpEx") . '">')
+				'META' => '<meta http-equiv="refresh" content="15;url=' . append_sid("index.$phpEx") . '">')
 			);
 
-			$message = $lang['Password_updated'] . "<br /><br />" . sprintf($lang['Click_return_index'],  "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>");
+			$message = $lang['Password_updated'] . '<br /><br />' . sprintf($lang['Click_return_index'],  '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
 
 			message_die(GENERAL_MESSAGE, $message);
 		}
@@ -94,13 +98,13 @@ if ( isset($HTTP_POST_VARS['submit']) )
 	}
 	else
 	{
-		message_die(GENERAL_ERROR, "Couldn't obtain user information for sendpassword", "", __LINE__, __FILE__, $sql);
+		message_die(GENERAL_ERROR, 'Could not obtain user information for sendpassword', '', __LINE__, __FILE__, $sql);
 	}
 }
 else
 {
-	$username = "";
-	$email = "";
+	$username = '';
+	$email = '';
 }
 
 //
@@ -109,33 +113,25 @@ else
 include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 
 $template->set_filenames(array(
-	"body" => "profile_send_pass.tpl",
-	"jumpbox" => "jumpbox.tpl")
+	'body' => 'profile_send_pass.tpl')
 );
-
-$jumpbox = make_jumpbox();
-$template->assign_vars(array(
-	"L_GO" => $lang['Go'],
-	"L_JUMP_TO" => $lang['Jump_to'],
-	"L_SELECT_FORUM" => $lang['Select_forum'],
-
-	"S_JUMPBOX_LIST" => $jumpbox,
-	"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
-);
-$template->assign_var_from_handle("JUMPBOX", "jumpbox");
+make_jumpbox('viewforum.'.$phpEx);
 
 $template->assign_vars(array(
-	"USERNAME" => $username,
-	"EMAIL" => $email,
+	'USERNAME' => $username,
+	'EMAIL' => $email,
 
-	"L_SEND_PASSWORD" => $lang['Send_password'], 
-	"L_ITEMS_REQUIRED" => $lang['Items_required'],
-	"L_EMAIL_ADDRESS" => $lang['Email_address'],
-	"L_SUBMIT" => $lang['Submit'],
-	"L_RESET" => $lang['Reset'])
+	'L_SEND_PASSWORD' => $lang['Send_password'], 
+	'L_ITEMS_REQUIRED' => $lang['Items_required'],
+	'L_EMAIL_ADDRESS' => $lang['Email_address'],
+	'L_SUBMIT' => $lang['Submit'],
+	'L_RESET' => $lang['Reset'],
+	
+	'S_PROFILE_ACTION' => append_sid("profile.$phpEx?mode=sendpassword"))
 );
 
-$template->pparse("body");
+$template->pparse('body');
 
 include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
-?>
+
+?>

phpBB/includes/usercp_viewprofile.php

@@ -51,20 +51,9 @@ $db->sql_freeresult($result);
 // Output page header and profile_view template
 //
 $template->set_filenames(array(
-	'body' => 'profile_view_body.tpl',
-	'jumpbox' => 'jumpbox.tpl')
+	'body' => 'profile_view_body.tpl')
 );
-
-$jumpbox = make_jumpbox();
-$template->assign_vars(array(
-	'L_GO' => $lang['Go'],
-	'L_JUMP_TO' => $lang['Jump_to'],
-	'L_SELECT_FORUM' => $lang['Select_forum'],
-
-	'S_JUMPBOX_LIST' => $jumpbox,
-	'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
-);
-$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
+make_jumpbox('viewforum.'.$phpEx);
 
 //
 // Calculate the number of days this user has been a member ($memberdays)
@@ -85,19 +74,6 @@ else
 	$percentage = 0;
 }
 
-if ( !empty($profiledata['user_viewemail']) || $userdata['user_level'] == ADMIN )
-{
-	$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL . "=" . $profiledata['user_id']) : 'mailto:' . $profiledata['user_email'];
-
-	$email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>';
-	$email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" border="0" /></a>';
-}
-else
-{
-	$email = '';
-	$email_img = '';
-}
-
 $avatar_img = '';
 if ( $profiledata['user_avatar_type'] && $profiledata['user_allowavatar'] )
 {
@@ -132,7 +108,7 @@ else
 {
 	for($i = 0; $i < count($ranksrow); $i++)
 	{
-		if ( $profiledata['user_posts'] > $ranksrow[$i]['rank_min'] && !$ranksrow[$i]['rank_special'] )
+		if ( $profiledata['user_posts'] >= $ranksrow[$i]['rank_min'] && !$ranksrow[$i]['rank_special'] )
 		{
 			$poster_rank = $ranksrow[$i]['rank_title'];
 			$rank_image = ( $ranksrow[$i]['rank_image'] ) ? '<img src="' . $ranksrow[$i]['rank_image'] . '" alt="' . $poster_rank . '" title="' . $poster_rank . '" border="0" /><br />' : '';
@@ -140,29 +116,51 @@ else
 	}
 }
 
+$temp_url = append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $profiledata['user_id']);
+$pm_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" title="' . $lang['Send_private_message'] . '" border="0" /></a>';
+$pm = '<a href="' . $temp_url . '">' . $lang['Send_private_message'] . '</a>';
+
+if ( !empty($profiledata['user_viewemail']) || $userdata['user_level'] == ADMIN )
+{
+	$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $profiledata['user_id']) : 'mailto:' . $profiledata['user_email'];
+
+	$email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>';
+	$email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>';
+}
+else
+{
+	$email_img = '&nbsp;';
+	$email = '&nbsp;';
+}
+
+$www_img = ( $profiledata['user_website'] ) ? '<a href="' . $profiledata['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : '&nbsp;';
+$www = ( $profiledata['user_website'] ) ? '<a href="' . $profiledata['user_website'] . '" target="_userwww">' . $profiledata['user_website'] . '</a>' : '&nbsp;';
+
 if ( !empty($profiledata['user_icq']) )
 {
-	$icq_status_img = '<a href="http://wwp.icq.com/' . $profiledata['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $profiledata['user_icq'] . '&amp;img=5" width="18" height="18" border="0" /></a>';
-	$icq_add_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $profiledata['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" border="0" /></a>';
+	$icq_status_img = '<a href="http://wwp.icq.com/' . $profiledata['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $profiledata['user_icq'] . '&img=5" width="18" height="18" border="0" /></a>';
+	$icq_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $profiledata['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>';
+	$icq =  '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $profiledata['user_icq'] . '">' . $lang['ICQ'] . '</a>';
 }
 else
 {
 	$icq_status_img = '&nbsp;';
-	$icq_add_img = '&nbsp;';
+	$icq_img = '&nbsp;';
+	$icq = '&nbsp;';
 }
 
-$aim_img = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" border="0" alt="' . $lang['AIM'] . '" /></a>' : '&nbsp;';
+$aim_img = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '&nbsp;';
+$aim = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $lang['AIM'] . '</a>' : '&nbsp;';
 
-$msnm_img = ( $profiledata['user_msnm'] ) ? '<img src="' . $images['icon_msnm'] . '" border="0" alt="' . $lang['MSNM'] . '" /> ' . $profiledata['user_msnm'] : '&nbsp;';
+$msn_img = ( $profiledata['user_msnm'] ) ? $profiledata['user_msnm'] : '&nbsp;';
+$msn = $msn_img;
 
-$yim_img = ( $profiledata['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $profiledata['user_yim'] . '&amp;.src=pg"><img src="' . $images['icon_yim'] . '" border="0" alt="' . $lang['YIM'] . '" /></a>' : '&nbsp;';
+$yim_img = ( $profiledata['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $profiledata['user_yim'] . '&amp;.src=pg"><img src="' . $images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : '';
+$yim = ( $profiledata['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $profiledata['user_yim'] . '&amp;.src=pg">' . $lang['YIM'] . '</a>' : '';
 
-$search_img = '<a href="' . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=posts") . '"><img src="' . $images['icon_search'] . '" border="0" alt="' . $lang['Search_user_posts'] . '" /></a>';
-$search = '<a href="' . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=posts") . '">' . $lang['Search_user_posts'] . '</a>';
-
-$www_img = ( $profiledata['user_website'] ) ? '<a href="' . $profiledata['user_website'] . '"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" border="0" /></a>' : '&nbsp;';
-
-$pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $profiledata['user_id']) . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" border="0" /></a>';
+$temp_url = append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=posts");
+$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . $lang['Search_user_posts'] . '" border="0" /></a>';
+$search = '<a href="' . $temp_url . '">' . $lang['Search_user_posts'] . '</a>';
 
 //
 // Generate page
@@ -180,23 +178,25 @@ $template->assign_vars(array(
 	'PERCENTAGE' => $percentage . '%', 
 	'POST_DAY_STATS' => sprintf($lang['User_post_day_stats'], $posts_per_day), 
 	'POST_PERCENT_STATS' => sprintf($lang['User_post_pct_stats'], $percentage), 
-	'EMAIL' => $email,
-	'EMAIL_IMG' => $email_img,
-	'PM_IMG' => $pm_img,
-	'UL_SEARCH' => $search,
+
 	'SEARCH_IMG' => $search_img,
-	'ICQ' => ( $profiledata['user_icq'] ) ? $profiledata['user_icq'] : '&nbsp;', 
-	'ICQ_IMG' => ( $profiledata['user_icq'] ) ? $images['icon_icq'] : '&nbsp;',
-	'ICQ_ADD_IMG' => $icq_add_img,
+	'SEARCH' => $search,
+	'PM_IMG' => $pm_img,
+	'PM' => $pm,
+	'EMAIL_IMG' => $email_img,
+	'EMAIL' => $email,
+	'WWW_IMG' => $www_img,
+	'WWW' => $www,
 	'ICQ_STATUS_IMG' => $icq_status_img,
-	'AIM' => ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $profiledata['user_aim'] . '</a>' : '&nbsp;',
+	'ICQ_IMG' => $icq_img, 
+	'ICQ' => $icq, 
 	'AIM_IMG' => $aim_img,
-	'MSN' => ( $profiledata['user_msnm'] ) ? $profiledata['user_msnm'] : '&nbsp;',
-	'MSN_IMG' => $msnm_img,
-	'YIM' => ( $profiledata['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $profiledata['user_yim'] . '&amp;.src=pg">' . $profiledata['user_yim'] . '</a>' : '&nbsp;',
+	'AIM' => $aim,
+	'MSN_IMG' => $msn_img,
+	'MSN' => $msn,
 	'YIM_IMG' => $yim_img,
-	'WEBSITE' => ( $profiledata['user_website'] ) ? '<a href="' . $profiledata['user_website'] . '" target="_phpbbwebsite">' . $profiledata['user_website'] . '</a>' : '&nbsp;',
-	'WEBSITE_IMG' => $www_img,
+	'YIM' => $yim,
+
 	'LOCATION' => ( $profiledata['user_from'] ) ? $profiledata['user_from'] : '&nbsp;',
 	'OCCUPATION' => ( $profiledata['user_occ'] ) ? $profiledata['user_occ'] : '&nbsp;',
 	'INTERESTS' => ( $profiledata['user_interests'] ) ? $profiledata['user_interests'] : '&nbsp;',
@@ -206,6 +206,7 @@ $template->assign_vars(array(
 	'L_ABOUT_USER' => sprintf($lang['About_user'], $profiledata['username']), 
 	'L_AVATAR' => $lang['Avatar'], 
 	'L_POSTER_RANK' => $lang['Poster_rank'], 
+	'L_JOINED' => $lang['Joined'], 
 	'L_TOTAL_POSTS' => $lang['Total_posts'], 
 	'L_SEARCH_USER_POSTS' => sprintf($lang['Search_user_posts'], $profiledata['username']), 
 	'L_CONTACT' => $lang['Contact'],

phpBB/index.php

@@ -267,6 +267,18 @@ if( ( $total_categories = count($category_rows) ) )
 		'FORUM_NEW_IMG' => $images['forum_new'],
 		'FORUM_LOCKED_IMG' => $images['forum_locked'],
 
+		'L_FORUM' => $lang['Forum'],
+		'L_TOPICS' => $lang['Topics'],
+		'L_REPLIES' => $lang['Replies'],
+		'L_VIEWS' => $lang['Views'],
+		'L_POSTS' => $lang['Posts'],
+		'L_LASTPOST' => $lang['Last_Post'], 
+		'L_NO_NEW_POSTS' => $lang['No_new_posts'],
+		'L_NEW_POSTS' => $lang['New_posts'],
+		'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'], 
+		'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'], 
+		'L_ONLINE_EXPLAIN' => $lang['Online_explain'], 
+
 		'L_MODERATOR' => $lang['Moderators'], 
 		'L_FORUM_LOCKED' => $lang['Forum_is_locked'],
 		'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'], 
@@ -299,10 +311,10 @@ if( ( $total_categories = count($category_rows) ) )
 		//
 		if ( $display_forums )
 		{
-			$template->assign_block_vars("catrow", array(
-				"CAT_ID" => $cat_id,
-				"CAT_DESC" => $category_rows[$i]['cat_title'],
-				"U_VIEWCAT" => append_sid("index.$phpEx?" . POST_CAT_URL . "=$cat_id"))
+			$template->assign_block_vars('catrow', array(
+				'CAT_ID' => $cat_id,
+				'CAT_DESC' => $category_rows[$i]['cat_title'],
+				'U_VIEWCAT' => append_sid("index.$phpEx?" . POST_CAT_URL . "=$cat_id"))
 			);
 
 			if ( $viewcat == $cat_id || $viewcat == -1 )
@@ -317,7 +329,8 @@ if( ( $total_categories = count($category_rows) ) )
 						{
 							if ( $forum_data[$j]['forum_status'] == FORUM_LOCKED )
 							{
-								$folder_image = '<img src="' . $images['forum_locked'] . '" alt="' . $lang['Forum_locked'] . '" />';
+								$folder_image = $images['forum_locked']; 
+								$folder_alt = $lang['Forum_locked'];
 							}
 							else
 							{
@@ -365,7 +378,8 @@ if( ( $total_categories = count($category_rows) ) )
 									}
 								}
 
-								$folder_image = ( $unread_topics ) ? '<img src="' . $images['forum_new'] . '" alt="' . $lang['New_posts'] . '" title="' . $lang['New_posts'] . '" />' : '<img src="' . $images['forum'] . '" alt="' . $lang['No_new_posts'] . '" title="' . $lang['No_new_posts'] . '" />';
+								$folder_image = ( $unread_topics ) ? $images['forum_new'] : $images['forum']; 
+								$folder_alt = ( $unread_topics ) ? $lang['New_posts'] : $lang['No_new_posts']; 
 							}
 
 							$posts = $forum_data[$j]['forum_posts'];
@@ -377,9 +391,9 @@ if( ( $total_categories = count($category_rows) ) )
 
 								$last_post = $last_post_time . '<br />';
 
-								$last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != "" ) ? $forum_data[$j]['post_username'] . " " : $lang['Guest'] . " " ) : '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "="  . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> ';
+								$last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != '' ) ? $forum_data[$j]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '='  . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> ';
 								
-								$last_post .= '<a href="' . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>';
+								$last_post .= '<a href="' . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . '=' . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>';
 							}
 							else
 							{
@@ -400,20 +414,21 @@ if( ( $total_categories = count($category_rows) ) )
 							$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
 							$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
 
-							$template->assign_block_vars("catrow.forumrow",	array(
-								"ROW_COLOR" => '#' . $row_color,
-								"ROW_CLASS" => $row_class,
-								"FOLDER" => $folder_image,
-								"FORUM_NAME" => $forum_data[$j]['forum_name'],
-								"FORUM_DESC" => $forum_data[$j]['forum_desc'],
-								"POSTS" => $forum_data[$j]['forum_posts'],
-								"TOPICS" => $forum_data[$j]['forum_topics'],
-								"LAST_POST" => $last_post,
-								"MODERATORS" => $moderator_list,
+							$template->assign_block_vars('catrow.forumrow',	array(
+								'ROW_COLOR' => '#' . $row_color,
+								'ROW_CLASS' => $row_class,
+								'FORUM_FOLDER_IMG' => $folder_image, 
+								'FORUM_NAME' => $forum_data[$j]['forum_name'],
+								'FORUM_DESC' => $forum_data[$j]['forum_desc'],
+								'POSTS' => $forum_data[$j]['forum_posts'],
+								'TOPICS' => $forum_data[$j]['forum_topics'],
+								'LAST_POST' => $last_post,
+								'MODERATORS' => $moderator_list,
 
-								"L_MODERATOR" => $l_moderators, 
+								'L_MODERATOR' => $l_moderators, 
+								'L_FORUM_FOLDER_ALT' => $folder_alt, 
 
-								"U_VIEWFORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))
+								'U_VIEWFORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))
 							);
 						}
 					}

phpBB/install.php

@@ -25,7 +25,7 @@ set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
 define('IN_PHPBB', true);
 $phpbb_root_path='./';
 include($phpbb_root_path.'extension.inc');
-include($phpbb_root_dir . 'includes/functions_selects.'.$phpEx);
+include($phpbb_root_path . 'includes/functions_selects.'.$phpEx);
 
 $userdata = array();
 $lang = array();
@@ -344,6 +344,7 @@ else
 	else
 	{
 		header("Location: " . append_sid("index.$phpEx", true));
+		exit;
 	}
 }
 
@@ -817,8 +818,8 @@ else
 				$error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
 			}
 			$sql = "UPDATE " . $table_prefix . "config
-				SET config_value = '" . $server_path . "' 
-				WHERE config_name = 'server_path'";
+				SET config_value = '" . $script_path . "' 
+				WHERE config_name = 'script_path'";
 			$result = $db->sql_query($sql);
 			if( !$result )
 			{
@@ -875,7 +876,7 @@ else
 					if( preg_match("/^(3\.23)|(4\.)/", $version) )
 					{
 						$sql = "ALTER TABLE " . $table_prefix . "sessions 
-							TYPE=HEAP";
+							TYPE=HEAP MAX_ROWS=500";
 						$db->sql_query($sql);
 					}
 				}
@@ -905,12 +906,12 @@ else
 			//
 			$config_data = '<?php'."\n\n";
 			$config_data .= "//\n// phpBB 2.x auto-generated config file\n// Do not change anything in this file!\n//\n\n";
-			$config_data .= '$dbms = "' . $dbms . '";' . "\n\n";
-			$config_data .= '$dbhost = "' . $dbhost . '";' . "\n";
-			$config_data .= '$dbname = "' . $dbname . '";' . "\n";
-			$config_data .= '$dbuser = "' . $dbuser . '";' . "\n";
-			$config_data .= '$dbpasswd = "' . $dbpasswd . '";' . "\n\n";
-			$config_data .= '$table_prefix = "' . $table_prefix . '";' . "\n\n";
+			$config_data .= '$dbms = \'' . $dbms . '\';' . "\n\n";
+			$config_data .= '$dbhost = \'' . $dbhost . '\';' . "\n";
+			$config_data .= '$dbname = \'' . $dbname . '\';' . "\n";
+			$config_data .= '$dbuser = \'' . $dbuser . '\';' . "\n";
+			$config_data .= '$dbpasswd = \'' . $dbpasswd . '\';' . "\n\n";
+			$config_data .= '$table_prefix = \'' . $table_prefix . '\';' . "\n\n";
 			$config_data .= 'define(\'PHPBB_INSTALLED\', true);'."\n\n";	
 			$config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!
 
@@ -1009,7 +1010,7 @@ else
 		{
 			$s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />';
 			$s_hidden_fields .= '<input type="hidden" name="password" value="' . $admin_pass1 . '" />';
-			$s_hidden_fields .= '<input type="hidden" name="redirect" value="admin/" />';
+			$s_hidden_fields .= '<input type="hidden" name="redirect" value="admin/index.php" />';
 			$s_hidden_fields .= '<input type="hidden" name="login" value="true" />';
 		}
 		else

phpBB/language/lang_albanian/email/admin_activate.tpl

@@ -0,0 +1,10 @@
+Subject: Llogari e re
+Charset: iso-8859-1
+
+P<EFBFBD>rsh<EFBFBD>ndetje,
+
+Llogaria e "{USERNAME}" <20>sht<68> c'aktivizuar ose sapo krijuar; kontrolloni detajet mbi k<>t<EFBFBD> p<>rdorues dhe aktivizoni llogarin<69> duke klikuar lidhjen e m<>poshtme:
+
+{U_ACTIVATE}
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/email/admin_send_email.tpl

@@ -0,0 +1,12 @@
+Charset: iso-8859-1
+
+Mesazhi i m<>posht<68>m <20>sht<68> d<>rguar nga nj<6E> administrator i "{SITENAME}". Nqs ky mesazh <20>sht<68> i pad<61>shiruesh<73>m, abuzues apo p<>rmban material t<> pahijsh<73>m ju lutem kontaktoni webmasterin tek adresa:
+
+{BOARD_EMAIL}
+
+Ju lutem p<>rfshini k<>t<EFBFBD> mesazh (sidomos detajet e serverit). 
+
+Mesazhi i d<>rguar vazhdon:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+{MESSAGE}

phpBB/language/lang_albanian/email/admin_welcome_activated.tpl

@@ -0,0 +1,8 @@
+Subject: Llogaria u aktivizia
+Charset: iso-8859-1
+
+P<EFBFBD>rsh<EFBFBD>ndetje {USERNAME},
+
+Llogaria juaj tek "{SITENAME}" u aktivizua, ju mund t<> identifikoheni tashti duke p<>rdorur emrin dhe fjal<61>kalimin q<> mor<6F>t n<> mesazhin e m<>parsh<73>m.
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/email/admin_welcome_inactive.tpl

@@ -0,0 +1,19 @@
+Subject: Mirsevini tek forumi i {SITENAME}
+Charset: iso-8859-1
+
+{WELCOME_MSG}
+
+Ju lutem ruajeni k<>t<EFBFBD> mesazh p<>r referenc<6E>. Informacioni mbi llogarin<69> tuaj <20>sht<68> si m<> posht<68>:
+
+----------------------------
+Identifikimi: {USERNAME}
+Fjal<EFBFBD>kalimi: {PASSWORD}
+----------------------------
+
+Llogaria juaj <20>sht<68> e <20>'aktivizuar tashti p<>r tashti, administratori duhet ta aprovoj<6F> p<>rpara se t<> keni mund<6E>si t<> identifikoheni. Kur llogaria juaj t<> aprovohet do merrni nj<6E> mesazh t<> ri.
+
+Ju lutem mos harroni fjal<61>kalimin sepse ai ruhet i shifruar n<> regjistrin ton<6F> dhe ne nuk mund ta deshifrojm<6A>. Megjithat<61> nqs harroni fjal<61>kalimin ju mund t<> k<>rkoni nj<6E> t<> ri i cili duhet aktivizuar n<> t<> nj<6E>jt<6A>n m<>nyr<79>.
+
+Ju fal<61>nderojm<6A> p<>r regjistrimin.
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/email/coppa_welcome_inactive.tpl

@@ -0,0 +1,53 @@
+Subject: Mirsevini tek forumi i {SITENAME}
+Charset: iso-8859-1
+
+{WELCOME_MSG}
+
+In compliance with the COPPA act your account is currently inactive.
+
+Please print this message out and have your parent or guardian sign and date it. Then fax it to:
+
+{FAX_INFO}
+
+OR mail it to:
+
+{MAIL_INFO}
+
+------------------------------ CUT HERE ------------------------------
+Permission to Participate at {SITENAME}
+
+Username: {USERNAME}
+Password: {PASSWORD}
+Email: {EMAIL_ADDRESS}
+
+ICQ Number: {ICQ}
+AIM Address: {AIM}
+MSN Messenger: {MSN}
+Yahoo Messenger: {YIM}
+Web Site: {WEB_SITE}
+From: {FROM}
+Occupation: {OCC}
+Interests: {INTERESTS}
+
+I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION. 
+I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. 
+I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME.
+
+
+Parent or Guardian 
+(print your name here): _____________________
+
+(sign here): __________________ 
+
+Date: _______________
+
+------------------------------ CUT HERE ------------------------------
+
+
+Once the administrator has recived the above form via fax or regular mail your account will be activated.
+
+Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
+
+Thank you for registering.
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/email/group_added.tpl

@@ -0,0 +1,12 @@
+Subject: Jeni an<61>tar i k<>tij grupi tashm<68>
+Charset: iso-8859-1
+
+Urime,
+
+Ju jeni pranuar tek grupi "{GROUP_NAME}" n<> {SITENAME}.
+Ky veprim u b<> nga moderatori i grupit ose administratori i forumit, kontaktoni ata p<>r m<> shum<75> informacion.
+
+Ju mund t<> shikoni an<61>tar<61>sit<69> tuaja k<>tu:
+{U_GROUPCP}
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/email/group_approved.tpl

@@ -0,0 +1,11 @@
+Subject: K<>rkesa juaj u aprovua
+Charset: iso-8859-1
+
+Urime,
+
+K<EFBFBD>rkesa juaj p<>r an<61>tar<61>sim tek grupi "{GROUP_NAME}" tek {SITENAME} u aprovua.
+Ju mund t<> shikoni an<61>tar<61>sit<69> tuaja k<>tu:
+
+{U_GROUPCP}
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/email/group_request.tpl

@@ -0,0 +1,11 @@
+Subject: Dikush ka b<>r<EFBFBD> k<>rkes<65> p<>r an<61>tar<61>sim tek grupi juaj
+Charset: iso-8859-1
+
+I nderuar {GROUP_MODERATOR},
+
+Nj<EFBFBD> an<61>tar ka k<>rkuar t<> an<61>tar<61>sohet tek nj<6E> nga grupet q<> moderoni tek {SITENAME}.
+P<EFBFBD>r ta aprovuar ose mosaprovuar k<>t<EFBFBD> k<>rkes<65> kliko:
+
+{U_GROUPCP}
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/email/index.htm

@@ -0,0 +1,10 @@
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+
+</body>
+</html>

phpBB/language/lang_albanian/email/privmsg_notify.tpl

@@ -0,0 +1,12 @@
+Subject: Sapo keni marr<72> mesazh privat t<> ri
+Charset: iso-8859-1
+
+P<EFBFBD>rsh<EFBFBD>ndetje {USERNAME},
+
+Ju sapo keni marr<72> nj<6E> mesazh t<> ri privat n<> llogarin<69> tuaj tek "{SITENAME}" dhe keni k<>rkuar tu informojm<6A> sa her<65> q<> kjo ndodh. Klikoni k<>tu p<>r ta par<61> mesazhin e ri:
+
+{U_INBOX}
+
+Kini parasysh q<> gjithmon<6F> mund t<> zgjidhni q<> t<> mos njoftoheni p<>r mesazhe t<> reja duke ndryshuar vetit<69> e duhura tek profili juaj.
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/email/profile_send_email.tpl

@@ -0,0 +1,15 @@
+Charset: iso-8859-1
+
+P<EFBFBD>rsh<EFBFBD>ndetje {TO_USERNAME},
+
+Mesazhi i m<>posht<68>m u d<>rgua p<>r ju nga {FROM_USERNAME} n<>p<EFBFBD>rmjet llogaris<69> tuaj tek {SITENAME}. Nqs ky mesazh <20>sht<68> i pad<61>shiruesh<73>m, abuzues apo p<>rmban material t<> pahijsh<73>m ju lutem kontaktoni webmasterin tek adresa:
+
+
+{BOARD_EMAIL}
+
+Ju lutem p<>rfshini k<>t<EFBFBD> mesazh (sidomos detajet e serverit). Ju lutem njoftoni q<> adresa nga u d<>rgua ky mesazh <20>sht<68> ajo e {FROM_USERNAME}.
+
+Mesazhi i d<>rguar vazhdon:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+{MESSAGE}

phpBB/language/lang_albanian/email/topic_notify.tpl

@@ -0,0 +1,14 @@
+Subject: P<>rgjigje tek tema - {TOPIC_TITLE}
+Charset: iso-8859-1
+
+P<EFBFBD>rsh<EFBFBD>ndetje {USERNAME},
+
+Ju po merrni k<>t<EFBFBD> mesazh sepse jeni duke v<>zhguar tem<65>n "{TOPIC_TITLE}" tek {SITENAME}. Kjo tem<65> ka pasur t<> pakt<6B>n nj<6E> p<>rgjigje q<> nga vizita juaj e fundit. Ju mund t<> p<>rdorni lidhjen e m<>poshtme p<>r t<> par<61> k<>to p<>rgjigje; nuk do ju d<>rgohen lajm<6A>rime t<> tjera deri sa ta vizitoni tem<65>n.
+
+{U_TOPIC}
+
+Nqs nuk d<>shironi m<> ta v<>zhgoni k<>t<EFBFBD> tem<65> ose klikoni lidhjen "Ndalo s<> v<>zhguari k<>t<EFBFBD> tem<65>", ose klikoni lidhjen e m<>poshtme:
+
+{U_STOP_WATCHING_TOPIC}
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/email/user_activate.tpl

@@ -0,0 +1,10 @@
+Subject: Riaktivizoni llogarin<69> tuaj
+Charset: iso-8859-1
+
+P<EFBFBD>rsh<EFBFBD>ndetje {USERNAME},
+
+Llogaria juaj tek "{SITENAME}" <20>sht<68> c'aktivizuar, ka shum<75> mund<6E>si p<>r shkak t<> ndryshimeve n<> profilin tuaj. Klikoni n<> lidhjen e m<>poshtme p<>r ta riaktivizuar:
+
+{U_ACTIVATE}
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/email/user_activate_passwd.tpl

@@ -0,0 +1,18 @@
+Subject: Aktivizoni fjal<61>kalimin e ri
+Charset: iso-8859-1
+
+P<EFBFBD>rsh<EFBFBD>ndetje {USERNAME}
+
+Po e merrni k<>t<EFBFBD> mesazh sepse ju (ose dikush q<> pretendon t<> jet<65> ju) ka k<>rkuar nj<6E> fjal<61>kalim i ri p<>r llogarin<69> tuaj tek {SITENAME}. Nqs nuk ishit ju ai q<> k<>rkuat nj<6E> fjal<61>kalim t<> ri injorojeni k<>t<EFBFBD> mesazh. Nqs ky mesazh ju vjen n<> m<>nyr<79> t<> p<>rs<72>ritur kontaktoni administratorin e forumit.
+
+P<EFBFBD>r t<> p<>rdorur fjal<61>kalimi e ri ju duhet ta aktivizoni duke klikuar m<> posht<68>:
+
+{U_ACTIVATE}
+
+Nqs kjo procedur<75> <20>sht<68> e sukseshme at<61>her<65> mund t<> identifikoheni duke p<>rdorur fjal<61>kalimin e m<>posht<68>m:
+
+Fjal<EFBFBD>kalimi: {PASSWORD}
+
+Ju mund ta ndryshoni k<>t<EFBFBD> fjal<61>kalim n<>p<EFBFBD>rmjet profilit tuaj. Nqs hasni ndonj<6E> problem kontaktoni administratorin e forumit.
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/email/user_welcome.tpl

@@ -0,0 +1,17 @@
+Subject: Mirsevini tek forumi i {SITENAME}
+Charset: iso-8859-1
+
+{WELCOME_MSG}
+
+Ju lutem ruajeni k<>t<EFBFBD> mesazh p<>r referenc<6E>. Informacioni mbi llogarin<69> tuaj <20>sht<68> si m<> posht<68>:
+
+----------------------------
+Identifikimi: {USERNAME}
+Fjal<EFBFBD>kalimi: {PASSWORD}
+----------------------------
+
+Ju lutem mos harroni fjal<61>kalimin sepse ai ruhet i shifruar n<> regjistrin ton<6F> dhe ne nuk mund ta deshifrojm<6A>. Megjithat<61> nqs harroni fjal<61>kalimin ju mund t<> k<>rkoni nj<6E> t<> ri i cili duhet aktivizuar n<> t<> nj<6E>jt<6A>n m<>nyr<79>.
+
+Ju fal<61>nderojm<6A> p<>r regjistrimin.
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/email/user_welcome_inactive.tpl

@@ -0,0 +1,21 @@
+Subject: Mirsevini tek forumi i {SITENAME}
+Charset: iso-8859-1
+
+{WELCOME_MSG}
+
+Ju lutem ruajeni k<>t<EFBFBD> mesazh p<>r referenc<6E>. Informacioni mbi llogarin<69> tuaj <20>sht<68> si m<> posht<68>:
+
+----------------------------
+Identifikimi: {USERNAME}
+Fjal<EFBFBD>kalimi: {PASSWORD}
+----------------------------
+
+Llogaria juaj <20>sht<68> e <20>'aktivizuar tashti p<>r tashti. Ju nuk mund ta p<>rdorni derisa t<> vizitoni lidhjen e m<>poshtme:
+
+{U_ACTIVATE}
+
+Ju lutem mos harroni fjal<61>kalimin sepse ai ruhet i shifruar n<> regjistrin ton<6F> dhe ne nuk mund ta deshifrojm<6A>. Megjithat<61> nqs harroni fjal<61>kalimin ju mund t<> k<>rkoni nj<6E> t<> ri i cili duhet aktivizuar n<> t<> nj<6E>jt<6A>n m<>nyr<79>.
+
+Ju fal<61>nderojm<6A> p<>r regjistrimin.
+
+{EMAIL_SIG}

phpBB/language/lang_albanian/lang_admin.php

@@ -0,0 +1,721 @@
+<?php
+
+/***************************************************************************
+ *                            lang_admin.php [English]
+ *                              -------------------
+ *     begin                : Sat Dec 16 2000
+ *     copyright            : (C) 2001 The phpBB Group
+ *     email                : support@phpbb.com
+ *
+ *     $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.
+ *
+ ***************************************************************************/
+
+//
+// Format is same as lang_main
+//
+
+//
+// Modules, this replaces the keys used
+// in the modules[][] arrays in each module file
+//
+$lang['General'] = "Administrim i P<>rgjithsh<73>m";
+$lang['Users'] = "Administrim i An<41>tar<61>ve";
+$lang['Groups'] = "Administrim i Grupeve";
+$lang['Forums'] = "Administrim i Forumeve";
+$lang['Styles'] = "Administrim i Paraqitjes";
+
+$lang['Configuration'] = "Konfigurimi";
+$lang['Permissions'] = "Autorizimet";
+$lang['Manage'] = "Menaxhimi";
+$lang['Disallow'] = "Mos lejo emrat";
+$lang['Prune'] = "Shkurtimi";
+$lang['Mass_Email'] = "Email Masiv";
+$lang['Ranks'] = "Gradimi";
+$lang['Smilies'] = "Figurinat";
+$lang['Ban_Management'] = "P<EFBFBD>rjashtimet";
+$lang['Word_Censor'] = "Fjal<EFBFBD>t e Censuruara";
+$lang['Export'] = "Eksporto";
+$lang['Create_new'] = "Krijo";
+$lang['Add_new'] = "Shto";
+$lang['Backup_DB'] = "Krijo nj<6E> kopje t<> Regjistrit";
+$lang['Restore_DB'] = "Rivendos Regjistrin";
+
+
+
+//
+// Index
+//
+$lang['Admin'] = "Administrim";
+$lang['Not_admin'] = "Ju nuk keni autorizim p<>r t<> modifikuar k<>t<EFBFBD> forum";
+$lang['Welcome_phpBB'] = "Mir<EFBFBD>sevini tek phpBB";
+$lang['Admin_intro'] = "Ju fal<61>nderojm<6A> q<> zgjodh<64>t phpBB p<>r forumin tuaj. Kjo faqe jep nj<6E> p<>rmbledhje t<> statistikave kryesore p<>r forumin tuaj. Kthehuni tek kjo faqe duke klikuar mbi butonin <u>Indeksi i Administrimit</u> n<> an<61>n e majt<6A> t<> faqes. Klikoni ikon<6F>n e phpBB p<>r t<> shkuar tek indeksi kryesor i forumeve. Lidhjet e tjera n<> an<61>n e majte t<> faqes mund<6E>sojn<6A> kontrollin e plot<6F> t<> forumit dhe p<>rmbajn<6A> udh<64>zime mbi p<>rdorimin e cdo kontrolli.";
+$lang['Main_index'] = "Indeksi i Forumit";
+$lang['Forum_stats'] = "Statistikat e Forumit";
+$lang['Admin_Index'] = "Indeksi i Administrimit";
+$lang['Preview_forum'] = "Shqyrto Forumin";
+
+$lang['Click_return_admin_index'] = "Kliko %sk<73>tu%s p<>r t<> shkuar tek indeksi i administrimit";
+
+$lang['Statistic'] = "Statistika";
+$lang['Value'] = "Vlera";
+$lang['Number_posts'] = "Numri i postimeve";
+$lang['Posts_per_day'] = "Postime n<> dit<69>";
+$lang['Number_topics'] = "Numri i temave";
+$lang['Topics_per_day'] = "Tema n<> dit<69>";
+$lang['Number_users'] = "Numri i an<61>tar<61>ve";
+$lang['Users_per_day'] = "An<EFBFBD>tar<EFBFBD> n<> dit<69>";
+$lang['Board_started'] = "Forumi filloi";
+$lang['Avatar_dir_size'] = "Madh<EFBFBD>sia e direktoris<69> s<> fotos personale";
+$lang['Database_size'] = "Madh<EFBFBD>sia e regjistrit";
+$lang['Gzip_compression'] ="Kompresimi me Gzip";
+$lang['Not_available'] = "Nuk ofrohet";
+
+$lang['ON'] = "Aktiv"; // This is for GZip compression
+$lang['OFF'] = "Jo-aktiv"; 
+
+
+//
+// DB Utils
+//
+$lang['Database_Utilities'] = "Vegla t<> dobishme p<>r p<>rpunimin e regjistrit";
+
+$lang['Restore'] = "Rivendos";
+$lang['Backup'] = "Krijo kopje";
+$lang['Restore_explain'] = "Ky veprim do kryej<65> nj<6E> rivendosje t<> plot<6F> t<> t<> gjitha tabelave t<> phpBB nga nj<6E> skedar. Nqs serveri juaj e lejon, ju mund t<> ngarkoni nj<6E> skedar t<> kompresuar me gzip. <b>KUJDES</b> Ky veprim do rishkruaj<61> t<> gjitha t<> dh<64>nat e forumit. Procesi i rivendosjes mund t<> k<>rkoj<6F> shum<75> koh<6F>, ju lutem mos ikni nga kjo faqe deri n<> p<>rfundim t<> procesit!";
+$lang['Backup_explain'] = "K<EFBFBD>tu mund t<> krijoni nj<6E> kopje t<> plot<6F> t<> phpBB. Nqs keni tabela speciale n<> t<> nj<6E>jtin regjist<73>r me phpBB dhe doni ti kopjoni n<> t<> nj<6E>jtin skedar, specifikoni emrat e tyre duke i ndar<61> me presje tek kutia e Tabelave Shtes<65>. Nqs serveri juaj e lejon, ju mund t<> kompresoni skedarin me gzip para se ta shkarkoni.";
+
+$lang['Backup_options'] = "Mund<EFBFBD>sit<EFBFBD> p<>r Kopjen";
+$lang['Start_backup'] = "Fillo kopjimin";
+$lang['Full_backup'] = "Kopjim i plot<6F>";
+$lang['Structure_backup'] = "Vet<EFBFBD>m - Kopjim i struktur<75>s";
+$lang['Data_backup'] = "Vet<EFBFBD>m - Kopjim i t<> dh<64>nave";
+$lang['Additional_tables'] = "Tabela Shtes<65>";
+$lang['Gzip_compress'] = "Kompreso skedarin me gzip";
+$lang['Select_file'] = "Zgjidh nj<6E> skedar";
+$lang['Start_Restore'] = "Fillo rivendosjen";
+
+$lang['Restore_success'] = "Regjistri u rivendos n<> m<>nyr<79> t<> suksesshme.<br /><br />Forumi juaj duhet t<> kthehet n<> gjendjen q<> kishte kur u kopjua.";
+$lang['Backup_download'] = "Shkarkimi do filloje s<> shpejti, prisni deri sa t<> filloj<6F>";
+$lang['Backups_not_supported'] = "Na vjen keq, por kopjimi nuk mb<6D>shtetet p<>r k<>t<EFBFBD> lloj regjistri";
+
+$lang['Restore_Error_uploading'] = "Problem me ngarkimin e skedarit (kopja e regjistrit)";
+$lang['Restore_Error_filename'] = "Problem me emrin e skedarit, provo nj<6E> skedar tjet<65>r";
+$lang['Restore_Error_decompress'] = "Nuk dekompreson dot skedarin me gzip, ngarkoni nj<6E> text-file";
+$lang['Restore_Error_no_file'] = "Asnj<EFBFBD> skedar nuk u ngarkua";
+
+
+//
+// Auth pages
+//
+$lang['Select_a_User'] = "Zgjidh nj<6E> an<61>tar";
+$lang['Select_a_Group'] = "Zgjidh nj<6E> grup";
+$lang['Select_a_Forum'] = "Zgjidh nj<6E> forum";
+$lang['Auth_Control_User'] = "Kontrolli i autorizimeve personale"; 
+$lang['Auth_Control_Group'] = "Kontrolli i autorizimeve t<> grupeve"; 
+$lang['Auth_Control_Forum'] = "Kontrolli i autorizimeve p<>r forumet"; 
+$lang['Look_up_User'] = "Analizo an<61>tarin"; 
+$lang['Look_up_Group'] = "Analizo grupin"; 
+$lang['Look_up_Forum'] = "Analizo forumin"; 
+
+$lang['Group_auth_explain'] = "K<EFBFBD>tu mund t<> ndryshoni autorizimet dhe statusin e moderatorit q<> i jan<61> caktuar cdo grupi an<61>tar<61>sh. Kujdes, mos harroni q<> ndryshimi i autorizimeve p<>r grupin mund t<> mos ndikoj<6F> autorizimet personale, etj. Ju do paralajm<6A>roheni n<> k<>to raste.";
+$lang['User_auth_explain'] = "K<EFBFBD>tu mund t<> ndryshoni autorizimet dhe statusin e moderatorit q<> i jan<61> caktuar cdo p<>rdoruesi. Kujdes, mos harroni q<> ndryshimi i autorizimeve p<>r p<>rdoruesin mund t<> mos ndikoj<6F> autorizimet p<>r grupin, etj. Ju do paralajm<6A>roheni n<> k<>to raste.";
+$lang['Forum_auth_explain'] = "K<EFBFBD>tu mund t<> ndryshoni autorizimet p<>r cdo forum. Ka dy m<>nyra p<>r ta b<>r<EFBFBD> k<>t<EFBFBD>, m<>nyra e thjesht<68> dhe m<>nyra e avancuar. M<>nyra e avancuar ofron kontroll m<> t<> p<>rpikt<6B> p<>r cdo veprim. Mos harroni q<> ndryshimi i nivelit t<> autorizimit n<> nj<6E> forum do ndikoj<6F> p<>rdorimin e tij nga p<>rdorues<65>t e ndrysh<73>m.";
+
+$lang['Simple_mode'] = "M<EFBFBD>nyra e thjesht<68>";
+$lang['Advanced_mode'] = "M<EFBFBD>nyra e avancuar";
+$lang['Moderator_status'] = "Status moderatori";
+
+$lang['Allowed_Access'] = "Lejohet hyrja";
+$lang['Disallowed_Access'] = "Ndalohet hyrja";
+$lang['Is_Moderator'] = "Esht<EFBFBD> moderator";
+$lang['Not_Moderator'] = "Nuk <20>sht<68> moderator";
+
+$lang['Conflict_warning'] = "Paralajm<EFBFBD>rim: Konflikt n<> autorizim";
+$lang['Conflict_access_userauth'] = "Ky p<>rdorues ka akoma te drejta p<>r hyrje n<> k<>t<EFBFBD> forum n<>p<EFBFBD>rmjet an<61>tar<61>sis<69> n<> grup. You duhet t<> ndryshoni autorizimet e grupit, ose ta hiqni k<>t<EFBFBD> p<>rdorues nga ky grup n<> m<>nyr<79> q<> ta ndaloni. Grupet q<> i japin t<> drejta (dhe forumet q<> ndikohen) jan<61> renditur m<> posht<68>.";
+$lang['Conflict_mod_userauth'] = "Ky p<>rdorues ka akoma t<> drejta Moderatori p<>r k<>t<EFBFBD> forum n<>p<EFBFBD>rmjet an<61>tar<61>sis<69> n<> grup. You duhet t<> ndryshoni autorizimet e grupit, ose ta hiqni k<>t<EFBFBD> p<>rdorues nga ky grup n<> m<>nyr<79> q<> ta ndaloni. Grupet q<> i japin t<> drejta (dhe forumet q<> ndikohen) jan<61> renditur m<> posht<68>.";
+
+$lang['Conflict_access_groupauth'] = "Ky p<>rdorues/<2F> kan<61> akoma te drejta p<>r hyrje n<> k<>t<EFBFBD> forum n<>p<EFBFBD>rmjet autorizimeve individuale. You duhet t<> ndryshoni autorizimet individuale  q<> ta/i ndaloni. P<>rdorues<65>t me t<> drejta (dhe forumet q<> ndikohen) jan<61> renditur m<> posht<68>.";
+$lang['Conflict_mod_groupauth'] = "Ky p<>rdorues ka akoma t<> drejta Moderatori p<>r k<>t<EFBFBD> forum n<>p<EFBFBD>rmjet autorizimeve personale. You duhet t<> ndryshoni autorizimet individuale q<> ta ndaloni. P<>rdorues<65>t me t<> drejta (dhe forumet q<> ndikohen) jan<61> renditur m<> posht<68>.";
+
+$lang['Public'] = "Publik";
+$lang['Private'] = "Privat";
+$lang['Registered'] = "I regjistruar";
+$lang['Administrators'] = "Administrator<EFBFBD>t";
+$lang['Hidden'] = "I fshehur";
+
+// These are displayed in the drop down boxes for advanced
+// mode forum auth, try and keep them short!
+$lang['Forum_ALL'] = "ALL";
+$lang['Forum_REG'] = "REG";
+$lang['Forum_PRIVATE'] = "PRIVATE";
+$lang['Forum_MOD'] = "MOD";
+$lang['Forum_ADMIN'] = "ADMIN";
+
+$lang['View'] = "Shiko";
+$lang['Read'] = "Lexo";
+$lang['Post'] = "Shkruaj";
+$lang['Reply'] = "P<EFBFBD>rgjigju";
+$lang['Edit'] = "Modifiko";
+$lang['Delete'] = "Fshi";
+$lang['Sticky'] = "Ngjit<EFBFBD>s";
+$lang['Announce'] = "Lajm<EFBFBD>ro"; 
+$lang['Vote'] = "Voto";
+$lang['Pollcreate'] = "Krijo votim";
+
+$lang['Permissions'] = "Autorizimet";
+$lang['Simple_Permission'] = "Autorizim i thjesht<68>suar";
+
+$lang['User_Level'] = "Nivel p<>rdoruesi"; 
+$lang['Auth_User'] = "P<EFBFBD>rdorues";
+$lang['Auth_Admin'] = "Administrator";
+$lang['Group_memberships'] = "An<EFBFBD>tar<EFBFBD>sia e grupit";
+$lang['Usergroup_members'] = "Ky grup ka keta an<61>tar<61>";
+
+$lang['Forum_auth_updated'] = "Autorizimet e forumit u ri-freskuan";
+$lang['User_auth_updated'] = "Autorizimet e p<>rdoruesit u ri-freskuan";
+$lang['Group_auth_updated'] = "Autorizimet e grupit u ri-freskuan";
+
+$lang['Auth_updated'] = "Autorizimet u ri-freskuan";
+$lang['Click_return_userauth'] = "Kliko %sketu%s p<>r ty kthyer tek Autorizimet e P<>rdoruesve";
+$lang['Click_return_groupauth'] = "Kliko %sketu%s p<>r ty kthyer tek Autorizimet e Grupeve";
+$lang['Click_return_forumauth'] = "Kliko %sketu%s p<>r ty kthyer tek Autorizimet e Forumeve";
+
+
+//
+// Banning
+//
+$lang['Ban_control'] = "Menaxhimi i p<>rjashtimeve";
+$lang['Ban_explain'] = "K<EFBFBD>tu b<>het p<>rjashtimi i p<>rdoruesve/an<61>tar<61>ve. Kjo arrihet duke p<>rjashtuar nj<6E> an<61>tar specifik, nj<6E> IP/hostname ose grup IP/hostname, ose t<> dyja bashk<68>. K<>to metoda pengojn<6A> nj<6E> p<>rdorues madje dhe t<> shikojn<6A> faqen kryesore t<> forumit. Nqs doni t<> pengoni dik<69> t<> p<>rjashtuar m<> par<61> dhe q<> tenton t<> regjistrohet me nj<6E> em<65>r t<> ri, mund ta ndaloni at<61> duke p<>rjashtuar adres<65>n e email. Kini parasysh, p<>rjashtimi i email-it nuk pengon dik<69> q<> t<> shkruaj<61> apo shikoj<6F> forumin. P<>r k<>t<EFBFBD>  p<>rdorni nj<6E> ose t<> dyja metodat e m<>sip<69>rme.";
+$lang['Ban_explain_warn'] = "Kujdes, p<>rjashtimi i nj<6E> serie IP-sh p<>rjashton cdo IP midis fillimit dhe fundit t<> seris<69>. Nqs ju duhet t<> p<>rjashtoni nj<6E> seri, mundohuni ta minimizoni serin<69>. ";
+
+$lang['Select_username'] = "Zgjidh identifikimin";
+$lang['Select_ip'] = "Zgjidh IP";
+$lang['Select_email'] = "Zgjidh adres<65>n e e-mail";
+
+$lang['Ban_username'] = "P<EFBFBD>rjashto nj<6E> ose m<> shum<75> an<61>tar<61>";
+$lang['Ban_username_explain'] = "P<EFBFBD>rjashtimi i nj<6E> ose m<> shum<75> an<61>tar<61>ve nj<6E>koh<6F>sisht <20>sht<68> i mundur me kombinimin e duhur t<> butonave";
+
+$lang['Ban_IP'] = "P<EFBFBD>rjashto nj<6E> ose m<> shum<75> IP ose hostname";
+$lang['IP_hostname'] = "IP ose hostnames";
+$lang['Ban_IP_explain'] = "Per t<> specifikuar m<> shum<75> se nj<6E> IP ose hostname, ndajini me presje. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use *";
+
+$lang['Ban_email'] = "P<EFBFBD>jashto nj<6E> ose m<> shum<75> adresa e-mail";
+$lang['Ban_email_explain'] = "Per t<> specifikuar m<> shum<75> se nj<6E> adres<65> e-maili, ndajini me presje. P<>r t<> specifikuar nj<6E> -wildcard username- p<>rdor *, p<>r shembull *@hotmail.com";
+
+$lang['Unban_username'] = "Riprano nj<6E> ose m<> shum<75> an<61>tar<61>";
+$lang['Unban_username_explain'] = "Ripranimi i nj<6E> ose m<> shum<75> an<61>tar<61>ve nj<6E>koh<6F>sisht <20>sht<68> i mundur me kombinimin e duhur t<> butonave";
+
+$lang['Unban_IP'] = "Riprano nj<6E> ose m<> shum<75> IP";
+$lang['Unban_IP_explain'] = "Ripranimi i nj<6E> ose m<> shum<75> IP nj<6E>koh<6F>sisht <20>sht<68> i mundur me kombinimin e duhur t<> butonave";
+
+$lang['Unban_email'] = "Riprano nj<6E> ose m<> shum<75> adresa e-maili";
+$lang['Unban_email_explain'] = "Ripranimi i nj<6E> ose m<> shum<75> adresave nj<6E>koh<6F>sisht <20>sht<68> i mundur me kombinimin e duhur t<> butonave";
+
+$lang['No_banned_users'] = "Asnj<EFBFBD> an<61>tar i p<>rjashtuar";
+$lang['No_banned_ip'] = "Asnj<EFBFBD> IP e p<>rjashtuar";
+$lang['No_banned_email'] = "Asnj<EFBFBD> adres<65> e-maili e p<>rjashtuar";
+
+$lang['Ban_update_sucessful'] = "Lista e p<>rjashtimeve u refreskua n<> m<>nyr<79> t<> suksesshme";
+$lang['Click_return_banadmin'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek menaxhimi i p<>rjashtimeve";
+
+
+//
+// Configuration
+//
+$lang['General_Config'] = "Konfigurim i p<>rgjithsh<73>m";
+$lang['Config_explain'] = "Formulari i m<>posht<68>m ju jep mund<6E>sine e konfigurimit t<> opsioneve t<> p<>rgjithshme. P<>r administrimin dhe konfigurimin e an<61>tar<61>ve dhe forumeve, p<>rdorni tabelat n<> krahun e majt<6A>.";
+
+$lang['Click_return_config'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek konfigurimi i p<>rgjithsh<73>m";
+
+$lang['General_settings'] = "Vetit<EFBFBD> e p<>rgjithshme t<> forumit(site)";
+$lang['Server_name'] = "Domain Name";
+$lang['Server_name_explain'] = "The domain name this board runs from";
+$lang['Script_path'] = "Script path";
+$lang['Script_path_explain'] = "The path where phpBB2 is located relative to the domain name";
+$lang['Server_port'] = "Server Port";
+$lang['Server_port_explain'] = "The port your server is running on, usually 80, only change if different";
+$lang['Site_name'] = "Emri i websitit";
+$lang['Site_desc'] = "P<EFBFBD>rshkrimi i websitit";
+$lang['Board_disable'] = "Disaktivizoje websitin";
+$lang['Board_disable_explain'] = "KUJDES!!!! Ky veprim do e b<>j<EFBFBD> forumin jofunksional. Nqs b<>ni logout pas disaktivizimit,nuk do keni mund<6E>si q<> t<> b<>ni login!";
+$lang['Acct_activation'] = "Mund<EFBFBD>so aktivizimin e llogaris<69> nga";
+$lang['Acc_None'] = "Askush"; // K<>to jan<61> 3 llojet e aktivizimit
+$lang['Acc_User'] = "An<EFBFBD>tari";
+$lang['Acc_Admin'] = "Administratori";
+
+$lang['Abilities_settings'] = "Veti Elementare t<> An<41>tar<61>ve dhe Forumeve";
+$lang['Max_poll_options'] = "Nr. maksimal i mund<6E>sive p<>r nj<6E> votim";
+$lang['Flood_Interval'] = "Flood Interval";
+$lang['Flood_Interval_explain'] = "Numri i sekondave q<> nj<6E> an<61>tar duhet t<> pres<65> midis postimeve"; 
+$lang['Board_email_form'] = "P<EFBFBD>rdorimi p<>r e-mail";
+$lang['Board_email_form_explain'] = "An<EFBFBD>tar<EFBFBD>t mund t<> d<>rgojn<6A> e-mail n<>p<EFBFBD>rmjet k<>tij serveri";
+$lang['Topics_per_page'] = "Diskutime p<>r faqe";
+$lang['Posts_per_page'] = "Poste p<>r faqe";
+$lang['Hot_threshold'] = "Posts for Popular Threshold";
+$lang['Default_style'] = "Paraqitja e paracaktuar";
+$lang['Override_style'] = "Z<EFBFBD>vend<EFBFBD>so preferenc<6E>n e p<>rdoruesve?";
+$lang['Override_style_explain'] = "Z<EFBFBD>vend<EFBFBD>son paraqitjen e preferuar t<> p<>rdoruesve me paraqitjen e paracaktuar";
+$lang['Default_language'] = "Gjuha e paracaktuar";
+$lang['Date_format'] = "Formatimi i Dat<61>s";
+$lang['System_timezone'] = "Brezi orar i sistemit";
+$lang['Enable_gzip'] = "Mund<EFBFBD>so kompresimin me GZip";
+$lang['Enable_prune'] = "Mund<EFBFBD>so shkurtimin/shartimin e forumeve";
+$lang['Allow_HTML'] = "Lejo HTML";
+$lang['Allow_BBCode'] = "Lejo BBCode";
+$lang['Allowed_tags'] = "Sh<EFBFBD>njat HTML t<> lejuara";
+$lang['Allowed_tags_explain'] = "Ndaji sh<73>njat me presje";
+$lang['Allow_smilies'] = "Lejo figurinat";
+$lang['Smilies_path'] = "Shtegu i direktoris<69> s<> figurinave";
+$lang['Smilies_path_explain'] = "Path under your phpBB root dir, e.g. images/smilies";
+$lang['Allow_sig'] = "Lejo firmat";
+$lang['Max_sig_length'] = "Madh<EFBFBD>sia maksimale e firmave";
+$lang['Max_sig_length_explain'] = "Nr. maksimal i shkronjave t<> lejuara n<> nj<6E> firm<72>";
+$lang['Allow_name_change'] = "Lejo nd<6E>rrimin e username";
+
+$lang['Avatar_settings'] = "Vetit<EFBFBD> e Ikonave Personale";
+$lang['Allow_local'] = "Mund<EFBFBD>so galerin<69> e ikonave personale";
+$lang['Allow_remote'] = "Mund<EFBFBD>so ikona personale nga servera t<> tjer<65>";
+$lang['Allow_remote_explain'] = "Ikona personale q<> ruhen n<> nj<6E> websit tjet<65>r";
+$lang['Allow_upload'] = "Mund<EFBFBD>so ngarkimin e ikonave personale";
+$lang['Max_filesize'] = "Madh<EFBFBD>sia maksimale e ikon<6F>s personale";
+$lang['Max_filesize_explain'] = "Vet<EFBFBD>m p<>r ikonat e ngarkuara ne k<>t<EFBFBD> server";
+$lang['Max_avatar_size'] = "Dimensionet maksimale t<> ikonave personale";
+$lang['Max_avatar_size_explain'] = "(Gjat<61>si x Gjer<65>si n<> piksel)";
+$lang['Avatar_storage_path'] = "Shtegu i magazinimit t<> ikonave personale";
+$lang['Avatar_storage_path_explain'] = "Path under your phpBB root dir, e.g. images/avatars";
+$lang['Avatar_gallery_path'] = "Shtegu i galeris<69> s<> ikonave personale";
+$lang['Avatar_gallery_path_explain'] = "Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery";
+
+$lang['COPPA_settings'] = "COPPA Settings";
+$lang['COPPA_fax'] = "COPPA Fax Number";
+$lang['COPPA_mail'] = "COPPA Mailing Address";
+$lang['COPPA_mail_explain'] = "This is the mailing address where parents will send COPPA registration forms";
+
+$lang['Email_settings'] = "Vetit<EFBFBD> e E-mail";
+$lang['Admin_email'] = "Adresa e email t<> administratorit";
+$lang['Email_sig'] = "Firma e email-it";
+$lang['Email_sig_explain'] = "Kjo firm<72> do u bashkangjitet n<> fund t<> gjith<74> mesazheve t<> derguara nga ky server";
+$lang['Use_SMTP'] = "P<EFBFBD>rdor server SMTP per d<>rgimin e email-ave";
+$lang['Use_SMTP_explain'] = "P<EFBFBD>rcaktoje k<>t<EFBFBD> veti nqs doni/jeni i detyruar t<> mos p<>rdorni programin mail te serverit";
+$lang['SMTP_server'] = "Adresa e serverit SMTP";
+$lang['SMTP_username'] = "SMTP Username";
+$lang['SMTP_username_explain'] = "Only enter a username if your smtp server requires it";
+$lang['SMTP_password'] = "SMTP Password";
+$lang['SMTP_password_explain'] = "Only enter a password if your smtp server requires it";
+
+$lang['Disable_privmsg'] = "Private Messaging";
+$lang['Inbox_limits'] = "Maksimumi i posteve n<> Inbox";
+$lang['Sentbox_limits'] = "Maksimumi i posteve n<> Sentbox";
+$lang['Savebox_limits'] = "Maksimumi i posteve n<> Savebox";
+
+$lang['Cookie_settings'] = "Vetit<EFBFBD> e Cookie-s "; 
+$lang['Cookie_settings_explain'] = "K<EFBFBD>to t<> dh<64>na kontrollojn<6A> se si cooki i d<>rgohet browser-it. N<> shumic<69>n e rasteve, vlerat e paracaktuara jane t<> mjaftueshme. Nqs keni nevoj<6F> ti ndryshoni, kini kujdes se t<> dh<64>na jokorrekte krijojne probleme me indentifikimin e an<61>tar<61>ve.";
+$lang['Cookie_name'] = "Emri i Cookie";
+$lang['Cookie_domain'] = "Domain i Cookie";
+$lang['Cookie_path'] = "Shtegu i Cookie";
+$lang['Session_length'] = "Zgjatja e sesionit [ n<> sekonda ]";
+$lang['Cookie_secure'] = "Cookie e sigurt<72> [ https ]";
+$lang['Session_length'] = "Session length [ seconds ]";
+
+
+//
+// Forum Management
+//
+$lang['Forum_admin'] = "Administrim Forumi";
+$lang['Forum_admin_explain'] = "Nga ky panel b<>het krijimi, fshirja, modifikimi, ri-renditja, dhe ri-sinkronizimi i kategorive dhe forumeve";
+$lang['Edit_forum'] = "Modifiko forumin";
+$lang['Create_forum'] = "Krijo forum";
+$lang['Create_category'] = "Krijo kategori";
+$lang['Remove'] = "Hiq";
+$lang['Action'] = "Veprimi";
+$lang['Update_order'] = "Rifresko renditjen";
+$lang['Config_updated'] = "Rifreskimi i konfigurimit t<> forumit u b<> n<> m<>nyr<79> t<> suksesshme";
+$lang['Edit'] = "Modifiko";
+$lang['Delete'] = "Fshi";
+$lang['Move_up'] = "L<EFBFBD>vize sip<69>r";
+$lang['Move_down'] = "L<EFBFBD>vize posht<68>";
+$lang['Resync'] = "Ri-sinkronizo";
+$lang['No_mode'] = "No mode was set";
+$lang['Forum_edit_delete_explain'] = "Formulari i m<>posht<68>m ju jep mund<6E>sine e konfigurimit t<> opsioneve t<> p<>rgjithshme. P<>r administrimin dhe konfigurimin e an<61>tar<61>ve dhe forumeve, p<>rdorni tabelat n<> krahun e majt<6A>.";
+
+$lang['Move_contents'] = "Zhvendos gjith<74> p<>rmbajtjen";
+$lang['Forum_delete'] = "Fshije k<>t<EFBFBD> forum";
+$lang['Forum_delete_explain'] = "Formulari i m<>posht<68>m ju jep mund<6E>sine e fshirjes s<> nj<6E> forumi (apo kategorie) dhe ruajtjen e gjith<74> mesazheve (forumeve) q<> p<>rmban.";
+
+$lang['Forum_settings'] = "Vetit<EFBFBD> e p<>rgjithshme t<> forumit";
+$lang['Forum_name'] = "Emri i forumit";
+$lang['Forum_desc'] = "P<EFBFBD>rshkrimi";
+$lang['Forum_status'] = "Statusi i forumit";
+$lang['Forum_pruning'] = "Auto-shkurtim";
+
+$lang['prune_freq'] = 'Kontrollo vjet<65>rsin<69> e diskutimit cdo';
+$lang['prune_days'] = "Hiq diskutimet ku nuk postohet prej";
+$lang['Set_prune_data'] = "Ju zgjodh<64>t auto-shkurtim p<>r k<>t<EFBFBD> forum por nuk specifikuat nj<6E> frekuenc<6E> ose nr. e dit<69>ve p<>r shkurtim. Ju lutem shkoni mbrapsht dhe specifikoni k<>to veti.";
+
+$lang['Move_and_Delete'] = "Zhvendos dhe Fshi";
+
+$lang['Delete_all_posts'] = "Fshi gjith<74> postet";
+$lang['Nowhere_to_move'] = "S'ke ku e con";
+
+$lang['Edit_Category'] = "Modifiko kategorin<69>";
+$lang['Edit_Category_explain'] = "P<EFBFBD>rdor k<>t<EFBFBD> formular p<>r nd<6E>rrimin e emrit t<> kategoris<69>";
+
+$lang['Forums_updated'] = "Informacioni rreth forumit dhe kategoris<69> u freskua n<> menyr<79> t<> suksesshme";
+
+$lang['Must_delete_forums'] = "Fshi gjith<74> forumet n<> k<>t<EFBFBD> kategori para se t<> fshish kategorin<69> vet<65>";
+
+$lang['Click_return_forumadmin'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek administrimi i forumeve";
+
+
+//
+// Smiley Management
+//
+$lang['smiley_title'] = "Veg<EFBFBD>l p<>r menaxhimin e figurinave";
+$lang['smile_desc'] = "Nga ky panel ju mund t<> shtoni, hiqni dhe editoni figurinat q<> mund t<> p<>rdoren nga p<>rdoruesit.";
+
+$lang['smiley_config'] = "Konfigurimi i figurinave";
+$lang['smiley_code'] = "Kodi i figurinave";
+$lang['smiley_url'] = "Adresa e figurin<69>s";
+$lang['smiley_emot'] = "Emocioni i figurin<69>s";
+$lang['smile_add'] = "Shto nj<6E> figurin<69>";
+$lang['Smile'] = "Figurina";
+$lang['Emotion'] = "Emocioni";
+
+$lang['Select_pak'] = "Zgjidh skedarin paket<65> (.pak)";
+$lang['replace_existing'] = "Z<EFBFBD>vend<EFBFBD>so figurin<69>n egzistuese";
+$lang['keep_existing'] = "Mbaje figurin<69>n egzistuese";
+$lang['smiley_import_inst'] = "You duhet t<> dekompresoni skedarin me figurina dhe vendosni figurinat n<> direktorin<69> e duhur. Pastaj zgjidhni informacionin e duhur n<> k<>t<EFBFBD> formular q<> t<> importoni skedarin e figurinave (Smiley Pack)";
+$lang['smiley_import'] = "Importo skedarin e figurinave (Smiley Pack)";
+$lang['choose_smile_pak'] = "Zgjidh nj<6E> nga skedar<61>t e figurinave ( .pak)";
+$lang['import'] = "Importo figurina";
+$lang['smile_conflicts'] = "Cfar<EFBFBD> duhet b<>r<EFBFBD> n<> rast konflikti";
+$lang['del_existing_smileys'] = "Fshi figurinat ekzistuese p<>rpara se t<> importosh";
+$lang['import_smile_pack'] = "Importo skedarin e figurinave";
+$lang['export_smile_pack'] = "Krijo nj<6E> skedar figurinash";
+$lang['export_smiles'] = "P<EFBFBD>r t<> krijuar nj<6E> skedar figurinash prej figurinave ekzistuese, kliko %sk<73>tu%s p<>r t<> shkarkuar skedarin smiles.pak Ndryshojini emrin skedarin nqs doni, po mos i ndryshoni -file extension-. Pastaj krijoni nj<6E> skedar .zip q<> p<>rmban t<> gjitha imazhet e figurinave plus skedarin .pak.";
+
+$lang['smiley_add_success'] = "Figurina u shtua n<> m<>nyr<79> t<> suksesshme.";
+$lang['smiley_edit_success'] = "Figurina u ri-freskua n<> m<>nyr<79> t<> suksesshme.";
+$lang['smiley_import_success'] = "Skedari i figurinave (Smiley Pack) u importua n<> m<>nyr<79> t<> suksesshme.";
+$lang['smiley_del_success'] = "Figurina u hoq n<> m<>nyr<79> t<> suksesshme.";
+$lang['Click_return_smileadmin'] = "Kliko %sk<73>tu%s p<>r ty kthyer tek Administrimi i Figurinave";
+
+
+//
+// User Management
+//
+$lang['User_admin'] = "Administrimi i An<41>tar<61>ve";
+$lang['User_admin_explain'] = "K<EFBFBD>tu mund t<> ndryshoni informacionin mbi an<61>tar<61>t dhe disa opcione specifike. B<>ni modifikimin e autorizimeve me an<61> t<> panelit t<> p<>rshtatsh<73>m n<> krahun e majt<6A> t<> panelit.";
+
+$lang['Look_up_user'] = "Analizo an<61>tarin";
+
+$lang['Admin_user_fail'] = "Nuk u arrit t<> ri-freskohej profili i an<61>tarit.";
+$lang['Admin_user_updated'] = "Profili i k<>tij an<61>tari u ri-freskua n<> m<>nyr<79> t<> suksesshme.";
+$lang['Click_return_useradmin'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek Administrimi i An<41>tar<61>ve";
+
+$lang['User_delete'] = "Fshije k<>t<EFBFBD> p<>rdorues";
+$lang['User_delete_explain'] = "Kliko k<>tu p<>r ta fshir<69> k<>t<EFBFBD> an<61>tar, ky veprim <20>sht<68> i pakthyesh<73>m.";
+$lang['User_deleted'] = "An<EFBFBD>tari u fshi n<> m<>nyr<79> t<> suksesshme.";
+
+$lang['User_status'] = "An<EFBFBD>tari <20>sht<68> aktiv";
+$lang['User_allowpm'] = "Mund t<> d<>rgoj<6F> Mesazhe Private";
+$lang['User_allowavatar'] = "Mund t<> shfaq<61> ikon<6F>n personale";
+
+$lang['Admin_avatar_explain'] = "K<EFBFBD>tu mund t<> shikoni dhe fshini ikon<6F>n aktuale personale t<> an<61>tarit.";
+
+$lang['User_special'] = "Fusha speciale vet<65>m p<>r administrator<6F>t.";
+$lang['User_special_explain'] = "K<EFBFBD>to fusha nuk mund t<> modifikohen nga an<61>tar<61>t. Ju mund t<> vendosni statusin dhe veti t<> tjera q<> nuk i jepen an<61>tar<61>ve.";
+
+
+//
+// Group Management
+//
+$lang['Group_administration'] = "Administrim i Grupeve";
+$lang['Group_admin_explain'] = "Tek ky panel ju mund t<> administroni t<> gjith<74> grupet e p<>rdoruesve. Fshi, krijo dhe modifiko grupet ekzistuese. Zgjidh moderator<6F>t, hap/mbyll dhe vendos emrin dhe p<>rshkrimin e grupit.";
+$lang['Error_updating_groups'] = "Pati nj<6E> problem gjat<61> ri-freskimit t<> grupeve";
+$lang['Updated_group'] = "Grupi u ri-freskua me sukses";
+$lang['Added_new_group'] = "Grupi u krijua me sukses";
+$lang['Deleted_group'] = "Grupi u fshi me sukses";
+$lang['New_group'] = "Krijo grup t<> ri";
+$lang['Edit_group'] = "Modifiko grupin";
+$lang['group_name'] = "Emri i grupit";
+$lang['group_description'] = "P<EFBFBD>rshkrimi i grupit";
+$lang['group_moderator'] = "Moderatori i grupit";
+$lang['group_status'] = "Statusi i grupit";
+$lang['group_open'] = "Grup i hapur";
+$lang['group_closed'] = "Grup i mbyllur";
+$lang['group_hidden'] = "Grup i fshehte";
+$lang['group_delete'] = "Fshi grupin";
+$lang['group_delete_check'] = "Fshi k<>t<EFBFBD> grup";
+$lang['submit_group_changes'] = "Paraqit ndryshimet";
+$lang['reset_group_changes'] = "Pastro ndryshimet";
+$lang['No_group_name'] = "Specifiko emrin e k<>tij grupi";
+$lang['No_group_moderator'] = "Specifiko moderatorin e k<>tij grupi";
+$lang['No_group_mode'] = "Specifiko nj<6E> m<>nyr<79> p<>r k<>t<EFBFBD> grup, hapur ose mbyllur";
+$lang['delete_group_moderator'] = "Fshi moderatorin e vjet<65>r t<> grupit?";
+$lang['delete_moderator_explain'] = "Nqs jeni duke ndryshuar moderatorin e grupit, v<>r nj<6E> kryq tek kjo kuti p<>r t<> hequr moderatorin e vjet<65>r nga grupi. Ndryshe, l<>re bosh dhe moderatori i vjet<65>r do b<>het nj<6E> an<61>tar i thjesht<68> i grupit.";
+$lang['Click_return_groupsadmin'] = "Kliko %sk<73>tu%s p<>r ty kthyer tek Administrimi i Grupeve";
+$lang['Select_group'] = "Zgjidh nj<6E> grup";
+$lang['Look_up_group'] = "Analizo nj<6E> grup";
+
+
+//
+// Prune Administration
+//
+$lang['Forum_Prune'] = "Shkurto forumin";
+$lang['Forum_Prune_explain'] = "Ky veprim do fshij<69> cdo tem<65> ku nuk <20>sht<68> postuar br<62>nda afatit q<> ju keni p<>rcaktuar. Nqs nuk p<>rcaktoni nj<6E> num<75>r, at<61>her<65> gjith<74> temat do fshihen. Megjithat<61>, temat ku ka votime t<> hapura dhe lajm<6A>rimet duhen fshir<69> mekanikisht.";
+$lang['Do_Prune'] = "B<EFBFBD>je shkurtimin";
+$lang['All_Forums'] = "Gjith<EFBFBD> forumet";
+$lang['Prune_topics_not_posted'] = "Shkurto temat pa pergjigje br<62>nda";
+$lang['Topics_pruned'] = "Temat e shkurtuara";
+$lang['Posts_pruned'] = "Mesazhet e shkurtuara";
+$lang['Prune_success'] = "Shkurtimi i forumeve u b<> me sukses";
+
+
+//
+// Word censor
+//
+$lang['Words_title'] = "Censurimi i fjal<61>ve";
+$lang['Words_explain'] = "Nga ky panel ju mund t<> shtoni, modifikoni, dhe hiqni fjal<61> q<> do censurohen automatikisht. Gjithashtu, emrat e an<61>tar<61>ve nuk do mund t<> p<>rmbajn<6A> fjal<61> t<> tilla. Wildcards (*) are accepted in the word field, eg. *test* will match detestable, test* would match testing, *test would match detest.";
+$lang['Word'] = "Fjal<EFBFBD>";
+$lang['Edit_word_censor'] = "Modifiko censur<75>n";
+$lang['Replacement'] = "Z<EFBFBD>vend<EFBFBD>simi";
+$lang['Add_new_word'] = "Shto nj<6E> fjal<61>";
+$lang['Update_word'] = "Ri-fresko censur<75>n";
+
+$lang['Must_enter_word'] = "You duhet t<> specifikoni nj<6E> fjal<61> dhe z<>vend<6E>simin e saj";
+$lang['No_word_selected'] = "Asnj<EFBFBD> fjal<61> nuk <20>sht<68> zgjedhur p<>r modifikim";
+
+$lang['Word_updated'] = "Censura e zgjedhur u ri-freskua me sukses";
+$lang['Word_added'] = "Censura u shtua me sukses";
+$lang['Word_removed'] = "Censura e zgjedhur u hoq me sukses";
+
+$lang['Click_return_wordadmin'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek Administrimi i Censur<75>s";
+
+
+//
+// Mass Email
+//
+$lang['Mass_email_explain'] = "Nga ky panel ju mund t<> d<>rgoni nj<6E> e-mail tek t<> gjith<74> an<61>tar<61>t e forumit, ose nje grupi specifik. P<>r t<> kryer k<>t<EFBFBD>, nj<6E> e-mail do i d<>rgohet adres<65>s administrative t<> specifikuar, dhe nj<6E> kopje karboni do u d<>rgohet gjith<74> marr<72>sve. Kini parasysh se nqs i d<>rgoni e-mail nje grupi t<> madh personash, ky proces do koh<6F>, k<>shtu q<> prisni deri sa t<> njoftoheni se procesi mbaroi.";
+$lang['Compose'] = "Harto"; 
+
+$lang['Recipients'] = "Marr<EFBFBD>sit"; 
+$lang['All_users'] = "T<EFBFBD> gjith<74> an<61>tar<61>t";
+
+$lang['Email_successfull'] = "Mesazhi u d<>rgua";
+$lang['Click_return_massemail'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek paneli i E-mail n<> Mas<61>";
+
+
+//
+// Ranks admin
+//
+$lang['Ranks_title'] = "Administrimi i Gradave";
+$lang['Ranks_explain'] = "Ky formular mund<6E>son shtimin, modifikimin dhe fshirjen e gradave. Gjithashtu, ju mund t<> krijoni grada t<> personalizuara t<> cilat i aplikohen p<>rdoruesve n<>p<EFBFBD>rmjet panelit t<> administrimit t<> p<>rdoruesve.";
+
+$lang['Add_new_rank'] = "Shto nj<6E> grad<61>";
+
+$lang['Rank_title'] = "Titulli i grad<61>s";
+$lang['Rank_special'] = "Cakto si grad<61> speciale";
+$lang['Rank_minimum'] = "Minimumi i mesazheve";
+$lang['Rank_maximum'] = "Maksimumi i mesazheve";
+$lang['Rank_image'] = "Ikona e grad<61>s";
+$lang['Rank_image_explain'] = "P<EFBFBD>rdore k<>t<EFBFBD> p<>r t<> specifikuar ikon<6F>n q<> shoq<6F>ron grad<61>n";
+
+$lang['Must_select_rank'] = "Zgjidh nj<6E> grad<61>";
+$lang['No_assigned_rank'] = "Nuk <20>sht<68> dh<64>n<EFBFBD> ndonj<6E> grad<61> speciale";
+
+$lang['Rank_updated'] = "Grada u ri-freskua me sukses";
+$lang['Rank_added'] = "Grada u shtua me sukses";
+$lang['Rank_removed'] = "Grada u fshi me sukses";
+$lang['No_update_ranks'] = "The rank was successfully deleted, however, user accounts using this rank were not updated.  You will need to manually reset the rank on these accounts";
+
+$lang['Click_return_rankadmin'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek Administrimi i Gradave";
+
+
+//
+// Disallow Username Admin
+//
+$lang['Disallow_control'] = "Kontrolli i emrave t<> ndaluar";
+$lang['Disallow_explain'] = "K<EFBFBD>tu mund t<> specifikoni emrat q<> nuk mund t<> p<>rdoren. Disallowed usernames are allowed to contain a wildcard character of *. Kini parasysh se nuk mund t<> specifikoni nj<6E> em<65>r q<> <20>sht<68> regjistruar tashm<68>. Fshini at<61> an<61>tar dhe pastaj ndalojeni at<61> fjal<61>.";
+
+$lang['Delete_disallow'] = "Fshi";
+$lang['Delete_disallow_title'] = "Hiq nj<6E> nga emrat e ndaluar";
+$lang['Delete_disallow_explain'] = "Heqja e nj<6E> emri nga lista e ndaluar b<>het duke e zgjedhur at<61> tek kjo list<73> dhe klikuar paraqit.";
+
+$lang['Add_disallow'] = "Shto";
+$lang['Add_disallow_title'] = "Shto nj<6E> em<65>r t<> ndaluar";
+$lang['Add_disallow_explain'] = "Ju mund t<> ndaloni nj<6E> em<65>r duke p<>rdorur * n<> vend t<> cdo karakteri n<> at<61> pozicion.";
+
+$lang['No_disallowed'] = "Asnj<EFBFBD> em<65>r i ndaluar";
+
+$lang['Disallowed_deleted'] = "Emri i ndaluar u fshi me sukses";
+$lang['Disallow_successful'] = "Emri i ndaluar u shtua me sukses";
+$lang['Disallowed_already'] = "Emri q<> shtuat nuk mund t<> ndalohet. Ky em<65>r ose ekziston n<> list<73>n e emrave t<> ndaluar, ose ekziston n<> list<73>n e censur<75>s ose <20>sht<68> n<> p<>rdorim nga nj<6E> an<61>tar.";
+
+$lang['Click_return_disallowadmin'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek Administrimi i emrave t<> ndaluar";
+
+
+//
+// Styles Admin
+//
+$lang['Styles_admin'] = "Administrimi i stileve";
+$lang['Styles_explain'] = "Me an<61> t<> k<>tij paneli mund t<> shtoni, hiqni dhe menaxhoni (shabllonet dhe motivet) n<> dispozicion t<> an<61>tar<61>ve.";
+$lang['Styles_addnew_explain'] = "Lista e m<>poshtme p<>rmban t<> gjith<74> motivet q<> jan<61> t<> mundsh<73>m p<>r shabllonet q<> keni. Artikujt n<> k<>t<EFBFBD> list<73> nuk jan<61> instaluar akoma n<> regjistrin e phpBB. Kliko butonin instalo p<>r t<> instaluar nj<6E> nga k<>to artikuj n<> databaz<61>.";
+
+$lang['Select_template'] = "Zgjidh nj<6E> shabllon";
+
+$lang['Style'] = "Stili";
+$lang['Template'] = "Shabllon";
+$lang['Install'] = "Instalo";
+$lang['Download'] = "Shkarko";
+
+$lang['Edit_theme'] = "Modifiko motivin";
+$lang['Edit_theme_explain'] = "N<EFBFBD> formularin m<> posht<68> modifiko vetit<69> e motivit q<> keni zgjedhur.";
+
+$lang['Create_theme'] = "Krijo motiv";
+$lang['Create_theme_explain'] = "P<EFBFBD>rdor formularin e m<>posht<68>m p<>r t<> krijuar nj<6E> motiv p<>r shabllonin e zgjedhur. Kur zgjidhni ngjyrat (p<>r t<> cilat duhen p<>rdorur numrat me baz<61> 16 --hexadecimal--) mos vendosni shenj<6E>n #. psh. #CC00BB <20>sht<68> gabim.";
+
+$lang['Export_themes'] = "Eksporto motivet";
+$lang['Export_explain'] = "Ky panel mund<6E>son eksportimin e t<> dh<64>nave t<> motivit p<>r shabllonin e zgjedhur. Zgjidh shabllonin nga lista e m<>poshtme dhe phpBB do krijoj<6F> automatikisht skedarin p<>r konfigurimin e motivit dhe do provoj<6F> ta ruaj<61> n<> direktorin<69> ku shablloni i zgjedhur rri. Nqs nuk mund ta ruani skedarin atje, do keni mund<6E>sin<69> p<>r ta shkarkuar n<> kompjuterin tuaj. N<> m<>nyr<79> q<> skedari t<> vendoset n<> direktorin<69> e shabllonit, webserveri duhet t<> ket<65> autorizim p<>r t<> shkruar n<> at<61> direktori. P<>r m<> shum<75> info, shiko manualin e p<>rdorimit.";
+
+$lang['Theme_installed'] = "Motivi i zgjedhur u instalua me sukses";
+$lang['Style_removed'] = "Stili i zgjedhur u hoq nga regjistri. P<>r ta hequr k<>t<EFBFBD> stil p<>rfundimisht nga sistemi juaj, fshijeni k<>t<EFBFBD> stil nga direktoria e shablloneve.";
+$lang['Theme_info_saved'] = "Informacioni i motivit p<>r shabllonin e zgjedhur u ruajt. Rivendosni autorizimet n<> nivelin lexim-vet<65>m (read-only) p<>r theme_info.cfg ";
+$lang['Theme_updated'] = "Motivi i zgjedhur u ri-freskua. Tashti duhet t<> eksportoni vetit<69> e reja t<> motivit";
+$lang['Theme_created'] = "Motivi u krijua. Tashti duhet t<> eskportoni motivin e ri tek skedari i konfigurimit p<>r ruajtje.";
+
+$lang['Confirm_delete_style'] = "Jeni i sigurt<72> p<>r fshirjen e k<>tij stili";
+
+$lang['Download_theme_cfg'] = "Eksportuesi nuk mundi t<> shkruaj<61> skedarin e informacionit t<> motivit. Kliko butonin e meposht<68>m p<>r ta shkarkuar k<>t<EFBFBD> skedar. Pasi ta keni shkarkuar, transferojeni tek direktoria q<> p<>rmban skedar<61>t e shablloneve. You mund ti arkivoni skedar<61>t dhe ti shp<68>rndani p<>r p<>rdorim diku tjet<65>r.";
+$lang['No_themes'] = "Shablloni q<> zgjodh<64>t nuk ka asnj<6E> motiv t<> bashkangjitur. P<>r t<> krijuar nj<6E> motiv t<> ri kliko butonin Krijo n<> an<61>n e majt<6A>.";
+$lang['No_template_dir'] = "Direktoria e shablloneve nuk hapet. Webserveri nuk mund ta lexoj<6F> ose direktoria nuk ekziston.";
+$lang['Cannot_remove_style'] = "Stili i zgjdhur nuk mund t<> fshihet sepse <20>sht<68> stili i paracaktuar i forumi. Ndryshoni stilin e paracaktuar dh pastaj provoni nga e para";
+$lang['Style_exists'] = "Emri i zgjedhur p<>r k<>t<EFBFBD> stil ekziston. Zgjidhni nj<6E> em<65>r tjet<65>r";
+
+$lang['Click_return_styleadmin'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek Administratori i Stileve";
+
+$lang['Theme_settings'] = "Vetit<EFBFBD> e motivit";
+$lang['Theme_element'] = "Elementi i motivit";
+$lang['Simple_name'] = "Em<EFBFBD>r i thjesht<68>";
+$lang['Value'] = "Vlera";
+$lang['Save_Settings'] = "Regjistro vetit<69>";
+
+$lang['Stylesheet'] = "CSS Stylesheet";
+$lang['Background_image'] = "Background Image";
+$lang['Background_color'] = "Background Colour";
+$lang['Theme_name'] = "Emri i Motivit";
+$lang['Link_color'] = "Link Colour";
+$lang['Text_color'] = "Ngjyra e tekstit";
+$lang['VLink_color'] = "Visited Link Colour";
+$lang['ALink_color'] = "Active Link Colour";
+$lang['HLink_color'] = "Hover Link Colour";
+$lang['Tr_color1'] = "Table Row Colour 1";
+$lang['Tr_color2'] = "Table Row Colour 2";
+$lang['Tr_color3'] = "Table Row Colour 3";
+$lang['Tr_class1'] = "Table Row Class 1";
+$lang['Tr_class2'] = "Table Row Class 2";
+$lang['Tr_class3'] = "Table Row Class 3";
+$lang['Th_color1'] = "Table Header Colour 1";
+$lang['Th_color2'] = "Table Header Colour 2";
+$lang['Th_color3'] = "Table Header Colour 3";
+$lang['Th_class1'] = "Table Header Class 1";
+$lang['Th_class2'] = "Table Header Class 2";
+$lang['Th_class3'] = "Table Header Class 3";
+$lang['Td_color1'] = "Table Cell Colour 1";
+$lang['Td_color2'] = "Table Cell Colour 2";
+$lang['Td_color3'] = "Table Cell Colour 3";
+$lang['Td_class1'] = "Table Cell Class 1";
+$lang['Td_class2'] = "Table Cell Class 2";
+$lang['Td_class3'] = "Table Cell Class 3";
+$lang['fontface1'] = "Font Face 1";
+$lang['fontface2'] = "Font Face 2";
+$lang['fontface3'] = "Font Face 3";
+$lang['fontsize1'] = "Font Size 1";
+$lang['fontsize2'] = "Font Size 2";
+$lang['fontsize3'] = "Font Size 3";
+$lang['fontcolor1'] = "Font Colour 1";
+$lang['fontcolor2'] = "Font Colour 2";
+$lang['fontcolor3'] = "Font Colour 3";
+$lang['span_class1'] = "Span Class 1";
+$lang['span_class2'] = "Span Class 2";
+$lang['span_class3'] = "Span Class 3";
+$lang['img_poll_size'] = "Polling Image Size [px]";
+$lang['img_pm_size'] = "Private Message Status size [px]";
+
+
+//
+// Install Process
+//
+$lang['Welcome_install'] = "Mir<EFBFBD>sevini tek instaluesi i phpBB v.2";
+$lang['Initial_config'] = "Konfigurimi elementar";
+$lang['DB_config'] = "Konfigurimi i regjistrit";
+$lang['Admin_config'] = "Konfigurimi i administratorit";
+$lang['continue_upgrade'] = "Once you have downloaded your config file to your local machine you may\"Continue Upgrade\" button below to move forward with the upgrade process. Please wait to upload the config file until the upgrade process is complete.";
+$lang['upgrade_submit'] = "Continue Upgrade";
+
+$lang['Installer_Error'] = "An error has occurred during installation";
+$lang['Previous_Install'] = "A previous installation has been detected";
+$lang['Install_db_error'] = "An error occurred trying to update the database";
+
+$lang['Re_install'] = "Your previous installation is still active. <br /><br />If you would like to re-install phpBB 2 you should click the Yes button below. Please be aware that doing so will destroy all existing data, no backups will be made! The administrator username and password you have used to login in to the board will be re-created after the re-installation, no other settings will be retained. <br /><br />Think carefully before pressing Yes!";
+
+$lang['Inst_Step_0'] = "Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist. If you are installing to a database that uses ODBC, e.g. MS Access you should first create a DSN for it before proceeding.";
+
+$lang['Start_Install'] = "Start Install";
+$lang['Finish_Install'] = "Finish Installation";
+
+$lang['Default_lang'] = "Default board language";
+$lang['DB_Host'] = "Database Server Hostname / DSN";
+$lang['DB_Name'] = "Your Database Name";
+$lang['DB_Username'] = "Database Username";
+$lang['DB_Password'] = "Database Password";
+$lang['Database'] = "Your Database";
+$lang['Install_lang'] = "Choose Language for Installation";
+$lang['dbms'] = "Database Type";
+$lang['Table_Prefix'] = "Prefix for tables in database";
+$lang['Admin_Username'] = "Administrator Username";
+$lang['Admin_Password'] = "Administrator Password";
+$lang['Admin_Password_confirm'] = "Administrator Password [ Confirm ]";
+
+$lang['Inst_Step_2'] = "Your admin username has been created. At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2.";
+
+$lang['Unwriteable_config'] = "Your config file is un-writeable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
+$lang['Download_config'] = "Download Config";
+
+$lang['ftp_choose'] = "Choose Download Method";
+$lang['ftp_option'] = "<br />Since FTP extensions are enabled in this version of PHP you may also be given the option of first trying to automatically ftp the config file into place.";
+$lang['ftp_instructs'] = "You have chosen to ftp the file to the account containing phpBB 2 automatically. Please enter the information below to facilitate this process. Note that the FTP path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it using any normal client.";
+$lang['ftp_info'] = "Enter Your FTP Information";
+$lang['Attempt_ftp'] = "Attempt to ftp config file into place";
+$lang['Send_file'] = "Just send the file to me and I'll ftp it manually";
+$lang['ftp_path'] = "FTP path to phpBB 2";
+$lang['ftp_username'] = "Your FTP Username";
+$lang['ftp_password'] = "Your FTP Password";
+$lang['Transfer_config'] = "Start Transfer";
+$lang['NoFTP_config'] = "The attempt to ftp the config file into place failed. Please download the config file and ftp it into place manually.";
+
+$lang['Install'] = "Install";
+$lang['Upgrade'] = "Upgrade";
+
+
+$lang['Install_Method'] = "Choose your installation method";
+
+$lang['Install_No_Ext'] = "The php configuration on your server doesn't support the database type that you choose";
+
+$lang['Install_No_PCRE'] = "phpBB2 Requires the Perl-Compatible Regular Expressions Module for php which your php configuration doesn't appear to support!";
+
+//
+// That's all Folks!
+// -------------------------------------------------
+
+?>

phpBB/language/lang_albanian/lang_bbcode.php

@@ -0,0 +1,76 @@
+<?php
+/***************************************************************************
+ *                         lang_bbcode.php [english]
+ *                            -------------------
+ *   begin                : Wednesday Oct 3, 2001
+ *   copyright            : (C) 2001 The phpBB Group
+ *   email                : support@phpbb.com
+ *
+ *   $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.
+ *
+ ***************************************************************************/
+/***************************************************************************/
+ *
+ *  Translation to Albanian done by alket ---> alkettttt@yahoo.com
+ * http://www26.brinkster.com/alketttt/
+ *
+ ***************************************************************************/
+ 
+// 
+// To add an entry to your BBCode guide simply add a line to this file in this format:
+// $faq[] = array("question", "answer");
+// If you want to separate a section enter $faq[] = array("--","Block heading goes here if wanted");
+// Links will be created automatically
+//
+// DO NOT forget the ; at the end of the line.
+// Do NOT put double quotes (") in your BBCode guide entries, if you absolutely must then escape them ie. \"something\"
+//
+// The BBCode guide items will appear on the BBCode guide page in the same order they are listed in this file
+//
+// If just translating this file please do not alter the actual HTML unless absolutely necessary, thanks :)
+//
+// In addition please do not translate the colours referenced in relation to BBCode any section, if you do
+// users browsing in your language may be confused to find they're BBCode doesn't work :D You can change
+// references which are 'in-line' within the text though.
+//
+  
+$faq[] = array("--","Hyrje");
+$faq[] = array("C'<27>sht<68> BBCode?", "BBCode <20>sht<68> nj<6E> implementim special i HTML. P<>rdorimi i BBCode tek forumi juaj varet nga konfigurimi q<> ka b<>r<EFBFBD> administratori. P<>r m<> tep<65>r BBCode mund t<> aktivizohet ose c'aktivizohet n<> mesazhet individuale. BBCode <20>sht<68> shum<75> i ngjash<73>m me HTML, tags jan<61> mbyllur brenda kllapave katrore [ and ] n<> vend t<> &lt; and &gt; dhe ofron kontroll m<> t<> madh n<> formatimin e teksteve. N<> var<61>si t<> shabllonit n<> p<>rdorim, shtimi i BBCode n<> mesazhet tuaja <20>sht<68> shum<75> i leht<68> n<>p<EFBFBD>rmjet kodeve t<> klikueshme mbi p<>rmbajtjen e mesazhit n<> formularin e postimit. Megjithat<61> guida e m<>poshtme mund t'ju hyj<79> n<> pun<75>.");
+
+$faq[] = array("--","Formatimi i tekstit");
+$faq[] = array("Si t<> krijoni tekst bold, underlined dhe italic.", "BBCode ju lejon ta ndryshoni stilin e tekstit shum<75> thjesht<68>. Psh: <ul><li>P<>r ta b<>r<EFBFBD> nj<6E> tekst bold futeni midis <b>[b][/b]</b>, psh. <br /><br /><b>[b]</b>P<>rsh<73>ndetje<b>[/b]</b><br /><br />b<>het <b>P<>rsh<73>ndetje</b></li><li>P<>r n<>nvizim p<>rdor <b>[u][/u]</b>, psh:<br /><br /><b>[u]</b>Mir<69>m<EFBFBD>ngjes<b>[/u]</b><br /><br />b<>het <u>Mir<69>m<EFBFBD>ngjes</u></li><li>P<>r t<> b<>r<EFBFBD> tekstin me italics p<>rdor <b>[i][/i]</b>, psh.<br /><br />Si jeni <b>[i]</b>Sonte?<b>[/i]</b><br /><br />del:  Si jeni <i>Sonte?</i></li></ul>");
+$faq[] = array("Si t<> ndryshohet ngjyra ose madh<64>sia e tekstit.", "P<EFBFBD>rdorni kodet e m<>poshtme p<>r k<>t<EFBFBD>, megjithat<61> kini parasysh q<> paraqitja n<> ekran varet nga sistemi dhe browser-i q<> p<>rdoret: <ul><li>Ndryshimi i ngjyr<79>s b<>het duke e futur tekstin midis <b>[color=][/color]</b>. Ju mund t<> specifikoni emrin e ngjyr<79>s (psh. red - kuq, blue - blu, yellow - verdh<64>, etj.) ose kodin hegzadeksimal, psh. #FFFFFF, #000000. Psh, p<>r t<> shkruar me t<> kuqe p<>rdorni:<br /><br  ><b>[color=red]</b>Hello!<b>[/color]</b><br /><br />ose<br /><br /><b>[color=#FF0000]</b>Hello!<b>[/color]</b><br /><br />dhe t<> dyja kodet do nxjerrin <span style=\"color:red\">Hello!</span></li><li>Ndryshimi i madh<64>sis<69> s<> tekstit b<>het n<> m<>nyr<79> t<> ngjashme duke p<>rdorur<b>[size=][/size]</b>. Ky kod varet nga shablloni n<> p<>rdorim megjithat<61> formati i rekomanduar <20>sht<68> nj<6E> vler<65> numerike q<> prezanton madh<64>sin<69> e tekstit n<> piksel, duke filluar nga 1 (aq i vog<6F>l sa nuk e sheh dot) deri tek 29-ta (shum<75> i madh). Psh:<br /><br /><b>[size=9]</b>I vog<6F>l<b>[/size]</b><br /><br />do jet<65> zakonisht <span style=\"font-size:9px\">I vog<6F>l</span><br /><br />kurse:<br /><br /><b>[size=24]</b>I st<73>rmadh!<b>[/size]</b><br /><br />do jet<65> <span style=\"font-size:24px\">I st<73>rmadh!</span></li></ul>");
+$faq[] = array("A mund ti kombinoj kodet e formatimit?", "Po, patjet<65>r, psh. nqs doni t<> t<>rhiqni v<>mendjen mund t<> shkruani:<br /><br /><b>[size=18][color=red][b]</b>Kujdes!<b>[/b][/color][/size]</b><br /><br />dhe kjo do nxjerr<72> <span style=\"color:red;font-size:18px\"><b>Kujdes!</b></span><br /><br />Kini parasysh q<> <20>sht<68> p<>rgjegj<67>sia juaj ti mbyllni kodet e formatimit n<> m<>nyr<79> korrekte. Shembulli i m<>posht<68>m tregon nj<6E> rast kur kodet nuk jan<61> mbyllur n<> m<>nyr<79> korrekte:<br /><br /><b>[b][u]</b>Kjo <20>sht<68> gabim<b>[/b][/u]</b>");
+
+$faq[] = array("--","Si t<> citoni dhe tekstet me gjer<65>si fikse");
+$faq[] = array("Si t<> citoni n<> p<>rgjigjet tuaja", "Ka dy m<>nyra p<>r t<> cituar, me ose pa referenc<6E>.<ul><li>Kur p<>rdorni funksionin Cito n<> p<>rgjigjet tuaja do shikoni q<> teksti i mesazhit shtohet n<> dritaren ku do shkruani i p<>rfshir<69> n<> nj<6E> bllok <b>[quote=\"\"][/quote]</b>. Kjo metod<6F> ju lejon t<> citoni duke iu refereruar nj<6E> personi. Psh. p<>r t<> cituar dicka nga z.Arjan shkruani:<br /><br /><b>[quote=\"z.Arjan\"]</b>teksti q<> po citoni shkon k<>tu<b>[/quote]</b><br /><br />Kjo do rezultoj<6F> n<> shtimin e  z.Arjan shkroi: p<>rpara tekstit q<> po citoni. Ju <b>duhet</b> t<> vini  \"\" rreth emrit; jan<61> t<> domosdoshme.</li><li>Metoda e dyt<79> ju lejon t<> citoni dicka pa specifikuar autorin. P<>r t<> b<>r<EFBFBD> k<>t<EFBFBD> rrethojeni tekstin mekodet <b>[quote][/quote]</b>. Kur t<> shikoni mesazhin do v<>reni q<> do tregoj<6F> vet<65>m Kuot<6F>: p<>rpara tekstit. </li></ul>");
+$faq[] = array("Shkruarja e kodeve kompjuterike dhe teksteve me gjer<65>si fikse", "Nqs doni t<> shkruani nj<6E> pjes<65> me kod kompjuteri ose cdo lloj teksti q<> k<>rkon gjer<65>si fikse at<61>her<65> duhet ta rrethoni me kodet <b>[code][/code]</b>, psh.<br /><br /><b>[code]</b>echo \"Ky <20>sht<68> kod komputeri\";<b>[/code]</b><br /><br />Formatimi i p<>rdorur br<62>nda kodeve <b>[code][/code]</b> ruhet kur p<>rpunohet nga kompjuteri.");
+
+$faq[] = array("--","Prodhimi i listave");
+$faq[] = array("Krijimi i nj<6E> liste t<> pa-renditur", "BBCode lejon dy lloj listash, t<> renditura dhe t<> parenditura. N<> thelb ato jan<61> t<> nj<6E>jta me ekuivalentet n<> HTML. Nj<4E> list<73> e parenditur tregon cdo send n<> list<73>n tuaj n<> m<>nyr<79> t<> nj<6E>pasnj<6E>shme t<> paraprira nga nj<6E> karakter pike. P<>r t<> krijuar nj<6E> list<73> t<> parenditur p<>rdoret <b>[list][/list]</b> dhe p<>rcakto cdo send t<> list<73>s duke p<>rdorur <b>[*]</b>. Psh. p<>r t<> renditur ngjyrat tuaja t<> preferuara ju mund t<> p<>rdorni:<br /><br /><b>[list]</b><br /><b>[*]</b>E kuqe<br /><b>[*]</b>Blu<br /><b>[*]</b>E verdh<64><br /><b>[/list]</b><br /><br />Kjo do prodhonte list<73>n<ul><li>E kuqe</li><li>Blu</li><li>E verdh<64></li></ul>");
+$faq[] = array("Krijimi i nj<6E> liste t<> renditur", "Lloji i dyt<79> i list<73>s, lista e renditur, ju mund<6E>son t<> kontrolloni se c'shkruhet para cdo sendi t<> list<73>s. P<>r t<> krijuar nj<6E> list<73> t<> renditur p<>rdoret <b>[list=1][/list]</b> p<>r t<> krijuar nj<6E> list<73> me renditje numerike ose <b>[list=a][/list]</b> p<>r nj<6E> list<73> me renditje alfabetike. Nj<4E>lloj si tek lista e parenditur cdo send p<>rcaktohet nga <b>[*]</b>. Psh:<br /><br /><b>[list=1]</b><br /><b>[*]</b>Shko n<> dyqan<br /><b>[*]</b>Bli nj<6E> kompjuter<br /><b>[*]</b>Shaje kompjuterin kur nuk punon<br /><b>[/list]</b><br /><br />do prodhoj<6F>:<ol type=\"1\"><li>Shko n<> dyqan</li><li>Bli nj<6E> kompjuter</li><li>Shaje kompjuterin kur nuk punon</li></ol>kurse p<>r nj<6E> list<73> me renditje alfabetike:<br /><br /><b>[list=a]</b><br /><b>[*]</b>P<>rgjigja e par<61> e mundshme<br /><b>[*]</b>P<>rgjigja e dyt<79> e mundshme<br /><b>[*]</b>P<>rgjigja e tret<65> e mundshme<br /><b>[/list]</b><br /><br />e cila jep<ol type=\"a\"><li>P<>rgjigja e par<61> e mundshme</li><li>P<>rgjigja e dyt<79> e mundshme</li><li>P<>rgjigja e tret<65> e mundshme</li></ol>");
+
+$faq[] = array("--", "Krijimi i lidhjeve");
+$faq[] = array("Lidhje me nj<6E> websit tjet<65>r", "BBCode i phpBB lejon disa m<>nyra p<>r krijimin e URI-ve, Uniform Resource Indicators q<> njihen si URL.<ul><li>M<>nyra e par<61> p<>rdor kodin <b>[url=][/url]</b>, cdo gj<67> q<> shkruani mbas shenj<6E>s s<> barazimit do shkaktoj<6F> p<>rmbajtjen e atij kodi t<> sh<73>rbej<65> si nj<6E> URL. Psh. p<>r tu lidhur me phpBB.com me k<>t<EFBFBD> metod<6F> shkruani:<br /><br /><b>[url=http://www.phpbb.com/]</b>Vizito phpBB!<b>[/url]</b><br /><br />kjo do prodhonte lidhjen q<> vijon, <a href=\"http://www.phpbb.com/\" target=\"_blank\">Vizito phpBB!</a> Do shikoni q<> lidhja hapet n<> nj<6E> dritare t<> re duke i lejuar p<>rdoruesit t<> vazhdojn<6A> t<> p<>rdorin forumin.</li><li>Nqs doni q<> adresa URL vet<65> t<> tregohet si lidhje shkruani:<br /><br /><b>[url]</b>http://www.phpbb.com/<b>[/url]</b><br /><br />Kjo do tregoj<6F> lidhjen q<> vijon, <a href=\"http://www.phpbb.com/\" target=\"_blank\">http://www.phpbb.com/</a></li><li>P<>r m<> tep<65>r phpBB p<>rdor dicka q<> quhet <i>Lidhjet Magjike</i>, kjo do e kthej<65> cdo URL me sintaks<6B> korrekte n<> nj<6E> lidhje pa patur nevoj<6F> te shkruhet ndonj<6E> kod, nuk ka nevoj<6F> as p<>r http://. Psh. shkruajtja e www.phpbb.com n<> mesazhin tuaj do krijoj<6F> nj<6E> lidhje tek <a href=\"http://www.phpbb.com/\" target=\"_blank\">www.phpbb.com</a> n<> m<>nyr<79> automatike kur dikush lexon mesazhin. </li><li>E nj<6E>jta gj<67> aplikohet me adresat e post<73>s elektronike, ju mund ta specifikoni adres<65>n me an<61> t<> kodit, psh:<br /><br /><b>[email]</b>no.one@domain.adr<b>[/email]</b><br /><br />e cila do tregoj<6F> <a href=\"emailto:no.one@domain.adr\">no.one@domain.adr</a> ose mund t<> shtypni thjesht no.one@domain.adr n<> mesazhin tuaj dhe adresa do konvertohet n<> lidhje n<> m<>nyr<79> automatike.</li></ul>Ashtu si me t<> gjitha kodet e tjera BBCode URL-t<> mund t<> mb<6D>shtjellin cdo lloj kodi tjet<65>r BBCode, psh <b>[img][/img]</b> (lexo m<> posht<68>), <b>[b][/b]</b>, etj. Ashtu si me kodet e formatimit <20>sht<68> n<> dor<6F>n tuaj q<> kodet t<> jen<65> hapur dhe mbyllur n<> rradh<64>n e duhur, psh: <br /><br /><b>[url=http://www.phpbb.com/][img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/url][/img]</b><br /><br /> <u>nuk</u> <20>sht<68> korrekte gj<67> q<> mund t<> shkaktoj<6F> fshirjen e mesazhit tuaj.");
+
+$faq[] = array("--", "Tregimi i imazheve");
+$faq[] = array("Shtimi i nj<6E> imazhi n<> mesazhin tuaj", "BBCode i phpBB p<>rfshin nj<6E> kod p<>r tregimin e imazheve n<> mesazhet tuaja. Duhet t<> keni dy gj<67>ra parasysh kur p<>rdorni k<>t<EFBFBD> kod; e para, shum<75> p<>rdorues nuk e cmojn<6A> vendosjen e shum<75> imazheve n<>p<EFBFBD>r poste dhe e dyta imazhi duhet t<> jet<65> diku n<> internet para se t<> tregohet n<> nj<6E> mesazh (nuk mund t<> ekzistoj<6F> vet<65>m n<> kompjuterin tuaj, p<>rvec rastit kur keni nj<6E> webserver). phpBB nuk e mund<6E>son mbajtjen e imazheve n<> nj<6E> dosje lokale tashti p<>r tashti (k<>to c<>shtje do adresohen n<> versionin e m<>vonsh<73>m t<> phpBB). P<>r t<> treguar nj<6E> imazh duhet ta rrethoni URL-n<> (adres<65>n n<> internet) e imazhit me kodet <b>[img][/img]</b>. Psh:<br /><br /><b>[img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/img]</b><br /><br />Sic u tregua n<> seksionin e URL (m<>sip<69>r) ju mund ta mb<6D>shtillni nj<6E> imazh me kodin <b>[url][/url]</b> nqs d<>shironi q<> imazhi t<> sh<73>rbej<65> edhe si lidhje, psh.<br /><br /><b>[url=http://www.phpbb.com/][img]</b>http://www.phpbb.com/images/phplogo.gif<b>[/img][/url]</b><br /><br />do prodhonte:<br /><br /><a href=\"http://www.phpbb.com/\" target=\"_blank\"><img src=\"http://www.phpbb.com/images/phplogo.gif\" border=\"0\" alt=\"\" /></a><br />");
+
+$faq[] = array("--", "C<EFBFBD>shtje t<> tjera");
+$faq[] = array("A mund t<> shtoj kodet e mia?", "Jo, nuk besojm<6A> se <20>sht<68> e mundur n<> phpBB 2.0 Po mundohemi t<> shtojm<6A> kode BBCode t<> personalizueshme n<> versionin tjet<65>r t<> phpBB.");
+
+//
+// This ends the BBCode guide entries
+//
+
+?>

phpBB/language/lang_albanian/lang_faq.php

@@ -0,0 +1,107 @@
+<?php
+/***************************************************************************
+ *                          lang_faq.php [english]
+ *                            -------------------
+ *   begin                : Wednesday Oct 3, 2001
+ *   copyright            : (C) 2001 The phpBB Group
+ *   email                : support@phpbb.com
+ *
+ *   $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.
+ *
+ ***************************************************************************/
+/***************************************************************************/
+ *
+ *  Translation to Albanian done by alket ---> alkettttt@yahoo.com
+ * http://www26.brinkster.com/alketttt/
+ *
+ ***************************************************************************/
+ 
+// 
+// To add an entry to your FAQ simply add a line to this file in this format:
+// $faq[] = array("question", "answer");
+// If you want to separate a section enter $faq[] = array("--","Block heading goes here if wanted");
+// Links will be created automatically
+//
+// DO NOT forget the ; at the end of the line.
+// Do NOT put double quotes (") in your FAQ entries, if you absolutely must then escape them ie. \"something\"
+//
+// The FAQ items will appear on the FAQ page in the same order they are listed in this file
+//
+ 
+  
+$faq[] = array("--","Probleme me regjistrimin dhe identifikimin");
+$faq[] = array("Pse nuk identifikohem dot?", "A jeni regjistruar? Duhet t<> regjistroheni nqs doni t<> identifikoheni. A jeni p<>rjashtuar nga forumi (nj<6E> mesazh do shfaqet dhe do ju thot<6F> q<> jeni p<>rjashtuar)? Nqs po, kontaktoni webmasterin ose administratorin e forumit p<>r sqarime t<> m<>tejshme. Nqs jeni regjistruar dhe nuk jeni p<>rjashtuar dhe prap<61> nuk identifikoheni dot, at<61>her<65> kontrolloni emrin e identifikimit dhe fjal<61>kalimin. Ky <20>sht<68> problemi m<> i zakonsh<73>m po nqs ju jeni i sigurt<72> q<> emri dhe fjal<61>kalimi jan<61> korrekt<6B> kontaktoni administratorin e forumit.");
+$faq[] = array("P<EFBFBD>rse <20>sht<68> e nevojshme q<> t<> regjistrohem?", "Kjo varet nga konfigurimi i forumit. Megjithat<61>, regjistrimi ju jep mund<6E>si q<> nuk u jepen vizitor<6F>ve t<> paregjistruar. Regjistrimi ju mund<6E>son caktimin e ikonave personale, p<>rdorimin e mesazheve private, d<>rgimin e mesazheve me post<73> elektronike an<61>tar<61>ve t<> tjer<65>, an<61>tar<61>simin n<> grupe p<>rdoruesish, etj. Regjistrimi b<>het brenda disa minutash k<>shtu q<> ju k<>shillojm<6A> ta b<>ni k<>t<EFBFBD>.");
+$faq[] = array("Pse c'indentifikohem automatikisht?", "Nqs nuk zgjidhni kutin<69> <i>M<> identifiko automatikisht</i> kur identifikoheni, programi i forumit do ju mbaj<61> mend vet<65>m p<>r nj<6E> koh<6F> t<> caktuar. Kjo ndalon p<>rdorimin e llogaris<69> tuaj nga dikush tjet<65>r q<> p<>rdor kompjuerin tuaj. Nqs doni t<> identifikoheni automatikisht, zgjidhni kutin<69> e p<>rmendur m<> lart<72>; Ky veprim nuk rekomandohet n<>se p<>rdorni nj<6E> kompjuter q<> nuk <20>sht<68> juaji.");
+$faq[] = array("A <20>sht<68> e mundur q<> emri im t<> mos shfaqet tek lista e p<>rdoruesve n<> linj<6E>?", "Po, tek profili juaj b<>je mund<6E>sin<69> <i>Fshih q<>nien n<> linj<6E></i> aktive. Pasi b<>n k<>t<EFBFBD> vet<65>m administrator<6F>t dhe ti mund t<> shikojne emrin t<>nd. Ti do num<75>rohesh si p<>rdorues i fshehur.");
+$faq[] = array("Humba fjal<61>kalimin!", "Mos u frik<69>soni. Megjith<74>se fjal<61>kalimi i vjet<65>r nuk mund t<> shikohet, ai mund t<> rishkruhet. P<>r t<> b<>r<EFBFBD> k<>t<EFBFBD> shko tek faqja e identifikimit dhe kliko <u>Harrova fjal<61>kalimin</u>, ndiq udh<64>zimet dhe br<62>nda disa minutash do keni nj<6E> fjal<61>kalim t<> ri.");
+$faq[] = array("U regjistrova po nuk identifikohem dot!", "N<EFBFBD> fillim kontrollo n<>se po specifikon emrin dhe fjal<61>kalimin e duhur. Nqs ata jan<61> korrekt, dy gj<67>ra mund t<> ndodhin: Nqs COPPA <20>sht<68> aktivizuar dhe ju zgjodh<64>t <u>Jam n<>n 13 vjec</u> kur u regjistruat, ndiq udh<64>zimet q<> tu d<>rguan. Nqs COPPA nuk <20>sht<68> aktivizuar, a ka nevoj<6F> p<>r aktivizim llogaria juaj? Disa forume k<>rkojn<6A> aktivizim t<> llogaris<69> nga ju ose administratori para se t<> identifikoheni. Kjo gj<67> duhet tu thuhej n<> momentin q<> u regjistruat. Nqs mor<6F>t nj<6E> mesazh me post<73> elektronike, ndiqni udh<64>zimet, nqs jo verifikoni adres<65>n tuaj t<> post<73>s elektronike. Nj<4E> prej arsyeve q<> aktivizimi k<>rkohet <20>sht<68> parandalimi i regjistrimit me adresa q<> nuk ekzistojn<6A>. Nqs jeni i sigurt<72> q<> adresa juaj e post<73>s elektronike <20>sht<68> korrekte, kontaktoni administratorin e forumit.");
+$faq[] = array("U regjistrova koh<6F> m<> par<61> po nuk identifikohem dot m<>!", "Arsyet m<> t<> zakonshme jan<61> specifikimi i gabuar i emrit t<> identifikimit ose fjal<61>kalimit (shikoni post<73>n elektronike me adres<65>n e s<> cil<69>s u u regjistruat p<>r k<>to) ose administratori ka fshir<69> llogarin<69> tuaj p<>r t<> zvog<6F>luar regjistrin e forumit. Provoni t<> regjistroheni prap<61> dhe t<> merrni pjes<65> n<> diskutime.");
+
+
+$faq[] = array("--","Preferencat dhe vetit<69> e p<>rdoruesve");
+$faq[] = array("Si mund ti ndryshoj vetit<69> e mia?", "T<EFBFBD> gjitha vetit<69> tuaja (nqs jeni regjistruar) ruhen ne regjist<73>r. Klikoni <u>Profili</u> p<> t<> modifikuar t<> gjitha vetit<69> e profilit tuaj (zakonisht shfaqet n<> fillim t<> faqes");
+$faq[] = array("Ora nuk <20>sht<68> e sakt<6B>!", "Ora <20>sht<68> p<>rgjith<74>sisht e sakt<6B>, megjithat<61> ju mund t<> jeni duke par<61> or<6F>n e nj<6E> brezi tjet<65> orar. N<> k<>t<EFBFBD> rast duhet t<> ndryshoni brezin orar ku jeni tek profili juaj, psh. Lond<6E>r, Paris, New York, Sidnei, etj. Vini re se brezi orar ashtu si shum<75> veti t<> tjera mund t<> ndryshoshet vet<65>m nqs jeni i regjistruar");
+$faq[] = array("E ndryshova brezin orar po ora <20>sht<68> prap<61> gabim!", "If you are sure you have set the timezone correctly and the time is still different the most likely answer is daylight savings time (or summer time as it is known in the UK and other places). The board is not designed to handle the changeovers between standard and daylight time so during summer months the time may be an hour different from the real local time.");
+$faq[] = array("Gjuha ime nuk <20>sht<68> n<> list<73>!", "Kjo ndodh se ose administratori nuk e ka instaluar ose paketa p<>r gjuh<75>n q<> doni nuk ekziston. Provoni ti k<>rkoni administratorit ta instaloj<6F> gjuh<75>n q<> doni; nqs nuk ekziston mos merrni leje dhe krijoni vet<65> nj<6E> p<>rkthim t<> ri. M<> shum<75> informacion ka tek faqja e phpBB Group (shiko lidhjen n<> fund t<> faqes)");
+$faq[] = array("Si mund t<> vendos nj<6E> imazh n<>n emrin tim?", "Zakonisht ka dy imazhe n<>n emrin tuaj. I pari <20>sht<68> imazhi q<> tregon grad<61>n tuaj dhe zakonisht p<>rb<72>het nga disa yje q<> tregojn<6A> se sa mesazhe keni shkruar n<> forum. N<>n k<>t<EFBFBD> mund t<> jet<65> nj<6E> imazh m<> i madh q<> njihet si ikona personale. Aktivizimi dhe m<>nyra e p<>rdorjes s<> ikonave personale <20>sht<68> n<> dor<6F> t<> administratorit t<> forumit. Nqs nuk keni mund<6E>si ti p<>rdorni ikonat personale, pyesni administratorin p<>r arsyet.");
+$faq[] = array("Si mund ta ndryshoj grad<61>n?", "In general you cannot directly change the wording of any rank (ranks appear below your username in topics and on your profile depending on the style used). Most boards use ranks to indicate the number of posts you have made and to identify certain users, e.g. moderators and administrators may have a special rank. Please do not abuse the board by posting unnecessarily just to increase your rank, you will probably find the moderator or administrator will simply lower your post count.");
+$faq[] = array("Kur klikoj butonin e post<73>s elektronike t<> nj<6E> p<>rdoruesi m<> k<>rkohet t<> identifikohem!", "Na vjen keq, po vet<65>m p<>rdorues<65>t e regjistruar mund t<> d<>rgojn<6A> mesazhe n<>p<EFBFBD>rmjet formularit t<> forumit (nqs administratori e ka aktivizuar k<>t<EFBFBD> funksion). Kjo b<>het p<>r t<> penguar abuzimin e sistemit t<> post<73>s elektronike nga p<>rdoruesit anonim<69>.");
+
+
+$faq[] = array("--","Probleme me postimin");
+$faq[] = array("Si mund t<> shkruaj n<> forum?", "Shum<EFBFBD> e thjesht<68>. Kliko n<> butonin e duhur tek paneli i forumit ose tem<65>s. Mund tu k<>rkohet t<> regjistroheni p<>rpara se t<> shkruani dicka; veprimet q<> ju lejohen tregohen n<>n panelin e forumit ose tem<65>s. (psh. <i>Ju mund t<> krijoni tema t<> reja n<> k<>t<EFBFBD> forum. Ju mund ti p<>rgjigjeni temave t<> k<>tij forumi<i> etj.)");
+$faq[] = array("Si mund ta redaktoj apo fshij nj<6E> mesazh?", "Nqs nuk jeni moderator ju mund t<> fshini apo redaktoni vet<65>m shkrimet tuaja (shpeshher<65> vet<65>m brenda nj<6E> kohe t<> caktuar mbas postimit) duke klikuar butonin <i>redakto</i> p<>r mesazhin e duhur.  If someone has already replied to the post you will find a small piece of text output below the post when you return to the topic, this lists the number of times you edited it. This will only appear if no one has replied, it also will not appear if moderators or administrators edit the post (they should leave a message saying what they altered and why). Please note that normal users cannot delete a post once someone has replied.");
+$faq[] = array("Si mund ti shtoj nj<6E> firm<72> mesazheve t<> mia?", "N<EFBFBD> fillim krijo nj<6E> firm<72> n<>p<EFBFBD>rmjet profilit tuaj. Pasi ta keni krijuar, zgjidhni kutin<69> <i>Bashkangjit firm<72>n</i> n<> formularin e postimit. Gjithashtu, ju mund ti shtoni firm<72>n cdo mesazhi automatikisht duke zgjedhur kutin<69> e duhur tek profili juaj (megjithat<61> ju akoma keni mund<6E>sin<69> p<>r t<> mos ta shtuar firm<72>n n<> mesazhe individuale, c'zgjidh kutin<69> tek formulari i postimit).");
+$faq[] = array("Si mund t<> b<>j nj<6E> sondazh?", "Kur hapni nj<6E> tem<65> t<> re  (ose kur redaktoni mesazhin e par<61> t<> tem<65>s, nqs keni lejen e duhur) do shikoni formularin <i>Hap Sondazh</i> n<>n formularin kryesor (nqs nuk e shikoni formularin e sondazhit ju nuk keni lejen e duhur p<>r t<> hapur nj<6E> sondazh). Shkruani pyetjen e sondazhit dhe t<> pakt<6B>n dy zgjedhje. P<>r t<> shtuar nj<6E> zgjedhje shkruaj emrin dhe kliko <i>Shto zgjedhje</i>. Gjithashtu keni mund<6E>si t<> specifikoni se p<>r sa dit<69> <20>sht<68> i hapur sondazhi, 0 <20>sht<68> sondazh infinit . Nr. i zgjedhjeve p<>r nj<6E> sondazh <20>sht<68> i kufizuar nga administratori.");
+$faq[] = array("Si fshihet apo redaktohet nj<6E> sondazh?", "Ashtu si mesazhet, sondazhet mund t<> redaktohen vet<65>m nga autori, moderator<6F>t ose administratori. P<>r t<> redaktuar sondazhin kliko tek mesazhi i par<61> i tem<65>s (vet<65>m mesazhi i par<61> n<> nj<6E> tem<65> mund t<> ket<65> nj<6E> sondazh). Nqs askush nuk ka votuar at<61>her<65> autori mund ta fshij<69> ose redaktoj<6F> sondazhin, megjithat<61> n<>se dikush ka votuar vet<65>m moderator<6F>t ose administratori mund ta redaktoj<6F> ose fshij<69>. Kjo b<>het p<>r t<> siguruar v<>rtet<65>sin<69> e nj<6E> sondazhi.");
+$faq[] = array("Pse nuk hyj dot n<> disa forume?", "Disa forume mund t<> jen<65> private dhe vet<65>m an<61>tar<61> me leje speciale mund t<> hyjn<6A> atje. Kjo leje jepet vetem nga administratori ose moderator<6F>t, pyesni ata n<>se mund t<> hyni.");
+$faq[] = array("Pse nuk votoj dot?", "Vet<EFBFBD>m p<>rdoruesit e regjistruar mund t<> votojn<6A>. Nqs jeni regjistruar dhe prap<61> nuk mund t<> votoni at<61>her<65> nuk keni lejen e duhur p<>r ta b<>r<EFBFBD> at<61> gj<67>.");
+
+
+$faq[] = array("--","Formatimi dhe llojet e temave");
+$faq[] = array("C'<27>sht<68> BBCode?", "BBCode <20>sht<68> nj<6E> implementim special i HTML. P<>rdorimi i BBCode tek forumi juaj varet nga konfigurimi q<> ka b<>r<EFBFBD> administratori. P<>r m<> tep<65>r BBCode mund t<> aktivizohet ose c'aktivizohet n<> mesazhet individuale. BBCode <20>sht<68> shum<75> i ngjash<73>m me HTML, tags jan<61> mbyllur brenda kllapave katrore [ and ] n<> vend t<> < and > dhe ofron kontroll m<> t<> madh n<> formatimin e teksteve. N<> var<61>si t<> shabllonit n<> p<>rdorim, shtimi i BBCode n<> mesazhet tuaja <20>sht<68> shum<75> i leht<68> n<>p<EFBFBD>rmjet kodeve t<> klikueshme mbi p<>rmbajtjen e mesazhit n<> formularin e postimit. Megjithat<61> udhezuesi i BBCode mund t'ju hyj<79> n<> pun<75>.");
+$faq[] = array("A mund t<> p<>rdor HTML?", "P<EFBFBD>rdorimi i HTML <20>sht<68> i mundur kur administratori e ka aktivizuar, ai ka kontroll t<> plot<6F>. Nqs HTML lejohet ju mund t<> realizoni se vet<65>m disa nga kodet punojn<6A>. Kjo <20>sht<68> b<>r<EFBFBD> p<>r arsye <i>sigurie</i> n<> m<>nyr<79> q<> t<> ndalohet abuzimi i forumit nga p<>rdorimi i kodeve HTML t<> cilat shkat<61>rrojn<6A> formatimin ose krijojn<6A> probleme t<> tjera. Nqs HTML <20>sht<68> aktivizuar ju mund ta <20>'aktivizoni n<> m<>nyr<79> individuale tek formulari i postimit.");
+$faq[] = array("Cfar<EFBFBD> jan<61> figurinat?", "Figurinat jan<61> imazhe t<> vogla q<> mund t<> p<>rdoren p<>r t<> shprehur emocione apo ndjenja n<> m<>nyr<79> grafike duke shkruar nj<6E> kod t<> thjesht<68> psh. :) n<>nkupton i g<>zuar dhe :( n<>nkupton i m<>rzitur. Lista e plot<6F> e figurinave shihet tek formulari i postimit. Mundohuni t<> mos i mbi-p<>rdorni figurinat ama, ato mund ta b<>jn<6A> nj<6E> mesazh t<> palexuesh<73>m dhe moderator<6F>t mund ta redaktojn<6A> ose fshijn<6A> mesazhin fare.");
+$faq[] = array("A mund t<> postoj imazhe?", "Imazhen mund t<> tregohen n<> mesazhin tuaj. Megjithat<61>, nuk ka asnj<6E> m<>nyr<79> p<>r ti ngarkuar imazhet n<> regjistrin e k<>tij forumi. Prandaj ju duhet t<> krijoni nj<6E> lidhje me nj<6E> imazh n<> internet. Psh. http://www.diku.net/foto-ime.gif. Nuk mund t<> lidhni nj<6E> imazh n<> kompjuterin tuaj ose imazhe q<> ruhen me fjal<61>kalim si psh. imazhe n<> inbox t<> hotmail apo yahoo etj. P<>r t<> krijuar lidhjen e imazhit me mesazhin tuaj p<>rdor kodin BBCode [img] ose  HTML. (Nqs lejohet)");
+$faq[] = array("Cfar<EFBFBD> jan<61> Lajm<6A>rimet?", "Lajm<EFBFBD>rimet shpesh p<>rmbajn<6A> informacion t<> r<>nd<6E>sish<73>m q<> duhet lexuar sa m<> par<61>. Lajm<6A>rimet q<>ndrojn<6A> n<> krye t<> forumit ku jan<61> postuar. Postimi i Lajm<6A>rimeve b<>het nga persona me leje t<> posa<73>me.");
+$faq[] = array("C'jan<61> temat ngjit<69>se?", "Temat ngjit<69>se duken n<>n lajm<6A>rimet dhe vet<65>m n<> faqen e par<61>. Ato jan<61> t<> r<>nd<6E>sishme k<>shtu q<> duhen lexuar po pat<61>t mund<6E>si. Ashtu si lajm<6A>rimet leja p<>r t<> postuar tema ngjit<69>se jepet nga administratori.");
+$faq[] = array("C'jan<61> temat e kycura?", "Temat mund t<> kycen nga moderator<6F>t ose administratori. Ju nuk mund ti p<>rgjigjeni temave t<> kycura dhe sondazhet mbyllen automatikisht. Temat mund t<> mbyllen p<>r shum<75> arsye.");
+
+
+$faq[] = array("--","Nivelet dhe grupet e p<>rdoruesve");
+$faq[] = array("C'jan<61> Administrator<6F>t?", "Administrator<EFBFBD>t jan<61> persona me nivelin m<> t<> lart<72> t<> kontrollit mbi gjith<74> forumin. Ata mund t<> vendosin mbi gjithcka q<> ka lidhje me forumin si psh. vendosjen e autorizimeve, p<>rjashtimin e an<61>tar<61>ve, kush b<>het moderator etj. Ata gjithashtu kan<61> t<> gjitha vetit<69> e nj<6E> moderatori.");
+$faq[] = array("C'jan<61> Moderator<6F>t?", "Moderator<EFBFBD>t jan<61> an<61>tar<61> (ose grupe an<61>tar<61>sh) t<> cil<69>t jan<61> zgjedhur p<>r tu marr<72> me problemet e p<>rditshme t<> forumit. Ata kan<61> mund<6E>si t<> redaktojn<6A> dhe fshijn<6A> mesazhet si edhe mund<6E>si t<> kycin, shkycin, zhvendosin, fshijn<6A> dhe ndajn<6A> temat e forumit q<> moderojn<6A>. P<>rgjith<74>sisht moderator<6F>t kan<61> p<>r detyr<79> t<> mbajn<6A> mesazhet <i>n<> tem<65></i> dhe t<> fshijn<6A> mesazhet fyese dhe abuzive");
+$faq[] = array("C'jan<61> grupet e an<61>tar<61>ve?", "Grupet e an<61>tar<61>ve jan<61> nj<6E> m<>nyr<79> p<>r grupimin e an<61>tar<61>ve p<>r q<>llime administrative. Cdo an<61>tar mund ti p<>rkas<61> disa grupeve dhe cdo grupi mund ti jepen autorizme t<> ndryshme. Kjo e b<>n t<> leht<68> b<>rjen e disa an<61>tar<61>ve moderator<6F> n<> nj<6E> forum apo dh<64>nien e lejes p<>r tu futur n<> nj<6E> forum privat etj.");
+$faq[] = array("Si mund t<> an<61>tar<61>sohem n<> nj<6E> grup?", "P<EFBFBD>r tu b<>r<EFBFBD> an<61>tar i nj<6E> grupi kliko atje ku thot<6F> Grupet e An<41>tar<61>ve  dhe do shihni t<> gjitha grupet. Megjithat<61> jo t<> gjitha grupet jan<61> <i>t<> hapura</i> p<>r cdo p<>rdorues, disa jan<61> t<> mbyllur dhe disa jan<61> t<> fsheht<68>. Nqs grupi <20>sht<68> i hapur at<61>her<65> kliko butonin e duhur p<>r tu b<>r<EFBFBD> an<61>tar. Moderatori i grupit duhet ta aprovoj<6F> k<>rkes<65>n tuaj, ata mund tu b<>jn<6A> pyetje t<> ndryshme.");
+$faq[] = array("Si mund t<> b<>hem moderator i nj<6E> grupi?", "Grupet e an<61>tar<61>ve krijohen fillimisht nga administratori dhe pastaj ai zgjedh moderatorin. Nqs doni t<> b<>heni moderator i nj<6E> grupi, kontaktoni administratorin, provo ti d<>rgosh nj<6E> mesazh privat.");
+
+
+$faq[] = array("--","Mesazhet Private");
+$faq[] = array("Nuk d<>rgoj dot mesazhe private!", "Ju ose nuk jeni regjistruar ose identifikuar, ose administratori ka <20>'aktivizuar sistemin e mesazheve private p<>r t<>r<EFBFBD> forumin. Gjithashtu administratori mund tua ket<65> ndaluar t<> d<>rgoni mesazhe private. N<> rastin e fundit kontaktoni administratorin.");
+$faq[] = array("Ngela duke marr<72> mesazhe private q<> nuk i dua!", "S<EFBFBD> shpejti do i shtojm<6A> nj<6E> list<73> injorimesh sistemit t<> mesazheve private, tashti p<>r tashti provoni ti lajm<6A>roni k<>ta persona. Nqs ata vazhdojn<6A> tu ngacmojn<6A> lajm<6A>roni administratorin i cili mund tua ndaloj<6F> mesazhet private atyre p<>rgjithmon<6F>.");
+$faq[] = array("M<EFBFBD> ka ardhur nj<6E> mesazh abuziv ose ofendues nga nj<6E> p<>rdorues i k<>tij forumi!", "Na vjen shum<75> keq p<>r k<>t<EFBFBD>. Sistemi i post<73>s elektronike q<> p<>rdor ky forum p<>rfshin disa m<>nyra p<>r gjetjen e personave q<> d<>rgojn<6A> mesazhe t<> tilla. Ju duhet ti d<>rgoni administratori nj<6E> kopje t<> plot<6F> t<> mesazhit q<> mor<6F>t; it is very important this include the headers (these list details of the user that sent the email). Administratori mund t<> veproj<6F> pastaj.");
+
+//
+// These entries should remain in all languages and for all modifications
+//
+$faq[] = array("--","C<EFBFBD>shtje t<> phpBB 2");
+$faq[] = array("Kush e krijoi k<>t<EFBFBD> program?", "Ky program (n<> form<72>n origjinale) u prodhua, l<>shua dhe <20>sht<68> pron<6F> e  <a href=\"http://www.phpbb.com/\" target=\"_blank\">phpBB Group</a>. I disponuesh<73>m sipas kushteve t<> GNU General Public Licence (Li<4C>enca Publike e P<>rgjithshme)  dhe mund t<> kopjohet lirisht, kliko tek lidhja e m<>sip<69>rme p<>r detaje");
+$faq[] = array("Pse nuk e ka X apo Y veti ky program?", "Ky program u shkrua dhe li<6C>encua n<>p<EFBFBD>rmjet phpBB Group. Nqs mendoni se nj<6E> veti e re duhet shtuar at<61>her<65> vizitoni faqen phpbb.com. Ju lutem mos postoni k<>rkesa p<>r veti tek forumi i phpbb.com, phpbb Group p<>rdor sourceforge.net p<>r menaxhimin e procesit t<> programimit t<> phpBB. Ju lutem shikoni n<>p<EFBFBD>r forum p<>r t<> par<61> se c'pozicion merr grupi yn<79> p<>r vetit<69> e reja dhe ndiqni procedurat e specifikuara.");
+$faq[] = array("K<EFBFBD> duhet t<> kontaktoj p<>r probleme abuzimi apo legale n<> lidhje me k<>t<EFBFBD> forum?", "Ju duhet t<> kontaktoni administratorin e k<>tij forumi. Nqs nuk mundeni, duhet t<> kontaktoni ndonj<6E> nga moderator<6F>t. Nqs nuk merrni p<>rgjigje at<61>her<65> kontaktoni pronarin e domain-it (b<>ni nj<6E> k<>rkim whois) ose nqs ky forum p<>rdor nj<6E> sh<73>rbim falas (psh. yahoo, free.fr, f2s.com, etc.), departamentin e ankesave t<> atij sh<73>rbimi. Ju lutem kini parasysh q<> phpBB Group nuk ka absolutisht asnj<6E> kontroll mbi k<>t<EFBFBD> forum dhe nuk mund t<> mbahet p<>rgjegj<67>s se si, ku ose nga kush p<>rdoret ky forum. Esht<68> komplet i kot<6F> kontaktimi i phpBB Group n<> lidhje me cdo lloj <20><>shtjeje legale (cease and desist, liable, defamatory comment, etc.) q<> nuk lidhet direkt me phpbb.com ose me programin e phpBB vet<65>. Nqs i d<>rgoni ndonj<6E> mesazh phpBB Group mbi cdo lloj p<>rdorimi t<> k<>tij nga programi nga nj<6E> subjekt i tret<65> at<61>her<65> duhet t<> prisni nj<6E> p<>rgjigje t<> shkurt<72>r ose mos prisni fare.");
+
+//
+// This ends the FAQ entries
+//
+
+?>

phpBB/language/lang_albanian/lang_main.php

@@ -0,0 +1,992 @@
+<?php
+/***************************************************************************
+ *                            lang_main.php [English]
+ *                              -------------------
+ *     begin                : Sat Dec 16 2000
+ *     copyright            : (C) 2001 The phpBB Group
+ *     email                : support@phpbb.com
+ *
+ *     $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.
+ *
+ ***************************************************************************/
+
+//
+// The format of this file is:
+//
+// ---> $lang['message'] = "text";
+//
+// You should also try to set a locale and a character
+// encoding (plus direction). The encoding and direction
+// will be sent to the template. The locale may or may
+// not work, it's dependent on OS support and the syntax
+// varies ... give it your best guess!
+//
+
+//setlocale(LC_ALL, "en");
+$lang['ENCODING'] = "iso-8859-1";
+$lang['DIRECTION'] = "LTR";
+$lang['LEFT'] = "LEFT";
+$lang['RIGHT'] = "RIGHT";
+$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
+
+//
+// Common, these terms are used
+// extensively on several pages
+//
+$lang['Forum'] = "Forum";
+$lang['Category'] = "Kategori";
+$lang['Topic'] = "Tema";
+$lang['Topics'] = "Temat";
+$lang['Replies'] = "P<EFBFBD>rgjigjet";
+$lang['Views'] = "Shikime";
+$lang['Post'] = "Mesazh";
+$lang['Posts'] = "Mesazhe";
+$lang['Posted'] = "Postuar";
+$lang['Username'] = "Identifikim";
+$lang['Password'] = "Fjal<EFBFBD>kalim";
+$lang['Email'] = "Email";
+$lang['Poster'] = "Shkruesi";
+$lang['Author'] = "Autori";
+$lang['Time'] = "Ora";
+$lang['Hours'] = "Or<EFBFBD>";
+$lang['Message'] = "Mesazh";
+
+$lang['1_Day'] = "1 Dit<69>";
+$lang['7_Days'] = "7 Dit<69>";
+$lang['2_Weeks'] = "2 Jav<61>";
+$lang['1_Month'] = "1 Muaj";
+$lang['3_Months'] = "3 Muaj";
+$lang['6_Months'] = "6 Muaj";
+$lang['1_Year'] = "1 Vit";
+
+$lang['Go'] = "Shko";
+$lang['Jump_to'] = "K<EFBFBD>rce tek";
+$lang['Submit'] = "Paraqit";
+$lang['Reset'] = "Nga e para";
+$lang['Cancel'] = "Anullo";
+$lang['Preview'] = "Preview";
+$lang['Confirm'] = "Konfirmo";
+$lang['Spellcheck'] = "Spellcheck";
+$lang['Yes'] = "Po";
+$lang['No'] = "Jo";
+$lang['Enabled'] = "Aktivizuar";
+$lang['Disabled'] = "C'aktivizuar";
+$lang['Error'] = "Problem";
+
+$lang['Next'] = "Tjetri";
+$lang['Previous'] = "I m<>parsh<73>m";
+$lang['Goto_page'] = "Shko tek faqja";
+$lang['Joined'] = "An<EFBFBD>tar<EFBFBD>suar";
+$lang['IP_Address'] = "Adresa IP";
+
+$lang['Select_forum'] = "Zgjidh nj<6E> forum";
+$lang['View_latest_post'] = "Shiko mesazhin e fundit";
+$lang['View_newest_post'] = "Shiko mesazhin m<> t<> ri";
+$lang['Page_of'] = "Faqja <b>%d</b> e <b>%d</b>"; // Replaces with: Page 1 of 2 for example
+
+$lang['ICQ'] = "Nr. i ICQ";
+$lang['AIM'] = "Adresa e AIM";
+$lang['MSNM'] = "MSN Messenger";
+$lang['YIM'] = "Yahoo Messenger";
+
+$lang['Forum_Index'] = "%s Indeksi i forumit";  // eg. sitename Forum Index, %s can be removed if you prefer
+
+$lang['Post_new_topic'] = "Posto tem<65> t<> re";
+$lang['Reply_to_topic'] = "P<EFBFBD>rgjigju tem<65>s";
+$lang['Reply_with_quote'] = "P<EFBFBD>rgjigju me kuot<6F>";
+
+$lang['Click_return_topic'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek tema"; // %s's here are for uris, do not remove!
+$lang['Click_return_login'] = "Kliko %sk<73>tu%s p<>r ta riprovuar";
+$lang['Click_return_forum'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek forumi";
+$lang['Click_view_message'] = "Kliko %sk<73>tu%s p<>r t<> par<61> mesazhin t<>nd";
+$lang['Click_return_modcp'] = "Kliko %sk<73>tu%s p<>r tu kthyer Paneli i Kontrollit p<>r Moderator<6F>t";
+$lang['Click_return_group'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek informacioni i grupit";
+
+$lang['Admin_panel'] = "Shko tek Paneli i Administrimit";
+
+$lang['Board_disable'] = "K<EFBFBD>rkojme ndjes<65> po ky forum nuk <20>sht<68> i disponuesh<73>m";
+
+
+//
+// Global Header strings
+//
+$lang['Registered_users'] = "An<EFBFBD>tar<EFBFBD>t e regjistruar";
+$lang['Browsing_forum'] = "P<EFBFBD>rdoruesit q<> po shfletojn<6A> forumin:";
+$lang['Online_users_zero_total'] = "<b>0</b> p<>rdorues online:";
+$lang['Online_users_total'] = "<b>%d</b> p<>rdorues online:";
+$lang['Online_user_total'] = "<b>%d</b> p<>rdorues online:";
+$lang['Reg_users_zero_total'] = " 0 an<61>tar<61>";
+$lang['Reg_users_total'] = " %d an<61>tar<61>";
+$lang['Reg_user_total'] = " %d an<61>tar";
+$lang['Hidden_users_zero_total'] = " 0 t<> fshehur";
+$lang['Hidden_user_total'] = " %d t<> fshehur";
+$lang['Hidden_users_total'] = " %d t<> fshehur";
+$lang['Guest_users_zero_total'] = " 0 vizitor<6F>";
+$lang['Guest_users_total'] = " %d vizitor<6F>";
+$lang['Guest_user_total'] = " %d vizitor";
+$lang['Record_online_users'] = "Nr. Rekord i p<>rdoruesve online ishte <b>%s</b> m<> %s"; // first %s = number of users, second %s is the date.
+
+$lang['Admin_online_color'] = "%sAdministrator%s";
+$lang['Mod_online_color'] = "%sModerator%s";
+
+$lang['You_last_visit'] = "Hera e fundit q<> vizituat %s"; // %s replaced by date/time
+$lang['Current_time'] = "Ora <20>sht<68> %s"; // %s replaced by time
+
+$lang['Search_new'] = "Shiko mesazhet q<> nga vizita e fundit";
+$lang['Search_your_posts'] = "Shiko mesazhet e tua";
+$lang['Search_unanswered'] = "Shiko mesazhet pa p<>rgjigje";
+
+$lang['Register'] = "Regjistrohu";
+$lang['Profile'] = "Profili";
+$lang['Edit_profile'] = "Modifiko profilin";
+$lang['Search'] = "K<EFBFBD>rko";
+$lang['Memberlist'] = "Lista e An<41>tar<61>ve";
+$lang['FAQ'] = "FAQ";
+$lang['BBCode_guide'] = "Udh<EFBFBD>zuesi i BBCode";
+$lang['Usergroups'] = "Grupet e An<41>tar<61>ve";
+$lang['Last_Post'] = "Mesazhi i fundit";
+$lang['Moderator'] = "Moderator";
+$lang['Moderators'] = "Moderator<EFBFBD>";
+
+
+//
+// Stats block text
+//
+$lang['Posted_articles_zero_total'] = "An<EFBFBD>tar<EFBFBD>t e k<>tij forumi kan<61> postuar <b>0</b> artikuj"; // Number of posts
+$lang['Posted_articles_total'] = "An<EFBFBD>tar<EFBFBD>t e k<>tij forumi kan<61> postuar <b>%d</b> artikuj"; // Number of posts
+$lang['Posted_article_total'] = "An<EFBFBD>tar<EFBFBD>t e k<>tij forumi kan<61> postuar <b>%d</b> artikull"; // Number of posts
+$lang['Registered_users_zero_total'] = "Forumi ka <b>0</b> an<61>tar<61> t<> regjistruar"; // # registered users
+$lang['Registered_users_total'] = "Forumi ka <b>%d</b> an<61>tar<61> t<> regjistruar"; // # registered users
+$lang['Registered_user_total'] = "Forumi ka <b>%d</b> an<61>tar t<> regjistruar"; // # registered users
+$lang['Newest_user'] = "An<EFBFBD>tari m<> i ri <20>sht<68> <b>%s%s%s</b>"; // a href, username, /a 
+
+$lang['No_new_posts_last_visit'] = "Asnj<EFBFBD> mesazh i ri q<> nga vizita juaj e fundit";
+$lang['No_new_posts'] = "Asnj<EFBFBD> mesazh i ri";
+$lang['New_posts'] = "Mesazhe t<> reja";
+$lang['New_post'] = "Mesazh i ri";
+$lang['No_new_posts_hot'] = "Asnj<EFBFBD> mesazh i ri [ Popular ]";
+$lang['New_posts_hot'] = "Mesazhe t<> reja [ Popular ]";
+$lang['No_new_posts_locked'] = "Asnj<EFBFBD> mesazh i ri [ Locked ]";
+$lang['New_posts_locked'] = "Mesazhe t<> reja [ Locked ]";
+$lang['Forum_is_locked'] = "Forumi <20>sht<68> kycur";
+
+
+//
+// Login
+//
+$lang['Enter_password'] = "Ju lutem shkruani identifikimin dhe fjalkalimin p<>r tu identifikuar";
+$lang['Login'] = "Identifikohu";
+$lang['Logout'] = "C'identifikohu";
+
+$lang['Forgotten_password'] = "Harrova fjalkalimin";
+
+$lang['Log_me_in'] = "M<EFBFBD> identifiko automatikisht sa her<65> q<> vizitoj";
+
+$lang['Error_login'] = "Keni specifikuar nj<6E> llogari inekzistente, inaktive ose nj<6E> fjal<61>kalim t<> gabuar";
+
+
+//
+// Index page
+//
+$lang['Index'] = "Indeksi";
+$lang['No_Posts'] = "Asnj<EFBFBD> mesazh";
+$lang['No_forums'] = "Ky forum <20>sht<68> bosh";
+
+$lang['Private_Message'] = "Mesazh Privat";
+$lang['Private_Messages'] = "Mesazhe Private";
+$lang['Who_is_Online'] = "Kush <20>sht<68> online";
+
+$lang['Mark_all_forums'] = "Sh<EFBFBD>noji gjith<74> forumet si t<> vizituar";
+$lang['Forums_marked_read'] = "T<EFBFBD> gjith<74> forumet jan<61> sh<73>nuar si t<> lexuar";
+
+
+//
+// Viewforum
+//
+$lang['View_forum'] = "Shiko forumin";
+
+$lang['Forum_not_exist'] = "Forumi q<> zgjodh<64>t nuk ekziston";
+$lang['Reached_on_error'] = "Keni arritur tek kjo faqe n<>p<EFBFBD>rmjet nj<6E> gabimi";
+
+$lang['Display_topics'] = "Shfaq tema nga ";
+$lang['All_Topics'] = "Gjith<EFBFBD> temat";
+
+$lang['Topic_Announcement'] = "<b>Lajm<6A>rim:</b>";
+$lang['Topic_Sticky'] = "<b>Ngjit<69>s</b>";
+$lang['Topic_Moved'] = "<b>Ka l<>vizur</b>";
+$lang['Topic_Poll'] = "<b>[ Sondazh ]</b>";
+
+$lang['Mark_all_topics'] = "Sh<EFBFBD>noji gjith<74> temat si t<> lexuara";
+$lang['Topics_marked_read'] = "Temat e k<>tij forumi u sh<73>nuan si t<> lexuara";
+
+$lang['Rules_post_can'] = "Ju <b>mund</b> t<> krijoni tema t<> reja n<> k<>t<EFBFBD> forum";
+$lang['Rules_post_cannot'] = "Ju <b>nuk mund</b> t<> krijoni tema t<> reja n<> k<>t<EFBFBD> forum";
+$lang['Rules_reply_can'] = "Ju <b>mund</b> ti p<>rgjigjeni temave t<> k<>tij forumi";
+$lang['Rules_reply_cannot'] = "Ju <b>nuk mund</b> ti p<>rgjigjeni temave t<> k<>tij forumi";
+$lang['Rules_edit_can'] = "Ju <b>mund</b> t<> modifikoni postimet tuaja n<> k<>t<EFBFBD> forum";
+$lang['Rules_edit_cannot'] = "Ju <b>nuk mund</b> t<> modifikoni postimet tuaja n<> k<>t<EFBFBD> forum";
+$lang['Rules_delete_can'] = "Ju <b>mund</b> t<> fshini postimet tuaja n<> k<>t<EFBFBD> forum";
+$lang['Rules_delete_cannot'] = "Ju <b>nuk mund</b> t<> fshini postimet tuaja n<> k<>t<EFBFBD> forum";
+$lang['Rules_vote_can'] = "Ju <b>mund</b> t<> votoni n<> votimet e k<>tij forumi";
+$lang['Rules_vote_cannot'] = "Ju <b>nuk mund</b> t<> votoni n<> votimet e k<>tij forumi";
+$lang['Rules_moderate'] = "Ju <b>mund</b> t<> %smoderoni k<>t<EFBFBD> forum%s"; // %s replaced by a href links, do not remove! 
+
+$lang['No_topics_post_one'] = "Nuk ka asnj<6E> mesazh n<> k<>t<EFBFBD> forum<br />Kliko tek <b>Hap tem<65> t<> re</b> p<>r t<> hapur nj<6E>";
+
+
+//
+// Viewtopic
+//
+$lang['View_topic'] = "Shiko tem<65>n";
+
+$lang['Guest'] = 'Guest';
+$lang['Post_subject'] = "Titulli i mesazhit";
+$lang['View_next_topic'] = "Shiko tem<65>n pasuese";
+$lang['View_previous_topic'] = "Shiko tem<65>n e m<>parshme";
+$lang['Submit_vote'] = "Paraqit vot<6F>n";
+$lang['View_results'] = "Shiko rezultatin";
+
+$lang['No_newer_topics'] = "Nuk ka tema m<> t<> reja n<> k<>t<EFBFBD> forum";
+$lang['No_older_topics'] = "Nuk ka tema m<> t<> vjetra n<> k<>t<EFBFBD> forum";
+$lang['Topic_post_not_exist'] = "Tema ose mesazhi q<> k<>rkuat nuk ekziston";
+$lang['No_posts_topic'] = "Nuk ka asnj<6E> mezash p<>r k<>t<EFBFBD> tem<65>";
+
+$lang['Display_posts'] = "Shfaq mesazhe nga";
+$lang['All_Posts'] = "T<EFBFBD> gjitha mesazhet";
+$lang['Newest_First'] = "M<EFBFBD> i riu n<> krye";
+$lang['Oldest_First'] = "M<EFBFBD> i vjetri n<> krye";
+
+$lang['Back_to_top'] = "Mbrapsht n<> krye";
+
+$lang['Read_profile'] = "Shiko profilin e an<61>tarit"; 
+$lang['Send_email'] = "D<EFBFBD>rgo email";
+$lang['Visit_website'] = "Vizito websitin e shkruesit";
+$lang['ICQ_status'] = "Statusi n<> ICQ";
+$lang['Edit_delete_post'] = "Modifiko/fshi k<>t<EFBFBD> mesazh";
+$lang['View_IP'] = "Shiko IP e shkruesit";
+$lang['Delete_post'] = "Fshije k<>t<EFBFBD> mesazh";
+
+$lang['wrote'] = "shkruajti"; // proceeds the username and is followed by the quoted text
+$lang['Quote'] = "Kuot<EFBFBD>"; // comes before bbcode quote output.
+$lang['Code'] = "Kodi"; // comes before bbcode code output.
+
+$lang['Edited_time_total'] = "Edituar p<>r her<65> t<> fundit nga %s n<> %s, edituar %d her<65> gjithsej"; // Last edited by me on 12 Oct 2001, edited 1 time in total
+$lang['Edited_times_total'] = "Edituar p<>r her<65> t<> fundit nga %s n<> %s, edituar %d her<65> gjithsej"; // Last edited by me on 12 Oct 2001, edited 2 times in total
+
+$lang['Lock_topic'] = "Kyce k<>t<EFBFBD> tem<65>";
+$lang['Unlock_topic'] = "Shkyce k<>t<EFBFBD> tem<65>";
+$lang['Move_topic'] = "Zhvendose k<>t<EFBFBD> tem<65>";
+$lang['Delete_topic'] = "Fshije k<>t<EFBFBD> tem<65>";
+$lang['Split_topic'] = "Ndaje k<>t<EFBFBD> tem<65>";
+
+$lang['Stop_watching_topic'] = "Ndalo s<> v<>zhguari k<>t<EFBFBD> tem<65>";
+$lang['Start_watching_topic'] = "V<EFBFBD>zhgo k<>t<EFBFBD> tem<65> p<>r p<>rgjigje";
+$lang['No_longer_watching'] = "Ju nuk e v<>zhgoni m<> k<>t<EFBFBD> tem<65>";
+$lang['You_are_watching'] = "Ju jeni duke e v<>zhguar k<>t<EFBFBD> tem<65>";
+
+$lang['Total_votes'] = "Totali i votave";
+
+//
+// Posting/Replying (Not private messaging!)
+//
+$lang['Message_body'] = "P<EFBFBD>rmbajtja e mesazhit";
+$lang['Topic_review'] = "Shqyrto tem<65>n";
+
+$lang['No_post_mode'] = "M<EFBFBD>nyra e postimit nuk <20>sht<68> specifikuar"; // If posting.php is called without a mode (newtopic/reply/delete/etc, shouldn't be shown normaly)
+
+$lang['Post_a_new_topic'] = "Hap nj<6E> tem<65> t<> re";
+$lang['Post_a_reply'] = "P<EFBFBD>rgjigju";
+$lang['Post_topic_as'] = "Hap nj<6E> tem<65> si";
+$lang['Edit_Post'] = "Modifiko mesazhin";
+$lang['Options'] = "Mund<EFBFBD>sit<EFBFBD>";
+
+$lang['Post_Announcement'] = "Lajm<EFBFBD>rim";
+$lang['Post_Sticky'] = "Ngjit<EFBFBD>s";
+$lang['Post_Normal'] = "Normal";
+
+$lang['Confirm_delete'] = "Jeni i sigurt<72> p<>r fshirjen e k<>tij mesazhi?";
+$lang['Confirm_delete_poll'] = "Jeni i sigurt<72> p<>r fshirjen e k<>tij sondazhi?";
+
+$lang['Flood_Error'] = "Nuk mund t<> postoni prap<61> menj<6E>her<65>";
+$lang['Empty_subject'] = "Duhet t<> specifikoni nj<6E> titull kur postoni nj<6E> mesazh";
+$lang['Empty_message'] = "Duhet t<> shkruani dicka kur postoni nj<6E> mesazh";
+$lang['Forum_locked'] = "Forumi <20>sht<68> kycur. Postimi, modifikimi dhe fshirja e temave s'lejohet";
+$lang['Topic_locked'] = "Forumi <20>sht<68> kycur. Postimi dhe modifikimi i mesazheve nuk lejohet";
+$lang['No_post_id'] = "Nuk u specifikua ID e postimit";
+$lang['No_topic_id'] = "Duhet t<> zgjidhni nj<6E> tem<65> p<>r tu p<>rgjigjur";
+$lang['No_valid_mode'] = "Ju vet<65>m mund t<> postoni, p<>rgjigjeni, modifikoni ose kuotoni mesazhet...ju lutem provojeni prap<61>";
+$lang['No_such_post'] = "Nj<EFBFBD> post i till<6C> nuk ekziston, ju lutem provoni prap<61>";
+$lang['Edit_own_posts'] = "Na vjen keq po ju mund t<> editoni vet<65>m mesazhet tuaja";
+$lang['Delete_own_posts'] = "Na vjen keq po ju mund t<> fshini vet<65>m mesazhet tuaja";
+$lang['Cannot_delete_replied'] = "Na vjen keq po ju nuk mund t<> fshini mesazhe t<> cilat kan<61> p<>rgjigje";
+$lang['Cannot_delete_poll'] = "Na vjen keq po ju nuk mund t<> fshini nj<6E> sondazh aktiv";
+$lang['Empty_poll_title'] = "Duhet t<> specifikoni nj<6E> titull p<>r sondazhin tuaj";
+$lang['To_few_poll_options'] = "Duhet t<> specifikoni t<> pakt<6B>n dy zgjedhje p<>r sondazhin";
+$lang['To_many_poll_options'] = "Keni v<>n<EFBFBD> shum<75> zgjedhje p<>r sondazhin";
+$lang['Post_has_no_poll'] = "Ky mesazh nuk ka sondazh";
+
+$lang['Add_poll'] = "Hap nj<6E> sondazh";
+$lang['Add_poll_explain'] = "Nqs nuk do t<> shtosh nj<6E> sondazh tek tema, l<>re fush<73>n bosh";
+$lang['Poll_question'] = "Pyetja e sondazhit";
+$lang['Poll_option'] = "Zgjedhje sondazhi";
+$lang['Add_option'] = "Shto mund<6E>si";
+$lang['Update'] = "Ri-fresko";
+$lang['Delete'] = "Fshi";
+$lang['Poll_for'] = "Vazhdo sondazhin p<>r";
+$lang['Days'] = "Dit<EFBFBD>"; // This is used for the Run poll for ... Days + in admin_forums for pruning
+$lang['Poll_for_explain'] = "[ Shkruaj 0 ose l<>r bosh p<>r nj<6E> sondazh q<> vazhdon gjithmon<6F> ]";
+$lang['Delete_poll'] = "Fshi sondazhin";
+
+$lang['Disable_HTML_post'] = "Disaktivizo HTML n<> k<>t<EFBFBD> mesazh";
+$lang['Disable_BBCode_post'] = "Disaktivizo BBCode n<> k<>t<EFBFBD> mesazh";
+$lang['Disable_Smilies_post'] = "Disaktivizo figurinat n<> k<>t<EFBFBD> mesazh";
+
+$lang['HTML_is_ON'] = "HTML <20>sht<68> e <u>aktivizuar</u>";
+$lang['HTML_is_OFF'] = "HTML <20>sht<68> e <u>disaktivizuar</u>";
+$lang['BBCode_is_ON'] = "%sBBCode%s <20>sht<68> i <u>aktivizuar</u>"; // %s are replaced with URI pointing to FAQ
+$lang['BBCode_is_OFF'] = "%sBBCode%s <20>sht<68> i <u>disaktivizuar</u>";
+$lang['Smilies_are_ON'] = "Figurinat jan<61> <u>aktivizuar</u>";
+$lang['Smilies_are_OFF'] = "Figurinat jan<61> <u>disaktivizuar</u>";
+
+$lang['Attach_signature'] = "Bashkangjit firm<72>n (firma mund t<> modifikohet tek profili)";
+$lang['Notify'] = "M<EFBFBD> njofto kur dikush p<>rgjigjet";
+$lang['Delete_post'] = "Fshije k<>t<EFBFBD> mesazh";
+
+$lang['Stored'] = "Mesazhi juaj u postua me sukses";
+$lang['Deleted'] = "Mesazhi juaj u fshi me sukses";
+$lang['Poll_delete'] = "Sondazhi juaj u fshi me sukses";
+$lang['Vote_cast'] = "Vota juaj u regjistrua";
+
+$lang['Topic_reply_notification'] = "Njoftim p<>r p<>rgjigje tek tema";
+
+$lang['bbcode_b_help'] = "Bold text: [b]text[/b] (alt+b)";
+$lang['bbcode_i_help'] = "Italic text: [i]text[/i] (alt+i)";
+$lang['bbcode_u_help'] = "Underline text: [u]text[/u] (alt+u)";
+$lang['bbcode_q_help'] = "Quote text: [quote]text[/quote] (alt+q)";
+$lang['bbcode_c_help'] = "Code display: [code]code[/code] (alt+c)";
+$lang['bbcode_l_help'] = "List: [list]text[/list] (alt+l)";
+$lang['bbcode_o_help'] = "Ordered list: [list=]text[/list] (alt+o)";
+$lang['bbcode_p_help'] = "Insert image: [img]http://image_url[/img] (alt+p)";
+$lang['bbcode_w_help'] = "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url] (alt+w)";
+$lang['bbcode_a_help'] = "Close all open bbCode tags";
+$lang['bbcode_s_help'] = "Font color: [color=red]text[/color] Tip: you can also use color=#FF0000";
+$lang['bbcode_f_help'] = "Font size: [size=x-small]small text[/size]";
+
+$lang['Emoticons'] = "Emocionet";
+$lang['More_emoticons'] = "Trego m<> shum<75> emocione";
+
+$lang['Font_color'] = "Ngjyra e fontit";
+$lang['color_default'] = "E paracaktuar";
+$lang['color_dark_red'] = "E kuqe e err<72>t";
+$lang['color_red'] = "E kuqe";
+$lang['color_orange'] = "Portokalli";
+$lang['color_brown'] = "Kafe";
+$lang['color_yellow'] = "E verdh<64>";
+$lang['color_green'] = "Jeshile";
+$lang['color_olive'] = "Ngjyr<EFBFBD> ulliri";
+$lang['color_cyan'] = "Boj<EFBFBD>qielli";
+$lang['color_blue'] = "Blu";
+$lang['color_dark_blue'] = "Blu e err<72>t";
+$lang['color_indigo'] = "Lejla";
+$lang['color_violet'] = "Vjollc<EFBFBD>";
+$lang['color_white'] = "E bardh<64>";
+$lang['color_black'] = "E zez<65>";
+
+$lang['Font_size'] = "Nr. i fontit";
+$lang['font_tiny'] = "i vock<63>l";
+$lang['font_small'] = "i vog<6F>l";
+$lang['font_normal'] = "normal";
+$lang['font_large'] = "i madh";
+$lang['font_huge'] = "i st<73>rmadh";
+
+$lang['Close_Tags'] = "Close Tags";
+$lang['Styles_tip'] = "Tip: Styles can be applied quickly to selected text";
+
+
+//
+// Private Messaging
+//
+$lang['Private_Messaging'] = "Mesazhim privat";
+
+$lang['Login_check_pm'] = "Identifikohu p<>r t<> par<61> mesazhet private";
+$lang['New_pms'] = "Ju keni %d mesazhe t<> reja"; // You have 2 new messages
+$lang['New_pm'] = "Ju keni %d mesazh t<> ri"; // You have 1 new message
+$lang['No_new_pm'] = "Ju nuk keni asnj<6E> mesazh t<> ri";
+$lang['Unread_pms'] = "Ju keni %d mesazhe t<> palexuara";
+$lang['Unread_pm'] = "Ju keni % mesazh t<> palexuar";
+$lang['No_unread_pm'] = "Ju nuk keni mesazhe t<> palexuara";
+$lang['You_new_pm'] = "Nj<EFBFBD> mesazh privat i ri ka ardhur p<>r ju tek Inbox";
+$lang['You_new_pms'] = "Disa mesazhe private t<> reja kan<61> ardhur p<>r ju tek Inbox";
+$lang['You_no_new_pm'] = "Asnj<EFBFBD> mesazh privat i ri n<> Inbox";
+
+$lang['Inbox'] = "Inbox";
+$lang['Outbox'] = "Outbox";
+$lang['Savebox'] = "Savebox";
+$lang['Sentbox'] = "Sentbox";
+$lang['Flag'] = "Flag";
+$lang['Subject'] = "Titulli";
+$lang['From'] = "Nga";
+$lang['To'] = "P<EFBFBD>r";
+$lang['Date'] = "Data";
+$lang['Mark'] = "Sh<EFBFBD>no";
+$lang['Sent'] = "D<EFBFBD>rguar";
+$lang['Saved'] = "Ruajtur";
+$lang['Delete_marked'] = "Fshi t<> sh<73>nuar<61>t";
+$lang['Delete_all'] = "Fshiji t<> gjith<74>";
+$lang['Save_marked'] = "Ruaji t<> sh<73>nuar<61>t"; 
+$lang['Save_message'] = "Ruaj mesazhin";
+$lang['Delete_message'] = "Fshi mesazhin";
+
+$lang['Display_messages'] = "Shfaq mesazhe nga"; // Followed by number of days/weeks/months
+$lang['All_Messages'] = "T<EFBFBD> gjith<74> mesazhet";
+
+$lang['No_messages_folder'] = "Ju nuk keni asnj<6E> mesazh n<> k<>t<EFBFBD> dosje";
+
+$lang['PM_disabled'] = "Mesazhet private nuk lejohen n<> k<>t<EFBFBD> forum";
+$lang['Cannot_send_privmsg'] = "Na vjen keq, po administratori jua ka ndaluar d<>rgimin e mesazheve private";
+$lang['No_to_user'] = "Duhet t<> specifikoni nj<6E> em<65>r p<>r t<> d<>rguar k<>t<EFBFBD> mesazh";
+$lang['No_such_user'] = "Na vjen keq po ky an<61>tar nuk ekziston";
+
+$lang['Disable_HTML_pm'] = "C'aktivizo HTML n<> k<>t<EFBFBD> mesazh";
+$lang['Disable_BBCode_pm'] = "C'aktivizo BBCode n<> k<>t<EFBFBD> mesazh";
+$lang['Disable_Smilies_pm'] = "C'aktivizo figurinat n<> k<>t<EFBFBD> mesazh";
+
+$lang['Message_sent'] = "Mesazhi juaj u d<>rgua";
+
+$lang['Click_return_inbox'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek Inbox";
+$lang['Click_return_index'] = "Kliko %sk<73>tu%s p<>r tu kthyer tek Indeksi";
+
+$lang['Send_a_new_message'] = "D<EFBFBD>rgo nj<6E> mesazh t<> ri privat";
+$lang['Send_a_reply'] = "P<EFBFBD>rgjigju nj<6E> mesazhi privat";
+$lang['Edit_message'] = "Modifiko mesazhin privat";
+
+$lang['Notification_subject'] = "Nj<EFBFBD> mesazh i ri privat ka ardhur";
+
+$lang['Find_username'] = "Gjej nj<6E> an<61>tar";
+$lang['Find'] = "Gjej";
+$lang['No_match'] = "Nuk u gjet asnj<6E>";
+
+$lang['No_post_id'] = "Nuk u specifikua ID e postimit";
+$lang['No_such_folder'] = "Nj<EFBFBD> dosje e till<6C> nuk ekziston";
+$lang['No_folder'] = "Asnj<EFBFBD> dosje nuk u specifikua";
+
+$lang['Mark_all'] = "Sh<EFBFBD>noji t<> gjith<74>/a";
+$lang['Unmark_all'] = "De-Sh<53>no t<> gjitha :)";
+
+$lang['Confirm_delete_pm'] = "Jeni i sigurt<72> q<> doni ta fshini k<>t<EFBFBD> mesazh?";
+$lang['Confirm_delete_pms'] = "Jeni i sigurt<72> q<> doni ti fshini k<>to mesazhe?";
+
+$lang['Inbox_size'] = "Ju e keni Inbox %d%% plot"; // eg. Your Inbox is 50% full
+$lang['Sentbox_size'] = "Ju e keni Sentbox %d%% plot"; 
+$lang['Savebox_size'] = "Ju e keni Savebox %d%% plot"; 
+
+$lang['Click_view_privmsg'] = "Kliko %sk<73>tu%s p<>r t<> vizituar Inbox-in tuaj";
+
+
+//
+// Profiles/Registration
+//
+$lang['Viewing_user_profile'] = "Duke par<61> profilin :: %s"; // %s is username 
+$lang['About_user'] = "Gjithcka mbi %s"; // %s is username
+
+$lang['Preferences'] = "Preferencat";
+$lang['Items_required'] = "Artikujt e sh<73>nuar me * jan<61> t<> domosdosh<73>m (unless stated otherwise)";
+$lang['Registration_info'] = "Informacioni i regjistrimit";
+$lang['Profile_info'] = "Informacioni i profilit";
+$lang['Profile_info_warn'] = "Ky informacion do jet<65> i disponuesh<73>m tek publiku";
+$lang['Avatar_panel'] = "Paneli i kontrollit t<> ikonave personale";
+$lang['Avatar_gallery'] = "Galeria e ikonave personale";
+
+$lang['Website'] = "Websit";
+$lang['Location'] = "Vendodhja";
+$lang['Contact'] = "Kontakto";
+$lang['Email_address'] = "Adresa e e-mail";
+$lang['Email'] = "Email";
+$lang['Send_private_message'] = "D<EFBFBD>rgo mesazh privat";
+$lang['Hidden_email'] = "[ I/e fshehur ]";
+$lang['Search_user_posts'] = "Gjej gjith<74> mesazhet nga %s";
+$lang['Interests'] = "Interesat";
+$lang['Occupation'] = "Profesioni"; 
+$lang['Poster_rank'] = "Grada e an<61>tarit";
+
+$lang['Total_posts'] = "Nr. total i mesazheve";
+$lang['User_post_pct_stats'] = "%.2f%% i totalit"; // 1.25% of total
+$lang['User_post_day_stats'] = "%.2f mesazhe n<> dit<69>"; // 1.5 posts per day
+$lang['Search_user_posts'] = "Gjej gjith<74> mesazhet nga %s"; // Find all posts by username
+
+$lang['No_user_id_specified'] = "Na vjen keq po ai an<61>tar nuk ekziston";
+$lang['Wrong_Profile'] = "Nuk lejohet modifiki i profilit t<> nj<6E> tjetri";
+
+$lang['Only_one_avatar'] = "Lejohet vet<65>m nj<6E> ikon<6F> personale";
+$lang['File_no_data'] = "Skedari tek URL q<> specifikuat <20>sht<68> i korruptuar";
+$lang['No_connection_URL'] = "Lidhja me URL q<> specifikuat <20>sht<68> e pamundur p<>r momentin";
+$lang['Incomplete_URL'] = "URL q<> specifikuat nuk ekziston";
+$lang['Wrong_remote_avatar_format'] = "URL e ikon<6F>s personale nuk <20>sht<68> e sakt<6B>";
+$lang['No_send_account_inactive'] = "Na vjen keq, po fjal<61>kalimi juaj nuk mund t<> nxirret nga regjistri sepse llogaria juaj nuk <20>sht<68> aktive. Kontaktoni administratorin ";
+
+$lang['Always_smile'] = "Lejo figurinat gjithmon<6F>";
+$lang['Always_html'] = "Lejo HTML gjithmon<6F>";
+$lang['Always_bbcode'] = "Lejo BBCode gjithmon<6F>";
+$lang['Always_add_sig'] = "Bashkangjite firm<72>n gjithmon<6F>";
+$lang['Always_notify'] = "M<EFBFBD> njofto gjithmon<6F> kur ka p<>rgjigje";
+$lang['Always_notify_explain'] = "D<EFBFBD>rgon nj<6E> email kur dikush shkruan n<> nj<6E> tem<65> ku keni shkruar edhe ju. Ky opsion mund t<> ndryshohet sa her<65> q<> poston";
+
+$lang['Board_style'] = "Stili i forumit";
+$lang['Board_lang'] = "Gjuha e forumit";
+$lang['No_themes'] = "Asnj<EFBFBD> tem<65> n<> regjist<73>r";
+$lang['Timezone'] = "Brezi orar";
+$lang['Date_format'] = "Formati i koh<6F>s";
+$lang['Date_format_explain'] = "Sintaksa e p<>rdorur <20>sht<68> identike me at<61> t<> funksionit  <a href=\"http://www.php.net/date\" target=\"_other\">date()</a> t<> PHP";
+$lang['Signature'] = "Firma";
+$lang['Signature_explain'] = "Kjo <20>sht<68> nj<6E> th<74>nie ose grup fjal<61>sh q<> i bashkangjitet cdo meszhi q<> shkruani. Nj<4E> limit prej %d karakteresh ekziston";
+$lang['Public_view_email'] = "Gjithmon<EFBFBD> tregoje adres<65>n time t<> e-mail";
+
+$lang['Current_password'] = "Fjal<EFBFBD>kalimi i tanish<73>m";
+$lang['New_password'] = "Fjal<EFBFBD>kalimi i ri";
+$lang['Confirm_password'] = "Konfirmo fjal<61>kalimin";
+$lang['Confirm_password_explain'] = "You must confirm your current password if you wish to change it or alter your email address";
+$lang['password_if_changed'] = "Vendosja e nj<6E> fjal<61>kalimi <20>sht<68> e nevojshme vet<65>m n<>se doni t<> ndryshoni fjal<61>kalimin e tanish<73>m";
+$lang['password_confirm_if_changed'] = "Konfirmimi i fjal<61>kalimit <20>sht<68> i nevojsh<73>m vet<65>m n<>se doni t<> ndryshoni fjal<61>kalimin e tanish<73>m";
+
+$lang['Avatar'] = "Ikona personale";
+$lang['Avatar_explain'] = "Shfaq nj<6E> imazh t<> vog<6F>l posht<68> emrit tuaj kur postoni. Vet<65>m nj<6E> imazh <20>sht<68> i lejuar dhe gjer<65>sia lejohet deri n<> %d pixel, lart<72>sia deri n<> %d pixel dhe madh<64>sia e skedarit deri n<> %d kB."; 
+$lang['Upload_Avatar_URL'] = "Ngarko ikon<6F>n nga interneti";
+$lang['Upload_Avatar_URL_explain'] = "Shkruaj adres<65>n e ikon<6F>s, do kopjohet k<>tu";
+$lang['Pick_local_Avatar'] = "Zgjidh nj<6E> ikon<6F> nga galeria";
+$lang['Link_remote_Avatar'] = "Link to off-site Avatar";
+$lang['Link_remote_Avatar_explain'] = "Specifiko adres<65>n e internetit (URL) t<> imazhit q<> doni t<> lidhni si ikon<6F>";
+$lang['Avatar_URL'] = "URL of Avatar Image";
+$lang['Select_from_gallery'] = "Select Avatar from gallery";
+$lang['View_avatar_gallery'] = "Show gallery";
+
+$lang['Select_avatar'] = "Zgjidh ikon<6F>n";
+$lang['Return_profile'] = "Anulloje ikon<6F>n";
+$lang['Select_category'] = "Zgjidh kategorin<69>";
+
+$lang['Delete_Image'] = "Fshi imazhin";
+$lang['Current_Image'] = "Imazhi i tanish<73>m";
+
+$lang['Notify_on_privmsg'] = "M<EFBFBD> njofto p<>r cdo mesazh privat";
+$lang['Popup_on_privmsg'] = "Hap dritare t<> re kur merr mesazh privat"; 
+$lang['Popup_on_privmsg_explain'] = "Some templates may open a new window to inform you when new private messages arrive"; 
+$lang['Hide_user'] = "Hide your online status";
+
+$lang['Profile_updated'] = "Profili juaj u rifreskua";
+$lang['Profile_updated_inactive'] = "Your profile has been updated, however you have changed vital details thus your account is now inactive. Check your email to find out how to reactivate your account, or if admin activation is require wait for the administrator to reactivate your account";
+
+$lang['Password_mismatch'] = "Fjal<EFBFBD>kalimet q<> specifikuat jan<61> t<> ndrysh<73>m";
+$lang['Current_password_mismatch'] = "Fjal<EFBFBD>kalimi q<> specifikuat nuk <20>sht<68> i nj<6E>jt<6A> me at<61> n<> regjistrin ton<6F>";
+$lang['Password_long'] = "Fjal<EFBFBD>kalimi juaj nuk duhet t<> ket<65> m<> shum<75> se 32 karaktere";
+$lang['Username_taken'] = "Na vjen keq po ky identifikim <20>sht<68> n<> p<>rdorim";
+$lang['Username_invalid'] = "Na vjen keq po ky identifikim p<>rmban nj<6E> karakter invalid si psh. \"";
+$lang['Username_disallowed'] = "Na vjen keq po ky identifikim nuk <20>sht<68> i lejuesh<73>m";
+$lang['Email_taken'] = "Na vjen keq po ajo adres<65> poste elektronike <20>sht<68> p<>rdorur m<> par<61>";
+$lang['Email_banned'] = "Na vjen keq po ajo adres<65> poste elektronike <20>sht<68> p<>rjashtuar";
+$lang['Email_invalid'] = "Na vjen keq po ajo adres<65> poste elektronike <20>sht<68> invalide";
+$lang['Signature_too_long'] = "Firma juaj <20>sht<68> shum<75> e gjat<61>";
+$lang['Fields_empty'] = "Duhet t<> mbushni fushat e domosdoshme";
+$lang['Avatar_filetype'] = "Lloji i skedarit t<> ikon<6F>s personale duhet t<> jet<65> .jpg, .gif or .png";
+$lang['Avatar_filesize'] = "Madh<EFBFBD>sia e skedarit t<> ikon<6F>s personale lejohet deri n<> %d kB"; // The avatar image file size must be less than 6 kB
+$lang['Avatar_imagesize'] = "Ikona personale duhet t<> jet<65> deri n<> %d pixel e gj<67>r<EFBFBD> dhe %d pixel e lart<72>"; 
+
+$lang['Welcome_subject'] = "Mir<EFBFBD>sevini tek %s Forums"; // Welcome to my.com forums
+$lang['New_account_subject'] = "Llogari e re p<>r an<61>tar<61>";
+$lang['Account_activated_subject'] = "Llogaria u aktivizua";
+
+$lang['Account_added'] = "Faleminderit p<>r regjistrimin, llogaria juaj u hap. Ju tashti keni mund<6E>si t<> identifikoheni. ";
+$lang['Account_inactive'] = "Llogaria juaj u hap. Megjithat<61>, ky forum k<>rkon aktivizimin e llogaris<69>. Nj<4E> mesazh me cel<65>sin e aktivizimit u d<>rgua tek adresa q<> dhat<61>. Shikoni mesazhin p<>r m<> shum<75> informacion.";
+$lang['Account_inactive_admin'] = "Llogaria juaj u hap. Megjithat<61>, ky forum k<>rkon aktivizimin e llogaris<69> nga administratori. Nj<4E> mesazh do ju d<>rgohet sapo llogaria juaj t<> aktivizohet.";
+$lang['Account_active'] = "Llogaria juaj u aktivizua, faleminderit p<>r regjistrimin";
+$lang['Account_active_admin'] = "Llogaria u aktivizua";
+$lang['Reactivate'] = "Riaktivizo llogarin<69>";
+$lang['COPPA'] = "Llogaria juaj u krijua por duhet t<> aprovohet nga administratori. Shikoni post<73>n elektronike p<>r detaje.";
+
+$lang['Registration'] = "Kushtet e Regjistrimit";
+$lang['Reg_agreement'] = "Megjith<EFBFBD>se administrator<6F>t dhe moderator<6F>t e k<>tij forumi do mundohen t<> fshijn<6A> ose redaktojn<6A> shkrime t<> kund<6E>rshtueshme sa m<> par<61>, <20>sht<68> e pamundur q<> t<> rishikohet cdo mesazh. Prandaj ju duhet t<> kuptoni se mesazhet e postuara n<> k<>t<EFBFBD> forum jan<61> shprehje e opinionit t<> autorit dhe jo t<> administratorit, moderator<6F>ve apo webmasterit (p<>rvec rasteve kur k<>ta t<> fundit jan<61> autor<6F> t<> shkrimeve) dhe ata nuk mund t<> mbahen p<>rgjegj<67>s. <br /><br />Ju pranoni t<> mos shkruani mesazhe abuzuese, vulgare, t<> neveritshme, urryese, k<>rc<72>nuese, shpif<69>se apo cdo lloj materiali q<> mund t<> bjer<65> ndesh me ligjet n<> p<>rdorim. Shkrime t<> tilla do cojn<6A> n<> p<>rjashtimin tuaj t<> menj<6E>hersh<73>m dhe t<> p<>rhersh<73>m (dhe njoftimin e ISP-s<> tuaj). Adresa IP p<>r cdo mesazh regjistrohet p<>r t<> b<>r<EFBFBD> t<> mundur aplikimin e k<>tyre procedurave. Ju pranoni q<> webmasteri, administratori dhe moderator<6F>t e k<>tij forumi kan<61> t<> drejt<6A> t<> fshijn<6A>, redaktojn<6A>, zhvendosin apo kycin cdo tem<65> sipas gjykimit t<> tyre. Si p<>rdorues ju pranoni q<> informacioni q<> ju dhat<61> do t<> ruhet n<> nj<6E> regjist<73>r. Megjith<74>se ky informacion nuk do i jepet askujt pa lejen tuaj webmasteri, administratori dhe moderator<6F>t nuk mund t<> mbahen p<>rgjegj<67>s nqs ky informacion vidhet.<br /><br />Ky forum p<>rdor cookies p<>r t<> ruajtur informacion n<> kompjuterin tuaj. K<>to cookies nuk p<>rmbajn<6A> asnj<6E> informacion personal, ato sh<73>rbejn<6A> vet<65>m p<>r p<>rmir<69>simin e sh<73>rbimit q<> ofrohet nga ky forum. Adresa e post<73>s elektronike p<>rdoret vet<65>m p<>r konfirmimin e regjistrimit tuaj dhe fjal<61>kalimit (dhe n<> rastet kur u d<>rgohet nj<6E> fjal<61>kalimi i ri nqs harroni at<61> q<> kishit).";
+
+$lang['Agree_under_13'] = "I pranoj k<>to kushte dhe jam <b>n<>n</b> 13 vjec";
+$lang['Agree_over_13'] = "I pranoj k<>to kushte dhe jam <b>mbi</b> 13 vjec";
+$lang['Agree_not'] = "Nuk i pranoj k<>to kushte";
+
+$lang['Wrong_activation'] = "Cel<EFBFBD>si i aktivizimit q<> dhat<61> nuk p<>rkon me asnj<6E> cel<65>s n<> regjistrin ton<6F>.";
+$lang['Send_password'] = "M<EFBFBD> d<>rgo nj<6E> fjal<61>kalim t<> ri"; 
+$lang['Password_updated'] = "Nj<EFBFBD> fjal<61>kalim i ri u krijua, shiko post<73>n elektronike p<>r detajet e aktivizimit";
+$lang['No_email_match'] = "Adresa e post<73>s elektronike q<> dhat<61> nuk p<>rkon me adres<65>n e atij an<61>tari";
+$lang['New_password_activation'] = "Aktivizim i fjal<61>kalimit t<> ri";
+$lang['Password_activated'] = "Llogaria juaj u ri-aktivizua. Jepni fjal<61>kalimin e ri p<>r tu identifikuar";
+
+$lang['Send_email_msg'] = "D<EFBFBD>rgo nj<6E> mesazh me post<73> elektronike";
+$lang['No_user_specified'] = "Asnj<EFBFBD> an<61>tar nuk u specifikua";
+$lang['User_prevent_email'] = "Ky an<61>tar nuk pranon mesazhe me post<73> elektronike. Provo ti d<>rgosh nj<6E> mesazh privat.";
+$lang['User_not_exist'] = "Ai an<61>tar nuk ekziston";
+$lang['CC_email'] = "D<EFBFBD>rgoi vetes nj<6E> kopje t<> mesazhit";
+$lang['Email_message_desc'] = "Ky mesazh do d<>rgohet si tekst i thjesht<68>. Mos p<>rdor HTML ose BBCode. Adresa e kthimit do jet<65> adresa juaj.";
+$lang['Flood_email_limit'] = "Nuk mund t<> d<>rgosh nj<6E> mesazh tashti. Provo m<> von<6F>";
+$lang['Recipient'] = "Marr<EFBFBD>si";
+$lang['Email_sent'] = "Mesazhi u d<>rgua";
+$lang['Send_email'] = "D<EFBFBD>rgo nj<6E> mesazh";
+$lang['Empty_subject_email'] = "Duhet t<> specifikoni nj<6E> subjekt p<>r k<>t<EFBFBD> mesazh";
+$lang['Empty_message_email'] = "Duhet t<> shkruani dicka q<> t<> d<>rgohet ky mesazh ";
+
+
+//
+// Memberslist
+//
+$lang['Select_sort_method'] = "Zgjidh metod<6F>n e renditjes";
+$lang['Sort'] = "Rendit";
+$lang['Sort_Top_Ten'] = "Top Ten Posters";
+$lang['Sort_Joined'] = "Data e an<61>tar<61>simit";
+$lang['Sort_Username'] = "Identifikimi";
+$lang['Sort_Location'] = "Vendi";
+$lang['Sort_Posts'] = "Nr. total i mesazheve";
+$lang['Sort_Email'] = "Adresa e post<73>s elektronike";
+$lang['Sort_Website'] = "Websiti";
+$lang['Sort_Ascending'] = "N<EFBFBD> ngjitje";
+$lang['Sort_Descending'] = "N<EFBFBD> zbritje";
+$lang['Order'] = "Rregulli";
+
+
+//
+// Group control panel
+//
+$lang['Group_Control_Panel'] = "Paneli i Kontrollit t<> Grupeve";
+$lang['Group_member_details'] = "Detajet e an<61>tar<61>sis<69> s<> grupeve";
+$lang['Group_member_join'] = "Futu n<> nj<6E> grup";
+
+$lang['Group_Information'] = "Informacioni i grupit";
+$lang['Group_name'] = "Emri i grupit";
+$lang['Group_description'] = "P<EFBFBD>rshkrimi i grupit";
+$lang['Group_membership'] = "An<EFBFBD>tar<EFBFBD>sia e grupit";
+$lang['Group_Members'] = "An<EFBFBD>tar<EFBFBD>t e grupit";
+$lang['Group_Moderator'] = "Moderatori i grupit";
+$lang['Pending_members'] = "An<EFBFBD>tar<EFBFBD>t n<> pritje";
+
+$lang['Group_type'] = "Lloji i grupit";
+$lang['Group_open'] = "Grup i hapur";
+$lang['Group_closed'] = "Grup i mbyllur";
+$lang['Group_hidden'] = "Grup i fsheht<68>";
+
+$lang['Current_memberships'] = "An<EFBFBD>tar<EFBFBD>sia aktuale";
+$lang['Non_member_groups'] = "Grupet pa an<61>tar<61>";
+$lang['Memberships_pending'] = "An<EFBFBD>tar<EFBFBD>sit<EFBFBD> n<> pritje";
+
+$lang['No_groups_exist'] = "Asnj<EFBFBD> grup nuk ekziston";
+$lang['Group_not_exist'] = "Ai grup nuk ekziston";
+
+$lang['Join_group'] = "Futu n<> grup";
+$lang['No_group_members'] = "Ky grup nuk ka an<61>tar<61>";
+$lang['Group_hidden_members'] = "Ky grup <20>sht<68> i fsheht<68>. Nuk mund t'ja shikosh an<61>tar<61>sin<69>";
+$lang['No_pending_group_members'] = "Ky grup nuk ka an<61>tar<61> n<> pritje";
+$lang["Group_joined"] = "Ju jeni pajtuar tek ky grup me sukses <br /> Ju do lajm<6A>roheni me post<73> elektronike kur t<> aprovoheni nga moderatori i grupit";
+$lang['Group_request'] = "Esht<EFBFBD> b<>r<EFBFBD> nj<6E> k<>rkes<65> p<>r an<61>tar<61>sim";
+$lang['Group_approved'] = "K<EFBFBD>rkesa juaj u aprovua";
+$lang['Group_added'] = "Ju shtuat k<>tij grupi"; 
+$lang['Already_member_group'] = "Ju jeni an<61>tar i k<>tij grupi tashm<68>!";
+$lang['User_is_member_group'] = "P<EFBFBD>rdoruesi <20>sht<68> an<61>tar i k<>tij grupi tashm<68>";
+$lang['Group_type_updated'] = "Lloji i grupit u ri-freskua";
+
+$lang['Could_not_add_user'] = "P<EFBFBD>rdoruesi q<> zgjodh<64>t nuk ekziston";
+$lang['Could_not_anon_user'] = "Nuk mund ta b<>sh an<61>tar grupi p<>rdoruesin Anonymous";
+
+$lang['Confirm_unsub'] = "Jeni i sigurt<72> p<>r anullimin e pajtimit tek ky grup?";
+$lang['Confirm_unsub_pending'] = "Pajtimi juaj tek ky grup nuk <20>sht<68> aprovuar akoma,  jeni i sigurt<72> q<> doni ta anulloni?";
+
+$lang['Unsub_success'] = "Pajtimi juaj tek ky grup <20>sht<68> anulluar";
+
+$lang['Approve_selected'] = "Aprovo t<> zgjedhurit";
+$lang['Deny_selected'] = "Kund<EFBFBD>rshto t<> zgjedhurit";
+$lang['Not_logged_in'] = "Duhet t<> jeni i identifikuar p<>r tu futur n<> nj<6E> grup";
+$lang['Remove_selected'] = "Hiq t<> zgjedhurit";
+$lang['Add_member'] = "Shto an<61>tar";
+$lang['Not_group_moderator'] = "Nuk mund ta kryeni at<61> veprim sepse nuk jeni moderatori i k<>tij grupi";
+
+$lang['Login_to_join'] = "Identifikohu p<>r tu futur n<> nj<6E> grup ose p<>r t<> menaxhuar an<61>tar<61>sit<69>";
+$lang['This_open_group'] = "Ky <20>sht<68> nj<6E> grup i hapur, klikoni p<>r t<> k<>rkuar an<61>tar<61>si";
+$lang['This_closed_group'] = "Ky grup <20>sht<68> mbyllur, nuk pranohen m<> an<61>tar<61>";
+$lang['This_hidden_group'] = "Ky <20>sht<68> grup i fsheht<68>, nuk lejohet aplikimi automatik";
+$lang['Member_this_group'] = "Ju jeni an<61>tar i k<>tij grupi";
+$lang['Pending_this_group'] = "K<EFBFBD>rkesa juaj p<>r an<61>tar<61>si n<> k<>t<EFBFBD> grup nuk <20>sht<68> konfirmuar akoma";
+$lang['Are_group_moderator'] = "Ju jeni moderatori i grupit";
+$lang['None'] = "Asnj<EFBFBD>";
+
+$lang['Subscribe'] = "Pajtohu";
+$lang['Unsubscribe'] = "Anullo pajtimin";
+$lang['View_Information'] = "Shiko informacionin";
+
+
+//
+// Search
+//
+$lang['Search_query'] = "Search Query";
+$lang['Search_options'] = "Search Options";
+
+$lang['Search_keywords'] = "Search for Keywords";
+$lang['Search_keywords_explain'] = "You can use <u>AND</u> to define words which must be in the results, <u>OR</u> to define words which may be in the result and <u>NOT</u> to define words which should not be in the result. Use * as a wildcard for partial matches";
+$lang['Search_author'] = "K<EFBFBD>rko p<>r autorin";
+$lang['Search_author_explain'] = "Use * as a wildcard for partial matches";
+
+$lang['Search_for_any'] = "Search for any terms or use query as entered";
+$lang['Search_for_all'] = "Search for all terms";
+$lang['Search_title_msg'] = "K<EFBFBD>rko titullin dhe p<>rmbajtjen mesazhit";
+$lang['Search_msg_only'] = "K<EFBFBD>rko vet<65>m p<>rmbajtjen mesazhit";
+
+$lang['Return_first'] = "Return first"; // followed by xxx characters in a select box
+$lang['characters_posts'] = "characters of posts";
+
+$lang['Search_previous'] = "Search previous"; // followed by days, weeks, months, year, all in a select box
+
+$lang['Sort_by'] = "Rendit sipas";
+$lang['Sort_Time'] = "Koh<EFBFBD>s s<> postimit";
+$lang['Sort_Post_Subject'] = "Subjekit t<> mesazhit";
+$lang['Sort_Topic_Title'] = "Titullit t<> tem<65>s";
+$lang['Sort_Author'] = "Autorit";
+$lang['Sort_Forum'] = "Forumit";
+
+$lang['Display_results'] = "Display results as";
+$lang['All_available'] = "All available";
+$lang['No_searchable_forums'] = "You do not have permissions to search any forum on this site";
+
+$lang['No_search_match'] = "No topics or posts met your search criteria";
+$lang['Found_search_match'] = "Search found %d match"; // eg. Search found 1 match
+$lang['Found_search_matches'] = "Search found %d matches"; // eg. Search found 24 matches
+
+$lang['Close_window'] = "Close Window";
+
+
+//
+// Auth related entries
+//
+// Note the %s will be replaced with one of the following 'user' arrays
+$lang['Sorry_auth_announce'] = "Sorry but only %s can post announcements in this forum";
+$lang['Sorry_auth_sticky'] = "Sorry but only %s can post sticky messages in this forum"; 
+$lang['Sorry_auth_read'] = "Sorry but only %s can read topics in this forum"; 
+$lang['Sorry_auth_post'] = "Sorry but only %s can post topics in this forum"; 
+$lang['Sorry_auth_reply'] = "Sorry but only %s can reply to posts in this forum"; 
+$lang['Sorry_auth_edit'] = "Sorry but only %s can edit posts in this forum"; 
+$lang['Sorry_auth_delete'] = "Sorry but only %s can delete posts in this forum"; 
+$lang['Sorry_auth_vote'] = "Sorry but only %s can vote in polls in this forum"; 
+
+// These replace the %s in the above strings
+$lang['Auth_Anonymous_Users'] = "<b>p<>rdorues anonim<69></b>";
+$lang['Auth_Registered_Users'] = "<b>p<>rdorues t<> regjistruar</b>";
+$lang['Auth_Users_granted_access'] = "<b>users granted special access</b>";
+$lang['Auth_Moderators'] = "<b>moderator<6F>t</b>";
+$lang['Auth_Administrators'] = "<b>administrator<6F>t</b>";
+
+$lang['Not_Moderator'] = "Ju nuk jeni moderator i k<>tij forumi";
+$lang['Not_Authorised'] = "I pa autorizuar";
+
+$lang['You_been_banned'] = "Ju jeni p<>rjashtuar nga ky forum <br />Kontaktoni webmasterin ose administratorin e forumit";
+
+
+//
+// Viewonline
+//
+$lang['Reg_users_zero_online'] = "Ka 0 an<61>tar<61> dhe "; // There ae 5 Registered and
+$lang['Reg_users_online'] = "Ka %d an<61>tar<61> dhe "; // There ae 5 Registered and
+$lang['Reg_user_online'] = "Ka %d an<61>tar dhe "; // There ae 5 Registered and
+$lang['Hidden_users_zero_online'] = "0 Hidden users online"; // 6 Hidden users online
+$lang['Hidden_users_online'] = "%d an<61>tar<61> sekret n<> linj<6E>"; // 6 Hidden users online
+$lang['Hidden_user_online'] = "%d an<61>tar sekret n<> linj<6E>"; // 6 Hidden users online
+$lang['Guest_users_online'] = "Ka %d vizitor<6F> n<> linj<6E>"; // There are 10 Guest users online
+$lang['Guest_users_zero_online'] = "Ka 0 vizitor<6F> n<> linj<6E>"; // There are 10 Guest users online
+$lang['Guest_user_online'] = "Ka %d vizitor n<> linj<6E>"; // There is 1 Guest user online
+$lang['No_users_browsing'] = "Nuk ka asnj<6E> p<>rdorues n<> linj<6E>";
+
+$lang['Online_explain'] = "This data is based on users active over the past five minutes";
+
+$lang['Forum_Location'] = "Venddodhja e forumit";
+$lang['Last_updated'] = "Rifreskuar m<>";
+
+$lang['Forum_index'] = "Indeksi i forumit";
+$lang['Logging_on'] = "Duke u identifikuar";
+$lang['Posting_message'] = "Duke shkruar nj<6E> mesazh";
+$lang['Searching_forums'] = "Duke k<>rkuar n<>p<EFBFBD>r forum";
+$lang['Viewing_profile'] = "Duke par<61> profilin";
+$lang['Viewing_online'] = "Duke par<61> kush <20>sht<68> n<> linj<6E>";
+$lang['Viewing_member_list'] = "Duke par<61> list<73>n e an<61>tar<61>ve";
+$lang['Viewing_priv_msgs'] = "Duke par<61> mesazhet private";
+$lang['Viewing_FAQ'] = "Duke par<61> FAQ";
+
+
+//
+// Moderator Control Panel
+//
+$lang['Mod_CP'] = "Paneli i kontrollit p<>r moderator<6F>t";
+$lang['Mod_CP_explain'] = "N<EFBFBD>p<EFBFBD>rmjet formularit t<> m<>posht<68>m mund t<> moderoni k<>t<EFBFBD> forum. Mund t<> kycni, shkycni, l<>vizni ose fshini cdo tem<65> ose nr. temash.";
+
+$lang['Select'] = "Zgjidh";
+$lang['Delete'] = "Fshi";
+$lang['Move'] = "L<EFBFBD>viz";
+$lang['Lock'] = "Kyc";
+$lang['Unlock'] = "Shkyc";
+
+$lang['Topics_Removed'] = "Temat e zgjedhura u hoq<6F>n me sukses nga regjistri";
+$lang['Topics_Locked'] = "Temat e zgjedhura u kyc<79>n me sukses";
+$lang['Topics_Moved'] = "Temat e zgjedhura u zhvendos<6F>n me sukses";
+$lang['Topics_Unlocked'] = "Temat e zgjedhura u shkyc<79>n me sukses";
+$lang['No_Topics_Moved'] = "Asnj<EFBFBD> tem<65> nuk u zhvendos";
+
+$lang['Confirm_delete_topic'] = "Jeni i sigurt<72> q<> doni t<> fshini tem<65>n/at e zgjedhur/a?";
+$lang['Confirm_lock_topic'] = "Jeni i sigurt<72> q<> doni t<> kycni tem<65>n/at e zgjedhur/a?";
+$lang['Confirm_unlock_topic'] = "Jeni i sigurt<72> q<> doni t<> shkycni tem<65>n/at e zgjedhur/a?";
+$lang['Confirm_move_topic'] = "Jeni i sigurt<72> q<> doni t<> l<>vizni tem<65>n/at e zgjedhur/a";
+
+$lang['Move_to_forum'] = "Zhvendos tek forumi";
+$lang['Leave_shadow_topic'] = "L<EFBFBD>r hijen e tem<65>s tek forumi i vjet<65>r";
+
+$lang['Split_Topic'] = "Split Topic Control Panel";
+$lang['Split_Topic_explain'] = "Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post";
+$lang['Split_title'] = "New topic title";
+$lang['Split_forum'] = "Forum for new topic";
+$lang['Split_posts'] = "Split selected posts";
+$lang['Split_after'] = "Split from selected post";
+$lang['Topic_split'] = "The selected topic has been split successfully";
+
+$lang['Too_many_error'] = "You have selected too many posts. You can only select one post to split a topic after!";
+
+$lang['None_selected'] = "You have no selected any topics to preform this operation on. Please go back and select at least one.";
+$lang['New_forum'] = "New forum";
+
+$lang['This_posts_IP'] = "IP for this post";
+$lang['Other_IP_this_user'] = "Other IP's this user has posted from";
+$lang['Users_this_IP'] = "Users posting from this IP";
+$lang['IP_info'] = "IP Information";
+$lang['Lookup_IP'] = "Look up IP";
+
+
+//
+// Timezones ... for display on each page
+//
+$lang['All_times'] = "Ora <20>sht<68> sipas %s"; // eg. All times are GMT - 12 Hours (times from next block)
+
+$lang['-12'] = "GMT - 12 Hours";
+$lang['-11'] = "GMT - 11 Hours";
+$lang['-10'] = "HST (Hawaii)";
+$lang['-9'] = "GMT - 9 Hours";
+$lang['-8'] = "PST (U.S./Canada)";
+$lang['-7'] = "MST (U.S./Canada)";
+$lang['-6'] = "CST (U.S./Canada)";
+$lang['-5'] = "EST (U.S./Canada)";
+$lang['-4'] = "GMT - 4 Hours";
+$lang['-3.5'] = "GMT - 3.5 Hours";
+$lang['-3'] = "GMT - 3 Hours";
+$lang['-2'] = "Mid-Atlantic";
+$lang['-1'] = "GMT - 1 Hours";
+$lang['0'] = "GMT";
+$lang['1'] = "CET (Europe)";
+$lang['2'] = "EET (Europe)";
+$lang['3'] = "GMT + 3 Hours";
+$lang['3.5'] = "GMT + 3.5 Hours";
+$lang['4'] = "GMT + 4 Hours";
+$lang['4.5'] = "GMT + 4.5 Hours";
+$lang['5'] = "GMT + 5 Hours";
+$lang['5.5'] = "GMT + 5.5 Hours";
+$lang['6'] = "GMT + 6 Hours";
+$lang['6.5'] = "GMT + 6.5 Hours";
+$lang['7'] = "GMT + 7 Hours";
+$lang['8'] = "WST (Australia)";
+$lang['9'] = "GMT + 9 Hours";
+$lang['9.5'] = "CST (Australia)";
+$lang['10'] = "EST (Australia)";
+$lang['11'] = "GMT + 11 Hours";
+$lang['12'] = "GMT + 12 Hours";
+
+// These are displayed in the timezone select box
+$lang['tz']['-12'] = "(GMT -12:00 hours) Eniwetok, Kwajalein";
+$lang['tz']['-11'] = "(GMT -11:00 hours) Midway Island, Samoa";
+$lang['tz']['-10'] = "(GMT -10:00 hours) Hawaii";
+$lang['tz']['-9'] = "(GMT -9:00 hours) Alaska";
+$lang['tz']['-8'] = "(GMT -8:00 hours) Pacific Time (US &amp; Canada), Tijuana";
+$lang['tz']['-7'] = "(GMT -7:00 hours) Mountain Time (US &amp; Canada), Arizona";
+$lang['tz']['-6'] = "(GMT -6:00 hours) Central Time (US &amp; Canada), Mexico City";
+$lang['tz']['-5'] = "(GMT -5:00 hours) Eastern Time (US &amp; Canada), Bogota, Lima, Quito";
+$lang['tz']['-4'] = "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz";
+$lang['tz']['-3.5'] = "(GMT -3:30 hours) Newfoundland";
+$lang['tz']['-3'] = "(GMT -3:00 hours) Brassila, Buenos Aires, Georgetown, Falkland Is";
+$lang['tz']['-2'] = "(GMT -2:00 hours) Mid-Atlantic, Ascension Is., St. Helena";
+$lang['tz']['-1'] = "(GMT -1:00 hours) Azores, Cape Verde Islands";
+$lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
+$lang['tz']['1'] = "(GMT +1:00 hours) Amsterdam, Berlin, Brussels, Madrid, Paris, Rome";
+$lang['tz']['2'] = "(GMT +2:00 hours) Cairo, Helsinki, Kaliningrad, South Africa, Warsaw";
+$lang['tz']['3'] = "(GMT +3:00 hours) Baghdad, Riyadh, Moscow, Nairobi";
+$lang['tz']['3.5'] = "(GMT +3:30 hours) Tehran";
+$lang['tz']['4'] = "(GMT +4:00 hours) Abu Dhabi, Baku, Muscat, Tbilisi";
+$lang['tz']['4.5'] = "(GMT +4:30 hours) Kabul";
+$lang['tz']['5'] = "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent";
+$lang['tz']['5.5'] = "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi";
+$lang['tz']['6'] = "(GMT +6:00 hours) Almaty, Colombo, Dhaka, Novosibirsk";
+$lang['tz']['6.5'] = "(GMT +6:30 hours) Rangoon";
+$lang['tz']['7'] = "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta";
+$lang['tz']['8'] = "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei";
+$lang['tz']['9'] = "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
+$lang['tz']['9.5'] = "(GMT +9:30 hours) Adelaide, Darwin";
+$lang['tz']['10'] = "(GMT +10:00 hours) Canberra, Guam, Melbourne, Sydney, Vladivostok";
+$lang['tz']['11'] = "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands";
+$lang['tz']['12'] = "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island";
+
+$lang['datetime']['Sunday'] = "e Diel<65>";
+$lang['datetime']['Monday'] = "e H<>n<EFBFBD>";
+$lang['datetime']['Tuesday'] = "e Mart<72>";
+$lang['datetime']['Wednesday'] = "e M<>rkur<75>";
+$lang['datetime']['Thursday'] = "e Enjte";
+$lang['datetime']['Friday'] = "e Premte";
+$lang['datetime']['Saturday'] = "e Shtun<75>";
+$lang['datetime']['Sun'] = "Sun";
+$lang['datetime']['Mon'] = "Mon";
+$lang['datetime']['Tue'] = "Tue";
+$lang['datetime']['Wed'] = "Wed";
+$lang['datetime']['Thu'] = "Thu";
+$lang['datetime']['Fri'] = "Fri";
+$lang['datetime']['Sat'] = "Sat";
+$lang['datetime']['January'] = "Janar";
+$lang['datetime']['February'] = "Shkurt";
+$lang['datetime']['March'] = "Mars";
+$lang['datetime']['April'] = "Prill";
+$lang['datetime']['May'] = "Maj";
+$lang['datetime']['June'] = "Qershor";
+$lang['datetime']['July'] = "Korrik";
+$lang['datetime']['August'] = "Gusht";
+$lang['datetime']['September'] = "Shtator";
+$lang['datetime']['October'] = "Tetor";
+$lang['datetime']['November'] = "N<EFBFBD>ntor";
+$lang['datetime']['December'] = "Dhjetor";
+$lang['datetime']['Jan'] = "Jan";
+$lang['datetime']['Feb'] = "Feb";
+$lang['datetime']['Mar'] = "Mar";
+$lang['datetime']['Apr'] = "Apr";
+$lang['datetime']['May'] = "May";
+$lang['datetime']['Jun'] = "Jun";
+$lang['datetime']['Jul'] = "Jul";
+$lang['datetime']['Aug'] = "Aug";
+$lang['datetime']['Sep'] = "Sep";
+$lang['datetime']['Oct'] = "Oct";
+$lang['datetime']['Nov'] = "Nov";
+$lang['datetime']['Dec'] = "Dec";
+
+//
+// Errors (not related to a
+// specific failure on a page)
+//
+$lang['Information'] = "Informacion";
+$lang['Critical_Information'] = "Informacion kritik ";
+
+$lang['General_Error'] = "Problem i p<>rgjithsh<73>m";
+$lang['Critical_Error'] = "Problem kritik";
+$lang['An_error_occured'] = "Pati nj<6E> problem";
+$lang['A_critical_error'] = "Pati nj<6E> problem kritik";
+
+//
+// That's all Folks!
+// -------------------------------------------------
+
+?>

phpBB/language/lang_arabic/email/admin_activate.tpl

@@ -1,4 +1,5 @@
 Subject: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+Charset: windows-1256
 
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
 

phpBB/language/lang_arabic/email/admin_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: windows-1256
+
 <EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD>  "{SITENAME}". <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
 
 {BOARD_EMAIL}

phpBB/language/lang_arabic/email/admin_welcome_activated.tpl

@@ -1,4 +1,5 @@
 Subject: <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+Charset: windows-1256
 
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {USERNAME},
 

phpBB/language/lang_arabic/email/admin_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> {SITENAME}
+Charset: windows-1256
 
 {WELCOME_MSG}
 

phpBB/language/lang_arabic/email/coppa_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> {SITENAME}
+Charset: windows-1256
 
 {WELCOME_MSG}
 

phpBB/language/lang_arabic/email/group_added.tpl

@@ -1,4 +1,5 @@
 Subject: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+Charset: windows-1256
 
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
 

phpBB/language/lang_arabic/email/group_approved.tpl

@@ -1,4 +1,5 @@
 Subject: <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>
+Charset: windows-1256
 
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
 

phpBB/language/lang_arabic/email/group_request.tpl

@@ -1,4 +1,5 @@
 Subject: <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+Charset: windows-1256
 
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F> {GROUP_MODERATOR},
 

phpBB/language/lang_arabic/email/privmsg_notify.tpl

@@ -1,4 +1,5 @@
 Subject: <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+Charset: windows-1256
 
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {USERNAME},
 

phpBB/language/lang_arabic/email/profile_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: windows-1256
+
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {TO_USERNAME},
 
 <EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {FROM_USERNAME} <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {SITENAME}. <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:

phpBB/language/lang_arabic/email/topic_notify.tpl

@@ -1,4 +1,5 @@
 Subject: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - {TOPIC_TITLE}
+Charset: windows-1256
 
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {USERNAME},
 

phpBB/language/lang_arabic/email/user_activate.tpl

@@ -1,4 +1,5 @@
 Subject: v
+Charset: windows-1256
 
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {USERNAME},
 

phpBB/language/lang_arabic/email/user_activate_passwd.tpl

@@ -1,4 +1,5 @@
 Subject: New password activation
+Charset: windows-1256
 
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> {USERNAME}
 

phpBB/language/lang_arabic/email/user_welcome.tpl

@@ -1,4 +1,5 @@
 Subject: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> {SITENAME}
+Charset: windows-1256
 
 {WELCOME_MSG}
 

phpBB/language/lang_arabic/email/user_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> {SITENAME}
+Charset: windows-1256
 
 {WELCOME_MSG}
 

phpBB/language/lang_bulgarian/email/admin_activate.tpl

@@ -1,9 +1,10 @@
-Subject: <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!
-
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "{USERNAME}" <20> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>) <20> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
-
-{U_ACTIVATE}
-
+Subject: <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+Charset: windows-1251
+
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!
+
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "{USERNAME}" <20> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>) <20> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
+
+{U_ACTIVATE}
+
 {EMAIL_SIG}

phpBB/language/lang_bulgarian/email/admin_send_email.tpl

@@ -1,8 +1,10 @@
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> "{SITENAME}". <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20> webmaster-<2D> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>:
-
-{BOARD_EMAIL}
-
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-{MESSAGE}
+Charset: windows-1251
+
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> "{SITENAME}". <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20> webmaster-<2D> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>:
+
+{BOARD_EMAIL}
+
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+{MESSAGE}