phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com

[Phpbb-checkins] CVS: phpBB2/includes template.php,1.12,1.13

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

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv7332/includes

Modified Files:
	template.php 
Log Message:
Minor changes

Index: template.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/template.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** template.php	14 Jul 2002 14:33:30 -0000	1.12
--- template.php	16 Jul 2002 20:39:05 -0000	1.13
***************
*** 76,80 ****
  		if ( !file_exists($this->cachedir) )
  		{
! 			mkdir($this->cachedir, 0644);
  		}
  
--- 76,81 ----
  		if ( !file_exists($this->cachedir) )
  		{
! 			@umask(0);
! 			mkdir($this->cachedir, 0777);
  		}
  
***************
*** 94,99 ****
  
  		$template_names = '';
! 		@reset($filename_array);
! 		while ( list($handle, $filename) = @each($filename_array) )
  		{
  			if ( empty($filename) )
--- 95,99 ----
  
  		$template_names = '';
! 		foreach ( $filename_array as $handle => $filename )
  		{
  			if ( empty($filename) )
***************
*** 258,263 ****
  	function assign_vars($vararray)
  	{
! 		reset($vararray);
! 		while ( list($key, $val) = each($vararray) )
  		{
  			$this->_tpldata['.'][0][$key] = $val;
--- 258,262 ----
  	function assign_vars($vararray)
  	{
! 		foreach ( $vararray as $key => $val )
  		{
  			$this->_tpldata['.'][0][$key] = $val;

[Phpbb-checkins] CVS: phpBB2/install/schemas mysql_basic.sql,1.3,1.4

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

Update of /cvsroot/phpbb/phpBB2/install/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv30662/install/schemas

Modified Files:
	mysql_basic.sql 
Log Message:
Registered shouldn't moderate forum ....

Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install/schemas/mysql_basic.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mysql_basic.sql	16 Jul 2002 18:18:36 -0000	1.3
--- mysql_basic.sql	16 Jul 2002 18:45:09 -0000	1.4
***************
*** 176,180 ****
  # -- Group auth
  INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type IN ('admin');
! INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 1, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type IN ('forum', 'mod');
  
  # -- Prefetch auth
--- 176,180 ----
  # -- Group auth
  INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type IN ('admin');
! INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 1, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type IN ('forum');
  
  # -- Prefetch auth

[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.136,1.137

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

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv22903/includes

Modified Files:
	functions.php 
Log Message:
How come this worked fine locally ... bloody amazing ...

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -r1.136 -r1.137
*** functions.php	14 Jul 2002 14:35:12 -0000	1.136
--- functions.php	16 Jul 2002 18:22:33 -0000	1.137
***************
*** 93,97 ****
  
  	$sql = "SELECT au.forum_id, u.user_id, u.username 
! 		FROM phpbb_auth_users au, phpbb_auth_options ao, " . USERS_TABLE . " u
  		WHERE ao.auth_type LIKE 'mod'  
  			AND au.auth_option_id = ao.auth_option_id 
--- 93,97 ----
  
  	$sql = "SELECT au.forum_id, u.user_id, u.username 
! 		FROM " . ACL_USERS_TABLE . " au, " . ACL_OPTIONS_TABLE . " ao, " . USERS_TABLE . " u
  		WHERE ao.auth_type LIKE 'mod'  
  			AND au.auth_option_id = ao.auth_option_id 
***************
*** 108,112 ****
  
  	$sql = "SELECT au.forum_id, g.group_id, g.group_name  
! 		FROM phpbb_auth_groups au, phpbb_auth_options ao, " . GROUPS_TABLE . " g
  		WHERE ao.auth_type LIKE 'mod' 
  			AND au.auth_option_id = ao.auth_option_id 
--- 108,112 ----
  
  	$sql = "SELECT au.forum_id, g.group_id, g.group_name  
! 		FROM " . ACL_GROUPS_TABLE . " au, " . ACL_OPTIONS_TABLE . " ao, " . GROUPS_TABLE . " g
  		WHERE ao.auth_type LIKE 'mod' 
  			AND au.auth_option_id = ao.auth_option_id 

[Phpbb-checkins] CVS: phpBB2/install/schemas mysql_basic.sql,1.2,1.3

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

Update of /cvsroot/phpbb/phpBB2/install/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv21586/install/schemas

Modified Files:
	mysql_basic.sql 
Log Message:
oops

Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install/schemas/mysql_basic.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mysql_basic.sql	16 Jul 2002 17:30:36 -0000	1.2
--- mysql_basic.sql	16 Jul 2002 18:18:36 -0000	1.3
***************
*** 114,118 ****
  INSERT INTO phpbb_auth_options (auth_type, auth_option) VALUES ('mod', 'approve');
  INSERT INTO phpbb_auth_options (auth_type, auth_option) VALUES ('mod', 'unrate');
! INSERT INTO phpbb_auth_options auth_type, (auth_option) VALUES ('mod', 'auth');
  
  INSERT INTO phpbb_auth_options (auth_type, auth_option) VALUES ('admin', 'general');
--- 114,118 ----
  INSERT INTO phpbb_auth_options (auth_type, auth_option) VALUES ('mod', 'approve');
  INSERT INTO phpbb_auth_options (auth_type, auth_option) VALUES ('mod', 'unrate');
! INSERT INTO phpbb_auth_options (auth_type, auth_option) VALUES ('mod', 'auth');
  
  INSERT INTO phpbb_auth_options (auth_type, auth_option) VALUES ('admin', 'general');

[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.188,1.189

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

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5724

Modified Files:
	viewtopic.php 
Log Message:
Remove topic_vote

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.188
retrieving revision 1.189
diff -C2 -r1.188 -r1.189
*** viewtopic.php	14 Jul 2002 14:45:26 -0000	1.188
--- viewtopic.php	16 Jul 2002 17:31:28 -0000	1.189
***************
*** 146,152 ****
  $join_sql = ( !$post_id ) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND p.post_approved = " . TRUE . " AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_approved = " . TRUE . " AND p2.post_id <= $post_id";
  $count_sql = ( !$post_id ) ? '' : ", COUNT(p2.post_id) AS prev_posts";
! $order_sql = ( !$post_id ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id ORDER BY p.post_id ASC";
  
! $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id " . $count_sql . "
  	FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $join_sql_table . " 
  	WHERE $join_sql
--- 146,152 ----
  $join_sql = ( !$post_id ) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND p.post_approved = " . TRUE . " AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_approved = " . TRUE . " AND p2.post_id <= $post_id";
  $count_sql = ( !$post_id ) ? '' : ", COUNT(p2.post_id) AS prev_posts";
! $order_sql = ( !$post_id ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, f.forum_name, f.forum_status, f.forum_id ORDER BY p.post_id ASC";
  
! $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, f.forum_name, f.forum_status, f.forum_id " . $count_sql . "
  	FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $join_sql_table . " 
  	WHERE $join_sql

[Phpbb-checkins] CVS: phpBB2 login.php,1.48,1.49

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

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv5664

Modified Files:
	login.php 
Log Message:
Add acl, remove user_level ... this needs fixing to ensure user can admin if board is disabled

Index: login.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/login.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** login.php	14 Jul 2002 14:45:21 -0000	1.48
--- login.php	16 Jul 2002 17:31:19 -0000	1.49
***************
*** 35,38 ****
--- 35,41 ----
  //
  $userdata = $session->start();
+ $session->configure($userdata);
+ 
+ $acl = new auth('list', $userdata);
  //
  // End session management
***************
*** 42,46 ****
  // Configure style, language, etc.
  //
- $session->configure($userdata);
  
  $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
--- 45,48 ----
***************
*** 58,62 ****
  		$password = ( isset($HTTP_POST_VARS['password']) ) ? $HTTP_POST_VARS['password'] : '';
  
! 		$sql = "SELECT user_id, username, user_email, user_password, user_active, user_level 
  			FROM " . USERS_TABLE . "
  			WHERE username = '" . str_replace("\'", "''", $username) . "'";
--- 60,64 ----
  		$password = ( isset($HTTP_POST_VARS['password']) ) ? $HTTP_POST_VARS['password'] : '';
  
! 		$sql = "SELECT user_id, username, user_email, user_password, user_active  
  			FROM " . USERS_TABLE . "
  			WHERE username = '" . str_replace("\'", "''", $username) . "'";

[Phpbb-checkins] CVS: phpBB2/install/schemas mysql_basic.sql,1.1,1.2 mysql_schema.sql,1.1,1.2

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

Update of /cvsroot/phpbb/phpBB2/install/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv5419/install/schemas

Modified Files:
	mysql_basic.sql mysql_schema.sql 
Log Message:
This will do a clean install ... it will fail if config isn't writeable or any other error occurs ...

Index: mysql_basic.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install/schemas/mysql_basic.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mysql_basic.sql	16 Jul 2002 12:51:51 -0000	1.1
--- mysql_basic.sql	16 Jul 2002 17:30:36 -0000	1.2
***************
*** 3,6 ****
--- 3,7 ----
  #
  # $Id$
+ #
  
  # -- Config
***************
*** 30,40 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style','0');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','15');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page','50');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold','25');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_chars', '0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars','255');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options','10');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_inbox_privmsgs','50');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','Thanks, The Management');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','you...@yo...');
--- 31,41 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style','0');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','10');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page','30');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold','25');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_chars', '0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars','255');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options','10');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_box_privmsgs','50');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','Thanks, The Management');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','you...@yo...');
***************
*** 46,53 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize','6144');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width','80');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height','80');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars/upload');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
--- 47,55 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_interval','10');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form','0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize','6144');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width','90');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height','90');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars/upload');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
***************
*** 63,75 ****
  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.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 ('newest_user_id', '1');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('newest_username', 'Admin');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('num_users', '1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('num_posts', '1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('num_topics', '1');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('limit_load', '1.0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('active_sessions', '0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600');
--- 65,77 ----
  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', '');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('newest_user_id', '1');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('newest_username', '');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('num_users', '1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('num_posts', '1');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('num_topics', '1');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('limit_load', '1.5');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('active_sessions', '0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600');
***************
*** 128,135 ****
  
  # -- phpbb_styles
! INSERT INTO phpbb_styles (style_id, template_id, theme_id, imageset_id, style_name, style_default) VALUES (1, 1, 1, 1, 'subSilver', 1);
  
  # -- phpbb_styles_imageset
! INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_path, post_new, post_locked, post_pm, reply_new, reply_pm, reply_locked, icon_quote, icon_edit, icon_search, icon_profile, icon_pm, icon_email, icon_www, icon_icq, icon_aim, icon_yim, icon_msnm, icon_no_edit, icon_no_email, icon_no_www, icon_no_icq, icon_no_aim, icon_no_yim, icon_no_msnm, icon_delete, icon_ip, goto_post, goto_post_new, goto_post_latest, goto_post_newest, forum, forum_new, forum_locked, folder, folder_new, folder_hot, folder_hot_new, folder_locked, folder_locked_new, folder_sticky, folder_sticky_new, folder_announce, folder_announce_new, topic_watch, topic_unwatch, poll_left, poll_center, poll_right, rating) VALUES (1, 'subSilver © phpBB Group', 'subSilver', '"imagesets/subSilver/{LANG}/post.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply-locked.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/post.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply.gif" width="88" height="27" border="0"', '"imagesets/subSilver/{LANG}/reply.gif" width="88" height="27" border="0"', '"imagesets/subSilver/{LANG}/reply-locked.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/icon_quote.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_edit.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_search.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_profile.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_pm.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_email.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_www.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_icq_add.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_aim.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_yim.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_msnm.gif" width="59" height="18" border="0"', '', '', '', '', '', '', '', '"imagesets/subSilver/icon_delete.gif" width="16" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_ip.gif" width="16" height="18" border="0"', '"imagesets/subSilver/icon_minipost.gif" width="12" height="9" border="0"', '"imagesets/subSilver/icon_minipost_new.gif" width="12" height="9" border="0"', '"imagesets/subSilver/icon_latest_reply.gif" width="18" height="9" border="0"', '"imagesets/subSilver/icon_newest_reply.gif" width="18" height="9" border="0"', '"imagesets/subSilver/folder_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder_new_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder_locked_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_hot.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new_hot.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce_new.gif" width="19" height="18" border="0"', '', '', '"imagesets/subSilver/voting_lcap.gif" width="4" height="12" border="0"', '"imagesets/subSilver/voting_rcap.gif" height="12" border="0"', '"imagesets/subSilver/voting_bar.gif" width="4" height="12" border="0"', '"imagesets/subSilver/ratings/{RATE}.gif" width="45" height="17" border="0"');
  
  # -- phpbb_styles_template
--- 130,137 ----
  
  # -- phpbb_styles
! INSERT INTO phpbb_styles (style_id, template_id, theme_id, imageset_id, style_name) VALUES (1, 1, 1, 1, 'subSilver');
  
  # -- phpbb_styles_imageset
! INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_path, post_new, post_locked, post_pm, reply_new, reply_pm, reply_locked, icon_quote, icon_edit, icon_search, icon_profile, icon_pm, icon_email, icon_www, icon_icq, icon_aim, icon_yim, icon_msnm, icon_no_email, icon_no_www, icon_no_icq, icon_no_aim, icon_no_yim, icon_no_msnm, icon_delete, icon_ip, goto_post, goto_post_new, goto_post_latest, goto_post_newest, forum, forum_new, forum_locked, folder, folder_new, folder_hot, folder_hot_new, folder_locked, folder_locked_new, folder_sticky, folder_sticky_new, folder_announce, folder_announce_new, topic_watch, topic_unwatch, poll_left, poll_center, poll_right, rating) VALUES (1, 'subSilver © phpBB Group', 'subSilver', '"imagesets/subSilver/{LANG}/post.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply-locked.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/post.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply.gif" width="88" height="27" border="0"', '"imagesets/subSilver/{LANG}/reply.gif" width="88" height="27" border="0"', '"imagesets/subSilver/{LANG}/reply-locked.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/icon_quote.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_edit.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_search.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_profile.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_pm.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_email.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_www.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_icq_add.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_aim.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_yim.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_msnm.gif" width="59" height="18" border="0"', '', '', '', '', '', '', '"imagesets/subSilver/icon_delete.gif" width="16" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_ip.gif" width="16" height="18" border="0"', '"imagesets/subSilver/icon_minipost.gif" width="12" height="9" border="0"', '"imagesets/subSilver/icon_minipost_new.gif" width="12" height="9" border="0"', '"imagesets/subSilver/icon_latest_reply.gif" width="18" height="9" border="0"', '"imagesets/subSilver/icon_newest_reply.gif" width="18" height="9" border="0"', '"imagesets/subSilver/folder_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder_new_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder_locked_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_hot.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new_hot.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce_new.gif" width="19" height="18" border="0"', '', '', '"imagesets/subSilver/voting_lcap.gif" width="4" height="12" border="0"', '"imagesets/subSilver/voting_rcap.gif" height="12" border="0"', '"imagesets/subSilver/voting_bar.gif" width="4" height="12" border="0"', '"imagesets/subSilver/ratings/{RATE}.gif" width="45" height="17" border="0"');
  
  # -- phpbb_styles_template
***************
*** 137,141 ****
  
  # -- phpbb_styles_theme
! INSERT INTO phpbb_styles_theme (theme_id, css_data, css_external) VALUES (1, 'th		{ background-image: url(templates/subSilver/images/cellpic3.gif) }\r\ntd.cat		{ background-image: url(templates/subSilver/images/cellpic1.gif) }\r\ntd.rowpic	{ background-image: url(templates/subSilver/images/cellpic2.jpg); background-repeat: repeat-y }\r\ntd.icqback	{ background-image: url(templates/subSilver/images/icon_icq_add.gif); background-repeat: no-repeat }\r\ntd.catHead,td.catSides,td.catLeft,td.catRight,td.catBottom { background-image: url(templates/subSilver/images/cellpic1.gif) }\r\nTH.thTop	{ background-image: url(templates/subSilver/images/cellpic3.gif) }', 'subSilver/subSilver.css');
  
  
--- 139,143 ----
  
  # -- phpbb_styles_theme
! INSERT INTO phpbb_styles_theme (theme_id, css_data, css_external) VALUES (1, 'th		{ background-image: url(templates/subSilver/images/cellpic3.gif) }\r\ntd.cat		{ background-image: url(templates/subSilver/images/cellpic1.gif) }\r\ntd.rowpic	{ background-image: url(templates/subSilver/images/cellpic2.jpg); background-repeat: repeat-y }\r\ntd.icqback	{ background-image: url(templates/subSilver/images/icon_icq_add.gif); background-repeat: no-repeat }\r\ntd.catHead,td.catSides,td.catLeft,td.catRight,td.catBottom { background-image: url(templates/subSilver/images/cellpic1.gif) }\r\nth.thTop	{ background-image: url(templates/subSilver/images/cellpic3.gif) }', 'subSilver/subSilver.css');
  
  
***************
*** 149,156 ****
  
  # -- 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 ( 0, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 0, 1, 0, 1, 1, NULL, '', '', '', '', '', '', 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 ( 1, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', 'ad...@yo...', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, '', 'english', 0, 'd M Y h:i a', '', '', 0, 1);
  
  
--- 151,158 ----
  
  # -- Users
! INSERT INTO phpbb_users (user_id, username, 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, NULL, '', '', '', 0, 0, 1, 0, 1, 0, 1, 1, NULL, '', '', '', '', '', '', 0, 0);
  
  # -- username: admin    password: admin (change this or remove it once everything is working!)
! INSERT INTO phpbb_users (user_id, username, 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', 0, '21232f297a57a5a743894a0e4a801fc3', 'ad...@yo...', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, '', 'english', 0, 'd M Y h:i a', '', '', 0, 1);
  
  
***************
*** 161,174 ****
  # -- Groups
  INSERT INTO phpbb_groups (group_id, group_name, group_type) VALUES (1, 'REGISTERED', 0);
! INSERT INTO phpbb_groups (group_id, group_name, group_type) VALUES (1, 'ADMINISTRATOR', 0);
  
  
  # -- 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, 1, 0);
  
  
  # -- 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_vote, topic_first_post_id, topic_last_post_id) VALUES (1, 'Welcome to phpBB 2', 2, '972086460', 0, 0, 1, 0, 0, 0, 1, 1);
  
  
--- 163,189 ----
  # -- Groups
  INSERT INTO phpbb_groups (group_id, group_name, group_type) VALUES (1, 'REGISTERED', 0);
! INSERT INTO phpbb_groups (group_id, group_name, group_type) VALUES (2, 'ADMINISTRATOR', 0);
  
  
  # -- User -> Group
! INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (1, 2, 0);
! INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (2, 2, 0);
! 
! 
! # -- User auth
! INSERT INTO phpbb_auth_users (user_id, forum_id, auth_option_id, auth_allow_deny) SELECT -1, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type LIKE 'forum' AND auth_option IN ('list', 'read', 'post', 'reply');
! 
! # -- Group auth
! INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type IN ('admin');
! INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 1, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type IN ('forum', 'mod');
! 
! # -- Prefetch auth
! INSERT INTO phpbb_auth_prefetch (user_id, forum_id, auth_option_id, auth_allow_deny) SELECT -1, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type LIKE 'forum' AND auth_option IN ('list', 'read', 'post', 'reply');
! INSERT INTO phpbb_auth_prefetch (user_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type IN ('admin');
! INSERT INTO phpbb_auth_prefetch (user_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_type IN ('forum', 'mod');
  
  
  # -- 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_first_post_id, topic_last_post_id) VALUES (1, 'Welcome to phpBB 2', 2, '972086460', 0, 0, 1, 0, 0, 1, 1);
  
  

Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install/schemas/mysql_schema.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mysql_schema.sql	16 Jul 2002 12:51:51 -0000	1.1
--- mysql_schema.sql	16 Jul 2002 17:30:36 -0000	1.2
***************
*** 49,56 ****
  #
  CREATE TABLE phpbb_auth_prefetch (
!   user_id mediumint(8) unsigned NOT NULL default '0',
    forum_id mediumint(8) unsigned NOT NULL default '0',
    auth_option_id smallint(5) unsigned NOT NULL default '0',
!   auth_allow_deny tinyint(4) NOT NULL default '1')
  );
  
--- 49,56 ----
  #
  CREATE TABLE phpbb_auth_prefetch (
!   user_id mediumint(8)  NOT NULL default '0',
    forum_id mediumint(8) unsigned NOT NULL default '0',
    auth_option_id smallint(5) unsigned NOT NULL default '0',
!   auth_allow_deny tinyint(4) NOT NULL default '1'
  );
  
***************
*** 61,65 ****
  #
  CREATE TABLE phpbb_auth_users (
!   user_id mediumint(8) unsigned NOT NULL default '0',
    forum_id mediumint(8) unsigned NOT NULL default '0',
    auth_option_id smallint(5) unsigned NOT NULL default '0',
--- 61,65 ----
  #
  CREATE TABLE phpbb_auth_users (
!   user_id mediumint(8)  NOT NULL default '0',
    forum_id mediumint(8) unsigned NOT NULL default '0',
    auth_option_id smallint(5) unsigned NOT NULL default '0',
***************
*** 135,138 ****
--- 135,140 ----
  CREATE TABLE phpbb_forums (
     forum_id smallint(5) UNSIGNED NOT NULL,
+    cat_id smallint(5) UNSIGNED NOT NULL, 
+ 
     parent_id smallint(5) UNSIGNED NOT NULL, 
     forum_order smallint(5) UNSIGNED DEFAULT '1' NOT NULL, 

[Phpbb-checkins] CVS: phpBB2/install install.php,1.2,1.3

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

Update of /cvsroot/phpbb/phpBB2/install
In directory usw-pr-cvs1:/tmp/cvs-serv5419/install

Modified Files:
	install.php 
Log Message:
This will do a clean install ... it will fail if config isn't writeable or any other error occurs ...

Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install/install.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** install.php	16 Jul 2002 14:45:00 -0000	1.2
--- install.php	16 Jul 2002 17:30:35 -0000	1.3
***************
*** 5,9 ****
   *   begin                : Tuesday, Sept 11, 2001
   *   copyright            : (C) 2001 The phpBB Group
!  *   email                : supportphpbb.com
   *
   *   $Id$
--- 5,9 ----
   *   begin                : Tuesday, Sept 11, 2001
   *   copyright            : (C) 2001 The phpBB Group
!  *   email                : su...@ph...
   *
   *   $Id$
***************
*** 96,133 ****
  
  //
- // drop table schema
- //
- $sql_array = array();
- 
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_auth_access";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_banlist";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_categories";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_config";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_disallow";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_forum_prune";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_forums";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_groups";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_posts";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_posts_text";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_privmsgs";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_privmsgs_text";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_ranks";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_search_results";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_search_wordlist";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_search_wordmatch";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_sessions";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_smilies";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_themes";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_themes_name";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_topics";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_topics_watch";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_user_group";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_users";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_vote_desc";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_vote_results";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_vote_voters";
- $sql_array['drop_schema'][] = "DROP TABLE phpbb_words";
- 
- //
  // Uncomment the following line to completely disable the ftp option...
  //
--- 96,99 ----
***************
*** 141,144 ****
--- 107,118 ----
  
  //
+ // Try opening config file
+ //
+ if ( @file_exists('../config.'.$phpEx) )
+ {
+ 	include('../config.'.$phpEx);
+ }
+ 
+ //
  // Obtain various vars
  //
***************
*** 146,150 ****
  $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
  
! if( isset($HTTP_POST_VARS['install_step']) || isset($HTTP_GET_VARS['install_step']) )
  {
  	$install_step = ( isset($HTTP_POST_VARS['install_step']) ) ? $HTTP_POST_VARS['install_step'] : $HTTP_GET_VARS['install_step'];
--- 120,124 ----
  $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
  
! if ( isset($HTTP_POST_VARS['install_step']) || isset($HTTP_GET_VARS['install_step']) )
  {
  	$install_step = ( isset($HTTP_POST_VARS['install_step']) ) ? $HTTP_POST_VARS['install_step'] : $HTTP_GET_VARS['install_step'];
***************
*** 182,194 ****
  
  //
! //
! //
! if ( @file_exists('../config.'.$phpEx) )
! {
! 	include('../config.'.$phpEx);
! }
! 
! //
! //
  //
  if ( !defined('PHPBB_INSTALLED') )
--- 156,160 ----
  
  //
! // Do we install/upgrade/update or quit back to index?
  //
  if ( !defined('PHPBB_INSTALLED') )
***************
*** 203,214 ****
  	include($phpbb_root_path . 'language/lang_' . $language . '/lang_admin.'.$phpEx);
  
- 	//
- 	// Ok for the time being I'm commenting this out whilst I'm working on
- 	// better integration of the install with upgrade as per Bart's request
- 	// JLH
- 	//
  	if ( $upgrade == 1 )
  	{
! 		// require('upgrade.'.$phpEx);
  		$install_step = 1;
  	}
--- 169,175 ----
  	include($phpbb_root_path . 'language/lang_' . $language . '/lang_admin.'.$phpEx);
  
  	if ( $upgrade == 1 )
  	{
! 		require('upgrade.'.$phpEx);
  		$install_step = 1;
  	}
***************
*** 221,231 ****
  
  //
! //
  //
  if ( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 1  && !defined("PHPBB_INSTALLED") && empty($HTTP_POST_VARS['upgrade_now']) )
  {
- 	header("Content-Type: text/x-delimtext; name=\"config.$phpEx\"");
- 	header("Content-disposition: attachment; filename=config.$phpEx");
- 
  	//
  	// We need to stripslashes no matter what the setting of magic_quotes_gpc is
--- 182,189 ----
  
  //
! // What shall we do?
  //
  if ( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 1  && !defined("PHPBB_INSTALLED") && empty($HTTP_POST_VARS['upgrade_now']) )
  {
  	//
  	// We need to stripslashes no matter what the setting of magic_quotes_gpc is
***************
*** 235,241 ****
  	$HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']);
  
  	echo $HTTP_POST_VARS['config_data'];
- 
  	exit;
  }
  else if ( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 2 && !defined("PHPBB_INSTALLED")  )
--- 193,201 ----
  	$HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']);
  
+ 	header("Content-Type: text/x-delimtext; name=\"config.$phpEx\"");
+ 	header("Content-disposition: attachment; filename=config.$phpEx");
  	echo $HTTP_POST_VARS['config_data'];
  	exit;
+ 
  }
  else if ( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 2 && !defined("PHPBB_INSTALLED")  )
***************
*** 250,254 ****
  	$s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />';
  
! 	if( $upgrade == 1 )
  	{
  		$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
--- 210,214 ----
  	$s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />';
  
! 	if ( $upgrade == 1 )
  	{
  		$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
***************
*** 292,296 ****
  		$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($HTTP_POST_VARS['config_data']) . '" />';
  		$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';
! 		if( $upgrade == 1 )
  		{
  			$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
--- 252,259 ----
  		$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($HTTP_POST_VARS['config_data']) . '" />';
  		$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';
! 
! 		page_header($lang['NoFTP_config'], "install.$phpEx");
! 
! 		if ( $upgrade == 1 )
  		{
  			$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
***************
*** 308,311 ****
--- 271,275 ----
  			$s_hidden_fields .= '<input type="hidden" name="script_path" value="'.$script_path.'" />';
  			$s_hidden_fields .= '<input type="hidden" name="board_email" value="'.$board_email.'" />';
+ 
  			$template->assign_block_vars("switch_upgrade_install", array());
  			$template->assign_vars(array(
***************
*** 314,328 ****
  			);
  		}
- 		$template->assign_block_vars("switch_common_install", array());
- 		
- 		$template->assign_vars(array(
- 			"L_INSTRUCTION_TEXT" => $lang['NoFTP_config'],
- 			"L_SUBMIT" => $lang['Download_config'],
- 
- 			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
- 			"S_FORM_ACTION" => "install.$phpEx")
- 		);
  
! 		$template->pparse('body');
  
  		exit;
--- 278,283 ----
  			);
  		}
  
! 		page_footer($lang['Download_config'], $s_hidden_fields);
  
  		exit;
***************
*** 348,356 ****
  		@ftp_chdir($conn_id, $ftp_dir);
  
! 		$res = ftp_put($conn_id, 'config.'.$phpEx, $tmpfname, FTP_ASCII);
  
  		@ftp_quit($conn_id);
  
  		unlink($tmpfname);
  		if( $upgrade == 1 )	
  		{
--- 303,312 ----
  		@ftp_chdir($conn_id, $ftp_dir);
  
! 		$res = ftp_put($conn_id, '../config.'.$phpEx, $tmpfname, FTP_ASCII);
  
  		@ftp_quit($conn_id);
  
  		unlink($tmpfname);
+ 
  		if( $upgrade == 1 )	
  		{
***************
*** 358,367 ****
  			exit;
  		}
  		//
! 		// Ok we are basically done with the install process let's go on 
! 		// and let the user configure their board now.
! 		//
! 		// We are going to do this by calling the admin_board.php from the
! 		// normal board admin section.
  		//
  		$s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />';
--- 314,322 ----
  			exit;
  		}
+ 
  		//
! 		// Ok we are basically done with the install process let's go on and let the user
! 		// configure their board now. We are going to do this by calling the admin_board.php
! 		// from the normal board admin section.
  		//
  		$s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />';
***************
*** 370,387 ****
  		$s_hidden_fields .= '<input type="hidden" name="submit" value="' . $lang['Login'] . '" />';
  
! 		$template->assign_block_vars("switch_common_install", array());
! 
! 		$template->assign_vars(array(
! 			"L_INSTRUCTION_TEXT" => $lang['Inst_Step_2'],
! 			"L_SUBMIT" => $lang['Finish_Install'],
! 
! 			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
! 			"S_FORM_ACTION" => "login.$phpEx")
! 		);
! 		
! 		$template->pparse('body');
  
  		exit();
  	}
  }
  else if ( ( empty($install_step) || $admin_pass1 != $admin_pass2 || empty($admin_pass1) || $dbhost == '' )  && !defined("PHPBB_INSTALLED") )
--- 325,334 ----
  		$s_hidden_fields .= '<input type="hidden" name="submit" value="' . $lang['Login'] . '" />';
  
! 		page_header($lang['Inst_Step_2'], "../login.$phpEx");
! 		page_footer($lang['Finish_Install'], $s_hidden_fields);
  
  		exit();
  	}
+ 
  }
  else if ( ( empty($install_step) || $admin_pass1 != $admin_pass2 || empty($admin_pass1) || $dbhost == '' )  && !defined("PHPBB_INSTALLED") )
***************
*** 447,525 ****
  	$s_hidden_fields = '<input type="hidden" name="install_step" value="1" />';
  
! 	page_header($instruction_text);
  
  ?>
! 					<tr>
! 						<th colspan="2"><?php echo $lang['Initial_config']; ?></th>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right" width="40%"><span class="gen"><?php echo $lang['Default_lang']; ?>: </span></td>
! 						<td class="row2"><?php echo $lang_options; ?></select></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['dbms']; ?>: </span></td>
! 						<td class="row2"><select name="dbms" onchange="if(document.install_form.upgrade.options[upgrade.selectedIndex].value == 1) { document.install_form.dbms.selectedIndex=0}"><?php echo $dbms_options; ?></select></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Install_Method']; ?>: </span></td>
! 						<td class="row2"><select name="upgrade" onchange="if( this.options[this.selectedIndex].value == 1 ) { document.install_form.dbms.selectedIndex=0; }"><?php echo $upgrade_option; ?></select></td>
! 					</tr>
! 					<tr>
! 						<th colspan="2"><?php echo $lang['DB_config']; ?></th>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Host']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="dbhost" value="<?php echo ( $dbhost != '' ) ? $dbhost : ''; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Name']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="dbname" value="<?php echo ( $dbname != '' ) ? $dbname : ''; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Username']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="dbuser" value="<?php echo ( $dbuser != '' ) ? $dbuser : ''; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Password']; ?>: </span></td>
! 						<td class="row2"><input type="password" name="dbpasswd" value="<?php echo ( $dbpasswd != '' ) ? $dbpasswd : ''; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Table_Prefix']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="prefix" value="<?php echo ( !empty($table_prefix) ) ? $table_prefix : 'phpbb_'; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<th colspan="2"><?php echo $lang['Admin_config']; ?></th>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Server_name']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="server_name" value="<?php echo $server_name; ?>" /></td>
! 					</tr> 
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Server_port']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="server_port" value="<?php echo $server_port; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Script_path']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="script_path" value="<?php echo $script_path; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_Username']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="admin_name" value="<?php echo ( $admin_name != '' ) ? $admin_name : ''; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_email']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="board_email" value="<?php echo ( $admin_email != '' ) ? $admin_email : ''; ?>" /></td>
! 					</tr> 
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_Password']; ?>: </span></td>
! 						<td class="row2"><input type="password" name="admin_pass1" value="<?php echo ( $admin_pass1 != '' ) ? $admin_pass1 : ''; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_Password_confirm']; ?>: </span></td>
! 						<td class="row2"><input type="password" name="admin_pass2" value="<?php echo ( $admin_pass2 != '' ) ? $admin_pass2 : ''; ?>" /></td>
! 					</tr>
  <?php
  
! 	page_footer($lang['Start_Install'], $s_hidden_fields);
  
  	exit;
--- 394,472 ----
  	$s_hidden_fields = '<input type="hidden" name="install_step" value="1" />';
  
! 	page_header($instruction_text, "install.$phpEx");
  
  ?>
! 	<tr>
! 		<th colspan="2"><?php echo $lang['Initial_config']; ?></th>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right" width="40%"><span class="gen"><?php echo $lang['Default_lang']; ?>: </span></td>
! 		<td class="row2"><?php echo $lang_options; ?></select></td>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['dbms']; ?>: </span></td>
! 		<td class="row2"><select name="dbms" onchange="if(document.install_form.upgrade.options[upgrade.selectedIndex].value == 1) { document.install_form.dbms.selectedIndex=0}"><?php echo $dbms_options; ?></select></td>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['Install_Method']; ?>: </span></td>
! 		<td class="row2"><select name="upgrade" onchange="if( this.options[this.selectedIndex].value == 1 ) { document.install_form.dbms.selectedIndex=0; }"><?php echo $upgrade_option; ?></select></td>
! 	</tr>
! 	<tr>
! 		<th colspan="2"><?php echo $lang['DB_config']; ?></th>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Host']; ?>: </span></td>
! 		<td class="row2"><input type="text" name="dbhost" value="<?php echo ( $dbhost != '' ) ? $dbhost : ''; ?>" /></td>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Name']; ?>: </span></td>
! 		<td class="row2"><input type="text" name="dbname" value="<?php echo ( $dbname != '' ) ? $dbname : ''; ?>" /></td>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Username']; ?>: </span></td>
! 		<td class="row2"><input type="text" name="dbuser" value="<?php echo ( $dbuser != '' ) ? $dbuser : ''; ?>" /></td>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Password']; ?>: </span></td>
! 		<td class="row2"><input type="password" name="dbpasswd" value="<?php echo ( $dbpasswd != '' ) ? $dbpasswd : ''; ?>" /></td>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['Table_Prefix']; ?>: </span></td>
! 		<td class="row2"><input type="text" name="prefix" value="<?php echo ( !empty($table_prefix) ) ? $table_prefix : 'phpbb_'; ?>" /></td>
! 	</tr>
! 	<tr>
! 		<th colspan="2"><?php echo $lang['Admin_config']; ?></th>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['Server_name']; ?>: </span></td>
! 		<td class="row2"><input type="text" name="server_name" value="<?php echo $server_name; ?>" /></td>
! 	</tr> 
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['Server_port']; ?>: </span></td>
! 		<td class="row2"><input type="text" name="server_port" value="<?php echo $server_port; ?>" /></td>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['Script_path']; ?>: </span></td>
! 		<td class="row2"><input type="text" name="script_path" value="<?php echo $script_path; ?>" /></td>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_Username']; ?>: </span></td>
! 		<td class="row2"><input type="text" name="admin_name" value="<?php echo ( $admin_name != '' ) ? $admin_name : ''; ?>" /></td>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_email']; ?>: </span></td>
! 		<td class="row2"><input type="text" name="board_email" value="<?php echo ( $board_email != '' ) ? $board_email : ''; ?>" /></td>
! 	</tr> 
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_Password']; ?>: </span></td>
! 		<td class="row2"><input type="password" name="admin_pass1" value="<?php echo ( $admin_pass1 != '' ) ? $admin_pass1 : ''; ?>" /></td>
! 	</tr>
! 	<tr>
! 		<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_Password_confirm']; ?>: </span></td>
! 		<td class="row2"><input type="password" name="admin_pass2" value="<?php echo ( $admin_pass2 != '' ) ? $admin_pass2 : ''; ?>" /></td>
! 	</tr>
  <?php
  
! 	page_footer($lang['Start_Install'], $s_hidden_fields, "install.$phpEx");
  
  	exit;
***************
*** 534,569 ****
  	// the relevant entries
  	//
! 	if( $reinstall )
  	{
! 		$sql_query = preg_replace('/phpbb_/', $table_prefix, $sql_array['drop_schema']);
! 		$sql_count = count($sql_query);
! 
! 		for($i = 0; $i < $sql_count; $i++)
! 		{
! 			$result = $db->sql_query($sql_query[$i]);
! 			if( !$result )
! 			{
! 				$error = $db->sql_error();
! 
! 				$template->assign_block_vars("switch_error_install", array());
! 
! 				$template->assign_vars(array(
! 					"L_ERROR_TITLE" => $lang['Installer_Error'],
! 					"L_ERROR" => $lang['Install_db_error'] . '<br /><br />' . $error)
! 				);
! 
! 				$template->pparse('body');
! 
! 				exit;
! 			}
! 		}
! 
! 		$admin_name = $userdata['username'];
! 		$admin_pass1 = $userdata['user_password'];
! 		$language = $userdata['user_lang'];
! 	}
! 	else if( isset($dbms) )
! 	{
! 		switch( $dbms )
  		{
  			case 'msaccess':
--- 481,487 ----
  	// the relevant entries
  	//
! 	if ( isset($dbms) )
  	{
! 		switch ( $dbms )
  		{
  			case 'msaccess':
***************
*** 586,592 ****
  				break;
  		}
  		if ( !extension_loaded( $check_exts ) && !extension_loaded( $check_other ) )
  		{	
! 			$template->assign_block_vars("switch_error_install", array());
  
  			$template->assign_vars(array(
--- 504,511 ----
  				break;
  		}
+ 
  		if ( !extension_loaded( $check_exts ) && !extension_loaded( $check_other ) )
  		{	
! /*			$template->assign_block_vars("switch_error_install", array());
  
  			$template->assign_vars(array(
***************
*** 594,605 ****
  				"L_ERROR" => $lang['Install_No_Ext'])
  			);
! 			$template->pparse('body');				
  			exit;
  		}
! 		include($phpbb_root_path.'includes/db.'.$phpEx);
  	}
  
! 	$dbms_schema = 'db/schemas/' . $available_dbms[$dbms]['SCHEMA'] . '_schema.sql';
! 	$dbms_basic = 'db/schemas/' . $available_dbms[$dbms]['SCHEMA'] . '_basic.sql';
  
  	$remove_remarks = $available_dbms[$dbms]['COMMENTS'];;
--- 513,528 ----
  				"L_ERROR" => $lang['Install_No_Ext'])
  			);
! 			$template->pparse('body');				*/
! 
  			exit;
  		}
! 
! 		include($phpbb_root_path . 'db/' . $dbms . '.' . $phpEx);
! 
! 		$db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false);
  	}
  
! 	$dbms_schema = 'schemas/' . $available_dbms[$dbms]['SCHEMA'] . '_schema.sql';
! 	$dbms_basic = 'schemas/' . $available_dbms[$dbms]['SCHEMA'] . '_basic.sql';
  
  	$remove_remarks = $available_dbms[$dbms]['COMMENTS'];;
***************
*** 607,615 ****
  	$delimiter_basic = $available_dbms[$dbms]['DELIM_BASIC']; 
  
! 	if( $install_step == 1 || $reinstall )
  	{
! 		if( $upgrade != 1 )
  		{
! 			if( $dbms != 'msaccess' )
  			{
  				//
--- 530,538 ----
  	$delimiter_basic = $available_dbms[$dbms]['DELIM_BASIC']; 
  
! 	if ( $install_step == 1 || $reinstall )
  	{
! 		if ( $upgrade != 1 )
  		{
! 			if ( $dbms != 'msaccess' )
  			{
  				//
***************
*** 620,624 ****
  				//
  				$sql_query = @fread(@fopen($dbms_schema, 'r'), @filesize($dbms_schema));
! 				$sql_query = preg_replace('/phpbb_/', $table_prefix, $sql_query);
  
  				$sql_query = $remove_remarks($sql_query);
--- 543,547 ----
  				//
  				$sql_query = @fread(@fopen($dbms_schema, 'r'), @filesize($dbms_schema));
! 				$sql_query = preg_replace('/phpbb_/is', $table_prefix, $sql_query);
  
  				$sql_query = $remove_remarks($sql_query);
***************
*** 629,648 ****
  				for($i = 0; $i < $sql_count; $i++)
  				{
! 					$result = $db->sql_query($sql_query[$i]);
! 					if( !$result )
! 					{
! 						$error = $db->sql_error();
! 		
! 						$template->assign_block_vars("switch_error_install", array());
! 
! 						$template->assign_vars(array(
! 							"L_ERROR_TITLE" => $lang['Installer_Error'],
! 							"L_ERROR" => $lang['Install_db_error'] . '<br />' . $error['message'])
! 						);
! 
! 						$template->pparse('body');
! 
! 						exit;
! 					}
  				}
  		
--- 552,556 ----
  				for($i = 0; $i < $sql_count; $i++)
  				{
! 					$db->sql_query($sql_query[$i]);
  				}
  		
***************
*** 660,679 ****
  				for($i = 0; $i < $sql_count; $i++)
  				{
! 					$result = $db->sql_query($sql_query[$i]);
! 					if( !$result )
! 					{
! 						$error = $db->sql_error();
! 		
! 						$template->assign_block_vars("switch_error_install", array());
! 
! 						$template->assign_vars(array(
! 							"L_ERROR_TITLE" => $lang['Installer_Error'],
! 							"L_ERROR" => $lang['Install_db_error'] . "<br />" . $error["message"])
! 						);
! 
! 						$template->pparse('body');
! 
! 						exit;
! 					}
  				}
  			}
--- 568,572 ----
  				for($i = 0; $i < $sql_count; $i++)
  				{
! 					$db->sql_query($sql_query[$i]);
  				}
  			}
***************
*** 686,690 ****
  			// to set up their forum defaults.
  			//
! 			$error = "";
  
  			//
--- 579,584 ----
  			// to set up their forum defaults.
  			//
! 			$admin_pass_md5 = ( $confirm && $userdata['user_level'] == ADMIN ) ? $admin_pass1 : md5($admin_pass1);
! 			$error = '';
  
  			//
***************
*** 729,734 ****
  			$db->sql_query($sql);
  
- 			$admin_pass_md5 = ( $confirm && $userdata['user_level'] == ADMIN ) ? $admin_pass1 : md5($admin_pass1);
- 
  			$sql = "UPDATE " . $table_prefix . "users 
  				SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "', user_lang = '" . str_replace("\'", "''", $language) . "', user_email='" . str_replace("\'", "''", $board_email) . "'
--- 623,626 ----
***************
*** 740,748 ****
  			$db->sql_query($sql);
  
- 
  			//
  			// Change session table to HEAP if MySQL version matches
  			//
! 			if( preg_match("/^mysql/", $dbms) )
  			{
  				$sql = "SELECT VERSION() AS mysql_version";
--- 632,639 ----
  			$db->sql_query($sql);
  
  			//
  			// Change session table to HEAP if MySQL version matches
  			//
! 			if ( preg_match("/^mysql/", $dbms) )
  			{
  				$sql = "SELECT VERSION() AS mysql_version";
***************
*** 761,765 ****
  			}
  
! 			if( $error != "" )
  			{
  				$template->assign_block_vars("switch_error_install", array());
--- 652,656 ----
  			}
  
! /*			if ( $error != '' )
  			{
  				$template->assign_block_vars("switch_error_install", array());
***************
*** 773,782 ****
  
  				exit;
! 			}
  		}
  
! 		if( !$reinstall && !$upgrade_now )
  		{
! 			$template->assign_block_vars("switch_common_install", array());
  
  			//
--- 664,673 ----
  
  				exit;
! 			}*/
  		}
  
! 		if ( !$reinstall && !$upgrade_now )
  		{
! //			$template->assign_block_vars("switch_common_install", array());
  
  			//
***************
*** 797,802 ****
  			$no_open = FALSE;
  
! 			$fp = @fopen('config.'.$phpEx, 'w');
! 			if( !$fp )
  			{
  				//
--- 688,692 ----
  			$no_open = FALSE;
  
! 			if ( !($fp = @fopen('../config.'.$phpEx, 'w')) )
  			{
  				//
***************
*** 806,810 ****
  				$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($config_data) . '" />';
  
! 				if( extension_loaded('ftp') && !defined('NO_FTP') )
  				{
  					$template->assign_block_vars('switch_ftp_option', array());
--- 696,700 ----
  				$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($config_data) . '" />';
  
! 				if ( extension_loaded('ftp') && !defined('NO_FTP') )
  				{
  					$template->assign_block_vars('switch_ftp_option', array());
***************
*** 822,826 ****
  					$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';
  				}
! 				if( $upgrade == 1 )
  				{
  					$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
--- 712,717 ----
  					$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';
  				}
! 
! 				if ( $upgrade == 1 )
  				{
  					$s_hidden_fields .= '<input type="hidden" name="upgrade" value="1" />';
***************
*** 866,870 ****
  		else
  		{
! 			$template->assign_block_vars("switch_common_install", array());
  		}
  
--- 757,761 ----
  		else
  		{
! //			$template->assign_block_vars("switch_common_install", array());
  		}
  
***************
*** 885,889 ****
  		// normal board admin section.
  		//
! 		if( !$reinstall )
  		{
  			$s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />';
--- 776,780 ----
  		// normal board admin section.
  		//
! 		if ( !$reinstall )
  		{
  			$s_hidden_fields = '<input type="hidden" name="username" value="' . $admin_name . '" />';
***************
*** 894,909 ****
  		else
  		{
! 			$s_hidden_fields = "";
  		}
  
! 		$template->assign_vars(array(
! 			"L_INSTRUCTION_TEXT" => $lang['Inst_Step_2'],
! 			"L_SUBMIT" => $lang['Finish_Install'],
! 
! 			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
! 			"S_FORM_ACTION" => ( $reinstall ) ? append_sid("login.$phpEx") : "login.$phpEx")
! 		);
! 		
! 		$template->pparse('body');
  
  		exit;
--- 785,793 ----
  		else
  		{
! 			$s_hidden_fields = '';
  		}
  
! 		page_header($lang['Inst_Step_2'], "../login.$phpEx");
! 		page_footer($lang['Finish_Install'], $s_hidden_fields);
  
  		exit;
***************
*** 932,936 ****
  //
  //
! function page_header($l_instructions)
  {
  	global $phpEx, $lang;
--- 816,820 ----
  //
  //
! function page_header($l_instructions, $s_action)
  {
  	global $phpEx, $lang;
***************
*** 960,972 ****
  <table width="85%" cellspacing="0" cellpadding="0" border="0" align="center">
  	<tr>
! 		<td><br clear="all" />
  
  <p><?php echo $l_instructions; ?></p>
  
! <form action="install.<?php echo $phpEx; ?>" name="install_form" method="post"><table class="bg" width="100%" cellspacing="1" cellpadding="2" border="0">
  <?php
  
  }
  
  function page_footer($l_submit, $s_hidden_fields)
  {
--- 844,861 ----
  <table width="85%" cellspacing="0" cellpadding="0" border="0" align="center">
  	<tr>
! 		<td><br clear="all" /><br />
  
  <p><?php echo $l_instructions; ?></p>
  
! <br clear="all" />
! 
! <form action="<?php echo $s_action; ?>" name="install_form" method="post"><table class="bg" width="100%" cellspacing="1" cellpadding="2" border="0">
  <?php
  
  }
  
+ //
+ //
+ //
  function page_footer($l_submit, $s_hidden_fields)
  {

[Phpbb-checkins] CVS: phpBB2/db postgres.php,NONE,1.1 postgres7.php,1.19,NONE

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

Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv24429/db

Added Files:
	postgres.php 
Removed Files:
	postgres7.php 
Log Message:
Renamed

--- NEW FILE ---
<?php
  /***************************************************************************
   *                               postgres7.php
   *                            -------------------
   *   begin                : Saturday, Feb 13, 2001
   *   copyright            : (C) 2001 The phpBB Group
   *   email                : supportphpbb.com
   *
   *   $Id: postgres.php,v 1.1 2002/07/16 15:12:44 psotfx Exp $
   *
   ***************************************************************************/

/***************************************************************************
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 ***************************************************************************/

if(!defined("SQL_LAYER"))
{

define("SQL_LAYER","postgresql");

class sql_db
{

	var $db_connect_id;
	var $query_result;
	var $in_transaction = 0;
	var $row = array();
	var $rowset = array();
	var $rownum = array();
	var $num_queries = 0;

	//
	// Constructor
	//
	function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
	{
		$this->connect_string = "";

		if( $sqluser )
		{
			$this->connect_string .= "user=$sqluser ";
		}

		if( $sqlpassword )
		{
			$this->connect_string .= "password=$sqlpassword ";
		}

		if( $sqlserver )
		{
			if( ereg(":", $sqlserver) )
			{
				list($sqlserver, $sqlport) = split(":", $sqlserver);
				$this->connect_string .= "host=$sqlserver port=$sqlport ";
			}
			else
			{
				if( $sqlserver != "localhost" )
				{
					$this->connect_string .= "host=$sqlserver ";
				}
			}
		}

		if( $database )
		{
			$this->dbname = $database;
			$this->connect_string .= "dbname=$database";
		}

		$this->persistency = $persistency;

		$this->db_connect_id = ( $this->persistency ) ? pg_pconnect($this->connect_string) : pg_connect($this->connect_string);

		return ( $this->db_connect_id ) ? $this->db_connect_id : false;
	}

	//
	// Other base methods
	//
	function sql_close()
	{
		if( $this->db_connect_id )
		{
			//
			// Commit any remaining transactions
			//
			if( $this->in_transaction )
			{
				@pg_exec($this->db_connect_id, "COMMIT");
			}

			if( $this->query_result )
			{
				@pg_freeresult($this->query_result);
			}

			return @pg_close($this->db_connect_id);
		}
		else
		{
			return false;
		}
	}

	//
	// Query method
	//
	function sql_query($query = "", $transaction = false)
	{
		//
		// Remove any pre-existing queries
		//
		unset($this->query_result);
		if( $query != "" )
		{
			$this->num_queries++;

			$query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2 OFFSET \\1", $query);

			if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction )
			{
				$this->in_transaction = TRUE;

				if( !@pg_exec($this->db_connect_id, "BEGIN") )
				{
					return false;
				}
			}

			$this->query_result = @pg_exec($this->db_connect_id, $query);
			if( $this->query_result )
			{
				if( $transaction == END_TRANSACTION )
				{
					$this->in_transaction = FALSE;

					if( !@pg_exec($this->db_connect_id, "COMMIT") )
					{
						@pg_exec($this->db_connect_id, "ROLLBACK");
						return false;
					}
				}

				$this->last_query_text[$this->query_result] = $query;
				$this->rownum[$this->query_result] = 0;

				unset($this->row[$this->query_result]);
				unset($this->rowset[$this->query_result]);

				return $this->query_result;
			}
			else
			{
				if( $this->in_transaction )
				{
					@pg_exec($this->db_connect_id, "ROLLBACK");
				}
				$this->in_transaction = FALSE;

				return false;
			}
		}
		else
		{
			if( $transaction == END_TRANSACTION && $this->in_transaction )
			{
				$this->in_transaction = FALSE;

				if( !@pg_exec($this->db_connect_id, "COMMIT") )
				{
					@pg_exec($this->db_connect_id, "ROLLBACK");
					return false;
				}
			}

			return true;
		}
	}

	//
	// Other query methods
	//
	function sql_numrows($query_id = 0)
	{
		if( !$query_id )
		{
			$query_id = $this->query_result;
		}

		return ( $query_id ) ? @pg_numrows($query_id) : false;
	}

	function sql_numfields($query_id = 0)
	{
		if( !$query_id )
		{
			$query_id = $this->query_result;
		}

		return ( $query_id ) ? @pg_numfields($query_id) : false;
	}

	function sql_fieldname($offset, $query_id = 0)
	{
		if( !$query_id )
		{
			$query_id = $this->query_result;
		}

		return ( $query_id ) ? @pg_fieldname($query_id, $offset) : false;
	}

	function sql_fieldtype($offset, $query_id = 0)
	{
		if( !$query_id )
		{
			$query_id = $this->query_result;
		}

		return ( $query_id ) ? @pg_fieldtype($query_id, $offset) : false;
	}

	function sql_fetchrow($query_id = 0)
	{
		if( !$query_id )
		{
			$query_id = $this->query_result;
		}

		if($query_id)
		{
			$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]);

			if( $this->row )
			{
				$this->rownum[$query_id]++;
				return $this->row;
			}
		}

		return false;
	}

	function sql_fetchrowset($query_id = 0)
	{
		if( !$query_id )
		{
			$query_id = $this->query_result;
		}

		if( $query_id )
		{
			unset($this->rowset[$query_id]);
			unset($this->row[$query_id]);
			$this->rownum[$query_id] = 0;

			while( $this->rowset = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC) )
			{
				$result[] = $this->rowset;
				$this->rownum[$query_id]++;
			}

			return $result;
		}

		return false;
	}

	function sql_fetchfield($field, $row_offset=-1, $query_id = 0)
	{
		if( !$query_id )
		{
			$query_id = $this->query_result;
		}

		if( $query_id )
		{
			if( $row_offset != -1 )
			{
				$this->row = @pg_fetch_array($query_id, $row_offset, PGSQL_ASSOC);
			}
			else
			{
				if( $this->rownum[$query_id] )
				{
					$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]-1, PGSQL_ASSOC);
				}
				else
				{
					$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC);

					if( $this->row )
					{
						$this->rownum[$query_id]++;
					}
				}
			}

			return $this->row[$field];
		}

		return false;
	}

	function sql_rowseek($offset, $query_id = 0)
	{

		if(!$query_id)
		{
			$query_id = $this->query_result;
		}

		if( $query_id )
		{
			if( $offset > -1 )
			{
				$this->rownum[$query_id] = $offset;
				return true;
			}
			else
			{
				return false;
			}
		}

		return false;
	}

	function sql_nextid()
	{
		$query_id = $this->query_result;

		if($query_id && $this->last_query_text[$query_id] != "")
		{
			if( preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text[$query_id], $tablename) )
			{
				$query = "SELECT currval('" . $tablename[1] . "_id_seq') AS last_value";
				$temp_q_id =  @pg_exec($this->db_connect_id, $query);
				if( !$temp_q_id )
				{
					return false;
				}

				$temp_result = @pg_fetch_array($temp_q_id, 0, PGSQL_ASSOC);

				return ( $temp_result ) ? $temp_result['last_value'] : false;
			}
		}

		return false;
	}

	function sql_affectedrows($query_id = 0)
	{
		if( !$query_id )
		{
			$query_id = $this->query_result;
		}

		return ( $query_id ) ? @pg_cmdtuples($query_id) : false;
	}

	function sql_freeresult($query_id = 0)
	{
		if( !$query_id )
		{
			$query_id = $this->query_result;
		}

		return ( $query_id ) ? @pg_freeresult($query_id) : false;
	}

	function sql_error($query_id = 0)
	{
		if( !$query_id )
		{
			$query_id = $this->query_result;
		}

		$result['message'] = @pg_errormessage($this->db_connect_id);
		$result['code'] = -1;

		return $result;
	}

} // class ... db_sql

} // if ... defined

?>
--- postgres7.php DELETED ---

[Phpbb-checkins] CVS: phpBB2/install install.php,1.1,1.2

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

Update of /cvsroot/phpbb/phpBB2/install
In directory usw-pr-cvs1:/tmp/cvs-serv14366/install

Modified Files:
	install.php 
Log Message:
Start integrating install.tpl

Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install/install.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** install.php	16 Jul 2002 12:51:51 -0000	1.1
--- install.php	16 Jul 2002 14:45:00 -0000	1.2
***************
*** 25,34 ****
  define('IN_PHPBB', true);
  $phpbb_root_path='./../';
! require($phpbb_root_path.'extension.inc');
! require($phpbb_root_dir . 'includes/functions_selects.'.$phpEx);
  
  $userdata = array();
  $lang = array();
- $reinstall = false;
  
  if ( !get_magic_quotes_gpc() )
--- 25,33 ----
  define('IN_PHPBB', true);
  $phpbb_root_path='./../';
! require($phpbb_root_path . 'extension.inc');
! require($phpbb_root_path . 'includes/functions.'.$phpEx);
  
  $userdata = array();
  $lang = array();
  
  if ( !get_magic_quotes_gpc() )
***************
*** 52,96 ****
  
  $available_dbms = array(
! 	"mysql" => array(
! 		"LABEL" => "MySQL 3.x",
! 		"SCHEMA" => "mysql", 
! 		"DELIM" => ";",
! 		"DELIM_BASIC" => ";",
! 		"COMMENTS" => "remove_remarks"
  	), 
! 	"mysql4" => array(
! 		"LABEL" => "MySQL 4.x",
! 		"SCHEMA" => "mysql", 
! 		"DELIM" => ";", 
! 		"DELIM_BASIC" => ";",
! 		"COMMENTS" => "remove_remarks"
  	), 
! 	"postgres" => array(
! 		"LABEL" => "PostgreSQL 7.x",
! 		"SCHEMA" => "postgres", 
! 		"DELIM" => ";", 
! 		"DELIM_BASIC" => ";",
! 		"COMMENTS" => "remove_comments"
  	), 
! 	"mssql" => array(
! 		"LABEL" => "MS SQL Server 7/2000",
! 		"SCHEMA" => "mssql", 
! 		"DELIM" => "GO", 
! 		"DELIM_BASIC" => ";",
! 		"COMMENTS" => "remove_comments"
  	),
! 	"msaccess" => array(
! 		"LABEL" => "MS Access [ ODBC ]",
! 		"SCHEMA" => "", 
! 		"DELIM" => "", 
! 		"DELIM_BASIC" => ";",
! 		"COMMENTS" => ""
  	),
! 	"mssql-odbc" =>	array(
! 		"LABEL" => "MS SQL Server [ ODBC ]",
! 		"SCHEMA" => "mssql", 
! 		"DELIM" => "GO",
! 		"DELIM_BASIC" => ";",
! 		"COMMENTS" => "remove_comments"
  	)
  );
--- 51,95 ----
  
  $available_dbms = array(
! 	'mysql' => array(
! 		'LABEL' => 'MySQL 3.x',
! 		'SCHEMA' => 'mysql', 
! 		'DELIM' => ';',
! 		'DELIM_BASIC' => ';',
! 		'COMMENTS' => 'remove_remarks'
  	), 
! 	'mysql4' => array(
! 		'LABEL' => 'MySQL 4.x',
! 		'SCHEMA' => 'mysql', 
! 		'DELIM' => ';', 
! 		'DELIM_BASIC' => ';',
! 		'COMMENTS' => 'remove_remarks'
  	), 
! 	'postgres' => array(
! 		'LABEL' => 'PostgreSQL 7.x',
! 		'SCHEMA' => 'postgres', 
! 		'DELIM' => ';', 
! 		'DELIM_BASIC' => ';',
! 		'COMMENTS' => 'remove_comments'
  	), 
! 	'mssql' => array(
! 		'LABEL' => 'MS SQL Server 7/2000',
! 		'SCHEMA' => 'mssql', 
! 		'DELIM' => 'GO', 
! 		'DELIM_BASIC' => ';',
! 		'COMMENTS' => 'remove_comments'
  	),
! 	'msaccess' => array(
! 		'LABEL' => 'MS Access [ ODBC ]',
! 		'SCHEMA' => '', 
! 		'DELIM' => '', 
! 		'DELIM_BASIC' => ';',
! 		'COMMENTS' => ''
  	),
! 	'mssql-odbc' =>	array(
! 		'LABEL' => 'MS SQL Server [ ODBC ]',
! 		'SCHEMA' => 'mssql', 
! 		'DELIM' => 'GO',
! 		'DELIM_BASIC' => ';',
! 		'COMMENTS' => 'remove_comments'
  	)
  );
***************
*** 153,157 ****
  else
  {
! 	$install_step = "";
  }
  
--- 152,156 ----
  else
  {
! 	$install_step = '';
  }
  
***************
*** 159,205 ****
  $upgrade_now = ( !empty($HTTP_POST_VARS['upgrade_now']) ) ? $HTTP_POST_VARS['upgrade_now']:'';
  
! $dbms = isset($HTTP_POST_VARS['dbms']) ? $HTTP_POST_VARS['dbms'] : "";
  $language = ( !empty($HTTP_POST_VARS['language']) ) ? $HTTP_POST_VARS['language'] : $default_language;
  
! $dbhost = ( !empty($HTTP_POST_VARS['dbhost']) ) ? $HTTP_POST_VARS['dbhost'] : "";
! $dbuser = ( !empty($HTTP_POST_VARS['dbuser']) ) ? $HTTP_POST_VARS['dbuser'] : "";
! $dbpasswd = ( !empty($HTTP_POST_VARS['dbpasswd']) ) ? $HTTP_POST_VARS['dbpasswd'] : "";
! $dbname = ( !empty($HTTP_POST_VARS['dbname']) ) ? $HTTP_POST_VARS['dbname'] : "";
  
! $table_prefix = ( !empty($HTTP_POST_VARS['prefix']) ) ? $HTTP_POST_VARS['prefix'] : "";
  
! $admin_name = ( !empty($HTTP_POST_VARS['admin_name']) ) ? $HTTP_POST_VARS['admin_name'] : "";
! $admin_pass1 = ( !empty($HTTP_POST_VARS['admin_pass1']) ) ? $HTTP_POST_VARS['admin_pass1'] : "";
! $admin_pass2 = ( !empty($HTTP_POST_VARS['admin_pass2']) ) ? $HTTP_POST_VARS['admin_pass2'] : "";
  
! $ftp_path = ( !empty($HTTP_POST_VARS['ftp_path']) ) ? $HTTP_POST_VARS['ftp_path'] : "";
! $ftp_user = ( !empty($HTTP_POST_VARS['ftp_user']) ) ? $HTTP_POST_VARS['ftp_user'] : "";
! $ftp_pass = ( !empty($HTTP_POST_VARS['ftp_pass']) ) ? $HTTP_POST_VARS['ftp_pass'] : "";
  
! $server_name = ( !empty($HTTP_POST_VARS['server_name']) ) ? $HTTP_POST_VARS['server_name'] : "";
! $server_port = ( !empty($HTTP_POST_VARS['server_port']) ) ? $HTTP_POST_VARS['server_port'] : "";
! $board_email = ( !empty($HTTP_POST_VARS['board_email']) ) ? $HTTP_POST_VARS['board_email'] : "";
! $script_path = ( !empty($HTTP_POST_VARS['script_path']) ) ? $HTTP_POST_VARS['script_path'] : "";
  
! if( @file_exists('config.'.$phpEx) )
  {
! 	include('config.'.$phpEx);
  }
  
! if( !defined("PHPBB_INSTALLED") )
  {
! 	include($phpbb_root_path.'includes/sql_parse.'.$phpEx);
! 	include($phpbb_root_path.'includes/constants.'.$phpEx);
! 	include($phpbb_root_path.'includes/template.'.$phpEx);
! 	include($phpbb_root_path.'includes/functions.'.$phpEx);
! 	include($phpbb_root_path.'includes/sessions.'.$phpEx);
  
  	//
  	// Import language file, setup template ...
  	//
! 	include($phpbb_root_path.'language/lang_' . $language . '/lang_main.'.$phpEx);
! 	include($phpbb_root_path.'language/lang_' . $language . '/lang_admin.'.$phpEx);
! 
! 	$template = new Template($phpbb_root_path . "templates/" . $default_template);
  
  	//
--- 158,205 ----
  $upgrade_now = ( !empty($HTTP_POST_VARS['upgrade_now']) ) ? $HTTP_POST_VARS['upgrade_now']:'';
  
! $dbms = isset($HTTP_POST_VARS['dbms']) ? $HTTP_POST_VARS['dbms'] : '';
  $language = ( !empty($HTTP_POST_VARS['language']) ) ? $HTTP_POST_VARS['language'] : $default_language;
  
! $dbhost = ( !empty($HTTP_POST_VARS['dbhost']) ) ? $HTTP_POST_VARS['dbhost'] : '';
! $dbuser = ( !empty($HTTP_POST_VARS['dbuser']) ) ? $HTTP_POST_VARS['dbuser'] : '';
! $dbpasswd = ( !empty($HTTP_POST_VARS['dbpasswd']) ) ? $HTTP_POST_VARS['dbpasswd'] : '';
! $dbname = ( !empty($HTTP_POST_VARS['dbname']) ) ? $HTTP_POST_VARS['dbname'] : '';
  
! $table_prefix = ( !empty($HTTP_POST_VARS['prefix']) ) ? $HTTP_POST_VARS['prefix'] : '';
  
! $admin_name = ( !empty($HTTP_POST_VARS['admin_name']) ) ? $HTTP_POST_VARS['admin_name'] : '';
! $admin_pass1 = ( !empty($HTTP_POST_VARS['admin_pass1']) ) ? $HTTP_POST_VARS['admin_pass1'] : '';
! $admin_pass2 = ( !empty($HTTP_POST_VARS['admin_pass2']) ) ? $HTTP_POST_VARS['admin_pass2'] : '';
  
! $ftp_path = ( !empty($HTTP_POST_VARS['ftp_path']) ) ? $HTTP_POST_VARS['ftp_path'] : '';
! $ftp_user = ( !empty($HTTP_POST_VARS['ftp_user']) ) ? $HTTP_POST_VARS['ftp_user'] : '';
! $ftp_pass = ( !empty($HTTP_POST_VARS['ftp_pass']) ) ? $HTTP_POST_VARS['ftp_pass'] : '';
  
! $server_name = ( !empty($HTTP_POST_VARS['server_name']) ) ? $HTTP_POST_VARS['server_name'] : '';
! $server_port = ( !empty($HTTP_POST_VARS['server_port']) ) ? $HTTP_POST_VARS['server_port'] : '';
! $board_email = ( !empty($HTTP_POST_VARS['board_email']) ) ? $HTTP_POST_VARS['board_email'] : '';
! $script_path = ( !empty($HTTP_POST_VARS['script_path']) ) ? $HTTP_POST_VARS['script_path'] : '';
  
! //
! //
! //
! if ( @file_exists('../config.'.$phpEx) )
  {
! 	include('../config.'.$phpEx);
  }
  
! //
! //
! //
! if ( !defined('PHPBB_INSTALLED') )
  {
! 	include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
! 	include($phpbb_root_path . 'includes/session.'.$phpEx);
  
  	//
  	// Import language file, setup template ...
  	//
! 	include($phpbb_root_path . 'language/lang_' . $language . '/lang_main.'.$phpEx);
! 	include($phpbb_root_path . 'language/lang_' . $language . '/lang_admin.'.$phpEx);
  
  	//
***************
*** 208,293 ****
  	// JLH
  	//
! 	
! 	if( $upgrade == 1 )
  	{
  		// require('upgrade.'.$phpEx);
  		$install_step = 1;
  	}
- 	
- 	//
- 	// Load default template for install
- 	// 
- 	$template->set_filenames(array(
- 		"body" => "install.tpl")
- 	);
- 
- 	$template->assign_vars(array(
- 		"L_INSTALLATION" => $lang['Welcome_install'])
- 	);
  }
  else
  {
! 	define("IN_ADMIN", 1);
! 
! 	include($phpbb_root_path.'common.'.$phpEx);
! 	include($phpbb_root_path.'includes/sql_parse.'.$phpEx);
! 
! 	//
! 	// Set page ID for session management
! 	//
! 	$userdata = session_pagestart($user_ip, PAGE_INDEX, $session_length);
! 	init_userprefs($userdata);
! 	//
! 	// End session management
! 	//
! 
! 	if( $userdata['user_level'] == ADMIN && !$cancel && $dbms != 'msaccess' )
! 	{
! 		if( !$confirm )
! 		{
! 			//
! 			// Sorry this has already been installed can't do anything more with it
! 			//
! 			include($phpbb_root_path . 'includes/page_header.'.$phpEx);
! 
! 			$template->set_filenames(array(
! 				"confirm" => "confirm_body.tpl")
! 			);
! 
! 			$template->assign_vars(array(
! 				"MESSAGE_TITLE" => $lang['Admin_config'],
! 				"MESSAGE_TEXT" => $lang['Re_install'],
! 
! 				"L_YES" => $lang['Yes'],
! 				"L_NO" => $lang['No'],
! 
! 				"S_CONFIRM_ACTION" => append_sid("install.$phpEx"),
! 				"S_HIDDEN_FIELDS" => $hidden_fields)
! 			);
! 
! 			$template->pparse("confirm");
! 
! 			include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
! 		}
! 
! 		include($phpbb_root_path.'language/lang_' . $language . '/lang_main.'.$phpEx);
! 		include($phpbb_root_path.'language/lang_' . $language . '/lang_admin.'.$phpEx);
! 
! 		$template = new Template($phpbb_root_path . "templates/" . $default_template);
! 
! 		$template->set_filenames(array(
! 			"body" => "install.tpl")
! 		);
! 
! 		$template->assign_vars(array(
! 			"L_INSTALLATION" => $lang['Welcome_install'])
! 		);
! 
! 		$reinstall = true;
! 	}
! 	else
! 	{
! 		header("Location: " . append_sid("index.$phpEx", true));
! 	}
  }
  
--- 208,221 ----
  	// JLH
  	//
! 	if ( $upgrade == 1 )
  	{
  		// require('upgrade.'.$phpEx);
  		$install_step = 1;
  	}
  }
  else
  {
! 	header("Location: ../index.$phpEx");
! 	exit;
  }
  
***************
*** 295,299 ****
  //
  //
! if( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 1  && !defined("PHPBB_INSTALLED") && empty($HTTP_POST_VARS['upgrade_now']) )
  {
  	header("Content-Type: text/x-delimtext; name=\"config.$phpEx\"");
--- 223,227 ----
  //
  //
! if ( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 1  && !defined("PHPBB_INSTALLED") && empty($HTTP_POST_VARS['upgrade_now']) )
  {
  	header("Content-Type: text/x-delimtext; name=\"config.$phpEx\"");
***************
*** 311,315 ****
  	exit;
  }
! else if( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 2 && !defined("PHPBB_INSTALLED")  )
  {
  	//
--- 239,243 ----
  	exit;
  }
! else if ( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 2 && !defined("PHPBB_INSTALLED")  )
  {
  	//
***************
*** 357,361 ****
  	$login_result = @ftp_login($conn_id, "$ftp_user", "$ftp_pass");
  
! 	if( !$conn_id || !$login_result )
  	{
  		//
--- 285,289 ----
  	$login_result = @ftp_login($conn_id, "$ftp_user", "$ftp_pass");
  
! 	if ( !$conn_id || !$login_result )
  	{
  		//
***************
*** 457,468 ****
  	}
  }
! else if( ( empty($install_step) || $admin_pass1 != $admin_pass2 || empty($admin_pass1) || $dbhost == "" )  && !defined("PHPBB_INSTALLED") )
! {	//
  	// Ok we haven't installed before so lets work our way through the various
  	// steps of the install process.  This could turn out to be quite a lengty 
  	// process.
  	//
- 
- 	//
  	// Step 0 gather the pertinant info for database setup...
  	// Namely dbms, dbhost, dbname, dbuser, and dbpasswd.
--- 385,395 ----
  	}
  }
! else if ( ( empty($install_step) || $admin_pass1 != $admin_pass2 || empty($admin_pass1) || $dbhost == '' )  && !defined("PHPBB_INSTALLED") )
! {
! 	//
  	// Ok we haven't installed before so lets work our way through the various
  	// steps of the install process.  This could turn out to be quite a lengty 
  	// process.
  	//
  	// Step 0 gather the pertinant info for database setup...
  	// Namely dbms, dbhost, dbname, dbuser, and dbpasswd.
***************
*** 472,476 ****
  	// Guess at some basic info used for install..
  	//
- 	
  	if ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME']) )
  	{
--- 399,402 ----
***************
*** 485,488 ****
--- 411,415 ----
  		$server_name = '';
  	}
+ 
  	if ( !empty($HTTP_SERVER_VARS['SERVER_PORT']) || !empty($HTTP_ENV_VARS['SERVER_PORT']) )
  	{
***************
*** 493,564 ****
  		$server_port = '80';
  	}
- 	$script_path = preg_replace('/install\.'.$phpEx.'/i', '', $HTTP_SERVER_VARS['PHP_SELF']);
  
! 	$instruction_text = $lang['Inst_Step_0'];
  
! 	if( (($HTTP_POST_VARS['admin_pass1'] != $HTTP_POST_VARS['admin_pass2']) && $install_step != '0') || (empty($HTTP_POST_VARS['admin_pass1']) && !empty($dbhost)))
  	{
  		$instruction_text = $lang['Password_mismatch'] . '<br />' . $instruction_text;
  	}
  
! 	$lang_options = language_select($language, 'language');
! 
! 	$dbms_options = '<select name="dbms" onchange="if(document.install_form.upgrade.options[upgrade.selectedIndex].value == 1) { document.install_form.dbms.selectedIndex=0}">';
! 	while( list($dbms_name, $details) = @each($available_dbms) )
  	{
! 		$selected = ( $dbms_name == $dbms ) ? "selected=\"selected\"" : "";
  		$dbms_options .= '<option value="' . $dbms_name . '">' . $details['LABEL'] . '</option>';
  	}
- 	$dbms_options .= '</select>';
  
! 	$upgrade_option = '<select name="upgrade"';
! 	$upgrade_option .= 'onchange="if( this.options[this.selectedIndex].value == 1 ) { document.install_form.dbms.selectedIndex=0; }">';
! 	$upgrade_option .= '<option value="0">' . $lang['Install'] . '</option>';
! 	$upgrade_option .= '<option value="1">' . $lang['Upgrade'] . '</option></select>';
  	
  	$s_hidden_fields = '<input type="hidden" name="install_step" value="1" />';
  
! 	$template->assign_block_vars("switch_stage_one_install", array());
! 	$template->assign_block_vars("switch_common_install", array());
  
! 	$template->assign_vars(array(
! 		"L_INSTRUCTION_TEXT" => $instruction_text,
! 		"L_INITIAL_CONFIGURATION" => $lang['Initial_config'], 
! 		"L_DATABASE_CONFIGURATION" => $lang['DB_config'], 
! 		"L_ADMIN_CONFIGURATION" => $lang['Admin_config'], 
! 		"L_LANGUAGE" => $lang['Default_lang'], 
! 		"L_DBMS" => $lang['dbms'], 
! 		"L_DB_HOST" => $lang['DB_Host'], 
! 		"L_DB_NAME" => $lang['DB_Name'], 
! 		"L_DB_USER" => $lang['DB_Username'], 
! 		"L_DB_PASSWORD" => $lang['DB_Password'], 
! 		"L_DB_PREFIX" => $lang['Table_Prefix'], 
! 		"L_UPGRADE" => $lang['Install_Method'],
! 		"L_ADMIN_USERNAME" => $lang['Admin_Username'], 
! 		"L_ADMIN_PASSWORD" => $lang['Admin_Password'], 
! 		"L_ADMIN_CONFIRM_PASSWORD" => $lang['Admin_Password_confirm'], 
! 		"L_SUBMIT" => $lang['Start_Install'], 
! 		"L_ADMIN_EMAIL" => $lang['Admin_email'],
! 		"L_SERVER_NAME" => $lang['Server_name'],
! 		"L_SERVER_PORT" => $lang['Server_port'],
! 		"L_SCRIPT_PATH" => $lang['Script_path'],
! 		
! 		"SCRIPT_PATH" => $script_path,
! 		"SERVER_PORT" => $server_port,
! 		"SERVER_NAME" => $server_name,
! 		"DB_PREFIX" => ( !empty($table_prefix) ) ? $table_prefix : "phpbb_", 
! 		"DB_HOST" => ( $dbhost != "" ) ? $dbhost : "", 
! 		"DB_USER" => ( $dbuser != "" ) ? $dbuser : "", 
! 		"DB_PASSWD" => ( $dbpasswd != "" ) ? $dbpasswd : "", 
! 		"ADMIN_USERNAME" => ( $admin_name != "" ) ? $admin_name : "", 
! 
! 		"S_LANG_SELECT" => $lang_options, 
! 		"S_DBMS_SELECT" => $dbms_options, 
! 		"S_HIDDEN_FIELDS" => $s_hidden_fields,
! 		"S_UPGRADE_SELECT" => $upgrade_option,
! 		"S_FORM_ACTION" => "install.$phpEx")
! 	);
  
! 	$template->pparse("body");
  
  	exit;
--- 420,525 ----
  		$server_port = '80';
  	}
  
! 	$script_path = preg_replace('/install\/install\.'.$phpEx.'/i', '', $HTTP_SERVER_VARS['PHP_SELF']);
  
! 	//
! 	//
! 	//
! 	$instruction_text = $lang['Inst_Step_0'];
! /*
! 	if ( (($HTTP_POST_VARS['admin_pass1'] != $HTTP_POST_VARS['admin_pass2']) && $install_step != '0') || ( empty($HTTP_POST_VARS['admin_pass1']) && !empty($dbhost)) )
  	{
  		$instruction_text = $lang['Password_mismatch'] . '<br />' . $instruction_text;
  	}
+ */
+ 	$lang_options = language_select($language, 'language', '../language');
  
! 	foreach( $available_dbms as $dbms_name => $details )
  	{
! 		$selected = ( $dbms_name == $dbms ) ? ' selected="selected' : '';
  		$dbms_options .= '<option value="' . $dbms_name . '">' . $details['LABEL'] . '</option>';
  	}
  
! 	$upgrade_option = '<option value="0">' . $lang['Install'] . '</option>';
! 	$upgrade_option .= '<option value="1">' . $lang['Upgrade'] . '</option>';
! 	$upgrade_option .= '<option value="2">' . $lang['Update'] . '</option>';
  	
  	$s_hidden_fields = '<input type="hidden" name="install_step" value="1" />';
  
! 	page_header($instruction_text);
  
! ?>
! 					<tr>
! 						<th colspan="2"><?php echo $lang['Initial_config']; ?></th>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right" width="40%"><span class="gen"><?php echo $lang['Default_lang']; ?>: </span></td>
! 						<td class="row2"><?php echo $lang_options; ?></select></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['dbms']; ?>: </span></td>
! 						<td class="row2"><select name="dbms" onchange="if(document.install_form.upgrade.options[upgrade.selectedIndex].value == 1) { document.install_form.dbms.selectedIndex=0}"><?php echo $dbms_options; ?></select></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Install_Method']; ?>: </span></td>
! 						<td class="row2"><select name="upgrade" onchange="if( this.options[this.selectedIndex].value == 1 ) { document.install_form.dbms.selectedIndex=0; }"><?php echo $upgrade_option; ?></select></td>
! 					</tr>
! 					<tr>
! 						<th colspan="2"><?php echo $lang['DB_config']; ?></th>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Host']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="dbhost" value="<?php echo ( $dbhost != '' ) ? $dbhost : ''; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Name']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="dbname" value="<?php echo ( $dbname != '' ) ? $dbname : ''; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Username']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="dbuser" value="<?php echo ( $dbuser != '' ) ? $dbuser : ''; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['DB_Password']; ?>: </span></td>
! 						<td class="row2"><input type="password" name="dbpasswd" value="<?php echo ( $dbpasswd != '' ) ? $dbpasswd : ''; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Table_Prefix']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="prefix" value="<?php echo ( !empty($table_prefix) ) ? $table_prefix : 'phpbb_'; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<th colspan="2"><?php echo $lang['Admin_config']; ?></th>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Server_name']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="server_name" value="<?php echo $server_name; ?>" /></td>
! 					</tr> 
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Server_port']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="server_port" value="<?php echo $server_port; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Script_path']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="script_path" value="<?php echo $script_path; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_Username']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="admin_name" value="<?php echo ( $admin_name != '' ) ? $admin_name : ''; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_email']; ?>: </span></td>
! 						<td class="row2"><input type="text" name="board_email" value="<?php echo ( $admin_email != '' ) ? $admin_email : ''; ?>" /></td>
! 					</tr> 
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_Password']; ?>: </span></td>
! 						<td class="row2"><input type="password" name="admin_pass1" value="<?php echo ( $admin_pass1 != '' ) ? $admin_pass1 : ''; ?>" /></td>
! 					</tr>
! 					<tr>
! 						<td class="row1" align="right"><span class="gen"><?php echo $lang['Admin_Password_confirm']; ?>: </span></td>
! 						<td class="row2"><input type="password" name="admin_pass2" value="<?php echo ( $admin_pass2 != '' ) ? $admin_pass2 : ''; ?>" /></td>
! 					</tr>
! <?php
  
! 	page_footer($lang['Start_Install'], $s_hidden_fields);
  
  	exit;
***************
*** 625,629 ****
  				break;
  		}
! 		if( !extension_loaded( $check_exts ) && !extension_loaded( $check_other ) )
  		{	
  			$template->assign_block_vars("switch_error_install", array());
--- 586,590 ----
  				break;
  		}
! 		if ( !extension_loaded( $check_exts ) && !extension_loaded( $check_other ) )
  		{	
  			$template->assign_block_vars("switch_error_install", array());
***************
*** 732,799 ****
  			$sql = "INSERT INTO " . $table_prefix . "config (config_name, config_value) 
  				VALUES ('board_startdate', " . time() . ")";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				$error .= "Could not insert board_startdate :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
! 			}
  
  			$sql = "INSERT INTO " . $table_prefix . "config (config_name, config_value) 
  				VALUES ('default_lang', '" . str_replace("\'", "''", $language) . "')";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				$error .= "Could not insert default_lang :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
! 			}
  			$sql = "UPDATE " . $table_prefix . "config
  				SET config_value = '" . $server_name . "' 
  				WHERE config_name = 'server_name'";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				$error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
! 			}
  			$sql = "UPDATE " . $table_prefix . "config
  				SET config_value = '" . $server_port . "' 
  				WHERE config_name = 'server_port'";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				$error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
! 			}
  			$sql = "UPDATE " . $table_prefix . "config
  				SET config_value = '" . $script_path . "' 
  				WHERE config_name = 'script_path'";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				$error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
! 			}
  			$sql = "UPDATE " . $table_prefix . "config
  				SET config_value = '" . $board_email . "' 
  				WHERE config_name = 'board_email'";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				$error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
! 			}
  			$sql = "UPDATE " . $table_prefix . "config
  				SET config_value = '" . $server_name . "' 
  				WHERE config_name = 'cookie_domain'";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				$error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
! 			}
  
  			$sql = "UPDATE " . $table_prefix . "config
  				SET config_value = '" . $admin_name . "' 
  				WHERE config_name = 'newest_username'";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				$error .= "Could not update Board info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
! 			}
! 			
! 
  
  			$admin_pass_md5 = ( $confirm && $userdata['user_level'] == ADMIN ) ? $admin_pass1 : md5($admin_pass1);
--- 693,731 ----
  			$sql = "INSERT INTO " . $table_prefix . "config (config_name, config_value) 
  				VALUES ('board_startdate', " . time() . ")";
! 			$db->sql_query($sql);
  
  			$sql = "INSERT INTO " . $table_prefix . "config (config_name, config_value) 
  				VALUES ('default_lang', '" . str_replace("\'", "''", $language) . "')";
! 			$db->sql_query($sql);
! 
  			$sql = "UPDATE " . $table_prefix . "config
  				SET config_value = '" . $server_name . "' 
  				WHERE config_name = 'server_name'";
! 			$db->sql_query($sql);
! 
  			$sql = "UPDATE " . $table_prefix . "config
  				SET config_value = '" . $server_port . "' 
  				WHERE config_name = 'server_port'";
! 			$db->sql_query($sql);
! 
  			$sql = "UPDATE " . $table_prefix . "config
  				SET config_value = '" . $script_path . "' 
  				WHERE config_name = 'script_path'";
! 			$db->sql_query($sql);
! 
  			$sql = "UPDATE " . $table_prefix . "config
  				SET config_value = '" . $board_email . "' 
  				WHERE config_name = 'board_email'";
! 			$db->sql_query($sql);
! 
  			$sql = "UPDATE " . $table_prefix . "config
  				SET config_value = '" . $server_name . "' 
  				WHERE config_name = 'cookie_domain'";
! 			$db->sql_query($sql);
  
  			$sql = "UPDATE " . $table_prefix . "config
  				SET config_value = '" . $admin_name . "' 
  				WHERE config_name = 'newest_username'";
! 			$db->sql_query($sql);
  
  			$admin_pass_md5 = ( $confirm && $userdata['user_level'] == ADMIN ) ? $admin_pass1 : md5($admin_pass1);
***************
*** 802,818 ****
  				SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "', user_lang = '" . str_replace("\'", "''", $language) . "', user_email='" . str_replace("\'", "''", $board_email) . "'
  				WHERE username = 'Admin'";
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				$error .= "Could not update admin info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
! 			}
  
  			$sql = "UPDATE " . $table_prefix . "users 
  				SET user_regdate = " . time();
! 			$result = $db->sql_query($sql);
! 			if( !$result )
! 			{
! 				$error .= "Could not update user_regdate :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
! 			}
  
  			//
--- 734,743 ----
  				SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "', user_lang = '" . str_replace("\'", "''", $language) . "', user_email='" . str_replace("\'", "''", $board_email) . "'
  				WHERE username = 'Admin'";
! 			$db->sql_query($sql);
  
  			$sql = "UPDATE " . $table_prefix . "users 
  				SET user_regdate = " . time();
! 			$db->sql_query($sql);
! 
  
  			//
***************
*** 1002,1005 ****
--- 927,990 ----
  	}
  	return $data;
+ }
+ 
+ //
+ //
+ //
+ function page_header($l_instructions)
+ {
+ 	global $phpEx, $lang;
+ 
+ ?>
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+ <html>
+ <head>
+ <link rel="stylesheet" href="../admin/subSilver.css" type="text/css">
+ <style type="text/css">
+ <!--
+ th		{ background-image: url('../admin/images/cellpic3.gif') }
+ td.cat	{ background-image: url('../admin/images/cellpic1.gif') }
+ //-->
+ </style>
+ <title><?php echo $lang['Welcome_install']; ?></title>
+ </head>
+ <body>
+ 
+ <table width="100%" cellspacing="0" cellpadding="0" border="0">
+ 	<tr>
+ 		<td><img src="../admin/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></td>
+ 		<td width="100%" background="../admin/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $lang['Welcome_install']; ?></span> &nbsp; &nbsp; &nbsp;</td>
+ 	</tr>
+ </table>
+ 
+ <table width="85%" cellspacing="0" cellpadding="0" border="0" align="center">
+ 	<tr>
+ 		<td><br clear="all" />
+ 
+ <p><?php echo $l_instructions; ?></p>
+ 
+ <form action="install.<?php echo $phpEx; ?>" name="install_form" method="post"><table class="bg" width="100%" cellspacing="1" cellpadding="2" border="0">
+ <?php
+ 
+ }
+ 
+ function page_footer($l_submit, $s_hidden_fields)
+ {
+ 	global $lang;
+ 
+ ?>
+ 	<tr> 
+ 		<td class="cat" align="center" colspan="2"><?php echo $s_hidden_fields; ?><input class="mainoption" type="submit" value="<?php echo $l_submit; ?>" /></td>
+ 	</tr>
+ </table></form>
+ 
+ <div align="center"><span class="copyright">Powered by phpBB <?php echo $board_config['version']; ?> &copy; 2002 <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB Group</a></span></div>
+ 
+ <br clear="all" />
+ 
+ </body>
+ </html>
+ <?php
+ 
  }
  

[Phpbb-checkins] CVS: phpBB2/install update_script.php,1.1,1.2

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

Update of /cvsroot/phpbb/phpBB2/install
In directory usw-pr-cvs1:/tmp/cvs-serv9466/install

Modified Files:
	update_script.php 
Log Message:
Alter SQL for decoding IPs as suggested by Josh (area51 post)

Index: update_script.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install/update_script.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** update_script.php	16 Jul 2002 12:51:51 -0000	1.1
--- update_script.php	16 Jul 2002 13:00:11 -0000	1.2
***************
*** 139,146 ****
  		for($i = 0; $i < count($sql); $i++)
  		{
! 			if ( !$db->sql_query($sql[$i]) )
! 			{
! 				die("Couldn't run update >> " . $sql[$i]);
! 			}
  		}
  	}
--- 139,143 ----
  		for($i = 0; $i < count($sql); $i++)
  		{
! 			$db->sql_query($sql[$i]);
  		}
  	}
***************
*** 154,161 ****
  			$sql = "SELECT ban_id, ban_ip 
  				FROM " . BANLIST_TABLE;
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				die("Couldn't select data >> " . $sql);
! 			}
  
  			if ( $row = $db->sql_fetchrow($result) )
--- 151,155 ----
  			$sql = "SELECT ban_id, ban_ip 
  				FROM " . BANLIST_TABLE;
! 			$result = $db->sql_query($sql);
  
  			if ( $row = $db->sql_fetchrow($result) )
***************
*** 171,180 ****
  			}
  
! 			$sql = "SELECT post_id, poster_ip 
! 				FROM " . POSTS_TABLE;
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				die("Couldn't select data >> " . $sql);
! 			}
  
  			if ( $row = $db->sql_fetchrow($result) )
--- 165,172 ----
  			}
  
! 			$sql = "SELECT DISTINCT poster_ip 
! 				FROM " . POSTS_TABLE . " 
! 				WHERE poster_ip NOT LIKE '%.%'";
! 			$result = $db->sql_query($sql);
  
  			if ( $row = $db->sql_fetchrow($result) )
***************
*** 184,198 ****
  					$sql_update[] = "UPDATE " . POSTS_TABLE . " 
  						SET poster_ip = '" . decode_ip($row['poster_ip']) . "'
! 						WHERE post_id = " . $row['post_id'];
  				}
  				while ( $row = $db->sql_fetchrow($result) );
  			}
  
! 			$sql = "SELECT privmsgs_id, privmsgs_ip 
  				FROM " . PRIVMSGS_TABLE;
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				die("Couldn't select data >> " . $sql);
! 			}
  
  			if ( $row = $db->sql_fetchrow($result) )
--- 176,187 ----
  					$sql_update[] = "UPDATE " . POSTS_TABLE . " 
  						SET poster_ip = '" . decode_ip($row['poster_ip']) . "'
! 						WHERE poster_ip LIKE '" . $row['poster_ip'] . "'"; 
  				}
  				while ( $row = $db->sql_fetchrow($result) );
  			}
  
! 			$sql = "SELECT DISTINCT privmsgs_ip 
  				FROM " . PRIVMSGS_TABLE;
! 			$result = $db->sql_query($sql);
  
  			if ( $row = $db->sql_fetchrow($result) )
***************
*** 202,234 ****
  					$sql_update[] = "UPDATE " . PRIVMSGS_TABLE . " 
  						SET privmsgs_ip = '" . decode_ip($row['privmsgs_ip']) . "'
! 						WHERE privmsgs_id = " . $row['privmsgs_id'];
! 				}
! 				while ( $row = $db->sql_fetchrow($result) );
! 			}
! 
! 			$sql = "SELECT session_id, session_ip 
! 				FROM " . SESSIONS_TABLE;
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				die("Couldn't select data >> " . $sql);
! 			}
! 
! 			if ( $row = $db->sql_fetchrow($result) )
! 			{
! 				do
! 				{
! 					$sql_update[] = "UPDATE " . SESSIONS_TABLE . " 
! 						SET session_ip = '" . decode_ip($row['session_ip']) . "'
! 						WHERE session_id = '" . $row['session_id'] . "'";
  				}
  				while ( $row = $db->sql_fetchrow($result) );
  			}
  
! 			$sql = "SELECT vote_id, vote_user_id, vote_user_ip 
  				FROM " . VOTE_USERS_TABLE;
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				die("Couldn't select data >> " . $sql);
! 			}
  
  			if ( $row = $db->sql_fetchrow($result) )
--- 191,202 ----
  					$sql_update[] = "UPDATE " . PRIVMSGS_TABLE . " 
  						SET privmsgs_ip = '" . decode_ip($row['privmsgs_ip']) . "'
! 						WHERE privmsgs_ip LIKE '" . $row['privmsgs_ip'] . "'";
  				}
  				while ( $row = $db->sql_fetchrow($result) );
  			}
  
! 			$sql = "SELECT DISTINCT vote_user_ip 
  				FROM " . VOTE_USERS_TABLE;
! 			$result = $db->sql_query($sql);
  
  			if ( $row = $db->sql_fetchrow($result) )
***************
*** 238,243 ****
  					$sql_update[] = "UPDATE " . VOTE_USERS_TABLE . " 
  						SET vote_user_ip = '" . decode_ip($row['vote_user_ip']) . "'
! 						WHERE vote_id = " . $row['vote_id'] . " 
! 							AND vote_user_id = " . $row['vote_user_id'];
  				}
  				while ( $row = $db->sql_fetchrow($result) );
--- 206,210 ----
  					$sql_update[] = "UPDATE " . VOTE_USERS_TABLE . " 
  						SET vote_user_ip = '" . decode_ip($row['vote_user_ip']) . "'
! 						WHERE vote_user_ip LIKE '" . $row['vote_user_ip'] . "'";
  				}
  				while ( $row = $db->sql_fetchrow($result) );
***************
*** 266,273 ****
  	SET config_value = '.1.0 [20020905]' 
  	WHERE config_name = 'version'";
! if ( !($result = $db->sql_query($sql)) )
! {
! 	die("Couldn't update version info");
! }
  
  echo "\n<br />\n<b>COMPLETE!</b><br />\n";
--- 233,237 ----
  	SET config_value = '.1.0 [20020905]' 
  	WHERE config_name = 'version'";
! $result = $db->sql_query($sql);
  
  echo "\n<br />\n<b>COMPLETE!</b><br />\n";
***************
*** 275,277 ****
  ?>
  </body>
! </html>
--- 239,241 ----
  ?>
  </body>
! </html>
\ No newline at end of file

[Phpbb-checkins] CVS: phpBB2 install.php,1.43,NONE update_script.php,1.9,NONE upgrade.php,1.28,NONE

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

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv7667

Removed Files:
	install.php update_script.php upgrade.php 
Log Message:
Move to centralised install/

--- install.php DELETED ---

--- update_script.php DELETED ---

--- upgrade.php DELETED ---

[Phpbb-checkins] CVS: phpBB2/db/schemas index.htm,1.1,NONE ms_access_primer.zip,1.17,NONE mssql_basic.sql,1.16,NONE mssql_schema.sql,1.27,NONE mysql_basic.sql,1.21,NONE mysql_schema.sql,1.27,NONE oracle_basic.sql,1.5,NONE oracle_schema.sql,1.5,NONE oracle_triggers.sql,1.1,NONE postgres_basic.sql,1.18,NONE postgres_schema.sql,1.22,NONE

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

Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv7340/db/schemas

Removed Files:
	index.htm ms_access_primer.zip mssql_basic.sql 
	mssql_schema.sql mysql_basic.sql mysql_schema.sql 
	oracle_basic.sql oracle_schema.sql oracle_triggers.sql 
	postgres_basic.sql postgres_schema.sql 
Log Message:
Move to 'centralised' location in install/

--- index.htm DELETED ---

--- ms_access_primer.zip DELETED ---

--- mssql_basic.sql DELETED ---

--- mssql_schema.sql DELETED ---

--- mysql_basic.sql DELETED ---

--- mysql_schema.sql DELETED ---

--- oracle_basic.sql DELETED ---

--- oracle_schema.sql DELETED ---

--- oracle_triggers.sql DELETED ---

--- postgres_basic.sql DELETED ---

--- postgres_schema.sql DELETED ---

[Phpbb-checkins] CVS: phpBB2/install/schemas index.htm,NONE,1.1 ms_access_primer.zip,NONE,1.1 mssql_basic.sql,NONE,1.1 mssql_schema.sql,NONE,1.1 mysql_basic.sql,NONE,1.1 mysql_schema.sql,NONE,1.1 oracle_basic.sql,NONE,1.1 oracle_schema.sql,NONE,1.1 oracle_triggers.sql,NONE,1.1 postgres_basic.sql,NONE,1.1 postgres_schema.sql,NONE,1.1

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

Update of /cvsroot/phpbb/phpBB2/install/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv7099/install/schemas

Added Files:
	index.htm ms_access_primer.zip mssql_basic.sql 
	mssql_schema.sql mysql_basic.sql mysql_schema.sql 
	oracle_basic.sql oracle_schema.sql oracle_triggers.sql 
	postgres_basic.sql postgres_schema.sql 
Log Message:
Centralise install/upgrade/schemas ... make for easier removal and less cluter ... I think ... install needs to have it's template hard coded

--- NEW FILE ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

--- NEW FILE ---
PK
ÿV@Iæcÿé4
ð+îÜ'ÀÑ>+IjAZ
&IäVD㼐ò²°þcÁœ‹“˜ÀÌòPÌ$0²rI0“Z1*ä¥	ŠQ`$A~2+I0ó°’ÀÊF„²ŒëK!!•‚J- Af–®803•à ,°ã&*žÂ†ê©R‚¤•˜,\܃ZYH`Jn GJ1 «+$SH깺…ÔÊ2îÁ$(`;›”`Ë0ÀV‰Ô6»´§”œG
ízp¼ôà¸	À,9$€1‡ñWâ©ÐX€_æVh`û¯½˜²y„¥âÿAhÁð0þ3Â6Œo„&8„¥Óo=ÁÔÃ(w°ÿ͘Ώ•<€±YÈv”F°s2+î&3­‡1Õv¥’1ʽ÷¤aÆ¡S6±mÜsÓÂÛqÿJ:Æ0縟Â<ȧJD	H$ÙoýÊ_ëwîg¿°¿‚2RÚwëöÊ4¼qYÓP¤µÑ(pY)û+Õß\Í6󚱀‘Œ4̨ÕY×6Óxd}ÙF—uÞB’°Þj¥n#õ)Ú6
:tèСC‡:tèø’a|V~vˆÂS6ʧU¬Žß—ó%3äãk^‘/ídš“K1F))Üe`”\µI檐Éø¤|²Úãµå+›Ä‰ë‚‰9›šÑüi`FÜ>ٛ%¬d0:Tþ#2ŒLhæmCs5i¤%í´tÌ"#	$‹ë+r4CL[RÊhÒæ}3â3\¨®®ãšòK˜äÿ:n||
"ø‰ꙛbŽÂDPyɑd#®ë^é]0ü¢@ñ.ËaÜmÄ]ZE1ˆõÙBH
þñ D^K°0DG… 0'+¡lå?sße¶Ý|­”‘ÇzHvpMF–/ûì'U>÷úx¿9A}@°ë
£Cy	gbHºWuL”ŽüÉîè¤MٟÒ1Úþ§Ï̆ÙÔÉïÿÒûs:F+ÿ.¨ÅóÕÉì(ߖ%N²ÜÎü}éåûðØãgr†'»ýª3ÙLqFÛ~~Üõb;ô±>e—-öŽ³?8sT>¿”5Ñ:˜¥(ߚ%/÷쇆ӋÒʟêãËF¹ýé>ì‚,qF+¿G^dÂ{ͬxþ3Vý§ãº"žÇ~[ ‚ýp;;Ènf/æãö“=FÎ&Óþì
A,w
çcö¿tüüOÿÒY(·'‚¹ý馄lå»*_ßKÛÍ×J™79ê$Mx=P¤?µ?fÀ 
¿fwù‰jc7ý°ÙnÆÞhNQgcÔ¥mŒ3_®¤kþyn0HW¾ù…z)EVº|i_-Èç—öS®)«³‹¯Véö
õ}—OrÍߒéz¼øîu¡k*Ƭ• ŽƒòånºH=Ä.¸R}J·ç˜“—»Ó/d[“—cÝ
îÉà3 Ùø&?†ì¡àWŸ×$b"q*‘x)É癀݌ ®yéÔýLã,
ÖË4¥i·,æ`sǼäËû—óeQsœÉÖÏƋù“gÔr…2O¤l6~Þ@ûòCÐñ“öMÔ§¨ÇÛåÿn"*Ý/ñUEγ’}h&d†ãŸÞÊÚÿ·£¥Ý
8þ}°ãXŸfM¢ÿÓ1Q”¹ºü‰ÃÇy>Æ[>íÍKåZØ#û=“ÔÇ¿0F?ÏOéû´|ŽÒÏ@ã›ûó2ÚkÒ9í3hüÓþ€ïøø§¶'=fƒtŸƒË\\æ
é°
Gƒ‘A_$<ÔöÊ=›–•W—{<—‹"øš·lZæ®r{Ýå·{½rAiÝöZŒî*÷”×–ûø÷ø6-«¨ªðV”¯«¨¨ Å[‹ÁEÖ][#ј³þH,0è;·
öG¾Qd]±Õ%Á½éÞòªrO]e…«Ì×Pí*s»}
eUõåe.—×å«v»]®uÞc節ߘLå*Êf}çÂéKqA¾ƒÞµJÏZ`h–i«
NŠàÏhÄ
ºx¯ò3XäjDë~“hÝ$ZóœÂ,sž©Ø"»ªÙdü(ï­hÈUÇ£1d °YœÇlb?Ž—89Ɗ n»À°ªk˽.WÜåqU”»ÊÀ¼ÈhôU´	Å.WT+õ¬u•º Ô·¡«c[Kìèj?ÂærO—¡Ï³66
Áç6ø`ûpdïpOØ	
Á@´Ëy&ŽM4wÅ«¡+íñG<nádKs°o8@Ìéí‹Aàng]O¬Ç	­½û}±¨<kÝΦ`ïðÝ=ÃGã[A°Ÿ|Ü̓†Ÿ´8Äl>Ž±àgVþäažÄùÙNeЧa¢åO´¯MÚÿ¯1+ªÌ0¦ýŸ‡õD;XZæcÔiö6d½/@¾¿]-
¾%nÍV¸«R…yñCëJ<
·j+¤ó뽬&èWê"]Sêbc%ŒÒM-QnoóJµâšÎ’{ØV{°”Ô67³LåDqégíçeí<ÁÝøŸŸß«Û™z€¤óh-μ“Ø‘¢
`£H”v0fu72Q\’Ê+Zj$¹Y^Œò×Áþê‡ìqâÄ#ôÓÚnllnn…úw¶…¨†m攨©1$
R`»?Ø-X¤€nkd·Ç*Ûv7†;ý½¡ŽÎ~I rA¿?–‚
¤ Ps°³_*”ƒ…0R$… ¼¦¶p¢#Ijû›vµ5ËÌHìfù<’¯È9å¥Â”ySÁû"mÁN9¶)¬Ý<9ûþŽþ¦¦Õ†ÆH¸™L\¬75öîî…™d¦JÒÜnÛéO9K-ô÷¶wîd‚Ù*Akg¨q÷n”‰JT"l¬H÷jC0ÒÛÆÄs´b©¬¹«
ÑÆps«@³J¾3èÈ›>O%è÷‡äjœ¯
_m·”¶{Zì<ÐÚ)%\˜Q¤H»H!ØØÛ%%\¬
µ5›±‚m¡ÈnY§%cDýÁÖdƒ8³Féæua[š'¢ÎÀDËÔ¢îÎݼ1KU’pG[·,XžA°ÚÐÛØ-µØ-j±¿¿³YJ·"ƒ@Ñb¶[UòH¨-(·“Þ¦‘J¹®T…ð‡Û°ƒµ…š™pU¡²~WgÓ¯œ÷•˜ê”…?†´xB0»ù#R[ؤpr­M,Ä …„"ÝݍÁC½í~l—‚i+ZÛÚ;{ÛZY°#»ä“þûn}oۏW\|ó́ž!°â%ßÿ4™ŒÎ7ò 7ä Ú ÇžoÛìÒ©‡Ÿ,x÷}¿øy•÷Ã5æÝëfnmº¸îÌÅóÝ?]Z·gð?úƒ%ñ_?zçÙÛ~z?œûóÏ>µéAã;ò‡wœéXxàWŸÎ|å̋NûV¿½áÑײ*÷†V¹WµÊ½:=ʽªUî²V¹ËÓ£Üe­rÏi•{nz”{N«Ü%­r—¦G¹KZå.j•»8=Ê]Ô*÷„V¹'¦G¹'´Ê]Ð*waz”» UîœV¹sÓ£Ü9­rǵÊŸåŽk•;¬Uîðô(wX«Ü
­r¦G¹ZåBZåBÓ£\¯V“ÞéÑd—V“]Ó¢‰0T˜Íþf‡³&„H–ÌtLNH+´öñÛ
z`4ãÝ	‚6:0‡
ZæÀžEƒØ´xrì)Z<Åæw±9NÄ¥äF"”<%7¡äùDì@–zœ=L‹¶qœ=E‹¦pœ=6‹foœ=/‹fnœ=,‹Fmœ=)‹ækœ=&‹æjœÍýˆæ'’* {3μBhZ"©2$‘l2‘4
Yˆqz"“A$;€Ì=$@6’¯YpHö
±Q鑣Ø232	Zˆñ¬Ó·ô,kz²|.dӐg¾¢$•9dÊ<½ØÓL(·^—wіNÔÇÜùÚ)vd°Š<E
G®œR5„TA‘F™ðÌ(ihmL;ý{QÌÌeËAWüõS"—‘ú¼â¿á"w¶þ’½H ^¿ý
i›èY§™g:Ê­éÎ:Æst
7ÑÕ«Ò¶
)òåaéõFÈVoéí“z¦I
,tU¡ XG¯¸ïoN±«¥)GǍeß™y+5ö½ÅÇÞzîƒsÞ+r
ËÔ·Û²ï_t踑ðŸ–]¿¥ýùÙ_}S|ú<^ʲï Wž
d~²*zZ>ý3Ù;Âμ#íCt|ѐïÿ7
Ë,Ù¦¼™œýÿ…‘,ZëPB¶ÿG’DàDäÄ »Fò81q’ωYöŒp÷Áˆ•“N
e‡ÂÈNŠ9™ÉÉ,Ù×02›“Næp2WvCŒÌãd>'8Y(;&F–ËŽ‰f·“«9YÃI*}%'Ìn§²Örr;'."T„›'åDìHVpr+'Ì50I'ë8©$2ÉzNª8©&²ÉN6rr‘R$›8ÙÌɝDV ©áÄËI-‘•H|œÔqROd
’N¶p²•ˆÉ6N9ù"UHš8i椅H
’V™\
N¸ê÷C]XÉÉ*NXç¿ÉNÊ8a]ý4’Û9qqºúƒH<œ”sÂúóÃHÖqRÉ	ëÏÏ"ÙÈÉœ°N{ÉfNîä¤Fö‚,âd1'K8qʲ£ì )âÄƉ‡ì2YÊÉ2NJG!0Lf^Rò6ñy	s1/#œù\¦cÅ'мƒ|^Æ阗’æ8䆖 sÚ:Ãäó2^gg‘ÒJÙæeTÎ˚Ëy©ìôy•óGêï«ÈôyÕ¾Úóª]é	SÓ%,fÉ[üž1e«Q»ŠðiÆyŒê¡aJóUÈóU+f
$ÎLBH0“I à ò*„Æ<&!’Éð’…Ĉʴ>XÁÔµŽo-lÅG«K«Ö]WêÚµ?e-k×µµënkݵÙïûÎ=wîÌÌMõWí|'“ó¿¯ó?ï{Îww’
$ÀYŒU‡ô›:n¯$"ÀÙ䨣ôJª
Wð<ŽE»Šk\©wì‡ê!Ú=ð4×áGw¡žV%¨o?1êílfŒk"”8^€cXp”£»·ƒuRì4³í†êÏs={õ7±•Ï¯eë®á¨E䃏¡pÄ8_övp
¿¶-
³tgq„j¯;ƒéØ@)…# zÿ4S¤Ýð<OÑCÎÔR¬®ã:¨,ƒ[#ÜÚNgôŒ˜;"îꤾ‰>†1-Œ¦‡4ÆÃ1µp™.˜š]”û{
Äø—z\øÌÖÁÁûS较ƒƒÕš+Ið̼¸ž‰÷ŝx_ñ±ÂÜÄr
±®ÿžrVNó˜ü–£1V¨üuIÑɲ1Ø ŠTboº?]üÞ¼“eÄmlͯ rÒńVß6~«fÀçcCÍR(•él›7;5¢ìõ¿8ØäËïh9„6úE¿t.V‘uTÅàbB>xŠç|牱e—ºiNËP‡-yæ·ë!ârÇ~2ÕããÞ+ï]¡yïÆÃï÷n=õþ¼‡u –¶Ñy®LÔ¸CÏÙÀ|É¥÷M¿ñ_œu²lÓ­ÿA‰„$úDñ×¶“¢½Rᕉä•lv1܍ªMUX­s•/‰iô'CâçÚY«âÏ_Ë®3Ï`JT/Jch“Ÿz¦½øÁ¹7 ëã/\J[˜Ðéør¬@ÕËÕ<qÊ
¦,¿Ò¨ö9NTÿôö¼›£Q‰ÄÁìÙònNPA¦Ä`ŠÃ¿Ô>~ý"Øزþo£l¡·™_‡º‰ì) “T²åd*¦<Lö–Fæxø(‘µŽÛ½7>¯Úù]¤ëN‚øQé.%³È`*ÂtÇ5ºæϟ'ºO&ÝxS|º&¢k¢C@dQS‰çÒ2ƒY(ˆýÿo¶ô2µãO½ÛÖk5˽I†cKo²áØÚ;h8–¢P$$!	IHB’„$$!	IHl)3½ãôåkñš3âÉÓr$ÑÿÿfËɲ—fÞS‘ëdéÕF
ÂÁÔLݘ¥ÒşẨèD6†öã嚩¿¿üIÒLÍûõΞÑ(6^µRá]·|wáBÍz‰=õo›Í´nwid¯u=Ad3¼ÉŒlÀw;jsÿÈØ·m6Ï
"iÉ£D±Ù²ãIiöP
1Vת’ô£:O|XEf¾ÁÌ“ìÓH^œð‘tü×âMã.ˆF¢!š )ç4KÉ,4˜ùašïi4ÍÍø–÷GÓš+ï'¢"v
×ø¬%S)Fë;òC¢-{ó•{£Ga|¥ü{¨^îâa]C&¦²}—Fê~ù!"»÷Ø.ó°F*eO ¥ÎUd–LU˜r«Fyḉò¶ÿo¢QŠAP$ð'³2k)'0ÑhoÒr~x/ôï»jG4ã¨w
GDgkζ\~9·}÷5ѝ­§LÛBQ&^½Û§<&™wºFUúÀ>¢úߋåöhT
TÁ„+Ϋ¡„XU“wэ¤£w/ÉzãíïGË]õ4>¹ñébìrÀçÂÒ¢î&a’ô)|hS±°¦³¿ø6’	Ž?s{Àgµ2Œ]aÊ$Çuœ…ãâ6pª€
5³ÃN%ÅuʸÂeÀmUrAØ1«‰¿ôËEL³Äu̸öÅÔ19®cá…LPîØP33쐤
u{Þþ#9 lth%ãcÇ|—b>ë¨	õ@ç/I]âaRͲ¸—Q…ÔÎøRó%T˜;à6 °
w:ºŸ±+·úd“Ú0ܵͼ `çIjXL9=Õ¾í?#ª]ï¼þ½hTzEM†åÓ`h
vÚT:“4jÕèV.=Â;§Óå•Ì‰OmÇFνœÂ¤1í×(F§	†H%r7Ü)eÒ¢jÐÈF¢	†H%òNaž:bd*‘`ˆT"wòH3i†®ÕHFª
šÈmÇiâv
¬T+¬Ð¨NoÒ`0tÆ'
Zȃ>̓ÃW,C¨XÔ-ûMŠw¸G9zÅB0DŠ•ÐD±P©ŽT±‘bávNcÒå+ÓhF£XPëúÛ8•IµîÄ_±‘ba€˜¤Q¸û:ÅB0„ŠùNaR°gkB±PµÿÁ›/)J¡W,
¯|î½Ã?ÁsºëÚ>u½J¬™¹\v]xì¾9mG?üÌ?~2mû©ëR¢¸ª*¼Œ‚ËÓ'Rók§¹<H®+©xÁüù-4
y3¹
½+ÜõÂÁ*I‚«$G"9,I+óé&÷ŠïBã›ìYõfþ5øы…¿«Cï»ÔœŸ[h3G"9*?–•XÊ,gñ«-ñùG/~-þci¾²^~øÏË"¿‹Œ‹»»c<7±©ßÅÆzmÓT	ª¾¨Sc ÒàRVÖB>ôÒfӉläßÅÆºí ªêkX² üøDç†ËKïóÔðù·Šۆ-cGþY,¼ÂOR1†
ó¨ÿ±Žõ?¾ôõ?g`ƒu8¸Ð7ÀïÂãª?ÔÜã°Æ1TsqÍ1~*ë[Œ3ààjϦÂÏ
¿ið˅î€=¼é*7îŠsü·ßLõ\ä/!§/Ò5‡û$u•²s¦,ïMe]c“«,¬_fMZ­¸“X“K]O ¾›õºýõë:öøIX\Êä´+’å´rZŠÜ/µ%%g§ÊÙ®ï–-°îgòÒùrT¥}=¦Î6ÿByÃÝš ®íÃ¥¯™¬™M—k™efíâNgŸÓí,*tæ3Ûd«ÕËÒd»”ít±âyîgž“åyçÕ®^R]ÍVÔ^¶½'ào·ºk-î‚@kÈ«ñU:<›Y ³½>ÐÚÙq»€I9ìªOE£¢|!dc›‡=XÁjú¤ræ=ЗRpSŸdõJ®$¯ËiÍ/±x=§³ø®
w¥§Hòº,^¶¼»³¥»¾ÝÁµ¶ù{j½´·wvX“¯^VÛWÊjÛ{ê›:Ý.©¿zYkcwgO'k8<Ö-Ì¿ÆQQ¨w°š†+üs¸¾Ö†î5õÝÛûª˜¤ô¿Á*ØYý–w«³d³wg,9VߎI7˜jãÚâ­áêÓUf_@ù©e‹Ùu>.ý.‚úfË×Öíë‘wÈ9½Ô`;¡´±8Êc¥ðó²yÀÀk²ÅðßÃv1œñÂñ205¬Z=³Œ-³xßeê^û»XE•€
 rp1FNpó/Ôü:à*.ÁÆ ê6x²LÕ¯þÖK¶$â¡îÇE¼à{…t•‚É?9áWïÁxâñà¡;¬Î:é7—â¡TüUªñ€m‰Ú¨üت®óÆð·Òþ¸÷äjwՀÝLçýp‡þýRK{pàR~/0Õ@|”S4wôc³z}æ0ŒÓ:àùV8îV÷ÃÐ˓QóI!sžV>qëâ‡ç“Րp“•€ù¨2Ž±µ“Έú
cŸ
dĜE¤ž²“.Z.U7ëˆ~?GºM¦¸•›ðV\™°ŽÅ.
.ò¶8FƒkGí
ì8Õc¾[ÅĎßÛi.n|¸SM¿õÛÉJrQ78e¶– h)Õãênºõ•ÃìQ{Ü&h_NÉÛJÇ8(g¸wŠ!붱Lì‚ÎËè°&¡4­y(Gé;>­MB‰†ʘá(}?@?óM\¹ à,Ô)èI1éJ¢Z=kâÊ“ZÒO™‹³ŽYåL¹ðCèŠÏÄ=xc]ßå
¼½
Áw?¢%
|å„ïŠ
áp÷rkH4îcÊÂZʌ‹LYû3kۖ»¥õÜï90ü§oþÉC”2|¸TKٝi¨•øâ ®¥J¥«,#ÇÌ0½HQ	tÒ¥"?ýõ‡^é]±÷γÓËõJíçûÁG%NÛd­éˆïu#Z2°ê̚=ß+)b¶Iyêèo¾¶f˭͏îMoùä{?ç$å3”ìú®Ö’‚Âɖ!ziùö/?¾ícÍOÜòoïï
žsô
«A\ôUšÑ¥F8ø¨K‰î¦nØu7µnUm†?ýtØå3Fc{ÓpĎÞÄàývÛt÷5ãýÐ|†ã՗¥F»øÔ֝b¹ZⲌÔáå±_8!".}ÎM&ÞpcÇ89ãøHЭ–½ÊÄ»ÓÓæôô±ééóûpVÒÓóÇÌw§(×í~Î0¾:9&Õ	“¯Ÿ£óO²ì²Ì.o~FÊ0Ã0Ã0̬1ŒWí	ýÖüÿo…Äwó…a†a†a†a˜KÉæ‚>fFæ»í¹0UÐÇüÀoDB‹
{cæ)´¸Ád{K¢¥¥­­cxx ewÇ0ž
g6}ãZ3XËr.Ñ|-,¥‰ë,_jE¥4³š¾öäõ™RâzÚdØÒRáô–\qûJ…ƒ;U†q§mÿ°íÿτúlW†a†a†a†™
›ú˜
‘‚>f@Q,q? Kãáøÿ%…½1ó¶ÿŸ“ý¿19°g µõZ_K2±¾)$®áé
†a†a†™ŸpÿÿƒÍûlÿ;‹T§™'`†a†a†
Râˆh}b¿ˆ‰~‘ñ1ø$÷]¢$¸´úØKвçíb'|£È`:f-¤…&îÿ3Ã0Ã0Ã0—˜Y÷Šˆ¿°—|pÿŸa†a†a†aŠÉå9ÿŸi¼L3ý5îiàñ“ã}D¬ƒýr¦}%WaD´YãEž¹ýƒî¹ýåSœÀ¶eœÍŒIÿ+E?®œ(¾Æþ…¦ñŽ¦2Jãìé÷½çć}’¼ü3ß=”bË7-¾;<=Ã0Ã0Ã031Œ«ÃjßgÍÿŸÏ?Ã0Ã0Ã0Ã\Y\äÀ{IQ,.F‰a|'¼\í‹·ûþøº~ZÃzÿo‘ïÿs¾ó·_틌Wûžƒ
üâŜïü÷û^ã
ŠƒBÌé
ž›­´”Bè°Ox§ÓÜà¹ÙŠüõS
£âhôÜlU¾¼ª05cTág ÊÌ«ª
ÔD!—F(ß
¨2òªºR”
¦¨ÆSÏÌ«´”ž<íU‰\‡ÎYþSù
ç£"{Ûè:ð<ŠUÅÂV=e̍"{[ï(4r*tÆèï"U8
 ûZ$‡ô¯AðUê7®
©þ&<ÝÂügà‡Êð!ZÀxÿæÿŸB;ZÈ
0Ã0Ã0ü?˜F'½óFH[øM–»¡ùi€ÏS˜úUà>Aõþ_›/ÄÃzͯLû¥ kë£NôÓÓ|Z;(ºaO.D°8Ã}ÜGèi¿âg†a†a†a˜‹Ä0¢ö˜“ìÿóùf†a†a†afD\¿üB4yûËKÄõkvJã^ÿJk“øIøïÄëÃ?
};ô…P:´=´*ôfÕ?U=Uõ©ªŽªHÕ¯+¿Yy²ò•×V^¨øAŗ*î­¸³bAŏ›‚åÁ·ÊŸ+?UÞ_¾¾ÜWþ½²'Ê6”ý_é÷KO–ö”n*­.}3ðrુ#»«Ó%ß*y²d¨äŽík¶O7[ïùsà÷ÿÃ\¾",K>iÓÕM^)šddÚ£l&ÍcòX¦G×Á&Å_dW§ÄÐãg±¨&>DŽ™e7|÷’©íõ–
.Ú¼®‡_k ˆ
à8f%	ð 5åÊRØèàtO,}*&ÍÓ8Ùìɰݔ#–En7¸H´&8ÀÕ*ê|
T<)²YAÐû¥´›LtãÄ.·x
¶zÃ#ÌÓZ§8œ˜äo?縥‹zi¦W¼ŒPÖ$éJ¢L‘×¹«(¯œ(kÈ*Œ!
%ÍGošôÄ!jÙ
èB+@‰ã¦{õ;ÎCɎx—å;à8gE©ìhm½ÖגLìoJ‰k\â֖¾}]Ã	’,tIÚZ»£v”µna´¯³k7	ÑB“2†}-ѤÔ’î˜ÆöVrñI—ádOOK|¢«¯3JÎaéœwtvõu´“sµ`†a†a†qaOÐøÿ~ñÿ¿}m‹©>;p”¼ßÿ¿þ¯u«Ê9þßïÿïS·405Aš% 
™9G)ù¬²ÓÇöÃ0Ã0Ã0Ìe
‚RMP£¨³LÔ)A9&VÔ+û4[j‚eʾ¡v*4AD	*a§R¬P‚*Ø©Ò«” ;!M°Z	°Ök” šŒ)ÁZ%X
Û!²ý°ßOÙêËà–nùÂSJý1MýnP€WðføÆ¥«Ü͞›­²4¯ÊNªÁ	ȂqHù]T3’…TòªÔ¾Uà|ÔIÊé•­DövÂ>áNÌםt
oðÜlEþŠú©†ŽQq4zn¶*_^U;éÆ+üT™yUµš(äÒå[
UF^U·SŠ°©[ë¹ÙjD^5ÍtF÷ºJónø=Hû·znzYfœ%šê©6WiöÒͶI)8±`RâÄÓÍ"{“çÉ´UÆ3ˆ r4f·G'žöª7;J}3RºElÛIÝz‘½59êÌ©s7ÓTã©gæUÚJOžöªD
®Ã
ç,ÿ©|…ãu%Úè:p/ÅuöXQgf}õ‘ýA…A›ÏúÞE¥—ý·Û—܈X'–jG¦/슧"ð·ÿ@*鍤cðo 9~ ÑxêíÐÿëßßæ7®
©þ&Eyæü¯LNQujÖ3ù8f!Éð±FÎÝ$uêä	Wm7s}Ô©ÅNv³u+³MëÄ9®»áˆZûA¨#Ô$bg[VÎÝWŠBvÚýpMÂw+tCôýÿì	`ÕýøßÌn6÷n„;œr""Úp
kBˆ€Őc“°.!1	A¼T¼ Þ­ö°jÑV[ïûh«mmµ­½lÕÖÖÖÿOkëÑö×_[òÿ~¿oî™ÝY0ˆÀ÷3ÉÎÛ÷}ïûÞ¼yóv¾3ïXBfqÈ軵éÏ#Ÿ• Eã;ËВÍÄVÊuÄZI¿Öòaj-i+¹å¯wc˜ÞvÿUp	Ë_«,¸¨¶A
Mz×sUë¾™>ãÖ.á!su‹íôéßõ¼0dN"ã$é*®è2GWqY~%®cÖK&[ñé—|l…gž!eáÓ*zÆ'Dô”(%ô )ŸLÑC¨[ˆMs†a†a†9aûÿÈÆ°ÿ†a†a†a˜£¶ÿlØþg†a†a†aU)ÌÇýŸUûՊ#Ü
9j„иîYd–e>kG4«Û1€ÞsZ)/»@[§P“Íÿ¿R
\óÿïS‚^S
„ô4ÜS
à8øêT¾E´£µ­>]Zwp»¯>ò|ŒÍWy®¢’ãCFÚ´R§ö&êæÞEÎí::iôZuzß ¶hãڌŽåÅúÜçûnαfßµØìŒL'

G
ʉ
hrvp7>Öq™èSdÄÁ·çN¿
4Àß$»ÃµC.ÍpúÄ	ú¤Cém4ö+à ÂF!§=äm
­àîðï¤Ñ/›´
JÅ.)ö%nÉC
µæz¤§´‘†Äà»r|WO/÷½×9
û<¹ûv¨½TÒÆûý¤qg¾ÇìL'qNt¥H'âœäŠ£¤Œ‚8Ÿ¶Å9K7˜— ·L^…n™»~:ëtzuÓ«îs/†a†a†±¢(Š1צeþÿ†ð^€a†a†aæh¤×7D”û†HƒRßiÐ/Óîg‰~ _FÙ°E¹?2Ww‹oGG8íý¿öþßx/-ï¥?y/÷w¨I^î«Å‡øå¾ßk~Çï|ÇÏïu†ùX(ø©¤5Y¿ÞhuúMÎóÿóüÿÚÆóÿ§RÏóÿóüÿ<ÿ?ÏÿŸ4â0Ÿÿ_ô:g\C…³…{+3*¦Â|£·.þc?ùë¿/Ðÿƒk`†±Í$mã ì§EPÖí'jæðA›ÿžGR~Óþç…
¿Ø6ANg§ÁÑf¨Nð3瓴OßDύÁ۞¨}}"¸
r‹o:ìþ,A/ç¡ÀKѕ»^A'@AG¹‚Å€çD%W©PJbùgf>nzvãGU´5­¬¬N$š£kªØ
#œeŠ*¢	ÍS‘ž«bñ:é‘-=êbUmµZ˜é¯®¶ÖÄkkš¥@Õͱx«ôʕ^‰ÊxM³æ•§yu'@ùäKȇže[驃@2Û±Š3ª+5…V¡!Ãô³
šÞÛªã5Zèéí>ŠL)l^Û\Q1%mk]Ÿ”	ÙÄцښD+IØ$•ÑÖê51#Éb»0Ö°ªf
	ÚU5‰hmm¬“Dƒl"8'muSÍñ¶†jv‹eZ%6Ášx¬M;´!6As,¡ÓPôW{äQÖF»cmòˆÂÒË©ª‚|Ò'ÑVWw×4¬Š‘wDz·%ªãUÕ«jª«È»_j†a†a†1Y-6Š¸èsS~֋Íð‰»q5¬vZC¬Ô萍¡P¾Vï ÉFø_[©(Ó䝴þÙ&ZÉW$ǵ惬†b•‚ÞzÐPJ]ÎQ¥ÑeäDOmªÍ·‹V0‹‹F-—1Êg7­àe
×L+’mT07ÍFnKiEõ¥ÕIùl$·ÔÑ
¡¤\笔VnkzÊ¥¢Bo%í	-Üh°ÿ)×ÊRˆ¤*k†a†a†a†a>±ÈQûåŠ(¥O‘ц£ë•Ááò$yþ¿Ãmþ¿E‚&TÀŠ€* Yœá0ˆðùÖfm‚„±˜žzՋøǧHŚO„Äõæ¥Ûô]#ÚELs爥ôÔ¬bwňÃ÷ÍÆúôrýú ¨ݐ:~.¡i:@^@ß+i:‡-ôl-|V‚ŸžeZrD•ØJ¹î€X+Á·ƒž¤u‘öAâT…îÍô<­‚Ž±E”8üW‰”Ç.мZlƒšh:E(*Î!úú6Ógœ>µ¿(ËL­|·Ó§1…„HöW2ûèÈ8æ¤Â:…„¢ËL}•åWâ:f½d²EbgPz*žuøÏYð™ž9aøŒà¿ÈCI»[äÀg.üç‰[ˆ§ª`†a†a˜#U)ÊÃýŸv«Cq„[‘Æb.= ÇK!ÈR‘Ç\€ºµ
û\€
Í[Õ綹
„AMÛ)w©ÆtûçZ*hDy~5†a†a†aæãEQv£ý3Œñÿ{y
~Î5ÿ²ôåkþåéËškþÉ4öíا„iaùÍ"¡uÁ/¶|ïŸ.ZJ®Àâ‹KÊmvøԋsD‰Å§“–çk„õ¿Ø–†nÑ’§áÞëŁ[…¬¢|ªÅÛ)Ç©†8„‡0Ã0Ã0Ã0i£(#"º; õÿOža†a†a†aŽBz}C¤A¹oˆ4(÷
ቢ<©ÐÝâg†íŸäý¿öþ?õ;ÿRc¾Á}Šgg
š |Ãg3Ý­5A=ñ¹ö2Sª\E5oôpöëåT3ÚüT†Rª´|(ÞFt—_eːöE$ ¼ó‰åz*¨Ý¾×f(
ú(j¤ÚN§cºçf¨
¤T…¹i§
Ÿ†*5¥ªJšÈ{ݓûªRRªZJ9¦n²çf¨)Õ,¦+ºÞv6Wj¶D§8És³žKÇUbQÝ[i;›õdŽ`›Ô	cœZþËn[,ܛ¼Nú´sœFÕP¢MF{tÙm^õoŽ©4–Òbü°£º2áÞf˜êÔ´Ôٛß<xé©)•.¥»nõªDSm‡Izþ{S¯_¢y¶O¡X¯Xتwj'f¶poe¦B%…BÙK¿OCˆÓ/Q)œ¨˜fӎƒ­
lèZ¶°A®ß^Ôཎ»}9½ÁÑ܎znÆZ¿+dôeâÓK¦ƒÖûÀ%qáÛež›‘H…+‘dÞwÐbá	á»&ýò´U¶ÓÂÝ´¦rü›-ñRÏÍHb‰+‰wÓLÂgµ÷òýÈ{Dk®Ë=7Cù\Cùo¾ç“k]¹OY—¹T¾øæ{ž*[  p¹p\hØgÁð©†R}áødJ›©Fo¡ÒõQ:É¥4Ùòñ¦Ryú¶Ðrì>ë»OH[}Œ®¾z¸<6AB[ýjÄX—â½I7Ò}.ßâW£ÒÎm#-êÜ*یõ¶}ªÙ´sÜ@—´ÞÍóÜµ
µúÑÉò\O«ÒË¥“Ì5Î}N`Ä¥~§mw}pS¡}oõYBôÂMb$·×kMö5ԄvˆÅðÙL+[7A=ñ¹ö2Sª\E5¸•ÚåmÐ&n¦zí£2”R¥õà+hAª6*iŸÊ–‘r9zëŠñS=7CQÐGQ#ÕÐv:^K¤O7URªÂÜ´S…OC•šRU%¨‰Ña“¿*%¥ª¥”#lê&{n†‘R¾L»õl®„ï-ä>És³žKÇUâµJ}ª%æ÷&¯“>í§‘@5”h“Ñ]v›Wý›c*
¤¥tX?쨮L¸·¦:5-uöæ!EÔS~	°Ð¤ÉØ­]&¤‘€4I†§>A-C‹)ËA¶MT-
uÿlôo‚»Ž&ºø»¨ø1æ0=D–Œ‰¾XŒ˜dàš?€†?YÁ]àßqM¬P¿›¨~ãïÄ
l”Ð-ßl+*<7£ž»ÿ!÷ÿ7Urÿÿ$³¹ÿ?÷ÿçþÿÜÿ?¹JîÿOª¸ÿ?÷ÿÿøúÿK¥@
^zjJ¥‹Aé®[½*ÑTÛáF’žÿÞT'Çù+$»ÜËâÓúßçY¿ÐàýKŽõK¶õK–õK¦õKÈú%Ãú%hý°~Q­_ùEUÞ¢A
Ùÿ_GvVdBôLa<8‚œ!Ò"Çþ(@æâo¹åú£
µL>Ù,.¦z¢ôõ©}};é3ÏáVáÄ­§òÙ©n§ãÆ8Á”qçL-N¯GI'qjmq¬5Œ†—à>4dFÅôá9U=dÞçË»dýÎ"?Kb†a†aæÈEQv‡uwõÿŸy'¼×ðc†a†a†a˜CH¹oˆ4(õ
‘þA>É•ÒðéþÁ˜Ã”žÝøQmF++«‰æèšê¾bg™¢ŠhBóT¤çªX¼NzdKºXU[­&GzÅ«k£­5±†Äښf)PuAs,Þ*½r¥W¢2^Ó¬yåi^Ý	Ð@>ùÒò¡'AÙVzê Ìv¬âŒêJMA¡U¨EÈ0ý¬Aƒ¦÷ƶêx:dz»"S
›×6WTL	DÛZ×Â'e‚ÄE6qE´¡¶&ÑJ’
6Ie´µzMÌH²Ø.Œ5¬ªYC‚6AUM"Z[ë$Ñ ›ÎI[ݔ@s¼­¡šÄƒÝb™V‰M°&kÓmˆMÐKhÅ4Ôí?%ÐZ½E×0»4^sv]bŒ8ÜSd‰; mX/#Ž´ù'ª£ñJ(æxu¢­VËÓ(ϝ±x•Qà¥IƒÔE[+×R˜ÑFí‘'°6Úk“qÃÒ«@Uù¤O¢­®.ï®iX#ïˆônKTÇ«ªWÕ4TW‘÷aÞì3Ã0Ã0G)lÿÙôÈXû‚ºÖƒA/¨=˜ñ‚†=€.hÔXæ‚Æ’€A.h„	XI‚Ɲ€$h4J¸ §WF¢£g £‡ÐÑ3Ñh©ƒc @£CÚÈà%ÐÇXö/8&´vÁ1I ]Ž©íXp”	´[Á1W ¡ÚKÏþÀ&ǁ(8–´4ÁQ!дÇJ$8V´Á±VhÆ =_À£ çxjÏ,'0Ã0Ã0Ã0Ì	ÛÿÃ0Ã0Ã0sä£*ùÜ¿-ä,k8Û¯6㯍AЦ$ê üÍÝp½LÍ­MȇJ¬“þ	“՘ôOÕÂ?/
ðXYâšÊ­UÄiº[œ¼MNՖEÓöÆÀ§È7фnà*
R÷¨yh-ÍÞÛfø®·M’éàŽ‹fQ	>¸bñɆ$*æŠ
	Š‰¤—¯Æ…¡;h™s«R»DWºÂæ»ÔªðR8Mœ¿ŸJ扩"OW2”쯊¹b²ÈÑUŒ'X–¸ŒýVÛA™¾º¢–p3 ×”Œ#%qjÜëm*t?]Áríûl8Œ"=úXŠþi[iji%äNc5_]AµÃÿ$å1†¶)jç€Æ5]u5KßV˒Á­…;”
æXëaŽvÕ§}¶µNfSôN×EÓi«Ì«ÜM––ñ‰>‘lM&Eò‹b»hBZus̞IÝ×T`†³üügh™”fä2ȃ‘é EN7ê¸lŒÌ(j¾ý¯
Ü-†DWc¶ïË $ÚaÛfo’Uí@ªrë݃BªLÑIæ
šªü”ló	Yæ
ìxÎp—ÏR×$VL;¹) ‚4îÿÿùÞf¾!pöÿ봁
rø)Øs¿&ÈX?Lº3O
Bà²vªš ¼3­1ò4AxgYyzŒlôöJ#¼s¼ÒÈï\¯4òÀ;Ï+|ðÎ÷J#Þa[eR
ïˆ-
MP
SL·ùÛÄ&›ïHҁ?7,òNòm‚ï#¡9ćÛ¨aÄ;ç5Ø¢mÿ›¼…Q¼‘ë€ü™ÌÉ9ðiõ“öLòeúu{úÖ{ún4|‹ÈbÞ`I{¦‡_™‡ß,‹ß&íþ¦‡_™‡ß,í¸ÓÝè‘îFt7z¤»Ñ#ݍéÆ<ҍy¤óH7æ‘nÌ#ݘ+Ýfú‰ìº
5ÓïÌÃÏgëˆ«û•yø͂³®ûYØË·ÌÓw4ŒpMԋ͎#÷ö/Kâ?®/|6ÑB׊ÌÝ'­óROþêwƒ'HøÑ9Ã0ÃYpÿ†a†a†a†ùØè—å¤D‰¢|5¿Aw‹Çó
G¸$ïÿ·|Âñ–¯¿:¬KÒ1`åÃI:¨;“t0Þi;;ïPŒw¨ÎŽ
Æ;TgÇ
9M¡f‘eÈ¿­ËP Éo³ì_×hògØìM€&¿Í²×ûl£Éoµì
›
M~›e¯Ûlhòg{¥&ŽWhòçz¥&žWhòç{¥&Ø+
4ù#^i É_à•šü…^i É_ä•šü¼Ò@“¿Ø+
4ùz¥&ÿ ¯4Ðäì•šü%^i É?Ä+
4ù‡z¥&ÿ0¯4Ðäî•šü#¼Ò@“¤Whòr¤áe½n;δTÝÒ²”ÒYžRóÞ?•Ô[³iØ¥N0•Ô©ÙizI“åÙi+¦’:5;íÇTR§f§Mé%M–g§™Jj×ì¶=SIËRJ½5›–i*©·fÓZµ>[ñ²[SËË|äVýøéeÕú…(ó
aMåbz*­€yÛ××DŸÍôÙEŸð©ÂOÜFƒ9ÝNW¸þGà/(îƒAúêuåsßy†a†a>i(ʣǀúÿÏä
Ë[Ðì`l?;‘¬3Àº$
z·$é`¼›uv0Þÿ:;
Œ÷¿ÎÎ
½óæoÊN›ïŽõ^7;¿vRñøt.s©|ñMïNÙú˜ìêÓaxª¡Tï8žL©ÙUßWé$—RîÿÏýÿMõÜÿÿðîÿzWÓ½I)Õ(\º KÈ%PJ…ìE]j´ÈاYÝJ…§òr‡4ÃŨ,)u.¤1!{K›£ðJE—¦e+ì1<º±Çn÷UTŒ2vÍoÐä
mx7û„±ö‘/¥·žŽ¬‰~Jµ¾ç]”SlÑ6‰-¤Ã/äR’6Ñ
[HmO)U]yhwE,ÕÚÖRZ¶¦ŽYÁ9Tª„œÉË(®Ië)õt…¥ÒØ%Ú´\—Z~¾Ê´P^##ýââÚq:*ónaˆÑQë#ê)¿Öø]$•çF§Ü°jZEצ\oFÖ']†¿þò®¤ÒV3Ýòš^™·¼TL4ŽG–sŒ¦ÐÇ>ÿð‹Xm9„¬É8±~‡qý”
ýÞb‘‹Ò™>öšo––µvêcWõzëóñ€ÜzuÙ՟«÷ª·¨Íê©°
RßPÞPžSö(ë•2%¨¼.ž—hÛépvq=Ÿ¾¾¾ž 2$¬Ûÿz½½™Ã‰ž^E@•Èg(à&Ëu
ŒaN
ÔvàèêÅÚ­Ì"­Eé²ù®íÔ£;®ØMÔ6w‚í.¯Þ&º&6Ã5'ïÀƒ´FW~»!uü\BuÛÅúnú•G>+©õi‡ëZr íߪµë4S«µ‚ßÅVrË_ï
:ÆQâð_E¿)8Z-~­¶A
²W°"Uë¼™>ãô©ý„Ì	-¶Ó§µ'±÷_!=F²Æџƒá¿¥'±¢Ë½Œeù•¸ŽY/™l„Ø”žŠgž!eÁg6=
ã"zJ”‡’>HʁÏÜ>„
᱅÷[f†a†a˜#Uù®!)JCv‹Dq„[‘^ùdö­s9Ë´¿ÜI§š4ûàZ×
ü7ßËîPŸ—1Ðì
XbdéªpÅ E§2@aè‚BA1v?¨!sPÑúHA‰Ð&lËA–E0TdãQXÅ6ibr,‚‘z⹠ȵÆè‚<äY®øj>[“o›lïgâd%[ØÏßJlþús0´´‹]1Ðâ´ëé¦g›[!ÎP›?ÚªíB_kޞF'=qÀ§¦Ž4ºµçlΔ¥­>Áæ‹/
4šÁ1D ŽQíapŒhÿ‚c‚@k“Úµà˜*ЎG™@»sª½ôÌlRp,h‚c¹@KMKp¬hA‚cµ@;kƒà8] éŽ
-=p4´ìÀÑ$ІG\h6–=ŒÀC¦‡#xÈjρ„õq-Ã0Ã0Ã0Ÿ|Tå4êíÿeEŽS×çüWáœãÿρ çó»°»ûuü‹èmb‹hO2B¾Äò½ö›Á/Ÿ-æèÿ¤¨pçj¹ë¥OcôRç<[œýïwl<úŸa†a†a†éxü?Ã0Ã0Ã0s4åğ TÑì·Eùyd«æVÅ‘?E4!_Vëhïÿ
´÷ÿ
³Ï€ý­ýþw
¬pj"ŠX÷Û÷Oþͼ7ÊÏþ
íQÞ.6Âl,ÅožšrÏ­TäŠgPy§K¹¾w*7WDè„o[i-‡F/ö܌â®jÒH`®çf(m2”û%?¥!t+üc®7C®Ñ½Ðs3Ô7ê¤Ú9_òWï“ç
.¥úÞ©´ÆÅ&øGµó<7Cíé.µEIÕ¢ºNPÛÑ)æ{n†âµû‘ß&(ת
X3ÚÀƒcÐkH…çf$´ú#&„…‹‹D=7#™•F2ïŽõ/(3™*¶-Lì—ynF"®Dþ:Ö;‘Hb³H€Ê9ž›¡ryÚ*ÛAi\tCÉwBÐIÕ³	~ºÄRÏÍHb‰+‰wÓL§•ïGÞÛè$ZsíÓtÍ5”¿ðæ{>¹Ö•û”u™Kå‹ÚÞ©Òl`}/ü©†Ò½{S+m¦½…J×Gé$—Ò;÷ú)•§oT;ßpBÚêctõÕÃå±	ÚêW#ƺïM¢¸‘š©fPßâW£ÒÎm#5JM ²j2^Ú>ÕlHÚ9n KZoŽ|Ú큆ÚñÔy®‡SÖEMQ=ä¿QkÅ}N`Ä¥~gÜT_)V‰m dEa$v¸éBñQ7è½*¨ÏíÕÕï°¨_#ä}Èbøl¦ÛÅ&¨'>×^fJ•«¨·R»¼
ÚÄÍT¯}T†Rª´|(ÞFt—_eːÝK#
áO,×SAí&¸ð½6CQÐGQ#ÕÐv:Ó=7CU ¥*ÌM;Uø4T©)UU‚šý6ù«RRªZJ9¦n²çf¨)Õ,¦+ºÞv6WÂ÷rŸä¹YÏ¥ã*±¨î­´ÍzZËLÞ:m¤Ó).»ÍëÞW^'}Ú9N#j(Ñ&£=ºì6¯ú7ÇTHKé±~ØQ]™po3LujZêì̓o¼ôԔJƒÒ]·zU¢©¶Ã$=ÿ½©NŽ×/Ñ<ہ§P¬W,lÕ;µ3[¸·2S¡’RájR¶ISié¸/2[뉞TÂaÝþw¢öËs
æP‚£ÙátoÚ¸ým
>u@2|N†k+ófí‚+ÎÚX¬ù4AȲWºl¾kàˆiîhk7Q“Ø)iínÝWm+4‹8¿©1ø¬€›û0}.¡{p4S
軵éÏ#Ÿ•tÜ9Öµä@3±•rÝ
±VÒ¯5>3ê"탠%m%·üõ® cl%ÿUp	Ë_«,0·	|ÿPµ 7Ógœ>µ¿‚MŠ@l§Oë*“Þ…!óY£Œ“d\ˆ¢ËcFdù•¸ŽY/™l„Ø”ž
Ÿ
øÏYð™Â'aøŒà¿ÈC	Nó rà3þóD-$ø‰Ã0Ã0Á°ýdÓÓCÖ£Åþ÷Â0Ã0Ã0Á¨Êìš"nË1çÿÓºiØX1]ÓÍn@ÜóÿéтæL|߬¿-Õ¦ù“¯=­ÝÿU‘c¦ŽMi L
°ÏBÀ*h/—Œ´òÔr™x„Ï°¤ÒÇ„À#däè‚LðÈ´Âzv³À#Ë"(Úø†l̓EP¬ÇÈ
‹ b <r-‚¡ú‘çGží8ö)$ȝùºs¸L<‡¶¨®'
AÄ"(Õ/
:ÎV¯žy(t¼-
!cL€
:Á–F±ô[Z®&BèUw'Aäu“¡‚N¶¥¡ew
TÐ)^iL¥îͦ
Ó®õ(´‡Ân-F'›b‹»Èà‘l²ùš½Ð­Ç£§~.¥d׃¡·‘¶"›özê63Òâ§ç¢YëT‰ß†;â ¶nêœW©EŠénuõîŸ`	Æe7£˜+܏tœa¬yi¢üÅi@…<v«´›zAnµ„²Jñ¸º¨¶l¤ãhqHõ^è!T+¸K=¥Ø¯º‘º35ÙJÑ¡ÁiJ¢¡ò);duØΦK .'o™~”mZ‡q<Öëa3H°tšáüOâ/S°_ØKÈC™µÖèãMìWy¥Iü7PÄ.X֚iž‹/ŽÝ:ÛvàylÐjœ½7ì<Öj‹/Ïè—ÏÛÃڈíG-Çq‡®mäcMkâfG¨6ê5l-á8uÝB7¶
é.àŽhÃ0	EYfÌö2æÿÛnà9
öÒî¾¾â=¤LsØ:¾úMo™îAæðúÞ¹k¥üuŠõim˜—Ìo:AŽÿ×íWšÁ$æ°Aÿ¡>þÿBëc6ó¦™/šö×ÌMIÌ|єÄÌÇ4<Í|xšùÐòy›ù¢)‰™oäÊi槙oœf¾‘]§™oÄp™ùMÉúù7q?¶ðe¶ðÙÂ?òûùsŸx†a¦ß*ƒ’Ùÿ¥lþ\H
ZŸø 	M(žÿŸçÿçùÿ†a†aæp§o?Q•÷ó1^Hµ[Î~+2À+ƒÞ½Ñû·‹ ÈE")IÇM³Ç|!
Þòe¥ToyÉÐT™ÝÿeŒ,]UA‹ ¾…Ábl#{tƒöXß\ð]úYBèk@[ü:µW]`Iš¾›„ì5‚]ä4+1…Å„â¹X;n‡•hLºÓe1.ñ3âì °}}¦•h€'÷iLºã>fg©¨B…Ô±­Ç0Ã0Ã0s4Àóÿ1Ã0Ã0Ã0‘ÿ þd	æ£TJÃÛýƒ1‡)=»ñ£*ڍVVV'ÍÑ5Õ	ì0Î2Eфæ©HÏU±xôȖu±ª¶Z-LŽôŠW×F[kb
‰µ5ÍR ê‚æX¼UzåJ¯De¼¦YóÊÓ¼º |ò¥äCO‚²­ôÔA ™íXÅՕš‚B«P‹aúYƒMïmÕñ-tÈôvE¦6¯m®¨˜ˆ¶µ®…Oʉ‹lâŠhCmM¢•$l’Êhkõš˜‘d±]kXU³†m‚ªšD´¶6ÖI¢A6œ“¶º)æx[C5‰»Å2­›`M<Ö¦Ú› 9–Њi¨ÛJ µz‹<®avi¼æìºÄq¸§Èw„-@<Ú°^FióOTGã•PÌñêD[­–§Qž!:cñ*£ÀK“©‹¶V®¥0£a	<Ù$cÕÕÔê'k¬MÒº¶ºNŒóL	4Dëäoǚk*e¼	È©‘Ëclò¶Du\;o$è’J­“Ð_푕³6Úk“å–þX½«*È' }muuÑxwMêyG¤7j¬ª^UÓP]EÞýòãÌ0Ã0Ã|"aûŸa†a†a†aŽ|T%ƒzú øŒÿ—íñÿ—@KDRŒñÿÖaþ¶õTÛøËò¶Uþûcü¿u˜Èc˜ÿpË÷6ZÍDŸk;N<$“ê
%q)w/åÏ1=Àv{ÿ€8—É8qç@‡úï_9ð`†a†a†a˜£EyÙé4Æÿ§ŠÁ0Ã0Ã0Ã0‡#Î7ÝB¯oˆO*Øÿ§0æ0GøòøÿOÿäÿ7üώµVCªNT’p2
yr
Ž%-Pp,hi‚£B i	Ž•-Hp¬h'‚c­@c§4ýÀ±A ¥Ž–8šÚpàˆ´ÙÀÑ)Ð8ÇVv8ÎhxõҚŽÒÈÂR¥X,ô
͚Ââå‰
Ÿ„ÿ–ÿ›üä?’_ž?-hþmy{ò.È;+ïƒÜ×s˜ûxî¢Ü¹#rsrÿ™Ó›ÓšszÎÉ9/e?•ýÕì³K³ó³ÿ/ëâ¬ö¬eþ)óg™ë3—gÎÉ|&tw賡1¡Hè?;3:26d¼üEðÛÁS‚sƒãƒ_ܸ,Pا¾­v©õê
õ—ÊsÊ}Ê<å¥XùxÆÿ©PûöEÄ®[óðÁ¡Èâôsäu™ÛëŠó^ùió.|~ä¬ÿùþÊËç®ûõŒ¹×ŒŸ¸þŠ¶÷{¸díî}ãÂ.Þ£ŒztÚÜÿÚúÄÅ¿«»âÓ¿S^¾øÑ'kǯ¹ç¤KþûÿÎ{·ò?ûþò÷V—|øÝwv>tù®—ïþ̪¹%/–ÿ赏\ÚîL֒¹2wæÊMæÊܙ›êÎÜÔC“¹©îÌMrgnÒ¡ÉÜ$wæ&¸37áÐdn‚;scݙ{h27֝¹Qî̍:4™åÎÜw憚Ì
qgn ;sMæº3—
^Åð™Ó+ôqg“ÅYb,™º3<4™“mȚ9՝9ôZýñgNug.phrpçÇ>öõÙj¿îõ1gNO֒¹,2kæ2Ý^@Aøã/L™¬ðʉåðM–µu‰˜^g~-Éî²çdüe·^p™÷R}p{Y"ê^ó!™3stç7èÎoðÐä7èÎoÀß€;¿C“߀g~#I¼>þÌEW3ꬿª»|Uwùª‡¦|Uwù*îü*îü*‡&¿Š;¿*Mtn;Â}Â}âЂp‚¢|?2VHñÊî÷#oGþùMäåȏ#ÏG¾y<ò@äîÈ‘/DnŒì‰ìŠ\9/Òi4G6DÖEª#ÑÈ¢Èüȱ‘é‘c"¥‘!‘¢Hn$ùoøῆß
ÿ>üjøgáÃß	?~$|oø®ð—Ã7‡¯_¾$Ü>'|vø¬°`†a†a†aŽ(qüx|ß,æÊÝqr7G»Ùr7KîÊän¦Ü͐»OÉÝt¹›&wSånŠÜM–»Ir7Q»	r7^îÆÉÝX¹#w£å®TîFÉÝH¹!wÃån˜Ü
•»!rW"wƒånÜ
”»b¹ wErW(wr‘»°ÜåË]žÜåÊ]ŽÜeË]–ÜeÊ]Hî2T’Câ¢MlD‹h³Ä1¶‘bPqFE9U­8mAž¡ èŠ¼þlx£úÑÞÿûÕæèGÉ<ŠÐÄpqŒÁUp𒬞§Òh¡¦$ÒÕ 9¾
¢áKq­Ï‡)O=È©Èñ½
b„Å
ˆ½G*aßšƒ»ÜrÔÒi”ÊV‘%NkÄr‹ ­M4àh³XK9ìþfJ%6ÿe>F9—iuÂåˆÇÒn;
Â#u
¥P k¥Yiôyé„#ZáÛi4æ¿S$àˆёèÚJ\GTO¹iPÚMâlpÇ©7MJ}1¸;µ~5Û(çXÂtôÜPv–ÉŠŠ+v€C(èøn@ä†ÄӁœÃk0Ĭg{<q|wÅ3‰ÆMﯱý:ñ,}Èb¶TOG±‘\æx+ɏ‡×¾óªÚ½ýW?7lT¦‡þÊåÐ'WêÔ¼’qñ¾È E÷ŸüÛ[¿üÆ?‹¼bZ™1¿=ýÝ;kW[~ɩтÁOŸp¥WL3ÏÝZ=‘<2ý{þô'*÷nþϳïL·ƒÆÌéé6ÞvßI¿]½âáªN7vç§RÇm‡¼w‚[òÏ=8æåÎ¥×
ýÜ7Õ+UÿtñLoÓb¯ô‹µÿoÉïùÎü¯¼º÷¾Ô±±¾Ä”›ÏΜ¶ñ±_W>øҏ.þé
1#u\¬ÿx•ãu*YýÁ9哿ùõò=g÷<¿ø‹“O¿“jw#Ôv=ïÝôÁ†Ð/¿e^[ðÉ·‡K¿jõfª-›©¦In÷G/ìþeōûÊNnú¢ßo³äÿ•È)þâî%÷=tqÛe÷<âÖ6ÁÖ¨{SO|]ÆËÖݼð+ïoþöÍ7ûGµ8ÚRï
§_3ӆý`Oèñ–öž°~ÅïGÿn}jM­#¬p9C­Q„Z"”ì,h"ꟼÿŽð‰Ï­¸¹nÝO¯œºò…³!BÄó’Ë"
·؇Ý9Bö@À6"W6ŠG8”"ôÉJ`
=Á]á÷•¬Zvý‰±á·løJ•5Aç•Ú/	¾›]T‘¸ïëKîÙôüÌ¿¯¹²“,Ï"a=Ýòï—$ÃÓ?Ø÷ò9ñªÝo­¼ïš«ºVx'©·ý’dá“/þì‡UOîy*»ê·y'©7'ý’äís.í[š»è”ÏO;ý¸3Ï]¶g%‰cd‹G)[¡~I´¬óµ™Ÿué¢gÊJVìýâ[C½So¼ú%ɦQ_[ýœyËïúôC{ÿ÷âï]´•’Ÿƒ,IZÛ¼~Iöº£?·íÝ¿¯¸êëÿ‰½¶bl•w²Ö¦²_’ýZô™µíþ˧ÿørÓ¤?\7ñ<J¶>‡Ú~Ãí-l¿$½~Úßo|þúùK?óäûÓ¦nˆ$»RÛú¯¿0ÿÅÿ´s|tçÏ_øò¿¾rÇ?åòÙãàs¤ã²q¶çý’|´·çå_¾4pñù?þÍ;ǝôÞvJ{a–Ú
Ûëg _2pÉÙŽ[2ù‘Ê/þû…ü¯º=ÓÚ;=ú%Á]£ŽýÇW}åä/e\ÑúÕ»–T¢Á0Q ÁPJ·«íd4j…¼’~ÎxƒÜE=ÍTÔ¯Ì 9`?àE¿‰ÎÎ-÷md)àn+(Çz»
~gLESi´þ8º~»µ
g8À½<Û	ðÝLWöH‹¥³R»ÛÞ VÁülàI)
–Ä2J«‰l¡S)g#!7+ ìr8Èj÷ærŽJ*×&¸²¬sœ&äòþ>l‚ôŸcÉ{
j“g¡ˆò–e1WLÇÂϑ
R¼€å2tû? .Èٗ±ï;BGÁ¢dgz„l¹U‡ÑÓgûÎç÷ã
/ù^òGÆ#ŒU󑀐Í<´êèxIˆ\ZßS{$pΓ“r›÷`ŎÎYç~û7÷áÔ?âþ{¾tIï±o”ë%d}$ÐH%ÒéµhÒOxñŽc7=qòWŸyö/£·ýéÒL­ÖXØ0˲‘<ýRö´õ£g.¸W™ùös×?~·Ð—HãŸuq‚öÜõaނygÛÜL¸ä>Ì¥Ö9%¨?•Y6ºtÕÎ#=“TÃ„H–C]ù„A¦rá¥ÜYX-§c7<~*—æS9çS6¯'qûóä
ï
“*n›Q¿dca{’âŒt¼À+Ë"OX³ì{Ý-L³Çëtî•B݁wáŠyŽ§²X¿UŽ
lL_6žÜ>ÿÆEÓß)[výOÖßúÕw²è
ûiµ«Û’5¦1:žzã¨%gÖÿð§ãçgž¼ý‹S_Êxü÷WezhvÆ´6‰s›F]?¼îî“wö®ßòVñoEzñõûó~ÛÕÄ9•X_àxg(í†ÎyÌ_潎^Óº±;€§¸zîœ%ª(A²ÿ›·V¨
4R9»s#âFÁf?rr´Yý¹Ô´$k_^ÌÀ
¼å9€7ÜéX;ÎÖ{0M,¯ö÷`¿Qqþ.\’$?z‹~
þñwEy)`Úÿ¯b‘Üȃá
á‚ðù§çÿ7ïÁ¼–¼¡y?̽(÷ÂSFä>™sFλٻ²Gf?‘µ:k岿dޔ¹$ó­ÐîÐÔÐ+]ù·O	~øb <ð¶z¹:M}UéQF*ψƒÁB±°Pì˜qü…Ó?8ù7óÞ(×÷Äú
Y¯Â¦'SX蹕Š\
™.Ԟ©îŸzù^\¾Åï‹=7#í€þ*á$ÏÍP}¾¡ú¼áR哨Ö{¡tŠ9ž›¡r«¡rÝoß'UçO­ÒÚa¿Üs3”wº”ë{§rëCõ
)¼Vñ:õ)ë¸+š4˜ë¹J›¥Ç~ÉOéF!W¬ìæû)Ÿ
Ø`¨/ljç|É_½‘OîÇÃýxö¯ÏwhY´dýx.¡Ù/4f{üÌßo~~Ý}…Kîí¹§~û/öT¡ßòWŸo8MVPg%uöÙuç‹Wþ;rf壼ñú#۞>3ÓC§Wÿg¦eÝx˃wEŸ5¥õº½w_îϼˆ­1ßñßd?xçòÝ'í:eÁ{Õ+¦w¿¡Š3:ŸqüÈ%Û»s±ý¸eËSåU6}fÜ3Ã9U®^º÷[=˳^›œú8»¨¶éoíß¼æÖ¿=¿6¼ðákÞ<{Iäé¤«
õ…Šo\öÈ3'?zÇ-ï¾{ÌgV§N×ÝsÙø—ÂSGÿ®å÷oxá%«ýŒ—뛶
t®õZ&¹ûÇ_éœÓÂG†ÿûS&}ø’¿Ž£VpKÞþÊðò·2NY¶·q×å¾övÅ?~'ĎS‹fÎ"pÆèÁ;eZæ’íJ´+±3ñ“t´˜“<úßKš?5ãœÊg^ùAÃ[›^[’º,õ×FγÙðèó_¹°óÓåìøÇ9ŸÿˤÓÓÕÒ(ä?ö‰qõÀp*X%ðW|ûåã{?©«t^™ÖûÎ+«_—ôA!àl	¬–û:î—$MˆW’f…é—$-ÏÕIš­F:I~”Þ2ζìÊM©@C7y;t°sål%­æwò–­_N³qµ¾önû%Yg{|
%;>‡‹Tíh¿$îlÌ­/û½šßþ±úm¿õˆSµÚý’¸ó§CZ­ò‰Gêƾ_’wþ昏
å˪\WÀÝæ®Hw¤1òNø•ðwÃUáùáIáûó¿˜eþÀ|5ÿ¯yçä5坚÷Zîó¹垔;%·$÷֜«sÎË	漗ýÛì–ìÕÙ²õHÖíYÓ²†fefíɼ ó¬ÌB¯‡~:-´(4#ôXÆW2®Íž‘ñ`OpSpÓs¸Õßü8ðd`I LÏJR:Øâ?ò-þ ͕çX…<…×Á[Dó““ÏE—õd-ˏâäzŽ¬u¯9sz²–Ì]å.¹«MÉ]å.¹]îÌí:4™ÛåÎÜNwævšÌítgn»;sÛM涻3w¾;sçšÌïÎÜVw涚Ìmug®Ó¹ÎC“¹NwæâîÌÅMæâîÌ5¹3×th2×äÎ\ƒ;s
‡&s
îÌmpgnáÉÜwæNwgîôC“¹Óݙ[ëÎÜÚC“¹µîÌ­vgnõ¡ÉÜjwæVº3·òÐdn¥;sîÌUšÌU¸3·Ü¹å‡&sËݙ[âÎܒC“¹%î̕»3W~(2§(æ˜ïÿ¯¶­Ý§³
JË{…ÒïÁ|LôÈÝg‡¢;TÝÐVøL†îéŽLݑ…Ùº#GwäêŽ<tÀQ¨;ŠtÇ
t”ƒ£ªg·¬$#tÇHÝ1Jw”¢ÏEx
òuGXwDtGAŽéÇhÝ1FwŒÃ0Ì÷VÛßÞjŸœU‚Moµ]dK$ë­¥)BS„ýÓòൃZqoðØGÿ´åAŠU0±+æß[måМ
è‚?{úßC–}¶ùÍß,é=)ÓC»W¿µÂgîÏýMç°e·ìüËä×K¤Ž‡ï„¾ÌdIkñãÓo¿tá}Còÿ<ä¥k®K­Ážëéÿ©‰ŸVûìò§Ôs¾y®a†W\k‡
tö1ï®GÎhøÐç
BOe¬Ëx/xYðSÁ_.ŒüXݬªO+ŠªÜ&”6ÑÅoü¹?÷ñOÑÇß;Ï\Jõ½S©½‡×<ÏÍP{ºS-ß³ñƒý»gûYÊ×у+©þÒ!‹?_3mϳßøm
ÅýÚ/ÏM6q;•}·À™B[„Þóû™Ö×ßÌ~íï¯øEËý_Ÿ˜é¡ÙÓzßvlæ›/]úÄ¢{Þn½-ò»eéÅ·¯òÖ¢[ƌNTÝÕ½ñÜO=vÖ¼ôtxÝ^÷­
·?·äŸ‹öV̺þŒõw_”ž¦f:¿­–†Û<¾ë{ÿø×ЍñO|ó²Ÿ.˜5â«é_›§¶‘%ß»öšÊ¯¾›ý•é÷¾››ž6Ù.è¥5ùñ‘'¾Q~ñšWKs¯ËølºgLù0yþʧŽÙü»…÷n~êì}ëãH/¾ß8†ÑÿyÃ؅/F·ßsâ¬	7ìè<­ö‘
§]=ºâ_×-¯Ú±nîºÿ»âoÛD£×X‡1ïÝVüìõ§,¿þÏÿóÓ³J|7=½ÖQ¯æè×Ýÿ´;NXÿþäO-ýFý7n|Ni¿ý¿
²×²÷eä{««.¹xi†ú÷yUŸ¿ïþ»nË;ä<R]*dñdWX¿t“ݵæ¢EŸûó
åWTw‡k&R~%-û]˜ËÑóöÇ?\uì͑xŵÛ?\¹â«]òžx:|Nôț÷¥Þ/…žþ½Êù&GŸyëÚ?ž0ì˜ÕÖYÓi!ú%ü÷ß/)¾½ô”‡‡ìù]ñ™Oݙº’è
K¿$=õ–W|0ký’koúð‰ÒлW\ãSõþ˜ŠëŽÏHä}ááEl^Pþê‰ï_på§Ôžê‘£ƒ<žá{ÇýåÉ+—^°ô†W¯|éýo>ñíÔõô`Žp8eþÅ×oýIÕç^ûaû3Ǿ¹›22>§ûfä Œy8fÕG/¿jmôÿ³w%àPví[‰JYÒf$BQ©˜1†3†"õjA¤"D¶Ò"d‹AH–lɖÊòV$-Z¬Ñòj!EŠH+‘_3ÓdÌ<óxzë™ïÿ]ÿ¹»®÷rÍõÞ¿ó;ç>Ï9÷}îûyNëí6ý9‚©tT”Ä´eøÐp‰>8„mÁÊ"ޗÞÇÃãý3þçE¼Ê÷ëñ…€ƒ
¯
/’÷%O"ñ+²…ñs#~nÄÿ6â×cËæy –
þû	lÅÌ=FøÝc„ÿoWÑ÷óPæ»c„³ÔÔÏ©Ÿ©Ÿ{C>Ùwœpl,„Þ	&R!býØ#Pn:tù>‚ôpª)2„ÝI æ	·9›£,`ÒuF ’<ÔöèçNè-'iéëQlÉx	ý
텞ÏÞøŽc£ý½5òÁµ)5ýJPR̂%çãï¢S§á¼¤Gۏ¥iKMAPD&7¨5®ï a–ÎÃÚAuwkpMÊ| YÈögH‹p
ì—Â#”Í/r5k¬(­;RûÌh}e·jêT;RaèêŒ5õ
³u”5ƒ–f=ÜcºGŒ) ‡ä¦ÿ‹«—ÖRÛ¥½ÇÎl+H>$ݧ›<Ú§cL1åo
ÛRiI7v–þ­€M12à2w“áÖüÚäºÉ,¥n2š?7ËUd•¥"NÆgEޔÍq_¯@ùm£¥ÿn¨gÕÌùú}fR–ÒËÉø‚[½¢¤Ò›Ô培
öŒÛV}šè‡ŽÓblyu9p-
_9Ò)„,æ]ÉÛϓÁcÄóŒ
´2edUÿ†¿m~VI³Å
;]à\·ú¥k%aúˆ³“ˆŠS‹ÍØ-Sþr§Z`ÇùÖ:·ï¨"*DO4ßú³ÙzZÍ­<Ÿµ¿u&ðG6³qàŽ½RÌŸŽÿ]Þÿß;~<9%Á®p…+\á
W¸Â®À"”hZŒM#¸E_Œ1–'hĬM˜Õ~FÌõR»VäOAKê¸ølœLù­µlNûˆ™õ]™@¬˜F$öl±èà¢ù‡ÞàŽÖcŒsMïy/B…?máï؟1H›Þcš¹­ÞæS•€-¨ßnâ8Ö-ïìþý/š„lÕ0K-Œp ][>üóüù@º”ô‘+uŽl¢Ž(@4}ñRZä…ñkMÜwrɤT/Z1=äeíê˜a'8S;”<o¦„ô âiæWt XAùL}à:i¤sØ^w¤övc®qÌ{aIÕsn	Œw^°Ž+ÜlÔ{»Û̪b‰=!·,¼´QÙÐ궘-7ñ[ò
v0ù¶Í¶øZ–óðð!(ñ¿›7—VW÷]Ò¸•RܕùW3ÔoG²[µÏ§¬ÚgÆÓWí5þÃõüÝúa=ÞØʕ)¿½O>ÇvÕfLŠÓDp†?_|°œaö5;LÆ79ê=J̨£3õ#+¶ÿöó2MW܌ɅëÖ,‘¯
çk¢C
ýK¬ó*¸®“ö÷Gëœ.ºÊ$§5aqL0¸¶-“6‹™£ô‚D
'd"ÆÎ
¤sM+RMÔ7°†¢Kç<wXmi¢ßÙ@C®¦q_ ]:ç“6™5W>I×⋷l|Èn¥
ÄÓWAËHPtéœ{g÷¸ãÊ}Öۇïgº.ÅÛØÅÀQçU ZŠOǑS´C
±ö0K¤ò¡{Ëp3˝wLvû
BPõU¹>]bdîÃÍìFûýKø±!©~ïš{Êc#5vzü þ:á5ñûé°§7×ã½3¯ßÖ+1‰_±úUí›D5ÆsÖØ
n6-»Ž-2<N°$w{H³¡ûôp³™Uéï!·ßÆ4.a

ßԑÍø,Å7póQ.{ã÷rGðŸÀËIàò`>¶ãc÷l^Sîk)ãÂc¢
»;›–óÙÂ1>m5ÓxžlÓ2	
”yç\°qö°Fup³Ù˜8ËËTTMÿ|ÛۆœdIP6š°³yð“éb=¤Ÿ´VÞÊ»VŒìlŒû‘¾¸Í"¥Y
¸F

•¦íoïbYÆ~K‰]µí½<.Ÿä óh6Ì<Ülz‹2%J&
àîÏKèLÔc¿¥¤¦dÍOUÞI(ý[Ú±¹7Œ
ü–JÐzöòÆèü,ËyVþKdØpî™Ú}Ëo¿‚m©I´yJ;¹(Ó	Œ
ü–Ò;’µÉÎYŒ¾®g×}=÷g`lුJë½­¯7ŸVJ­h0ÄɏfÃ|Zû¾Áóª+n
.g¥ó|À†!06ð[êÞ1§åv„pŸÚÌÌO؋`là·Ô4¯Ü*9‰aâþŒ¨Ü¬Þ! 6œ{¦BZªTØn”$Ñ;ýÖ`là·TJØʒrÁ3ø|äºÚç“n‚±ßRMËcÖ8”²’Äb¢ÉŒlXOæàfƒ¾éÞ¼Þ[̤¸³•ÏC]ÅŒ
ü–X¦Ðòí-:4íáÓf3åÀØÀo©‹¶Ÿ¥Ÿ9'O:X®žçјç
Àfä<
¶¯ћTlìۗç^ˆ>3›ûðï[ÿ€5	Íc6­ê¬‚këÄfïöÌS+ď4ÉÃ#+<ÿk#¸Â®p…+\á
W¸Â®ŒV?Z 2¦Ÿ¾ùœŸ–y:ðᛝÃ‚Œ9 J¸££÷²Á퉫fàÞ´Ówò®8øcGïÇN2©A¦'ü½+øPà|àÕH~âÕ2&&xR”ôE2Þ
Ôˆ!Ê=7ˆ'nAAaíцPož«n‚„àžúo9uíÀPØÛÈ­ÿBID“7&jYDVŒfQ.ÖÅ\*˜ŸŠ=t4¬&¦í–)֝¾Q<$`·pC,^ªx0
s6‘%ÈuÎj?A/ü•:™•m'  °öÈ/Ôy)úõ5RîЛ¼Ô\q((¬=úûêE㣽'	‡wÌÕõâ%žCao#ûi$¦]ônèÞZ6.

kœºz’ô¿ž$F§:½èæ,ÖÝ"¦wÿm€ñ'4×"åPX³SÌ(h1í܋‰ü˜ÃÒ§ER+•š  °öHbCuÑøb1ÓÂ3=Ê&x)BAa푚Ë+ù
ž‡¦I•Jy‡dƒ¡Œdq˜Qv!:ê2+H¹"â<û^jd@AaíÑe×8ñìm+0qå[ß$©Š@AaíÑbwÝðÅå]úä/¦Ùo.-ËC
{’žUÅ%m&e>;¸£Þ¤N
î¯#žDoQ]¯À˜ßûâ_ŠÝwÊèMæ©ÎW?K2N(~2¹Å+Ú¤Ü÷ÿÎ@€y/"-1úSY#-q:C	z¤5êf:õË⾆5ê&‘ºç7֒*Àxir×ªTx²ù§~LáM0^Zäµ³QÏEÛhw~ÇUÁØÙM@¼€ž¸yÝ®{g­mg’Ù8ÝxÏ\u0^œ´ã¦^%¢’§:²åP-YXƋ“vTçRönÝdtnw„ç™nÍøѼØ{ªpó7W…üRÏÞ(ß;XËSxçû„ïÿÃBޑü?†úµh®påׅÝüæäz´ÆW¢u¾-:?®ïÚeS"ØsÇÉõ ?ą0UÑ
(^X(+ ÙÄ뿱®ç{T}Ô~Î ÔþÄ툜ª|0^œ´ãs§²ŽÂö†¹jo&…6¥ƒñ⤧ñ洐5ŒÓwß÷ڕ˜¿z4/öÑ-ܼ&XÙ½}?©ÈgËìրãí`¼8iÇc‡Í’k3Îãsv}uÊ+Aƒñâ¤7¸øè6­_ÉÕÒ5©DÖ
ñúo<òù"ƒ?¦ï:R7Ãé¶'/NÚq–ýഃ
†)3¥%öŒS´ãÅI;ވ·ÊÖêzlš=5í/¤ÂNF^`'póRÊÝ2;çj«ìa,•tŒ'íXÛ.wH[~v?y:.Ñø\9/NÚ1 Íub6¯)ª§úŸHüe ^@ç7póJ°|gÙüj!>a‹k©æYga0^œ´cß˜yFY~CÏ©½˜Ƌ“vt‰‹ºÚ¦ˆ%>?%ÚêkÁø4ø©ÜÌ.j¬±9M,|¿>¢o«83NÚ21ø¦ì¨¢'_e:ˆ:àÌ8i͜+ݵ
Ššom;‘§“LeFKVuV7·"ŸyøÆtbO„ŽáŽ7=cqã¤E}LæñÉÜ?§õôíîÐÇŸÆâÆI›F8V^7³öÀF»O—¨’è[ÂÃ㍉ÿƒ©yX®p…+n¹Íï~nóWËoþ×Ëm:©K5»r›$¥Ü&
I/·Ù‘7‡øN#Òð’‰×Rßgi”ߺÊVÊ/^Ô®OŸƒìîͤI¸°ãâÆå;ôɾn7Þ¥~ìŒuD‹±ÄF5P\jÜ?U„¬¢¼zÒIõ@š›©–¥ÌFÍÕF/lN»é£ƒÚ´ü‡½+
¬áxã³//w¼G¨T\)ê,Š¢^.ä8Úºªi¡H$‘¡HHA©£¨ð§’’†8ꦇºêjÕU=üՕ:ªŽ¢úþ;3oßî›ìÛ}‘—öO¿ßcg³3ßÌ7ßÎ|3ßìßk¸ïÕÒÄežåNѯéða½«å»dPºûksÜQ£ÇSý’Lµ„â[Ñ*ï½7>hʽÛ×MŸœiqæô÷<엲àhàœ¯ÖyÛývk5êQ¦Z%ȼ’CÚÑïj‡ú.™5¶ïC“D5z\BåÖÖÆٗ+om„üW.î÷¨§_»ijq$™4GŠ9†f~ò7®r]›v2v¯ÿºê¹ çÛR¬\óœû¡Å!é{—6N»óëêLE	fêj˽]½•Ò­èHú€á^¾=Õ¨i—*Yò.¥åiñ¾Ïš¿?+$çŒÛ•
«î¤ªÅ†·f…„“ã„Xæ,÷Éÿ íÏÝWŒÚ”8(àx”Z,ƒ‰‘çʕýxÌF„k¯°W4[½TûŠB¤lÝM”DÊÖ<[: =RþÍVyéœ_ù
[Þý^V•¤Žè.XÖT€]DÁê ’0².§9ì’(«¶Ò­È_T8vI–Õw|J|ˆ¦ã·½ÝÎΚƲ¬Ò™°öÎ¥*Ï.,°:w¢•w.hJ»$ʪi1ß֋UµvIžÕó9$ÑÆüµ¾E¢Ö4´]˜`›QS	;ˆµuo6ØvFdc6a£	õ±`Ãza;Cb*
¬œW'ì^Ú¶.Y»‡lð W1ǹ›¿ÿ; ók›ç
Ú:&¹CâVÃieZöPzÿ景lŒX4íd¯;î5^ŒR¦Ž•¼q{£Iñ²ºÎ
ºgý<ïÝÝ[è€pÍÇëÀtÈR`ª
=Aè1M¥f5–DL'ЖécX
öÂ@$ö•ä^A™2A"§Ýpù7T¦è±²þ”eý$®ÙRT›nDmjÌj³ Úñ‡KÖNÞØ$½=ï!~öóó²­©MlÙ`yE˜wžN0…ŠŸqðì;ï‡Í<—1ìÙæGȺ6v‘Fª
ݒCŸë²büÖo¾ì·c„rÊ	ˆÎ
MJ˜ÀýÔús<œzUÉéå³ÄgÑ+ÝÔ¸O!j—„!w%"ørCÆÁ1šdŽ’°¨8¬0áp¥þ«N÷WŽ-Éâm³Ÿ:£üb_ìÐöÏÀmš^¼óۉÐÒŅs;ÄWýȁyúàí!›\N7þeçʇÊqáR8Ĥ}„ºíÈÚ³´0hí±´Ø?¸ÛÊ1`=†ßp¬‰ºyv£¾:y…/I›yÛãò§ï©½):\+”̜ݎ'jýÞ:tíÂÏÿô¸ç¥L-Hq,‘„ÀÿGî×X·º0,ãa…Î;sDªIS8ï†â¿—ÞÑ0º04sâÎ*û]Æ´PË}$¢}kŒð•»×ÎhºåtbÊð¬+o(Ó
R,у¹ë§~Yw@·cík_WY­ÎÎÅ(¢Õ†šcY’~³°¡ï+
Ù’}ûN°@9,¿Ñ¨äNÞ»‹CüïÅÌk»ì·a‘n[”cÂ'óàrEÏ’‹O³â?ÓuZÜ}£wÎÒj¦õ±-òq¶}Þæ1ݦÌÿ Íw#RŽ+†È™¶žÒøW«³®:Fúç†þ:ö™«o)Ç"|ùc£˜9w—ó–ÚU}—ë‡<ê|ëì#5
“LÚuÜkÄïMȑï«é¿ÍŽ6lñîÞ»åÂËWÕbZ«·ùØâ̼Ü*ðz«Þ­¯Bw÷ï©Ûr¡Ž­±àCh«(FÖãòŽðwŸJoÿeƒt[cϊ6q4zýžûþ½ü']šP=ò³|­­ñDòòŽDt‰bëìQ^
ó[òݻǓú$]°5&\‚âLqT,ˆ\“òmZ—éCµÍ¦÷k÷‹íqoëzŽÃ
E7þQ#"dJ¤†Ó
<P«qb§”¢àѕbçNÍ}&b_ü×½.ÛN/ÍÙބã
¦MÚ7úƒU+;U×À	&3_Œ#fL½‹³|ž›ç”te¾Z+‚µ p2kT›yÉó½FŠ:Dfö¸}i¶šdÙ·Ûvé,ÇgW·óÛ¶0 ¸ß¶‚k¶Ó³`öÏù#.¼z`øʉ­úLÉëšg«n X>®ï/헾â7åî˜3×7ÎÚ¯L{x‰&Ê9>9³?¬”vbkÂêc*Sb=eÒÜç¯}\´ð¯Èœ°wçÿPéä©x壑¤WI‘;}ïЬ€ûa“7;ójõ*/©µ¢æqþ>EQà7!ëú,Øtñˁ^¶PFXhŒÒÏz\w«fÇÕÈkæ—sýfRøw÷¾Q{“CÍyØõMñ`ݙ¼àÂüŽÿõŸ6ÝW™2UBÙíQzèô!=H?žvò:R¦Ä-É3í¦+³
{&]ß<yæa¿«ôãù\ŸPRî\j´Ïq¶ßf÷õ¿è¾d´ZY¡–µ
ÄÞO½ª³Þöâ‹Oíà>Ü_µ¡š¼pÿZÚ'½¿zàߧCW$.Ú1õL5ýµ˜ØWÆo­Ä(
;l”NXaéЌ]’eG–Ô*kɱ!»°ÁP‰¥AºFÁ²*\²ìø–È„t³HiǟŽNÙ%qv`Lº8GZKW
ËÒñb‡Ûh‰,©"ä†Éì"v¼Nz®„\›^ÞaGýf~,
}a¼®l¼pÜ`Ñþå‚
óºä}ÿ0)-¬îe¡/N¾<ÇÚ/av09kN~ÎáZ÷+ÏîÙi\Ϗuۜeâh¤‹&NÅgµÌ\Ü$8{Z@ß…³î(ÑQøqêö¢†ÏøÍ}ÖûÃv®óå(„½袘8“Iö-'pMjUŽSåÓ
+nÔk<|Ê­uÒ5ê–쪶+±„OgpQœ{dA„Õéc7;‰Í³|^Ë+eX¼õä.ùügoõVÔCUÈBSóBÓ!õîÞΊ¿é7?ÙíQÍæágÇœ­¾k‡p'.äºZÁsîèo_
[âÓ·Ba`RUg™øåvîØ3hم¿Þhß}y@И¤M·Š”é¤Ýv!†ä_ÝÞ÷¹šÔmUpÍ`·Û}®ÙC’ÑRšÞ¯ì¾tàÓà¿=µÖóŠtMh)wÒÀoÀ–õâÖòW¦ÞQM ¡Üúï ¸@q•Nqå**®(¢¸ú›—çíñ®ýî$‡üçàcÞ^~
?úlÆ,uÅES¥2TWqˆfFFºhmøÅKçÏvu–IANuym¬þKÙáٗÝïœmï®L/y[ÒXšgö\¶ÇwiÃöwëõoϕ&–d$ݎ菳)3Ú»¾c~b¿Ñ5çþ “T2j0£nÖÞøgVúg„5¿ä6ôzrRƒ1HiP’U™É ‰Ðyj¢,/•(¿gô%”)‹®ÜE½`ÿóµè¨ä
ø‰ÔbVÚêý±³&Ý3’O
	VžöÙ¸‹õßXß=&zùŽâšñH´×JŽ*•99.©bµ/%®Î¾ÔøÙ3—I—`(oqVæ¤Û¯ÛyÄea›îùGV‡&Éÿ
×ÓCH©ž>YFã­Õ<\À8ޞs×¢}æoIc¶7rßòò†ÐŒ¤Vc?;·n3~6Ô©zßϐ	ҚM$‚ !&ß	­l»­kþ®Ï¯ÕI½8ÕY&V)•xÈÅΣ®MߨÓÒ·kY\Ô.`¯:ý(s—•ÖG¡æ8ñ¯—%8
Oj-͐<sMøÒh+ÈÐ
!*,­ÄÃCðÀåÊQâQQðÀºÆIâQ…÷pÀX÷8K<ªñL¬‹\$^‚~+®š¼IwlÜ$Ï	‰ãģ®à»;Þ£dׯdûa­#f½›$dµ3e”Žz±~‹ü)ò'—Øzˆ†mG(Ÿ2Ù<Îh¼o4®0ãŒÆÝF#ß"qäZ‘¿jø
Qˆ	ŸFÞ¦qC4„#¹ÒN³O³Ñr"Ò L£'!ŒF£ñ]£ÑËh<JÔò4ëq žÙt3;¦‰!!´äj”&ëÈÓ‘°®’t<0
'ä!Ž\ÝÞ<œxš
|È
¼9`š[Fc£±®Ñ˜*Éÿ/ޙ§Ùˆƒò¢iœ1–°äa4:ºÒÄ]xšM8Ï|óMi¤šˆä»Z­Ù*
y?ªäýpýp°â‡ï´VüðVŽVü0«N2~%뛭¥µdݵGùµ^«­×Eš!
uyºåºtsuÙº)º‰º1ºDÝ0]´N‘A
‡žCo7õüé•óÁÅþÒ©¬â滖'EdævA%
ȹ##N"ӜDñ±ƒ‘ø 
éѦêǚfænÑ"—GYîA~
??š˜O¬91ρg×Lj}ÞÐcñµØeK"“íF’<ˆ';ÇIòÕ™viFôX­ú?P>Ã`ù…YüBEöz˜Ù{ñ@‘EÛY‡&ÈÉ’=ËÓ3sòAK(k¯“_°Å¯›˜d#s’Ž’$‹b뎔KRº½r¹Á'›™û;ÿ<›ÄïÄKHÃ'æžÖ`æéBœHÖæçjî1'_ÉLÆPrèI<Âgifæ¶fDíEDí‰BøÐxVh(2šlÎ_•„¡³‹ÝÈ?
zÕÕñò( ôSÐXþ÷²Å¯‰E®Ê6Ëã½m‡‰<¤'~˟ö™ËË@c*‚4×í,~/	2
Ø]©A¨Ÿ“øœãÿ¯¾¡ÑšþsBøçÀßâÿèS>ȧÈ&hÅx]µÂYƒ‘¹cGþG=4Ä#wBzìÁD.¨"rÃò@ô@.“¨‡aMôèƒLZ¤µ¤ù§EAhò@¡èurPC
ŠAUP8ŠBÃø»h”Œºòφòa,Ÿ†ñ¡ãøûŠ¨‰âQ9K#¥"7IL“q2œÑk4"£1†\ƒÈ5…\#xémÁbÐàL¦á3í€Éø½$¡)}€–§ÙŠƒF¢Ôt3F¤¡©õ'×xráÈÓlÃAƒPwJ#}Í|>­–üð
gég¦û_{×Eu¶ÏìnÈ&²!\ŒC€ˆ€ †›
Q77@Ø@ä"Á’@#	I„‘$b!r	´U[/E!@¬åfQ©R	
l‹­·*}ªð¯µò÷ò#ùÏwfÏÞf'!äú¾ódòÎÌ9çûæ›sfÏûìÌ·?ƒcj4c|ÆÏ;N1>ãé]*€öIÞòCi¢ÑHΨx6o$7ÇŠxÕLÇQ·*
'
’t’$P3>Fªƒ$	–Ä"I#']$	—¤«$݈ð
[Ý]’’\'I‘
å\M«sŸhg)ߟÈÛÈyp±"ýåbö¯ý®ö#<öå3…G=……¾'W¤®IåéŽ8al
ÿ_ 2z>,mFòÒÙüH¾(U,Z¥³zX´Åâù:‡ó¥l¶°›ÇìÂÊá](¥#eÉü/OXrlOuĆÖâÜÕã1l:ßCÉ>Õm²–+²þ¨éyÔ8Fhb$ó±šÙ8ÞÂ=üø—"}­š'ˆ)ñQÄ×"ßì6#³ØsÆàÚÐéT¢ ¦_Ê?b×%¿9±hô´â¿<GûΘÒ7nÄ›¼¾î9x\IIG«,âNÞY`[_œßãȪß-
ôѪ{*Sº*=Þ="èGí[÷Ô/ÜvÜWM÷H®š÷ûâÁWòm	«üøcƒò±?›ÔóHe9êϼð¡©ÿ¸1þÙÌ2Ëô½wÑ_ý|ΦTüÞv¢Û¦MÞ³ê_sßؽfeec<ÈuÚÿÞº„%OLÞøî¼õƒáþj9ƂŒycéÉÓ½ìñÏnX6smP¿ú‹¤M9¢ÙF}õÙ®°Ä­[f}woBÜjm:Fôg·&ÜYóúKÁö]¥äIÜ}ÈÿY¨IÄTlÝe©ýûù‰eG~:°ôâ…güG°˜å;kG¼yî›%ã_;Qvÿžñ÷ú«McXM®+¯¥{Úrôð[j6L\ÿaðß:¿t±Ø_kÞéxUl|¡_Í3·žòbѯ
2“ޟ篕ùâ^ãÛ+>`
F>`
L	²òÛÓ°ÃݟI_Y1±´ï—kŽ>ÒëȝŒ6eß
cîf‹¤ÏÌH)¡)‡1ñ
ëPü!l,/ã˜œBÿCÿCÿCÿCÿCÿCÿCÿCÿCÿ_‘þ?çÔÿ&úþ_.Í
ÒÿeK_¸æ󓊁Þ>L¡¼Y‘3øü™Ó.ý¢êíÄíµ§–ôÉycí[ñÇSUõ·œ±ÉxêÍàÓx4(¦ü¸ŠíUìrÁ‡¹¶×fýäú^b^åmÁ÷l~ÓçíyrÔד_™:jqd¿‰ïúªI7RŠ¨{½}tËÙÌi“~úÙ©ZÛ¹Åÿë«Þ"q?Ìæײ˜yÏD=fJÁ<ìoÕ/_xÖ4ùàžÞá¿ž»ñšNjÈ`×Շù"fNҞ”¬Œ~}>R}t¨_‡2Ï3nsJaXÄ{#“·­ýrà¿«×=—Á\¡úº*Ó4·)k<¶½êyèèèèÿ†îõÐÿÐÿÐÿÐÿº]ú¿£ëƒ2Mäúû9/=KM
ðM1,3“ÿI4Ý42úy@ñÇy‘ãL&W[A&ªèØ­ Æ·t~F: 6ï:`æ[ڏ(o¹ÕZIŸÎL©¯ç
ÌëEb)Ö|mà§QÇːÄ(V©Žâ¨“!Öùb'ÖcùÚÈëœ`LµŽ{ìĵçerSOY{Lû©î}vxÄ
µÎekËnç²µÎeiËjç²´ÎÍÓ:7¯eœ›§u.Më\ZË8—¦un¶Ö¹ÙÍè7ÕEÌGƬ
»nSE·Ïî:c“ÿù
æþ—ë±YÏ7@+ŸË´K‹fVO&ö:MtÍNM|YýO_{¦°©¬˜7ÏS_¹+d3ù^;ox¸›Œ¢—	é™óRÎ&òrô ¿»”!^uë!ʨÍÓ»ÌÀ¦ñ;$-c<–Ѫc6îاcw;X8T3%«+ýWÂ[ÁHa©,‘›IeÃÙ6’/q,–;öO—fÇTÇƋE×H¥ÓÈùSÇÒéõڅæVË×lÝ,ßw1z„»òùý&fS¶«ÆRŒä±$¸ŒÍpŸûÑÎdžŸ±¥nY°‹þ{£G‚Ó¹
º‚t5óÄۀ¹nWµ¿Wðcíhø-ÂÇÄ2Éc±»ÜKuº7ô½í"·o¨]á+žî©/;ª¯6RDNòˆ°gU×îˏe¼Ëä
ŠLߘ(>_ÒÅÝ?Z|âÐX.æ<›G&ÚqϧøЖ̟۞`tQ¯hÌw|®uœX4
5u1Edq‡‰ˆ~4ԙT:génOÍÑ<;G#«]FÈ=
--- NEW FILE ---
/*

  Basic DB data for phpBB2 devel (MSSQL)

 $Id: mssql_basic.sql,v 1.1 2002/07/16 12:51:51 psotfx Exp $

*/

BEGIN TRANSACTION;

/*
  -- Config
*/
INSERT INTO phpbb_config (config_name, config_value) VALUES ('config_id','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename','yourdomain.com');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc','A _little_ text to describe your forum');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name','phpbb2mysql');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path','/');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain','');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_secure','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_length','3600');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_html','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_html_tags','b,i,u,pre');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bbcode','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_smilies','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_namechange','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_theme_create','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','15');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page','50');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold','25');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options','10');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars','255');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_inbox_privmsgs','50');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sentbox_privmsgs','25');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_savebox_privmsgs','50');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','Thanks, The Management');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','you...@yo...');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host','');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username','');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password','');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize','6144');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width','80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height','80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles');
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 ('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 ('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', '.1.0 [20020421]');

/*
  -- Categories
*/
SET IDENTITY_INSERT phpbb_categories ON;

INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test category 1', 1);

SET IDENTITY_INSERT phpbb_categories OFF;


/*
  -- Forums
*/
INSERT INTO phpbb_forums (forum_id, cat_id, forum_name, forum_desc, forum_status, forum_order, forum_posts, forum_topics, forum_last_post_id, prune_next, prune_enable, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_pollcreate, auth_vote, auth_attachments) VALUES (1, 1, 'Test Forum 1', 'This is just a test forum, nothing special here.', '', 1, 1, 1, 1, '', 1, '', '', '', '', 1, 1, 3, 1, 1, 1, 3);

/*
  -- Users
  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_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', 'ad...@yo...', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, '', 'english', 0, 'd M Y h:i a', '', '', 0, 1);


/*
  -- Ranks
*/
SET IDENTITY_INSERT phpbb_ranks ON;

INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES (1, 'Site Admin', -1, 1, '');

SET IDENTITY_INSERT phpbb_ranks OFF;


/*
  -- Groups
*/
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);


/*
  -- User -> Group
*/
INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (1, -1, '');
INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (2, 2, '');


/*
  -- Demo Topic
*/
SET IDENTITY_INSERT phpbb_topics ON;

INSERT INTO phpbb_topics (topic_id, topic_title, topic_poster, topic_time, topic_views, topic_replies, forum_id, topic_status, topic_type, topic_vote, topic_first_post_id, topic_last_post_id, topic_moved_id) VALUES (1, 'Welcome to phpBB 2', 2, '972086460', 0, 0, 1, 0, 0, 0, 1, 1, '');

SET IDENTITY_INSERT phpbb_topics OFF;


/*
  -- Demo Post
*/
SET IDENTITY_INSERT phpbb_posts ON;

INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post_username, poster_ip) VALUES (1, 1, 1, 2, 972086460, NULL, '7F000001');
INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, NULL, 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!');

SET IDENTITY_INSERT phpbb_posts OFF;


/*
  -- Themes
*/
SET IDENTITY_INSERT phpbb_themes ON;

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 (1, 'subSilver', 'subSilver', 'subSilver.css', '', 'E5E5E5', '000000', '006699', '5493B4', '', 'DD6900', 'EFEFEF', 'DEE3E7', 'D1D7DC', '', '', '', '98AAB1', '006699', 'FFFFFF', 'cellpic1.gif', 'cellpic3.gif', 'cellpic2.jpg', 'FAFAFA', 'FFFFFF', '', 'row1', 'row2', '', 'Verdana, Arial, Helvetica, sans-serif', 'Trebuchet MS', 'Courier, ''Courier New'', sans-serif', 10, 11, 12, '444444', '006600', 'FFA34F', '', '', '');

SET IDENTITY_INSERT phpbb_themes OFF;

INSERT INTO phpbb_themes_name (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, tr_class1_name, tr_class2_name, tr_class3_name, th_color1_name, th_color2_name, th_color3_name, th_class1_name, th_class2_name, th_class3_name, td_color1_name, td_color2_name, td_color3_name, td_class1_name, td_class2_name, td_class3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, span_class1_name, span_class2_name, span_class3_name) VALUES (1, 'The lightest row colour', 'The medium row color', 'The darkest row colour', '', '', '', 'Border round the whole page', 'Outer table border', 'Inner table border', 'Silver gradient picture', 'Blue gradient picture', 'Fade-out gradient on index', 'Background for quote boxes', 'All white areas', '', 'Background for topic posts', '2nd background for topic posts', '', 'Main fonts', 'Additional topic title font', 'Form fonts', 'Smallest font size', 'Medium font size', 'Normal font size (post body etc)', 'Quote & copyright text', 'Code text colour', 'Main table header text colour', '', '', '');


/*
  -- Smilies
*/
SET IDENTITY_INSERT phpbb_smilies ON;

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_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');

SET IDENTITY_INSERT phpbb_smilies OFF;


/*
  -- Search Words
*/
SET IDENTITY_INSERT phpbb_search_wordlist ON;

INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 1, 'example', 0 );
INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 2, 'post', 0 );
INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 3, 'phpbb', 0 );
INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 4, 'installation', 0 );
INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 5, 'delete', 0 );
INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 6, 'topic', 0 );
INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 7, 'forum', 0 );
INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 8, 'since', 0 );
INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 9, 'everything', 0 );
INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 10, 'seems', 0 );
INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 11, 'working', 0 );
INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 12, 'welcome', 0 );

SET IDENTITY_INSERT phpbb_search_wordlist OFF;


/*
  -- Search Word Matches
*/
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 1, 1, 0 );
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 2, 1, 0 );
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 3, 1, 0 );
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 4, 1, 0 );
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 5, 1, 0 );
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 6, 1, 0 );
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 7, 1, 0 );
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 8, 1, 0 );
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 9, 1, 0 );
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 10, 1, 0 );
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 11, 1, 0 );
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 12, 1, 1 );
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 3, 1, 1 );

COMMIT;

--- NEW FILE ---
/*

  mssql_schema.sql for phpBB2 (c) 2001, phpBB Group 

 $Id: mssql_schema.sql,v 1.1 2002/07/16 12:51:51 psotfx Exp $

*/

BEGIN TRANSACTION
GO

CREATE TABLE [phpbb_auth_access] (
	[group_id] [int] NULL ,
	[forum_id] [int] NULL ,
	[auth_view] [smallint] NOT NULL ,
	[auth_read] [smallint] NOT NULL ,
	[auth_post] [smallint] NOT NULL ,
	[auth_reply] [smallint] NOT NULL ,
	[auth_edit] [smallint] NOT NULL ,
	[auth_delete] [smallint] NOT NULL ,
	[auth_sticky] [smallint] NOT NULL ,
	[auth_announce] [smallint] NOT NULL ,
	[auth_vote] [smallint] NOT NULL ,
	[auth_pollcreate] [smallint] NOT NULL ,
	[auth_attachments] [smallint] NOT NULL ,
	[auth_mod] [smallint] NOT NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_banlist] (
	[ban_id] [int] IDENTITY (1, 1) NOT NULL ,
	[ban_userid] [int] NULL ,
	[ban_ip] [char] (40) NULL ,
	[ban_email] [varchar] (50) NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_categories] (
	[cat_id] [int] IDENTITY (1, 1) NOT NULL ,
	[cat_title] [varchar] (50) NOT NULL ,
	[cat_order] [int] NOT NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_config] (
	[config_name] [varchar] (255) NULL ,
	[config_value] [varchar] (255) NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_disallow] (
	[disallow_id] [int] IDENTITY (1, 1) NOT NULL ,
	[disallow_username] [varchar] (100) NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_forum_prune] (
	[prune_id] [int] IDENTITY (1, 1) NOT NULL ,
	[forum_id] [int] NOT NULL ,
	[prune_days] [int] NOT NULL ,
	[prune_freq] [int] NOT NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_forums] (
	[forum_id] [int] NOT NULL ,
	[cat_id] [int] NOT NULL ,
	[forum_name] [varchar] (100) NOT NULL ,
	[forum_desc] [varchar] (255) NULL ,
	[forum_status] [smallint] NOT NULL ,
	[forum_order] [int] NOT NULL ,
	[forum_posts] [int] NOT NULL ,
	[forum_topics] [smallint] NOT NULL ,
	[forum_last_post_id] [int] NOT NULL ,
	[prune_next] [int] NULL ,
	[prune_enable] [smallint] NOT NULL ,
	[auth_view] [smallint] NOT NULL ,
	[auth_read] [smallint] NOT NULL ,
	[auth_post] [smallint] NOT NULL ,
	[auth_reply] [smallint] NOT NULL ,
	[auth_edit] [smallint] NOT NULL ,
	[auth_delete] [smallint] NOT NULL ,
	[auth_sticky] [smallint] NOT NULL ,
	[auth_announce] [smallint] NOT NULL ,
	[auth_vote] [smallint] NOT NULL ,
	[auth_pollcreate] [smallint] NOT NULL ,
	[auth_attachments] [smallint] NOT NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_forums_watch] (
	[forum_id] [int] NOT NULL ,
	[user_id] [int] NOT NULL ,
	[notify_status] [smallint] NOT NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_groups] (
	[group_id] [int] NOT NULL ,
	[group_type] [smallint] NULL ,
	[group_name] [varchar] (50) NOT NULL ,
	[group_description] [varchar] (255) NOT NULL ,
	[group_moderator] [int] NULL ,
	[group_single_user] [smallint] NOT NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_posts] (
	[post_id] [int] IDENTITY (1, 1) NOT NULL ,
	[topic_id] [int] NOT NULL ,
	[forum_id] [int] NOT NULL ,
	[poster_id] [int] NOT NULL ,
	[post_time] [int] NOT NULL ,
	[poster_ip] [char] (40) NULL ,
	[post_username] [char] (25) NULL ,
	[enable_bbcode] [smallint] NULL ,
	[enable_html] [smallint] NULL ,
	[enable_smilies] [smallint] NULL ,
	[enable_sig] [smallint] NULL ,
	[post_edit_time] [int] NULL ,
	[post_edit_count] [smallint] NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_posts_text] (
	[post_id] [int] NOT NULL ,
	[bbcode_uid] [char] (10) NULL ,
	[post_subject] [char] (60) NULL ,
	[post_text] [text] NULL 
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO

CREATE TABLE [phpbb_privmsgs] (
	[privmsgs_id] [int] IDENTITY (1, 1) NOT NULL ,
	[privmsgs_type] [smallint] NOT NULL ,
	[privmsgs_subject] [varchar] (100) NOT NULL ,
	[privmsgs_from_userid] [int] NOT NULL ,
	[privmsgs_to_userid] [int] NOT NULL ,
	[privmsgs_date] [int] NOT NULL ,
	[privmsgs_ip] [char] (40) NOT NULL ,
	[privmsgs_enable_bbcode] [smallint] NULL ,
	[privmsgs_enable_html] [smallint] NULL ,
	[privmsgs_enable_smilies] [smallint] NULL ,
	[privmsgs_attach_sig] [smallint] NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_privmsgs_text] (
	[privmsgs_text_id] [int] NOT NULL ,
	[privmsgs_bbcode_uid] [char] (10) NULL ,
	[privmsgs_text] [text] NULL 
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO

CREATE TABLE [phpbb_ranks] (
	[rank_id] [int] IDENTITY (1, 1) NOT NULL ,
	[rank_title] [varchar] (50) NOT NULL ,
	[rank_min] [int] NULL ,
	[rank_special] [smallint] NULL ,
	[rank_image] [varchar] (50) NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_search_results] (
	[search_id] [int] NOT NULL ,
	[session_id] [char] (32) NOT NULL ,
	[search_array] [text] NOT NULL 
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO

CREATE TABLE [phpbb_search_wordlist] (
	[word_id] [int] IDENTITY (1, 1) NOT NULL ,
	[word_text] [varchar] (50) NOT NULL ,
	[word_common] [tinyint] NOT NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_search_wordmatch] (
	[post_id] [int] NOT NULL ,
	[word_id] [int] NOT NULL ,
	[title_match] [smallint] NOT NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_sessions] (
	[session_id] [char] (32) NOT NULL ,
	[session_user_id] [int] NOT NULL ,
	[session_start] [int] NULL ,
	[session_time] [int] NULL ,
	[session_ip] [char] (40) NOT NULL ,
	[session_page] [int] NULL ,
	[session_logged_in] [smallint] NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_smilies] (
	[smilies_id] [int] IDENTITY (1, 1) NOT NULL ,
	[code] [varchar] (10) NOT NULL ,
	[smile_url] [varchar] (50) NOT NULL ,
	[emoticon] [varchar] (50) NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_themes] (
	[themes_id] [int] IDENTITY (1, 1) NOT NULL ,
	[template_name] [varchar] (30) NOT NULL ,
	[style_name] [varchar] (50) NOT NULL ,
	[head_stylesheet] [varchar] (50) NULL ,
	[body_background] [varchar] (50) NULL ,
	[body_bgcolor] [char] (6) NULL ,
	[body_text] [char] (6) NULL ,
	[body_link] [char] (6) NULL ,
	[body_vlink] [char] (6) NULL ,
	[body_alink] [char] (6) NULL ,
	[body_hlink] [char] (6) NULL ,
	[tr_color1] [char] (6) NULL ,
	[tr_color2] [char] (6) NULL ,
	[tr_color3] [char] (6) NULL ,
	[tr_class1] [varchar] (25) NULL ,
	[tr_class2] [varchar] (25) NULL ,
	[tr_class3] [varchar] (25) NULL ,
	[th_color1] [char] (6) NULL ,
	[th_color2] [char] (6) NULL ,
	[th_color3] [char] (6) NULL ,
	[th_class1] [varchar] (25) NULL ,
	[th_class2] [varchar] (25) NULL ,
	[th_class3] [varchar] (25) NULL ,
	[td_color1] [char] (6) NULL ,
	[td_color2] [char] (6) NULL ,
	[td_color3] [char] (6) NULL ,
	[td_class1] [varchar] (25) NULL ,
	[td_class2] [varchar] (25) NULL ,
	[td_class3] [varchar] (25) NULL ,
	[fontface1] [varchar] (50) NULL ,
	[fontface2] [varchar] (50) NULL ,
	[fontface3] [varchar] (50) NULL ,
	[fontsize1] [smallint] NULL ,
	[fontsize2] [smallint] NULL ,
	[fontsize3] [smallint] NULL ,
	[fontcolor1] [char] (6) NULL ,
	[fontcolor2] [char] (6) NULL ,
	[fontcolor3] [char] (6) NULL ,
	[span_class1] [varchar] (25) NULL ,
	[span_class2] [varchar] (25) NULL ,
	[span_class3] [varchar] (25) NULL ,
	[img_size_poll] [smallint] NULL ,
	[img_size_privmsg] [smallint] NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_themes_name] (
	[themes_id] [int] NOT NULL ,
	[tr_color1_name] [varchar] (50) NULL ,
	[tr_color2_name] [varchar] (50) NULL ,
	[tr_color3_name] [varchar] (50) NULL ,
	[tr_class1_name] [varchar] (50) NULL ,
	[tr_class2_name] [varchar] (50) NULL ,
	[tr_class3_name] [varchar] (50) NULL ,
	[th_color1_name] [varchar] (50) NULL ,
	[th_color2_name] [varchar] (50) NULL ,
	[th_color3_name] [varchar] (50) NULL ,
	[th_class1_name] [varchar] (50) NULL ,
	[th_class2_name] [varchar] (50) NULL ,
	[th_class3_name] [varchar] (50) NULL ,
	[td_color1_name] [varchar] (50) NULL ,
	[td_color2_name] [varchar] (50) NULL ,
	[td_color3_name] [varchar] (50) NULL ,
	[td_class1_name] [varchar] (50) NULL ,
	[td_class2_name] [varchar] (50) NULL ,
	[td_class3_name] [varchar] (50) NULL ,
	[fontface1_name] [varchar] (50) NULL ,
	[fontface2_name] [varchar] (50) NULL ,
	[fontface3_name] [varchar] (50) NULL ,
	[fontsize1_name] [varchar] (50) NULL ,
	[fontsize2_name] [varchar] (50) NULL ,
	[fontsize3_name] [varchar] (50) NULL ,
	[fontcolor1_name] [varchar] (50) NULL ,
	[fontcolor2_name] [varchar] (50) NULL ,
	[fontcolor3_name] [varchar] (50) NULL ,
	[span_class1_name] [varchar] (50) NULL ,
	[span_class2_name] [varchar] (50) NULL ,
	[span_class3_name] [varchar] (50) NULL
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_topics] (
	[topic_id] [int] IDENTITY (1, 1) NOT NULL ,
	[forum_id] [int] NOT NULL ,
	[topic_title] [varchar] (60) NOT NULL ,
	[topic_poster] [int] NOT NULL ,
	[topic_time] [int] NOT NULL ,
	[topic_views] [int] NOT NULL ,
	[topic_replies] [int] NOT NULL ,
	[topic_status] [smallint] NOT NULL ,
	[topic_type] [smallint] NOT NULL ,
	[topic_vote] [smallint] NOT NULL ,
	[topic_first_post_id] [int] NULL ,
	[topic_last_post_id] [int] NULL ,
	[topic_moved_id] [int] NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_topics_watch] (
	[topic_id] [int] NOT NULL ,
	[user_id] [int] NOT NULL ,
	[notify_status] [smallint] NOT NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_user_group] (
	[group_id] [int] NOT NULL ,
	[user_id] [int] NOT NULL ,
	[user_pending] [smallint] NULL 
) ON [PRIMARY]
GO

CREATE TABLE [phpbb_users] (
	[user_id] [int] NOT NULL ,
	[user_active] [smallint] NULL ,
	[username] [varchar] (25) NOT NULL ,
	[user_password] [varchar] (32) NOT NULL ,
	[user_session_time] [int] NOT NULL ,
	[user_session_page] [smallint] NOT NULL ,
	[user_lastvisit] [i...
 
[truncated message content]

[Phpbb-checkins] CVS: phpBB2/install install.php,NONE,1.1 update_script.php,NONE,1.1 upgrade.php,NONE,1.1

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

Update of /cvsroot/phpbb/phpBB2/install
In directory usw-pr-cvs1:/tmp/cvs-serv7099/install

Added Files:
	install.php update_script.php upgrade.php 
Log Message:
Centralise install/upgrade/schemas ... make for easier removal and less cluter ... I think ... install needs to have it's template hard coded

--- NEW FILE ---
<?php
/***************************************************************************
 *                                install.php
 *                            -------------------
 *   begin                : Tuesday, Sept 11, 2001
 *   copyright            : (C) 2001 The phpBB Group
 *   email                : supportphpbb.com
 *
 *   $Id: install.php,v 1.1 2002/07/16 12:51:51 psotfx Exp $
 *
 ***************************************************************************/

/***************************************************************************
 *
 *   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.
 *
[...967 lines suppressed...]

//
// addslashes to vars if magic_quotes_gpc is off this is a security precaution
// to prevent someone trying to break out of a SQL statement.
//
function slash_input_data(&$data)
{
	if ( is_array($data) )
	{
		while( list($k, $v) = each($data) )
		{
			$data[$k] = ( is_array($v) ) ? slash_input_data($v) : addslashes($v);
		}

		@reset($data);
	}
	return $data;
}

?>
--- NEW FILE ---
<html>
<body>
<?php

// --------------------------------
//
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]);
}
//
// --------------------------------

define('IN_PHPBB', 1);
$phpbb_root_path='./../';
include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'config.'.$phpEx);
include($phpbb_root_path . 'includes/constants.'.$phpEx);
include($phpbb_root_path . 'includes/functions.'.$phpEx);
include($phpbb_root_path . 'includes/db.'.$phpEx);

$sql = "SELECT config_value  
	FROM " . CONFIG_TABLE . " 
	WHERE config_name = 'version'";
if ( !($result = $db->sql_query($sql)) )
{
	die("Couldn't obtain version info");
}

if ( $row = $db->sql_fetchrow($result) )
{
	$sql = array();
	switch ( $row['config_value'] )
	{
		case '.0.0':
		case '.1.0 [20020402]':
			echo 'Updating from [20020402] :: ';
			flush();

			$sql[] = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) 
				VALUES ('session_gc', '3600')";
			$sql[] = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) 
				VALUES ('session_last_gc', '0')";

			echo '<span style="color:green">DONE</span><br /><br />';
		case '.1.0 [20020420]':
			switch ( SQL_LAYER )
			{
				case 'mysql':
				case 'mysql4':
					$sql[] = "CREATE TABLE " . $table_prefix . "forums_watch (forum_id smallint(5) UNSIGNED NOT NULL DEFAULT '0', user_id mediumint(8) NOT NULL DEFAULT '0', notify_status tinyint(1) NOT NULL default '0', KEY forum_id (forum_id), KEY user_id (user_id), KEY notify_status (notify_status))";
					break;

				case 'mssql-odbc':
				case 'mssql':
					$sql[] = "CREATE TABLE [" . $table_prefix . "forums_watch] ([forum_id] [int] NOT NULL , [user_id] [int] NOT NULL , [notify_status] [smallint] NOT NULL ) ON [PRIMARY]";
					$sql[] = "CREATE  INDEX [IX_" . $table_prefix . "forums_watch] ON [" . $table_prefix . "forums_watch]([forum_id], [user_id]) ON [PRIMARY]";
					break;

				case 'postgresql':
					$sql[] = "CREATE TABLE " . $table_prefix . "forums_watch (forum_id int4, user_id int4, notify_status int2 NOT NULL default '0')";
					$sql[] = "CREATE  INDEX forum_id_" . $table_prefix . "forums_watch_index ON " . $table_prefix . "forums_watch (forum_id)";
					$sql[] = "CREATE  INDEX user_id_" . $table_prefix . "forums_watch_index ON " . $table_prefix . "forums_watch (user_id)";
				default:
					die("No DB LAYER found!");
					break;
			}
		case '.1.0 [20020421]':
			$user_data_sql = "SELECT COUNT(user_id) AS total_users, MAX(user_id) AS newest_user_id FROM " . USERS_TABLE . " WHERE user_id <> " . ANONYMOUS;
			if($result = $db->sql_query($user_data_sql))
			{
				$row = $db->sql_fetchrow($result);
				$user_count = $row['total_users'];
				$newest_user_id = $row['newest_user_id'];
				
				$username_sql = "SELECT username FROM " . USERS_TABLE . " WHERE user_id = $newest_user_id";
				if(!$result = $db->sql_query($username_sql))
				{
					die('Could not get username to update to [20020430]');
				}
				$row = $db->sql_fetchrow($result);
				$newest_username = $row['username'];
			}
			else
			{
				die('Could not get user count for update to [20020430]');
			}
				
			$sql[] = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value)
				VALUES ('newest_user_id', $newest_user_id)";
			$sql[] = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value)
				VALUES ('newest_username', '$newest_username')";
			$sql[] = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value)
				VALUES ('num_users', $user_count)";
		case '.1.0 [20020430]':
			switch ( SQL_LAYER )
			{
				case 'mysql':
				case 'mysql4':
					$sql[] = "ALTER TABLE " . BANLIST_TABLE . " 
						MODIFY ban_email char(60) NULL, 
						MODIFY ban_ip char(40) NOT NULL";
					$sql[] = "ALTER TABLE " . DISALLOW_TABLE . " 
						MODIFY disallow_username char(30) NOT NULL";
					$sql[] = "ALTER TABLE " . POSTS_TABLE . " 
						MODIFY poster_ip char(40) NOT NULL, 
						MODIFY post_username char(30) NULL";
					$sql[] = "ALTER TABLE " . PRIVMSGS_TABLE . " 
						MODIFY privmsgs_subject char(60) NOT NULL, 
						MODIFY privmsgs_ip char(40) NOT NULL";
					$sql[] = "ALTER TABLE " . SESSIONS_TABLE . " 
						MODIFY session_ip char(40) NOT NULL";
					$sql[] = "ALTER TABLE " . USERS_TABLE . " 
						ADD COLUMN user_ip char(40) NOT NULL";
					$sql[] = "ALTER TABLE " . VOTE_USERS_TABLE . " 
						MODIFY COLUMN vote_user_ip char(40) NOT NULL";
					break;

				case 'mssql-odbc':
				case 'mssql':
					$sql[] = "";
					break;

				case 'postgresql':
					$sql[] = "";
				default:
					die("No DB LAYER found!");
					break;
			}

			break;
		default;
			echo 'No updates made<br /><br />';
	}

	if ( count($sql) )
	{
		for($i = 0; $i < count($sql); $i++)
		{
			if ( !$db->sql_query($sql[$i]) )
			{
				die("Couldn't run update >> " . $sql[$i]);
			}
		}
	}

	$sql_update = array();

	switch ( $row['config_value'] )
	{
		case '.1.0 [20020430]':

			$sql = "SELECT ban_id, ban_ip 
				FROM " . BANLIST_TABLE;
			if ( !($result = $db->sql_query($sql)) )
			{
				die("Couldn't select data >> " . $sql);
			}

			if ( $row = $db->sql_fetchrow($result) )
			{
				do
				{
					$ban_ip = str_replace('255', '256', decode_ip($row['ban_ip']));
					$sql_update[] = "UPDATE " . BANLIST_TABLE . " 
						SET ban_ip = '$ban_ip'
						WHERE ban_id = " . $row['ban_id'];
				}
				while ( $row = $db->sql_fetchrow($result) );
			}

			$sql = "SELECT post_id, poster_ip 
				FROM " . POSTS_TABLE;
			if ( !($result = $db->sql_query($sql)) )
			{
				die("Couldn't select data >> " . $sql);
			}

			if ( $row = $db->sql_fetchrow($result) )
			{
				do
				{
					$sql_update[] = "UPDATE " . POSTS_TABLE . " 
						SET poster_ip = '" . decode_ip($row['poster_ip']) . "'
						WHERE post_id = " . $row['post_id'];
				}
				while ( $row = $db->sql_fetchrow($result) );
			}

			$sql = "SELECT privmsgs_id, privmsgs_ip 
				FROM " . PRIVMSGS_TABLE;
			if ( !($result = $db->sql_query($sql)) )
			{
				die("Couldn't select data >> " . $sql);
			}

			if ( $row = $db->sql_fetchrow($result) )
			{
				do
				{
					$sql_update[] = "UPDATE " . PRIVMSGS_TABLE . " 
						SET privmsgs_ip = '" . decode_ip($row['privmsgs_ip']) . "'
						WHERE privmsgs_id = " . $row['privmsgs_id'];
				}
				while ( $row = $db->sql_fetchrow($result) );
			}

			$sql = "SELECT session_id, session_ip 
				FROM " . SESSIONS_TABLE;
			if ( !($result = $db->sql_query($sql)) )
			{
				die("Couldn't select data >> " . $sql);
			}

			if ( $row = $db->sql_fetchrow($result) )
			{
				do
				{
					$sql_update[] = "UPDATE " . SESSIONS_TABLE . " 
						SET session_ip = '" . decode_ip($row['session_ip']) . "'
						WHERE session_id = '" . $row['session_id'] . "'";
				}
				while ( $row = $db->sql_fetchrow($result) );
			}

			$sql = "SELECT vote_id, vote_user_id, vote_user_ip 
				FROM " . VOTE_USERS_TABLE;
			if ( !($result = $db->sql_query($sql)) )
			{
				die("Couldn't select data >> " . $sql);
			}

			if ( $row = $db->sql_fetchrow($result) )
			{
				do
				{
					$sql_update[] = "UPDATE " . VOTE_USERS_TABLE . " 
						SET vote_user_ip = '" . decode_ip($row['vote_user_ip']) . "'
						WHERE vote_id = " . $row['vote_id'] . " 
							AND vote_user_id = " . $row['vote_user_id'];
				}
				while ( $row = $db->sql_fetchrow($result) );
			}
			break;
	}

	if ( count($sql_update) )
	{
		echo 'Updating existing data :: ';
		flush();

		for($i = 0; $i < count($sql_update); $i++)
		{
			if ( !$db->sql_query($sql_update[$i]) )
			{
				die("Couldn't run update >> " . $sql_update[$i]);
			}
		}

		echo "DONE<br /><br />\n";
	}
}

$sql = "UPDATE " . CONFIG_TABLE . " 
	SET config_value = '.1.0 [20020905]' 
	WHERE config_name = 'version'";
if ( !($result = $db->sql_query($sql)) )
{
	die("Couldn't update version info");
}

echo "\n<br />\n<b>COMPLETE!</b><br />\n";
echo "\n<p>Don't forget to delete this file!</p>\n";
?>
</body>
</html>

--- NEW FILE ---
<?php
/***************************************************************************
*                                  upgrade.php
*                              -------------------
*     begin                : Wed Sep 05 2001
*     copyright            : (C) 2001 The phpBB Group
*     email                : su...@ph...
*
*     $Id: upgrade.php,v 1.1 2002/07/16 12:51:51 psotfx Exp $
*
****************************************************************************/

/***************************************************************************
 *
 *   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.
 *
[...1902 lines suppressed...]
			for($i = 0; $i < count($drop_tables); $i++)
			{
				print " * Dropping table '" . $drop_tables[$i] . "' :: ";
				flush();

				$sql = "DROP TABLE " . $drop_tables[$i];
				query($sql, "Couldn't drop table :: " . $drop_tables[$i]);

				print "<span class=\"ok\"><b>OK</b></span><br />\n";
			}

			echo "\n<br /><br />\n\n<font size=\"+3\"><b>UPGRADE COMPLETED</b></font><br />\n";
	}
}

print "<br />If the upgrade completed without error you may click <a href=\"index.$phpEx\">Here</a> to proceed to the index<br />";

common_footer();

?>

[Phpbb-checkins] CVS: phpBB2/install/schemas - New directory

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

Update of /cvsroot/phpbb/phpBB2/install/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv6754/schemas

Log Message:
Directory /cvsroot/phpbb/phpBB2/install/schemas added to the repository

[Phpbb-checkins] CVS: phpBB2/install - New directory

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

Update of /cvsroot/phpbb/phpBB2/install
In directory usw-pr-cvs1:/tmp/cvs-serv6697/install

Log Message:
Directory /cvsroot/phpbb/phpBB2/install added to the repository

[Phpbb-checkins] CVS: phpBB2/templates/subSilver search_results_posts.tpl.html,NONE,1.1 search_results_topics.tpl.html,NONE,1.1 search_results_posts.tpl,1.12,NONE search_results_topics.tpl,1.11,NONE

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

Update of /cvsroot/phpbb/phpBB2/templates/subSilver
In directory usw-pr-cvs1:/tmp/cvs-serv5708/templates/subSilver

Added Files:
	search_results_posts.tpl.html search_results_topics.tpl.html 
Removed Files:
	search_results_posts.tpl search_results_topics.tpl 
Log Message:
Changed names

--- NEW FILE ---
 
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  <tr> 
	<td align="left" valign="bottom"><span class="maintitle">{L_SEARCH_MATCHES}</span><br /></td>
  </tr>
</table>

<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  <tr> 
	<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
  </tr>
</table>

<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center">
  <tr> 
	<th width="150" height="25" class="thCornerL" nowrap="nowrap">{L_AUTHOR}</th>
	<th width="100%" class="thCornerR" nowrap="nowrap">{L_MESSAGE}</th>
  </tr>
  <!-- BEGIN searchresults -->
  <tr> 
	<td class="catHead" colspan="2" height="28"><span class="topictitle"><img src="templates/subSilver/images/folder.gif" align="absmiddle">&nbsp; {L_TOPIC}:&nbsp;<a href="{searchresults.U_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span></td>
  </tr>
  <tr> 
	<td width="150" align="left" valign="top" class="row1" rowspan="2"><span class="name"><b>{searchresults.POSTER_NAME}</b></span><br />
	  <br />
	  <span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br />
	  {L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br />
	</td>
	<td width="100%" valign="top" class="row1"><img src="{searchresults.MINI_POST_IMG}" width="12" height="9" alt="{searchresults.L_MINI_POST_ALT}" title="{searchresults.L_MINI_POST_ALT}" border="0" /><span class="postdetails">{L_FORUM}:&nbsp;<b><a href="{searchresults.U_FORUM}" class="postdetails">{searchresults.FORUM_NAME}</a></b>&nbsp; &nbsp;{L_POSTED}: {searchresults.POST_DATE}&nbsp; &nbsp;{L_SUBJECT}: <b><a href="{searchresults.U_POST}">{searchresults.POST_SUBJECT}</a></b></span></td>
  </tr>
  <tr>
	<td valign="top" class="row1"><span class="postbody">{searchresults.MESSAGE}</span></td>
  </tr>
  <!-- END searchresults -->
  <tr> 
	<td class="catBottom" colspan="2" height="28" align="center">&nbsp; </td>
  </tr>
</table>

<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
  <tr> 
	<td align="left" valign="top"><span class="nav">{PAGE_NUMBER}</span></td>
	<td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><br /><span class="gensmall">{S_TIMEZONE}</span></td>
  </tr>
</table>

<table width="100%" cellspacing="2" border="0" align="center">
  <tr> 
	<td valign="top" align="right">{JUMPBOX}</td>
  </tr>
</table>

--- NEW FILE ---
 
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  <tr> 
	<td align="left" valign="bottom"><span class="maintitle">{L_SEARCH_MATCHES}</span><br /></td>
  </tr>
</table>

<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  <tr> 
	<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
  </tr>
</table>

<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
  <tr> 
	<th width="4%" height="25" class="thCornerL" nowrap="nowrap">&nbsp;</th>
	<th class="thTop" nowrap="nowrap">&nbsp;{L_FORUM}&nbsp;</th>
	<th class="thTop" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
	<th class="thTop" nowrap="nowrap">&nbsp;{L_AUTHOR}&nbsp;</th>
	<th class="thTop" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
	<th class="thTop" nowrap="nowrap">&nbsp;{L_VIEWS}&nbsp;</th>
	<th class="thCornerR" nowrap="nowrap">&nbsp;{L_LASTPOST}&nbsp;</th>
  </tr>
  <!-- BEGIN searchresults -->
  <tr> 
	<td class="row1" align="center" valign="middle"><img src="{searchresults.TOPIC_FOLDER_IMG}" width="19" height="18" alt="{searchresults.L_TOPIC_FOLDER_ALT}" title="{searchresults.L_TOPIC_FOLDER_ALT}" /></td>
	<td class="row1"><span class="forumlink"><a href="{searchresults.U_VIEW_FORUM}" class="forumlink">{searchresults.FORUM_NAME}</a></span></td>
	<td class="row2"><span class="topictitle">{searchresults.NEWEST_POST_IMG}{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span><br /><span class="gensmall">{searchresults.GOTO_PAGE}</span></td>
	<td class="row1" align="center" valign="middle"><span class="name">{searchresults.TOPIC_AUTHOR}</span></td>
	<td class="row2" align="center" valign="middle"><span class="postdetails">{searchresults.REPLIES}</span></td>
	<td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.VIEWS}</span></td>
	<td class="row2" align="center" valign="middle" nowrap="nowrap"><span class="postdetails">{searchresults.LAST_POST_TIME}<br />{searchresults.LAST_POST_AUTHOR} {searchresults.LAST_POST_IMG}</span></td>
  </tr>
  <!-- END searchresults -->
  <tr> 
	<td class="catBottom" colspan="7" height="28" valign="middle">&nbsp; </td>
  </tr>
</table>

<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
  <tr> 
	<td align="left" valign="top"><span class="nav">{PAGE_NUMBER}</span></td>
	<td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><br /><span class="gensmall">{S_TIMEZONE}</span></td>
  </tr>
</table>

<table width="100%" cellspacing="2" border="0" align="center">
  <tr> 
	<td valign="top" align="right">{JUMPBOX}</td>
  </tr>
</table>

--- search_results_posts.tpl DELETED ---

--- search_results_topics.tpl DELETED ---

[Phpbb-checkins] CVS: phpBB2 viewonline.php,1.56,1.57

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

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv4938

Modified Files:
	viewonline.php 
Log Message:
remove user_level, add colour

Index: viewonline.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewonline.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** viewonline.php	14 Jul 2002 14:45:26 -0000	1.56
--- viewonline.php	16 Jul 2002 12:45:17 -0000	1.57
***************
*** 54,58 ****
  // Get user list
  //
! $sql = "SELECT u.user_id, u.username, u.user_allow_viewonline, u.user_level, s.session_time, s.session_page, s.session_ip
  	FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
  	WHERE u.user_id = s.session_user_id
--- 54,58 ----
  // Get user list
  //
! $sql = "SELECT u.user_id, u.username, u.user_allow_viewonline, u.user_colour, s.session_time, s.session_page, s.session_ip
  	FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
  	WHERE u.user_id = s.session_user_id
***************
*** 82,88 ****
  			$username = $row['username'];
  
  			if ( !$row['user_allow_viewonline'] )
  			{
! 				$view_online = ( $userdata['user_level'] == ADMIN ) ? true : false;
  				$hidden_users++;
  
--- 82,93 ----
  			$username = $row['username'];
  
+ 			if ( $row['user_colour'] )
+ 			{
+ 				$username = '<b style="color:#' . $row['user_colour'] . '">' . $username . '</b>';
+ 			}
+ 
  			if ( !$row['user_allow_viewonline'] )
  			{
! 				$view_online = ( $acl->get_admin_acl() ) ? true : false;
  				$hidden_users++;
  

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.109,1.110

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

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv4888/includes

Modified Files:
	page_header.php 
Log Message:
oops

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -r1.109 -r1.110
*** page_header.php	16 Jul 2002 12:42:26 -0000	1.109
--- page_header.php	16 Jul 2002 12:45:05 -0000	1.110
***************
*** 122,126 ****
  			}
  			
! 			if ( $row['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
  			{
  				$online_userlist .= ( $online_userlist != '' ) ? ', ' . $user_online_link : $user_online_link;
--- 122,126 ----
  			}
  			
! 			if ( $row['user_allow_viewonline'] || $acl->get_admin_acl() )
  			{
  				$online_userlist .= ( $online_userlist != '' ) ? ', ' . $user_online_link : $user_online_link;

[Phpbb-checkins] CVS: phpBB2/includes page_header.php,1.108,1.109

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

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv3936/includes

Modified Files:
	page_header.php 
Log Message:
Remove user_level

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -r1.108 -r1.109
*** page_header.php	14 Jul 2002 14:41:55 -0000	1.108
--- page_header.php	16 Jul 2002 12:42:26 -0000	1.109
***************
*** 79,83 ****
  //
  $user_forum_sql = ( !empty($forum_id) ) ? "AND s.session_page LIKE '%f=$forum_id%'" : '';
! $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_ip
  	FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE ." s
  	WHERE u.user_id = s.session_user_id
--- 79,83 ----
  //
  $user_forum_sql = ( !empty($forum_id) ) ? "AND s.session_page LIKE '%f=$forum_id%'" : '';
! $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_colour, s.session_ip
  	FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE ." s
  	WHERE u.user_id = s.session_user_id

[Phpbb-checkins] CVS: phpBB2/admin admin_database.php,NONE,1.1 admin_db_utilities.php,1.43,NONE admin_user_ban.php,1.22,NONE

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

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv861/admin

Added Files:
	admin_database.php 
Removed Files:
	admin_db_utilities.php admin_user_ban.php 
Log Message:
renamed

--- NEW FILE ---
<?php
/***************************************************************************
*                             admin_db_utilities.php
*                              -------------------
*     begin                : Thu May 31, 2001
*     copyright            : (C) 2001 The phpBB Group
*     email                : su...@ph...
*
*     $Id: admin_database.php,v 1.1 2002/07/16 12:31:19 psotfx Exp $
*
****************************************************************************/

/***************************************************************************
 *
 *   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.
 *
[...982 lines suppressed...]
		$handler(trim($schema_insert));

	}
	return(true);
}

function output_table_content($content)
{
	global $tempfile;

	//fwrite($tempfile, $content . "\n");
	//$backup_sql .= $content . "\n";
	echo $content ."\n";
	return;
}
//
// End Functions
// -------------

?>
--- admin_db_utilities.php DELETED ---

--- admin_user_ban.php DELETED ---

[Phpbb-checkins] CVS: phpBB2/admin admin_ban.php,NONE,1.1 admin_disallow.php,1.9,1.10 admin_groups.php,1.25,1.26 admin_ranks.php,1.13,1.14 admin_smilies.php,1.22,1.23

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

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv32161/admin

Modified Files:
	admin_disallow.php admin_groups.php admin_ranks.php 
	admin_smilies.php 
Added Files:
	admin_ban.php 
Log Message:
Minor changes

--- NEW FILE ---
<?php
/***************************************************************************
 *                              admin_ban.php
 *                            -------------------
 *   begin                : Tuesday, Jul 31, 2001
 *   copyright            : (C) 2001 The phpBB Group
 *   email                : su...@ph...
 *
 *   $Id: admin_ban.php,v 1.1 2002/07/16 12:28:12 psotfx Exp $
 *
 ***************************************************************************/

/***************************************************************************
 *
 *   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.
 *
 ***************************************************************************/

define('IN_PHPBB', 1);

if( !empty($setmodules) )
{
	if ( !$acl->get_acl_admin('ban') )
	{
		return;
	}

	$filename = basename(__FILE__);
	$module['Users']['Ban_users'] = $filename . "$SID&amp;mode=user";
	$module['Users']['Ban_emails'] = $filename . "$SID&amp;mode=email";
	$module['Users']['Ban_ips'] = $filename . "$SID&amp;mode=ip";

	return;
}

//
// Load default header
//
$phpbb_root_path = '../';
require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx);

//
//
//
if ( !$acl->get_acl_admin('ban') )
{
	return;
}

//
// Start program
//
if( isset($HTTP_POST_VARS['submit']) )
{
	$user_bansql = '';
	$email_bansql = '';
	$ip_bansql = '';

	$user_list = array();
	if( isset($HTTP_POST_VARS['ban_user']) )
	{
		$user_list_temp = $HTTP_POST_VARS['ban_user'];

		for($i = 0; $i < count($user_list_temp); $i++)
		{
			$user_list[] = trim($user_list_temp[$i]);
		}
	}

	$ip_list = array();
	if( isset($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) )
			{
				//
				// Don't ask about all this, just don't ask ... !
				//
				$ip_1_counter = $ip_range_explode[1];
				$ip_1_end = $ip_range_explode[5];

				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];

					if($ip_2_counter == 0 && $ip_2_end == 254)
					{
						$ip_2_counter = 256;
						$ip_2_fragment = 256;

						$ip_list[] = "$ip_1_counter.256.256.256";
					}

					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];

						if($ip_3_counter == 0 && $ip_3_end == 254 )
						{
							$ip_3_counter = 256;
							$ip_3_fragment = 256;

							$ip_list[] = "$ip_1_counter.$ip_2_counter.256.256";
						}

						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];

							if($ip_4_counter == 0 && $ip_4_end == 254)
							{
								$ip_4_counter = 256;
								$ip_4_fragment = 256;

								$ip_list[] = "$ip_1_counter.$ip_2_counter.$ip_3_counter.256";
							}

							while($ip_4_counter <= $ip_4_end)
							{
								$ip_list[] = "$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter";
								$ip_4_counter++;
							}
							$ip_3_counter++;
						}
						$ip_2_counter++;
					}
					$ip_1_counter++;
				}
			}
			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]) )
					{
						$ip_list[] = $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])) )
			{
				$ip_list[] = str_replace('*', '256', trim($ip_list_temp[$i]));
			}
		}
	}

	$email_list = array();
	if(isset($HTTP_POST_VARS['ban_email']))
	{
		$email_list_temp = explode(',', $HTTP_POST_VARS['ban_email']);

		for($i = 0; $i < count($email_list_temp); $i++)
		{
			//
			// This ereg match is based on one by ph...@un...
			// 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])) )
			{
				$email_list[] = trim($email_list_temp[$i]);
			}
		}
	}

	$sql = "SELECT *
		FROM " . BANLIST_TABLE;
	if( !$result = $db->sql_query($sql) )
	{
		message_die(GENERAL_ERROR, "Couldn't obtain banlist information", "", __LINE__, __FILE__, $sql);
	}

	$current_banlist = $db->sql_fetchrowset($result);

	$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'])
			{
				$in_banlist = true;
			}
		}

		if(!$in_banlist)
		{
			$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) )
			{
				message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql);
			}
		}
	}

	for($i = 0; $i < count($ip_list); $i++)
	{
		$in_banlist = false;
		for($j = 0; $j < count($current_banlist); $j++)
		{
			if($ip_list[$i] == $current_banlist[$j]['ban_ip'])
			{
				$in_banlist = true;
			}
		}

		if ( !$in_banlist )
		{
			$kill_ip_sql = ( preg_match('/256/s') ) ? "session_ip LIKE '" . preg_replace('/(256)/s', '%', $ip_list[$i]) . "'" : "session_ip = '" . $ip_list[$i] . "'";

			$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) )
			{
				message_die(GENERAL_ERROR, "Couldn't insert ban_ip info into database", "", __LINE__, __FILE__, $sql);
			}
		}
	}

	//
	// 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 != "" )
	{
		$sql = "DELETE FROM " . SESSIONS_TABLE . "
			WHERE $kill_session_sql";
		if( !$result = $db->sql_query($sql) )
		{
			message_die(GENERAL_ERROR, "Couldn't delete banned sessions from database", "", __LINE__, __FILE__, $sql);
		}
	}

	for($i = 0; $i < count($email_list); $i++)
	{
		$in_banlist = false;
		for($j = 0; $j < count($current_banlist); $j++)
		{
			if( $email_list[$i] == $current_banlist[$j]['ban_email'] )
			{
				$in_banlist = true;
			}
		}

		if( !$in_banlist )
		{
			$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
				VALUES ('" . str_replace("\'", "''", $email_list[$i]) . "')";
			if( !$result = $db->sql_query($sql) )
			{
				message_die(GENERAL_ERROR, "Couldn't insert ban_email info into database", "", __LINE__, __FILE__, $sql);
			}
		}
	}

	$where_sql = "";

	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($where_sql != "")
				{
					$where_sql .= ", ";
				}
				$where_sql .= $user_list[$i];
			}
		}
	}

	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($where_sql != "")
				{
					$where_sql .= ", ";
				}
				$where_sql .= $ip_list[$i];
			}
		}
	}

	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($where_sql != "")
				{
					$where_sql .= ", ";
				}
				$where_sql .= $email_list[$i];
			}
		}
	}

	if( $where_sql != "" )
	{
		$sql = "DELETE FROM " . BANLIST_TABLE . "
			WHERE ban_id IN ($where_sql)";
		if( !$result = $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_die(GENERAL_MESSAGE, $message);

}
else
{
	$template->set_filenames(array(
		'body' => 'admin/user_ban_body.tpl')
	);

	$template->assign_vars(array(
		'L_BAN_TITLE' => $lang['Ban_control'],
		'L_BAN_EXPLAIN' => $lang['Ban_explain'],
		'L_BAN_EXPLAIN_WARN' => $lang['Ban_explain_warn'],
		'L_IP_OR_HOSTNAME' => $lang['IP_hostname'],
		'L_EMAIL_ADDRESS' => $lang['Email_address'],
		'L_SUBMIT' => $lang['Submit'],
		'L_RESET' => $lang['Reset'],

		'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)
	);

	$userban_count = 0;
	$ipban_count = 0;
	$emailban_count = 0;

	$sql = "SELECT b.ban_id, u.user_id, u.username
		FROM " . BANLIST_TABLE . " b, " . USERS_TABLE . " u
		WHERE u.user_id = b.ban_userid
			AND b.ban_userid <> 0
			AND u.user_id <> " . ANONYMOUS . "
		ORDER BY u.user_id 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]['ban_id'] . '">' . $user_list[$i]['username'] . '</option>';
		$userban_count++;
	}

	if( $select_userlist == '' )
	{
		$select_userlist = '<option value="-1">' . $lang['No_banned_users'] . '</option>';
	}

	$select_userlist = '<select name="unban_user[]" multiple="multiple" size="5">' . $select_userlist . '</select>';

	$sql = "SELECT ban_id, ban_ip, ban_email
		FROM " . BANLIST_TABLE;
	if ( !($result = $db->sql_query($sql)) )
	{
		message_die(GENERAL_ERROR, 'Could not select current ip ban list', '', __LINE__, __FILE__, $sql);
	}

	$banlist = $db->sql_fetchrowset($result);
	$db->sql_freeresult($result);

	$select_iplist = '';
	$select_emaillist = '';

	for($i = 0; $i < count($banlist); $i++)
	{
		$ban_id = $banlist[$i]['ban_id'];

		if ( !empty($banlist[$i]['ban_ip']) )
		{
			$ban_ip = str_replace('256', '*', $banlist[$i]['ban_ip']);
			$select_iplist .= '<option value="' . $ban_id . '">' . $ban_ip . '</option>';
			$ipban_count++;
		}
		else if ( !empty($banlist[$i]['ban_email']) )
		{
			$ban_email = $banlist[$i]['ban_email'];
			$select_emaillist .= '<option value="' . $ban_id . '">' . $ban_email . '</option>';
			$emailban_count++;
		}
	}

	if ( $select_iplist == '' )
	{
		$select_iplist = '<option value="-1">' . $lang['No_banned_ip'] . '</option>';
	}

	if ( $select_emaillist == '' )  
	{
		$select_emaillist = '<option value="-1">' . $lang['No_banned_email'] . '</option>';
	}

	$select_iplist = '<select name="unban_ip[]" multiple="multiple" size="5">' . $select_iplist . '</select>';
	$select_emaillist = '<select name="unban_email[]" multiple="multiple" size="5">' . $select_emaillist . '</select>';

	$template->assign_vars(array(
		'L_UNBAN_USER' => $lang['Unban_username'],
		'L_UNBAN_USER_EXPLAIN' => $lang['Unban_username_explain'],
		'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'],

		'S_UNBAN_USERLIST_SELECT' => $select_userlist,
		'S_UNBAN_IPLIST_SELECT' => $select_iplist,
		'S_UNBAN_EMAILLIST_SELECT' => $select_emaillist,
		'S_BAN_ACTION' => append_sid("admin_user_ban.$phpEx"))
	);
}

$template->pparse('body');

include('page_footer_admin.'.$phpEx);

?>
Index: admin_disallow.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_disallow.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** admin_disallow.php	22 Mar 2002 17:00:32 -0000	1.9
--- admin_disallow.php	16 Jul 2002 12:28:12 -0000	1.10
***************
*** 9,13 ****
   *   $Id$
   *
-  *
   ***************************************************************************/
  
--- 9,12 ----
***************
*** 26,30 ****
  {
  	$filename = basename(__FILE__);
! 	$module['Users']['Disallow'] = append_sid($filename);
  
  	return;
--- 25,29 ----
  {
  	$filename = basename(__FILE__);
! 	$module['Users']['Disallow'] = $filename . $SID;
  
  	return;

Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** admin_groups.php	22 Mar 2002 17:00:32 -0000	1.25
--- admin_groups.php	16 Jul 2002 12:28:12 -0000	1.26
***************
*** 9,13 ****
   *   $Id$
   *
-  *
   ***************************************************************************/
  
--- 9,12 ----
***************
*** 26,30 ****
  {
  	$filename = basename(__FILE__);
! 	$module['Groups']['Manage'] = $filename;
  
  	return;
--- 25,31 ----
  {
  	$filename = basename(__FILE__);
! 	$module['Groups']['Create'] = $filename . "SID&amp;mode=create";
! 	$module['Groups']['Delete'] = $filename . "SID&amp;mode=delete";
! 	$module['Groups']['Manage'] = $filename . "SID&amp;mode=manage";
  
  	return;

Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** admin_ranks.php	22 Mar 2002 17:00:32 -0000	1.13
--- admin_ranks.php	16 Jul 2002 12:28:12 -0000	1.14
***************
*** 9,13 ****
   *   $Id$
   *
-  *
   ***************************************************************************/
  
--- 9,12 ----
***************
*** 25,28 ****
--- 24,32 ----
  if( !empty($setmodules) )
  {
+ 	if ( !$acl->get_acl_admin('user') )
+ 	{
+ 		return;
+ 	}
+ 
  	$file = basename(__FILE__);
  	$module['Users']['Ranks'] = "$file";
***************
*** 33,41 ****
  // Let's set the root dir for phpBB
  //
! $phpbb_root_path = "../";
  require($phpbb_root_path . 'extension.inc');
  require('pagestart.' . $phpEx);
  
! if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
  	$mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
--- 37,56 ----
  // Let's set the root dir for phpBB
  //
! $phpbb_root_path = '../';
  require($phpbb_root_path . 'extension.inc');
  require('pagestart.' . $phpEx);
  
! //
! //
! //
! if ( !$acl->get_acl_admin('user') )
! {
! 	return;
! }
! 
! //
! //
! //
! if ( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
  	$mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
***************
*** 46,67 ****
  	// These could be entered via a form button
  	//
! 	if( isset($HTTP_POST_VARS['add']) )
  	{
! 		$mode = "add";
  	}
! 	else if( isset($HTTP_POST_VARS['save']) )
  	{
! 		$mode = "save";
  	}
  	else
  	{
! 		$mode = "";
  	}
  }
  
  
! if( $mode != "" )
  {
! 	if( $mode == "edit" || $mode == "add" )
  	{
  		//
--- 61,82 ----
  	// These could be entered via a form button
  	//
! 	if ( isset($HTTP_POST_VARS['add']) )
  	{
! 		$mode = 'add';
  	}
! 	else if ( isset($HTTP_POST_VARS['save']) )
  	{
! 		$mode = 'save';
  	}
  	else
  	{
! 		$mode = '';
  	}
  }
  
  
! if ( $mode != '' )
  {
! 	if ( $mode == 'edit' || $mode == 'add' )
  	{
  		//
***************
*** 70,88 ****
  		$rank_id = ( isset($HTTP_GET_VARS['id']) ) ? intval($HTTP_GET_VARS['id']) : 0;
  		
! 		$s_hidden_fields = "";
  		
! 		if( $mode == "edit" )
  		{
! 			if( empty($rank_id) )
  			{
! 				message_die(GENERAL_MESSAGE, $lang['Must_select_rank']);
  			}
  
  			$sql = "SELECT * FROM " . RANKS_TABLE . "
  				WHERE rank_id = $rank_id";
! 			if(!$result = $db->sql_query($sql))
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't obtain rank data", "", __LINE__, __FILE__, $sql);
! 			}
  			
  			$rank_info = $db->sql_fetchrow($result);
--- 85,100 ----
  		$rank_id = ( isset($HTTP_GET_VARS['id']) ) ? intval($HTTP_GET_VARS['id']) : 0;
  		
! 		$s_hidden_fields = '';
  		
! 		if ( $mode == 'edit' )
  		{
! 			if ( empty($rank_id) )
  			{
! 				message_die(MESSAGE, $lang['Must_select_rank']);
  			}
  
  			$sql = "SELECT * FROM " . RANKS_TABLE . "
  				WHERE rank_id = $rank_id";
! 			$result = $db->sql_query($sql);
  			
  			$rank_info = $db->sql_fetchrow($result);
***************
*** 97,105 ****
  		$s_hidden_fields .= '<input type="hidden" name="mode" value="save" />';
  
! 		$rank_is_special = ( $rank_info['rank_special'] ) ? "checked=\"checked\"" : "";
! 		$rank_is_not_special = ( !$rank_info['rank_special'] ) ? "checked=\"checked\"" : "";
  		
  		$template->set_filenames(array(
! 			"body" => "admin/ranks_edit_body.tpl")
  		);
  
--- 109,117 ----
  		$s_hidden_fields .= '<input type="hidden" name="mode" value="save" />';
  
! 		$rank_is_special = ( $rank_info['rank_special'] ) ? ' checked="checked"' : '';
! 		$rank_is_not_special = ( !$rank_info['rank_special'] ) ? ' checked="checked"' : '';
  		
  		$template->set_filenames(array(
! 			'body' => 'admin/ranks_edit_body.tpl')
  		);
  
***************
*** 108,114 ****
  			"SPECIAL_RANK" => $rank_is_special,
  			"NOT_SPECIAL_RANK" => $rank_is_not_special,
! 			"MINIMUM" => ( $rank_is_special ) ? "" : $rank_info['rank_min'],
! 			"IMAGE" => ( $rank_info['rank_image'] != "" ) ? $rank_info['rank_image'] : "",
! 			"IMAGE_DISPLAY" => ( $rank_info['rank_image'] != "" ) ? '<img src="../' . $rank_info['rank_image'] . '" />' : "",
  			
  			"L_RANKS_TITLE" => $lang['Ranks_title'],
--- 120,126 ----
  			"SPECIAL_RANK" => $rank_is_special,
  			"NOT_SPECIAL_RANK" => $rank_is_not_special,
! 			"MINIMUM" => ( $rank_is_special ) ? '' : $rank_info['rank_min'],
! 			"IMAGE" => ( $rank_info['rank_image'] != '' ) ? $rank_info['rank_image'] : '',
! 			"IMAGE_DISPLAY" => ( $rank_info['rank_image'] != '' ) ? '<img src="../' . $rank_info['rank_image'] . '" />' : '',
  			
  			"L_RANKS_TITLE" => $lang['Ranks_title'],
***************
*** 124,133 ****
  			"L_NO" => $lang['No'],
  			
! 			"S_RANK_ACTION" => append_sid("admin_ranks.$phpEx"),
  			"S_HIDDEN_FIELDS" => $s_hidden_fields)
  		);
  		
  	}
! 	else if( $mode == "save" )
  	{
  		//
--- 136,145 ----
  			"L_NO" => $lang['No'],
  			
! 			"S_RANK_ACTION" => "admin_ranks.$phpEx$SID",
  			"S_HIDDEN_FIELDS" => $s_hidden_fields)
  		);
  		
  	}
! 	else if ( $mode == 'save' )
  	{
  		//
***************
*** 136,150 ****
  		
  		$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : 0;
! 		$rank_title = ( isset($HTTP_POST_VARS['title']) ) ? trim($HTTP_POST_VARS['title']) : "";
  		$special_rank = ( $HTTP_POST_VARS['special_rank'] == 1 ) ? TRUE : 0;
  		$min_posts = ( isset($HTTP_POST_VARS['min_posts']) ) ? intval($HTTP_POST_VARS['min_posts']) : -1;
! 		$rank_image = ( (isset($HTTP_POST_VARS['rank_image'])) ) ? trim($HTTP_POST_VARS['rank_image']) : "";
  
! 		if( $rank_title == "" )
  		{
! 			message_die(GENERAL_MESSAGE, $lang['Must_select_rank']);
  		}
  
! 		if( $special_rank == 1 )
  		{
  			$max_posts = -1;
--- 148,162 ----
  		
  		$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : 0;
! 		$rank_title = ( isset($HTTP_POST_VARS['title']) ) ? trim($HTTP_POST_VARS['title']) : '';
  		$special_rank = ( $HTTP_POST_VARS['special_rank'] == 1 ) ? TRUE : 0;
  		$min_posts = ( isset($HTTP_POST_VARS['min_posts']) ) ? intval($HTTP_POST_VARS['min_posts']) : -1;
! 		$rank_image = ( (isset($HTTP_POST_VARS['rank_image'])) ) ? trim($HTTP_POST_VARS['rank_image']) : '';
  
! 		if ( $rank_title == "" )
  		{
! 			message_die(MESSAGE, $lang['Must_select_rank']);
  		}
  
! 		if ( $special_rank == 1 )
  		{
  			$max_posts = -1;
***************
*** 155,163 ****
  		// The rank image has to be a jpg, gif or png
  		//
! 		if($rank_image != "")
  		{
! 			if ( !preg_match("/(\.gif|\.png|\.jpg)$/is", $rank_image))
  			{
! 				$rank_image = "";
  			}
  		}
--- 167,175 ----
  		// The rank image has to be a jpg, gif or png
  		//
! 		if ( $rank_image != '' )
  		{
! 			if ( !preg_match('/(\.gif|\.png|\.jpg)$/is', $rank_image))
  			{
! 				$rank_image = '';
  			}
  		}
***************
*** 179,193 ****
  		}
  		
! 		if( !$result = $db->sql_query($sql) )
! 		{
! 			message_die(GENERAL_ERROR, "Couldn't update/insert into ranks table", "", __LINE__, __FILE__, $sql);
! 		}
  
! 		$message .= "<br /><br />" . sprintf($lang['Click_return_rankadmin'], "<a href=\"" . append_sid("admin_ranks.$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 == "delete" )
  	{
  		//
--- 191,202 ----
  		}
  		
! 		$db->sql_query($sql);
  
! 		$message .= '<br /><br />' . sprintf($lang['Click_return_rankadmin'], '<a href="' . "admin_ranks.$phpEx$SID" . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . "index.$phpEx$SID&amp;pane=right" . '">', '</a>');
  
! 		message_die(MESSAGE, $message);
  
  	}
! 	else if ( $mode == 'delete' )
  	{
  		//
***************
*** 195,199 ****
  		//
  		
! 		if( isset($HTTP_POST_VARS['id']) || isset($HTTP_GET_VARS['id']) )
  		{
  			$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : intval($HTTP_GET_VARS['id']);
--- 204,208 ----
  		//
  		
! 		if ( isset($HTTP_POST_VARS['id']) || isset($HTTP_GET_VARS['id']) )
  		{
  			$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : intval($HTTP_GET_VARS['id']);
***************
*** 204,234 ****
  		}
  		
! 		if( $rank_id )
  		{
  			$sql = "DELETE FROM " . RANKS_TABLE . "
  				WHERE rank_id = $rank_id";
! 			
! 			if( !$result = $db->sql_query($sql) )
! 			{
! 				message_die(GENERAL_ERROR, "Couldn't delete rank data", "", __LINE__, __FILE__, $sql);
! 			}
  			
  			$sql = "UPDATE " . USERS_TABLE . " 
  				SET user_rank = 0 
  				WHERE user_rank = $rank_id";
  
! 			if( !$result = $db->sql_query($sql) ) 
! 			{
! 				message_die(GENERAL_ERROR, $lang['No_update_ranks'], "", __LINE__, __FILE__, $sql);
! 			}
! 
! 			$message = $lang['Rank_removed'] . "<br /><br />" . sprintf($lang['Click_return_rankadmin'], "<a href=\"" . append_sid("admin_ranks.$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['Must_select_rank']);
  		}
  	}
--- 213,235 ----
  		}
  		
! 		if ( $rank_id )
  		{
  			$sql = "DELETE FROM " . RANKS_TABLE . "
  				WHERE rank_id = $rank_id";
! 			$db->sql_query($sql);
  			
  			$sql = "UPDATE " . USERS_TABLE . " 
  				SET user_rank = 0 
  				WHERE user_rank = $rank_id";
+ 			$db->sql_query($sql);
  
! 			$message = $lang['Rank_removed'] . '<br /><br />' . sprintf($lang['Click_return_rankadmin'], '<a href="' . "admin_ranks.$phpEx$SID" . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . "index.$phpEx$SID&amp;pane=right" . '">', '</a>');
  
! 			message_die(MESSAGE, $message);
  
  		}
  		else
  		{
! 			message_die(MESSAGE, $lang['Must_select_rank']);
  		}
  	}
***************
*** 245,252 ****
  		$sql = "SELECT * FROM " . RANKS_TABLE . "
  			ORDER BY rank_min, rank_title";
! 		if( !$result = $db->sql_query($sql) )
! 		{
! 			message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql);
! 		}
  		
  		$rank_rows = $db->sql_fetchrowset($result);
--- 246,250 ----
  		$sql = "SELECT * FROM " . RANKS_TABLE . "
  			ORDER BY rank_min, rank_title";
! 		$result = $db->sql_query($sql);
  		
  		$rank_rows = $db->sql_fetchrowset($result);
***************
*** 264,268 ****
  			"L_ACTION" => $lang['Action'],
  			
! 			"S_RANKS_ACTION" => append_sid("admin_ranks.$phpEx"))
  		);
  		
--- 262,266 ----
  			"L_ACTION" => $lang['Action'],
  			
! 			"S_RANKS_ACTION" => "admin_ranks.$phpEx$SID")
  		);
  		
***************
*** 290,295 ****
  				"SPECIAL_RANK" => ( $special_rank == 1 ) ? $lang['Yes'] : $lang['No'],
  
! 				"U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&amp;id=$rank_id"),
! 				"U_RANK_DELETE" => append_sid("admin_ranks.$phpEx?mode=delete&amp;id=$rank_id"))
  			);
  		}
--- 288,293 ----
  				"SPECIAL_RANK" => ( $special_rank == 1 ) ? $lang['Yes'] : $lang['No'],
  
! 				"U_RANK_EDIT" => "admin_ranks.$phpEx$SID&amp;mode=edit&amp;id=$rank_id",
! 				"U_RANK_DELETE" => "admin_ranks.$phpEx$SID&amp;mode=delete&amp;id=$rank_id")
  			);
  		}
***************
*** 307,315 ****
  	$sql = "SELECT * FROM " . RANKS_TABLE . "
  		ORDER BY rank_min ASC, rank_special ASC";
! 	if( !$result = $db->sql_query($sql) )
! 	{
! 		message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql);
! 	}
! 	$rank_count = $db->sql_numrows($result);
  
  	$rank_rows = $db->sql_fetchrowset($result);
--- 305,309 ----
  	$sql = "SELECT * FROM " . RANKS_TABLE . "
  		ORDER BY rank_min ASC, rank_special ASC";
! 	$result = $db->sql_query($sql);
  
  	$rank_rows = $db->sql_fetchrowset($result);
***************
*** 326,330 ****
  		"L_ACTION" => $lang['Action'],
  		
! 		"S_RANKS_ACTION" => append_sid("admin_ranks.$phpEx"))
  	);
  	
--- 320,324 ----
  		"L_ACTION" => $lang['Action'],
  		
! 		"S_RANKS_ACTION" => "admin_ranks.$phpEx$SID")
  	);
  	
***************
*** 336,340 ****
  		$rank_min = $rank_rows[$i]['rank_min'];
  		
! 		if( $special_rank == 1 )
  		{
  			$rank_min = $rank_max = "-";
--- 330,334 ----
  		$rank_min = $rank_rows[$i]['rank_min'];
  		
! 		if ( $special_rank == 1 )
  		{
  			$rank_min = $rank_max = "-";
***************
*** 353,365 ****
  			"RANK_MIN" => $rank_min,
  
! 			"U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&amp;id=$rank_id"),
! 			"U_RANK_DELETE" => append_sid("admin_ranks.$phpEx?mode=delete&amp;id=$rank_id"))
  		);
  	}
  }
  
- $template->pparse("body");
- 
  include('page_footer_admin.'.$phpEx);
  
! ?>
--- 347,357 ----
  			"RANK_MIN" => $rank_min,
  
! 			"U_RANK_EDIT" => "admin_ranks.$phpEx$SID&amp;mode=edit&amp;id=$rank_id",
! 			"U_RANK_DELETE" => "admin_ranks.$phpEx$SID&amp;mode=delete&amp;id=$rank_id")
  		);
  	}
  }
  
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file

Index: admin_smilies.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_smilies.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** admin_smilies.php	24 Mar 2002 00:15:36 -0000	1.22
--- admin_smilies.php	16 Jul 2002 12:28:12 -0000	1.23
***************
*** 32,36 ****
  {
  	$filename = basename(__FILE__);
! 	$module['General']['Smilies'] = $filename;
  
  	return;
--- 32,36 ----
  {
  	$filename = basename(__FILE__);
! 	$module['General']['Emoticons'] = $filename;
  
  	return;

[Phpbb-checkins] CVS: phpBB2/admin admin_forum_prune.php,1.22,NONE admin_forumauth.php,1.23,NONE admin_mass_email.php,1.17,NONE admin_ug_auth.php,1.13,NONE

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

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv18092/admin

Removed Files:
	admin_forum_prune.php admin_forumauth.php admin_mass_email.php 
	admin_ug_auth.php 
Log Message:
bye bye

--- admin_forum_prune.php DELETED ---

--- admin_forumauth.php DELETED ---

--- admin_mass_email.php DELETED ---

--- admin_ug_auth.php DELETED ---

[Phpbb-checkins] CVS: phpBB2/db/schemas mysql_schema.sql,1.26,1.27

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

Update of /cvsroot/phpbb/phpBB2/db/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv31922/db/schemas

Modified Files:
	mysql_schema.sql 
Log Message:
oops

Index: mysql_schema.sql
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/schemas/mysql_schema.sql,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** mysql_schema.sql	14 Jul 2002 14:40:17 -0000	1.26
--- mysql_schema.sql	14 Jul 2002 20:24:12 -0000	1.27
***************
*** 38,42 ****
  CREATE TABLE phpbb_auth_options (
    auth_option_id tinyint(4) NOT NULL auto_increment,
!   auth_option char(20) NOT NULL default '',
    PRIMARY KEY  (auth_option_id,auth_option)
  );
--- 38,43 ----
  CREATE TABLE phpbb_auth_options (
    auth_option_id tinyint(4) NOT NULL auto_increment,
!   auth_type char(15) NOT NULL default '', 
!   auth_option char(15) NOT NULL default '',
    PRIMARY KEY  (auth_option_id,auth_option)
  );