Version 3.3.4

2025-12-19 00:35:52 -08:00
1 parent 78706903a2
commit fb6b5baabc
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -0,0 +1,71 @@
+<?php
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board - requirements checker
+ * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * </pre>
+ *
+ * @author 		$Author: bfarber $ (Orginal: Mark)
+ * @copyright	(c) 2010 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/company/standards.php#license
+ * @package		IP.Board
+ * @link		http://www.invisionpower.com
+ * @since		8th September 2010
+ * @version		$Revision: 10914 $
+ */
+
+class core_upgradeCheck
+{
+	/**
+	 * Check we can upgrade
+	 *
+	 * @return	mixed	Boolean true or error message
+	 */
+	public function checkForProblems()
+	{
+		//-----------------------------------------
+		// Compatibility check
+		//-----------------------------------------
+		
+		$minAppVersions = array(
+			// 'app' => minVersionNumber
+		);
+		
+		$args = func_get_args();
+		if ( !empty( $args ) )
+		{
+			$errors = array();
+			foreach ( $minAppVersions as $k => $v )
+			{
+				if ( !isset( ipsRegistry::$applications[ $k ] ) or !ipsRegistry::$applications[ $k ]['app_enabled'] )
+				{
+					continue;
+				}
+			
+				$numbers = IPSSetUp::fetchAppVersionNumbers( $k );
+			
+				/* Are we upgrading this app now? */
+				if ( isset( $args[0][ $k ] ) )
+				{
+					$ourVersion = $numbers['latest'][0];
+				}
+				/* No - check installed version */
+				else
+				{
+					$ourVersion = $numbers['current'][0];
+				}
+				
+				if ( $v > $ourVersion )
+				{
+					$appName = ipsRegistry::$applications[ $k ]['app_title'];
+					$allVersions = IPSSetUp::fetchXmlAppVersions( $k );
+					
+					return "The version of {$appName} you have installed will not work with this version of IP.Board. You must upgrade {$appName} to {$allVersions[ $v ]} or higher, or disable it in the Admin CP in order continue.";
+				}
+			}
+		}
+		
+		return TRUE;
+	}
+}
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -48,24 +48,24 @@ $INSERT[] = "INSERT INTO emoticons (id, typed, image, clickable, emo_set, emo_po
 $INSERT[] = "INSERT INTO pfields_data (pf_id, pf_title, pf_desc, pf_content, pf_type, pf_not_null, pf_member_hide, pf_max_input, pf_member_edit, pf_position, pf_show_on_reg, pf_input_format, pf_admin_only, pf_topic_format, pf_group_id, pf_icon, pf_key) VALUES
 (1, 'AIM', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_aim.gif', 'aim'),
 (2, 'MSN', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_msn.gif', 'msn'),
-(3, 'Сайт', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_website.gif', 'website'),
+(3, 'Website URL', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_website.gif', 'website'),
 (4, 'ICQ', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_icq.gif', 'icq'),
-(5, 'Пол', '', 'u=Не определился|m=Мужчина|f=Женщина', 'drop', 0, 0, 0, 1, 0, 0, '', 0, '', 2, '', 'gender'),
-(6, 'Город', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '<span class=\'ft\'>{title}</span><span class=\'fc\'>{content}</span>', 2, '', 'location'),
-(7, 'Интересы', '', '', 'textarea', 0, 0, 0, 1, 0, 0, '', 0, '', 2, '', 'interests'),
+(5, 'Gender', '', 'u=Not Telling|m=Male|f=Female', 'drop', 0, 0, 0, 1, 0, 0, '', 0, '', 2, '', 'gender'),
+(6, 'Location', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '<span class=\'ft\'>{title}</span><span class=\'fc\'>{content}</span>', 2, '', 'location'),
+(7, 'Interests', '', '', 'textarea', 0, 0, 0, 1, 0, 0, '', 0, '', 2, '', 'interests'),
 (8, 'Yahoo', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_yahoo.gif', 'yahoo'),
 (9, 'Jabber', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_jabber.gif', 'jabber'),
 (10, 'Skype', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_skype.gif', 'skype')";

 $INSERT[] = "INSERT INTO pfields_groups (pf_group_id, pf_group_name, pf_group_key) VALUES
-(1, 'Контакты', 'contact'),
-(2, 'Информация', 'profile_info')";
+(1, 'Contact Methods', 'contact'),
+(2, 'Profile Information', 'profile_info')";

-$INSERT[] = "INSERT INTO core_sys_lang VALUES(1, 'ru_RU.UTF-8', 'Русский (RU)', 1, 0, 1)";
+$INSERT[] = "INSERT INTO core_sys_lang VALUES(1, 'en_US', 'English (USA)', 1, 0, 1)";

-$INSERT[] = "INSERT INTO titles (id, posts, title, pips) VALUES (1, 0, 'Новичок', '1');";
-$INSERT[] = "INSERT INTO titles (id, posts, title, pips) VALUES (2, 10, 'Пользователь', '2');";
-$INSERT[] = "INSERT INTO titles (id, posts, title, pips) VALUES (4, 30, 'Продвинутый пользователь', '3');";
+$INSERT[] = "INSERT INTO titles (id, posts, title, pips) VALUES (1, 0, 'Newbie', '1');";
+$INSERT[] = "INSERT INTO titles (id, posts, title, pips) VALUES (2, 10, 'Member', '2');";
+$INSERT[] = "INSERT INTO titles (id, posts, title, pips) VALUES (4, 30, 'Advanced Member', '3');";

 $INSERT[] ="INSERT INTO permission_index VALUES(1, 'members', 'profile_view', 1, '*', '', '', '', '', '', '', 0, 0, NULL)";
 $INSERT[] ="INSERT INTO permission_index VALUES(2, 'core', 'help', 1, '*', '', '', '', '', '', '', 0, 0, NULL)";
@@ -73,21 +73,26 @@ $INSERT[] ="INSERT INTO permission_index VALUES(2, 'core', 'help', 1, '*', '', '
 /* Report center stuff */

 $INSERT[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Пример плагина', 'Плагин, не требующий написания кода, но требующий настройки.', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'default', ',3,4,6,', ',4,6,', 'a:5:{s:14:"required_input";a:1:{s:8:"video_id";s:13:"[^A-Za-z0-9_]";}s:10:"string_url";s:41:"http://www.youtube.com/watch?v={video_id}";s:12:"string_title";s:25:"#PAGE_TITLE# ({video_id})";s:13:"section_title";s:7:"YouTube";s:11:"section_url";s:22:"http://www.youtube.com";}', 1, 'core');
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app)
+VALUES(1, 'Simple Plugin Example', 'Plugin that does not require any programming, but does need to be configured.', 'Invision Power Services, Inc', 'http://invisionpower.com', 'v1.0', 'default', ',3,4,6,', ',4,6,', 'a:5:{s:14:"required_input";a:1:{s:8:"video_id";s:13:"[^A-Za-z0-9_]";}s:10:"string_url";s:41:"http://www.youtube.com/watch?v={video_id}";s:12:"string_title";s:25:"#PAGE_TITLE# ({video_id})";s:13:"section_title";s:7:"YouTube";s:11:"section_url";s:22:"http://www.youtube.com";}', 1, 'core');
 EOF;
 $INSERT[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Плагин форума', 'Плагин жалоб на сообщения и темы в форумах.', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'post', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:15:"report_supermod";i:1;}', 1, 'forums');
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app)
+VALUES(1, 'Forum Plugin', 'This is the plugin used for reporting posts on the forum.', 'Invision Power Services, Inc', 'http://invisionpower.com', 'v1.0', 'post', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:15:"report_supermod";i:1;}', 1, 'forums');
 EOF;
 $INSERT[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Плагин личных сообщений', 'Плагин жалоб на личные сообщения', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'messages', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:18:"plugi_messages_add";s:5:"4";}', 1, 'members');
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app)
+VALUES(1, 'Private Messages Plugin', 'This plugin allows private messages to be reported', 'Invision Power Services, Inc', 'http://invisionpower.com', 'v1.0', 'messages', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:18:"plugi_messages_add";s:5:"4";}', 1, 'members');
 EOF;
 $INSERT[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app) VALUES(1, 'Плагин пользовательских профилей', 'Плагин жалоб на профили пользователей', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'profiles', ',1,2,3,4,6,', ',4,6,', 'N;', 1, 'members');
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd, app)
+VALUES(1, 'Member Profiles', 'Allows you to report member profiles', 'Invision Power Services, Inc', 'http://invisionpower.com', 'v1.0', 'profiles', ',1,2,3,4,6,', ',4,6,', 'N;', 1, 'members');
 EOF;

-$INSERT[] = "INSERT INTO rc_status VALUES(1, 'Новая', 1, 5, 1, 0, 1, 1);";
-$INSERT[] = "INSERT INTO rc_status VALUES(2, 'Рассматривается', 1, 5, 0, 0, 1, 2);";
-$INSERT[] = "INSERT INTO rc_status VALUES(3, 'Завершена', 0, 0, 0, 1, 0, 3);";
+
+$INSERT[] = "INSERT INTO rc_status VALUES(1, 'New Report', 1, 5, 1, 0, 1, 1);";
+$INSERT[] = "INSERT INTO rc_status VALUES(2, 'Under Review', 1, 5, 0, 0, 1, 2);";
+$INSERT[] = "INSERT INTO rc_status VALUES(3, 'Complete', 0, 0, 0, 1, 0, 3);";

 $INSERT[] = <<<EOF
 INSERT INTO rc_status_sev (id, status, points, img, is_png, width, height) VALUES
@@ -104,22 +109,29 @@ INSERT INTO rc_status_sev (id, status, points, img, is_png, width, height) VALUE
 (11, 2, 12, 'style_extra/report_icons/flag_red_review.png', 1, 16, 16);
 EOF;

-$INSERT[] = "INSERT INTO reputation_levels VALUES(1, -20, 'Очень плохой', '');";
-$INSERT[] = "INSERT INTO reputation_levels VALUES(2, -10, 'Плохой', '');";
-$INSERT[] = "INSERT INTO reputation_levels VALUES(3, 0, 'Обычный', '');";
-$INSERT[] = "INSERT INTO reputation_levels VALUES(4, 10, 'Хороший', '');";
-$INSERT[] = "INSERT INTO reputation_levels VALUES(5, 20, 'Очень хороший', '');";
+$INSERT[] = "INSERT INTO reputation_levels VALUES(1, -20, 'Bad', '');";
+$INSERT[] = "INSERT INTO reputation_levels VALUES(2, -10, 'Poor', '');";
+$INSERT[] = "INSERT INTO reputation_levels VALUES(3, 0, 'Neutral', '');";
+$INSERT[] = "INSERT INTO reputation_levels VALUES(4, 10, 'Good', '');";
+$INSERT[] = "INSERT INTO reputation_levels VALUES(5, 20, 'Excellent', '');";

 $INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(1, 'Twitter', 'twitter', 1, 1, 1);";
 $INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(2, 'Facebook', 'facebook', 1, 2, 1);";
-$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(3, 'Digg', 'digg', 1, 3, 1);";
-$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(4, 'Del.icio.us', 'delicious', 1, 4, 1);";
-$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(5, 'Вконтакте', 'vkontakte', 1, 5, 1);";
-$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(6, 'Мемори', 'memori', 1, 6, 1);";
-$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(7, 'БобрДобр', 'bobrdobr', 1, 7, 1);";
-$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(8, 'Email', 'email', 1, 7, 1);";
-$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(9, 'Google+', 'googleplusone', 1, 3, 1);";
-$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(10, 'Печать', 'print', 1, 10, 0);";
-$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(11, 'Скачать', 'download', 1, 11, 0);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(3, 'Google Plus One', 'googleplusone', 1, 3, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(4, 'Digg', 'digg', 1, 4, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(5, 'Del.icio.us', 'delicious', 1, 6, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(6, 'Reddit', 'reddit', 1, 7, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(7, 'StumbleUpon', 'stumble', 1, 8, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(8, 'Email', 'email', 1, 9, 1);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(10, 'Print', 'print', 1, 10, 0);";
+$INSERT[] = "INSERT INTO core_share_links (share_id, share_title, share_key, share_enabled, share_position, share_canonical) VALUES(11, 'Download', 'download', 1, 11, 0);";
+
+$INSERT[] = "INSERT INTO members_warn_reasons (wr_id, wr_name, wr_points, wr_points_override, wr_remove, wr_remove_unit, wr_remove_override, wr_order)
+VALUES
+	(1, 'Spamming', 1, 0, 0, 'h', 0, 1),
+	(2, 'Inappropriate Language', 1, 0, 0, 'h', 0, 2),
+	(3, 'Signature Violation', 1, 0, 0, 'h', 0, 3),
+	(4, 'Abusive Behaviour', 1, 0, 0, 'h', 0, 4),
+	(5, 'Topic Bumping', 1, 0, 0, 'h', 0, 5);";


@@ -47,6 +47,7 @@ $TABLE[] = "CREATE TABLE announcements (
  announce_start int(10) unsigned NOT NULL default 0,
  announce_end int(10) unsigned NOT NULL default 0,
  announce_active tinyint(1) NOT NULL default 1,
+  announce_seo_title VARCHAR(255) NOT NULL DEFAULT '',
  PRIMARY KEY  (announce_id),
  KEY announce_end (announce_end)
 );";
@@ -87,6 +88,7 @@ $TABLE[] = "CREATE TABLE attachments (
  attach_img_width int(5) NOT NULL default 0,
  attach_img_height int(5) NOT NULL default 0,
  attach_parent_id INT NOT NULL DEFAULT '0',
+  attach_is_archived INT(1) NOT NULL DEFAULT 0,
  PRIMARY KEY  (attach_id),
  KEY attach_pid (attach_rel_id),
  KEY attach_post_key (attach_post_key),
@@ -259,7 +261,7 @@ $TABLE[] = "CREATE TABLE core_tags_cache (
 	
 $TABLE[] = "CREATE TABLE cache_store (
  cs_key varchar(255) NOT NULL default '',
-  cs_value mediumtext,
+  cs_value mediumtext NULL DEFAULT NULL,
  cs_array tinyint(1) NOT NULL default 0,
  cs_updated int(10) NOT NULL default 0,
  cs_rebuild TINYINT( 1 ) NOT NULL DEFAULT '0',
@@ -286,6 +288,33 @@ $TABLE[] = "CREATE TABLE converge_local (
  PRIMARY KEY  (converge_api_code),
  KEY converge_active (converge_active)
 );";
+$TABLE[] = "CREATE TABLE core_archive_log (
+	archlog_id	INT(10) AUTO_INCREMENT NOT NULL,
+	archlog_app		VARCHAR(255) NOT NULL DEFAULT 0,
+	archlog_date	INT(10) NOT NULL DEFAULT 0,
+	archlog_ids		MEDIUMTEXT,
+	archlog_count	INT(10) NOT NULL DEFAULT 0,
+	archlog_is_restore INT(1) NOT NULL DEFAULT 0,
+	archlog_is_error	INT(1) NOT NULL DEFAULT 0,
+	archlog_msg			TEXT,
+	PRIMARY KEY  (archlog_id)
+);";
+$TABLE[] = "CREATE TABLE core_archive_restore (
+	restore_min_tid	INT(10) NOT NULL DEFAULT 0,
+	restore_max_tid	INT(10) NOT NULL DEFAULT 0,
+	restore_manual_tids MEDIUMTEXT
+);";
+$TABLE[] = "CREATE TABLE core_archive_rules (
+  archive_key	CHAR(32) NOT NULL DEFAULT '',
+  archive_app	VARCHAR(32) NOT NULL DEFAULT 'core',
+  archive_field	VARCHAR(255) NOT NULL DEFAULT '',
+  archive_value	VARCHAR(255) NOT NULL DEFAULT '',
+  archive_text	TEXT NOT NULL,
+  archive_unit	VARCHAR(255) NOT NULL DEFAULT '',
+  archive_skip	INT(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (archive_key)
+);";
+
 $TABLE[] = "CREATE TABLE core_applications (
  app_id int(10) NOT NULL auto_increment,
  app_title varchar(255) NOT NULL default '',
@@ -326,7 +355,9 @@ $TABLE[] = "CREATE TABLE core_hooks (
  hook_extra_data text,
  hook_key varchar(32) default NULL,
  hook_global_caches VARCHAR(255) NULL DEFAULT NULL,
-  PRIMARY KEY  (hook_id)
+  PRIMARY KEY  (hook_id),
+  KEY hook_enabled (hook_enabled,hook_position),
+  KEY hook_key (hook_key)
 );";
 $TABLE[] = "CREATE TABLE core_hooks_files (
  hook_file_id int(10) NOT NULL auto_increment,
@@ -379,7 +410,7 @@ $TABLE[] = "CREATE TABLE core_item_markers (
  item_app_key_3 int(10) NOT NULL default 0,
  item_is_deleted INT(1) NOT NULL DEFAULT 0,
  UNIQUE KEY combo_key (item_key,item_member_id,item_app),
-  KEY marker_index (item_member_id,item_app),
+  KEY marker_index (item_member_id, item_app, item_app_key_1),
  KEY item_last_saved (item_last_saved),
  KEY item_member_id (item_is_deleted,item_member_id)
 );";
@@ -525,10 +556,7 @@ $TABLE[] = "CREATE TABLE core_sys_module (
  sys_module_key varchar(32) NOT NULL default '',
  sys_module_description varchar(100) NOT NULL default '',
  sys_module_version varchar(32) NOT NULL default '',
-  sys_module_parent varchar(32) NOT NULL DEFAULT '',
  sys_module_protected tinyint(1) unsigned NOT NULL default 0,
-  sys_module_tables varchar(255) NOT NULL DEFAULT '',
-  sys_module_hooks varchar(255) NOT NULL DEFAULT '',
  sys_module_visible tinyint(1) unsigned NOT NULL default 1,
  sys_module_position int(5) NOT NULL default 0,
  sys_module_admin int(1) NOT NULL default 0,
@@ -565,6 +593,7 @@ $TABLE[] = "CREATE TABLE core_uagents (
  uagent_regex_capture int(1) NOT NULL default 0,
  uagent_type varchar(200) NOT NULL default '',
  uagent_position int(10) NOT NULL default 0,
+  uagent_default_regex TEXT,
  PRIMARY KEY  (uagent_id),
  KEY uagent_key (uagent_key),
  KEY ordering ( uagent_position , uagent_key )
@@ -600,6 +629,7 @@ $TABLE[] = "CREATE TABLE dnames_change (
  dname_ip_address varchar(46) NOT NULL default '',
  dname_previous varchar(255) NOT NULL default '',
  dname_current varchar(255) NOT NULL default '',
+  dname_discount TINYINT(1) NOT NULL DEFAULT 0,
  PRIMARY KEY  (dname_id),
  KEY dname_member_id (dname_member_id),
  KEY date_id (dname_member_id,dname_date),
@@ -739,7 +769,8 @@ $TABLE[] = "CREATE TABLE inline_notifications (
 PRIMARY KEY  (notify_id),
 KEY notify_to_id ( notify_to_id, notify_sent ),
 KEY grabber (notify_to_id, notify_read, notify_sent),
- KEY notify_meta_key (notify_meta_key)
+ KEY notify_meta_key (notify_meta_key),
+ KEY notify_from_id (notify_from_id)
 );";

 $TABLE[] = "CREATE TABLE login_methods (
@@ -819,17 +850,15 @@ $TABLE[] = "CREATE TABLE members (
  mod_posts varchar(100) NOT NULL default '0',
  auto_track varchar(50) default '0',
  temp_ban varchar(100) default '0',
-  sub_end int(10) NOT NULL default 0,
  login_anonymous char(3) NOT NULL default '0&0',
  ignored_users text,
  mgroup_others varchar(255) NOT NULL default '',
  org_perm_id varchar(255) NOT NULL default '',
  member_login_key varchar(32) NOT NULL default '',
  member_login_key_expire int(10) NOT NULL default 0,
-  subs_pkg_chosen smallint(3) NOT NULL default 0,
  has_blog TEXT NULL,
+  blogs_recache tinyint(1) NULL DEFAULT NULL,
  has_gallery tinyint(1) NOT NULL default 0,
-  members_editor_choice char(3) NOT NULL default 'std',
  members_auto_dst tinyint(1) NOT NULL default 1,
  members_display_name varchar(255) NOT NULL default '',
  members_seo_name varchar(255) NOT NULL default '',
@@ -843,7 +872,6 @@ $TABLE[] = "CREATE TABLE members (
  members_profile_views int(10) unsigned NOT NULL default 0,
  members_pass_hash varchar(32) NOT NULL default '',
  members_pass_salt varchar(5) NOT NULL default '',
-  identity_url text,
  member_banned tinyint(1) NOT NULL default 0,
  member_uploader varchar(32) NOT NULL default 'default',
  members_bitoptions int(10) unsigned NOT NULL default 0,
@@ -851,8 +879,6 @@ $TABLE[] = "CREATE TABLE members (
  fb_emailhash varchar(60) NOT NULL default '',
  fb_lastsync int(10) NOT NULL default 0,
  members_day_posts VARCHAR(32) NOT NULL default '0,0',
-  vk_uid bigint(20) unsigned NOT NULL default '0',
-  vk_token TEXT NULL, 
  live_id VARCHAR( 32 ) NULL,
  twitter_id VARCHAR(255) NOT NULL DEFAULT '',
  twitter_token VARCHAR(255) NOT NULL DEFAULT '',
@@ -862,10 +888,12 @@ $TABLE[] = "CREATE TABLE members (
  fb_session VARCHAR(200) NOT NULL default '',
  fb_token TEXT NULL, 
  ips_mobile_token VARCHAR( 64 ) NULL,
+  unacknowledged_warnings TINYINT(1) DEFAULT NULL,
  PRIMARY KEY  (member_id),
  KEY members_l_display_name (members_l_display_name),
  KEY members_l_username (members_l_username),
  KEY mgroup ( member_group_id , member_id ),
+  KEY member_groups ( member_group_id, mgroup_others ),
  KEY bday_day (bday_day),
  KEY bday_month (bday_month),
  KEY member_banned (member_banned),
@@ -875,8 +903,8 @@ $TABLE[] = "CREATE TABLE members (
  KEY joined (joined),
  KEY fb_uid (fb_uid),
  KEY twitter_id (twitter_id),
-  KEY vk_uid (vk_uid),
-  KEY email (email)
+  KEY email (email),
+  KEY blogs_recache (blogs_recache)
 );";


@@ -889,6 +917,65 @@ $TABLE[] = "CREATE TABLE members_partial (
  KEY partial_member_id (partial_member_id)
 );";

+$TABLE[] = "CREATE TABLE members_warn_actions (
+  wa_id int(11) unsigned NOT NULL AUTO_INCREMENT,
+  wa_points int(32) DEFAULT NULL,
+  wa_mq int(2) DEFAULT NULL,
+  wa_mq_unit char(1) DEFAULT NULL,
+  wa_rpa int(2) DEFAULT NULL,
+  wa_rpa_unit char(1) DEFAULT NULL,
+  wa_suspend int(2) DEFAULT NULL,
+  wa_suspend_unit char(1) DEFAULT NULL,
+  wa_ban_group tinyint(1) DEFAULT NULL,
+  wa_override tinyint(1) DEFAULT NULL,
+  PRIMARY KEY (wa_id),
+  KEY wa_points (wa_points)
+);";
+
+$TABLE[] = "CREATE TABLE members_warn_logs (
+  wl_id int(11) unsigned NOT NULL AUTO_INCREMENT,
+  wl_member mediumint(8) DEFAULT NULL,
+  wl_moderator mediumint(8) DEFAULT NULL,
+  wl_date int(10) DEFAULT NULL,
+  wl_reason int(10) DEFAULT NULL,
+  wl_points int(5) DEFAULT NULL,
+  wl_note_member text,
+  wl_note_mods text,
+  wl_mq int(2) DEFAULT NULL,
+  wl_mq_unit char(1) DEFAULT NULL,
+  wl_rpa int(2) DEFAULT NULL,
+  wl_rpa_unit char(1) DEFAULT NULL,
+  wl_suspend int(2) DEFAULT NULL,
+  wl_suspend_unit char(1) DEFAULT NULL,
+  wl_ban_group tinyint(1) DEFAULT NULL,
+  wl_expire int(2) DEFAULT NULL,
+  wl_expire_unit char(1) DEFAULT NULL,
+  wl_acknowledged tinyint(1) DEFAULT NULL,
+  wl_content_app varchar(32) DEFAULT NULL,
+  wl_content_id1 varchar(32) DEFAULT NULL,
+  wl_content_id2 varchar(32) DEFAULT NULL,
+  wl_expire_date INT(10) DEFAULT NULL,
+  PRIMARY KEY (wl_id),
+  KEY wl_member (wl_member),
+  KEY wl_moderator (wl_moderator),
+  KEY wl_date (wl_member,wl_date),
+  KEY content (wl_content_app,wl_content_id1,wl_content_id2),
+  KEY wl_expire_date (wl_expire_date)
+);";
+
+$TABLE[] = "CREATE TABLE members_warn_reasons (
+  wr_id int(11) unsigned NOT NULL AUTO_INCREMENT,
+  wr_name varchar(255) DEFAULT NULL,
+  wr_points float DEFAULT NULL,
+  wr_points_override tinyint(1) DEFAULT NULL,
+  wr_remove int(2) DEFAULT NULL,
+  wr_remove_unit char(1) DEFAULT NULL,
+  wr_remove_override tinyint(1) DEFAULT NULL,
+  wr_order int(10) DEFAULT NULL,
+  PRIMARY KEY (wr_id),
+  KEY wr_order (wr_order)
+);";
+
 $TABLE[] = "CREATE TABLE member_status_actions (
  action_id int(10) NOT NULL AUTO_INCREMENT,
  action_status_id int(10) unsigned NOT NULL DEFAULT 0,
@@ -944,14 +1031,6 @@ $TABLE[] = "CREATE TABLE member_status_updates (
  KEY status_member_id ( status_member_id, status_approved, status_date )
 );";

-$TABLE[] = "CREATE TABLE openid_temp (
-  id varchar(32) NOT NULL,
-  referrer text,
-  privacy tinyint(1) NOT NULL default 0,
-  cookiedate tinyint(1) NOT NULL default 0,
-  fullurl text,
-  PRIMARY KEY  (id)
-);";
 $TABLE[] = "CREATE TABLE permission_index (
  perm_id int(10) unsigned NOT NULL auto_increment,
  app varchar(32) NOT NULL,
@@ -1063,8 +1142,8 @@ $TABLE[] = "CREATE TABLE profile_portal (
  tc_last_sid_import VARCHAR(50) NULL DEFAULT '0',
  tc_photo text,
  tc_bwoptions int(10) unsigned NOT NULL default 0,
-  vk_bwoptions int(10) unsigned NOT NULL default 0,
  pp_customization mediumtext,
+  pp_profile_update INT(10) UNSIGNED NOT NULL default '0',
  PRIMARY KEY  (pp_member_id)
 );";

@@ -1115,7 +1194,8 @@ $TABLE[] = "CREATE TABLE rc_comments (
  edit_date INT NOT NULL DEFAULT '0',
  author_name VARCHAR( 255 ) NULL DEFAULT NULL,
  ip_address VARCHAR( 46 ) NULL DEFAULT NULL,
-  PRIMARY KEY  (id)
+  PRIMARY KEY  (id),
+  KEY report_comments ( rid, approved, comment_date )
 );";
 $TABLE[] = "CREATE TABLE rc_modpref (
  mem_id mediumint(8) NOT NULL default 0,
@@ -1129,7 +1209,8 @@ $TABLE[] = "CREATE TABLE rc_reports (
  report MEDIUMTEXT NOT NULL,
  report_by mediumint(8) NOT NULL default 0,
  date_reported int(10) NOT NULL default 0,
-  PRIMARY KEY  (id)
+  PRIMARY KEY  (id),
+  KEY rid (rid)
 );";
 $TABLE[] = "CREATE TABLE rc_reports_index (
  id int(11) NOT NULL auto_increment,
@@ -1182,9 +1263,11 @@ $TABLE[] = "CREATE TABLE reputation_cache (
  type_id int(10) unsigned NOT NULL,
  rep_points int(10) NOT NULL DEFAULT '0',
  rep_like_cache MEDIUMTEXT,
+  cache_date INT(10) NOT NULL DEFAULT 0,
  PRIMARY KEY  (id),
  UNIQUE KEY app (app, type, type_id),
-  KEY (type, type_id)
+  KEY cache_date (cache_date),
+  KEY type (type, type_id)
 );";
 $TABLE[] = "CREATE TABLE reputation_index (
  id bigint(10) unsigned NOT NULL auto_increment,
@@ -1206,6 +1289,16 @@ $TABLE[] = "CREATE TABLE reputation_levels (
  level_image varchar(255) NOT NULL,
  PRIMARY KEY  (level_id)
 );";
+
+$TABLE[] = "CREATE TABLE reputation_totals (
+  rt_key CHAR(32) NOT NULL,
+  rt_app_type CHAR(32) NOT NULL,
+  rt_total INT(10) NOT NULL DEFAULT 0,
+  rt_type_id INT(10) NOT NULL DEFAULT 0,
+  PRIMARY KEY (rt_key),
+  INDEX rt_app_type (rt_app_type, rt_total)
+);";
+
 $TABLE[] = "CREATE TABLE rss_export (
  rss_export_id int(10) NOT NULL auto_increment,
  rss_export_enabled tinyint(1) NOT NULL default 0,
@@ -1235,7 +1328,6 @@ $TABLE[] = "CREATE TABLE rss_import (
  rss_import_showlink varchar(255) NOT NULL default '0',
  rss_import_topic_open tinyint(1) NOT NULL default 0,
  rss_import_topic_hide tinyint(1) NOT NULL default 0,
-  rss_import_inc_pcount tinyint(1) NOT NULL default 0,
  rss_import_topic_pre varchar(50) NOT NULL default '',
  rss_import_allow_html tinyint(1) NOT NULL default 0,
  rss_import_auth tinyint(1) NOT NULL default 0,
@@ -1294,15 +1386,10 @@ $TABLE[] = "CREATE TABLE sessions (
  KEY location2 (location_2_type,location_2_id),
  KEY location3 (location_3_type,location_3_id),
  KEY running_time (running_time),
-  KEY member_id (member_id)
-);";
-$TABLE[] = "CREATE TABLE core_inline_messages (
-inline_msg_id		INT(10) NOT NULL auto_increment,
-inline_msg_date		INT(10) NOT NULL DEFAULT 0,
-inline_msg_content	TEXT,
-PRIMARY KEY (inline_msg_id),
-KEY inline_msg_date (inline_msg_date)
+  KEY member_id (member_id),
+  KEY ip_address (ip_address)  
 );";
+
 $TABLE[] = "CREATE TABLE skin_cache (
  cache_id int(10) NOT NULL auto_increment,
  cache_updated int(10) NOT NULL default 0,
@@ -1582,7 +1669,8 @@ $TABLE[] = "CREATE TABLE twitter_connect (
 	t_key		VARCHAR(32) NOT NULL default '',
 	t_token		VARCHAR(255) NOT NULL default '',
 	t_secret	VARCHAR(255) NOT NULL default '',
-	t_time		INT(10) NOT NULL default 0
+	t_time		INT(10) NOT NULL default 0,
+	PRIMARY KEY  (t_key)
 );";

 $TABLE[] = "CREATE TABLE upgrade_history (
@@ -1665,12 +1753,28 @@ $TABLE[] = "CREATE TABLE spam_service_log (
  ip_address varchar(46) NOT NULL,
  PRIMARY KEY  (id)
 );";
+$TABLE[] = "CREATE TABLE mobile_app_style (
+  id int(10) NOT NULL AUTO_INCREMENT,
+  filename varchar(255) NOT NULL,
+  hasRetina tinyint(1) NOT NULL DEFAULT '0',
+  isInUse tinyint(1) NOT NULL DEFAULT '0',
+  lastUpdated int(10) NOT NULL,
+  PRIMARY KEY (id),
+  UNIQUE KEY filename (filename)
+);";
 $TABLE[] = "CREATE TABLE mobile_notifications (
  id int(10) unsigned NOT NULL AUTO_INCREMENT,
  notify_title text NOT NULL,
  notify_date int(10) unsigned NOT NULL,
  member_id mediumint(8) unsigned NOT NULL,
  notify_sent tinyint(3) unsigned NOT NULL DEFAULT 0,
-  PRIMARY KEY (id)
+  notify_url text null,
+  PRIMARY KEY (id),
+  KEY (notify_sent,notify_date)
+);";
+$TABLE[] = "CREATE TABLE mobile_device_map (
+  token varchar(64) NOT NULL DEFAULT '',
+  member_id mediumint(8) DEFAULT NULL,
+  PRIMARY KEY (token)
 );";
 ?>
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -2,15 +2,15 @@

 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
 |   > IPB UPGRADE MODULE:: IPB 2.0.0 PDR1 -> PDR 2
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -2,15 +2,15 @@

 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
 |   > IPB UPGRADE MODULE:: IPB 2.0.0 PDR1 -> PDR 2
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,32 +1,32 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   IP.Board v3.2.3
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
-|   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
-+---------------------------------------------------------------------------
-|
-|   > IPB UPGRADE MODULE:: IPB 2.0.0 PF1 -> PF 2
-|   > Script written by Matt Mecham
-|   > Date started: 23rd April 2004
-|   > "So what, pop is dead - it's no great loss.
-	   So many facelifts, it's face flew off"
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-$SQL = array();
-
-$SQL[] = "INSERT INTO custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('CODEBOX', 'Use this BBCode tag to show a scrolling codebox. Useful for long sections of code.', 'codebox', '<div class=\'codetop\'>CODE</div><div class=\'codemain\' style=\'height:200px;white-space:pre;overflow:auto\'>{content}</div>', 0, '[codebox]long_code_here = '';[/codebox]');";
+<?php
+
+/*
+--------------------------------------------------------------------------
+|   IP.Board v3.3.4
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
+---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE MODULE:: IPB 2.0.0 PF1 -> PF 2
+|   > Script written by Matt Mecham
+|   > Date started: 23rd April 2004
+|   > "So what, pop is dead - it's no great loss.
+	   So many facelifts, it's face flew off"
+--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+$SQL = array();
+
+$SQL[] = "INSERT INTO custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('CODEBOX', 'Use this BBCode tag to show a scrolling codebox. Useful for long sections of code.', 'codebox', '<div class=\'codetop\'>CODE</div><div class=\'codemain\' style=\'height:200px;white-space:pre;overflow:auto\'>{content}</div>', 0, '[codebox]long_code_here = '';[/codebox]');";
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */
 # Fix bug where unread PM count not incremented
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,458 +1,458 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   IP.Board v3.2.3
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
-|   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
-+---------------------------------------------------------------------------
-|
-|   > IPB UPGRADE MODULE:: IPB 2.0.2 -> IPB 2.0.3
-|   > Script written by Matt Mecham
-|   > Date started: 23rd April 2004
-|   > "So what, pop is dead - it's no great loss.
-	   So many facelifts, it's face flew off"
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class version_upgrade
-{
-	/**
-	 * Custom HTML to show
-	 *
-	 * @var		string
-	 */
-	protected $_output = '';
-	
-	/**
-	 * fetchs output
-	 * 
-	 * @return	string
-	 */
-	public function fetchOutput()
-	{
-		return $this->_output;
-	}
-		
-	/**
-	 * Execute selected method
-	 *
-	 * @param	object		Registry object
-	 * @return	@e void
-	 */
-	public function doExecute( ipsRegistry $registry ) 
-	{
-		/* Make object */
-		$this->registry =  $registry;
-		$this->DB       =  $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->cache    =  $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-		
-		//--------------------------------
-		// What are we doing?
-		//--------------------------------
-
-		switch( $this->request['workact'] )
-		{
-			case 'sql':
-				$this->upgrade_sql(1);
-				break;
-			case 'sql1':
-				$this->upgrade_sql(1);
-				break;
-			case 'sql2':
-				$this->upgrade_sql(2);
-				break;
-			case 'sql3':
-				$this->upgrade_sql(3);
-				break;
-			case 'sql4':
-				$this->upgrade_sql(4);
-				break;
-			case 'polls':
-				$this->convert_polls();
-				break;
-			case 'calevents':
-				$this->convert_calevents();
-				break;
-			case 'skin':
-				$this->add_skin();
-				break;				
-			
-			default:
-				$this->upgrade_sql(1);
-				break;
-		}
-		
-		if ( $this->request['workact'] )
-		{
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-	
-	
-	/*-------------------------------------------------------------------------*/
-	// SQL: 0
-	/*-------------------------------------------------------------------------*/
-	
-	function upgrade_sql( $id=1 )
-	{
-		$man     = 0; // Manual upgrade ? intval( $this->install->ipsclass->input['man'] );
-		$cnt     = 0;
-		$SQL     = array();
-		$file    = '_updates_'.$id.'.php';
-		$output  = "";
-		$path    = IPSLib::getAppDir( 'core' ) . '/setup/versions/upg_21003/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . $file;
-		$prefix  = $this->registry->dbFunctions()->getPrefix();
-	
-		if ( is_file( $path ) )
-		{
-			require( $path );/*noLibHook*/
-		
-			$this->error   = array();
-			$this->sqlcount 		= 0;
-			$output					= "";
-			
-			$this->DB->return_die = 1;
-			
-			foreach( $SQL as $query )
-			{
-				$this->DB->allow_sub_select 	= 1;
-				$this->DB->error				= '';
-				
-				$query = str_replace( "<%time%>", time(), $query );
-							
-				/* Need to tack on a prefix? */
-				if ( $prefix )
-				{
-					$query = IPSSetUp::addPrefixToQuery( $query, $prefix );
-				}
-				
-				if ( IPSSetUp::getSavedData('man') )
-				{
-					$output .= preg_replace( "/\s{1,}/", " ", $query ) . "\n\n";
-				}
-				else
-				{
-					if( ! $query )
-					{
-						continue;
-					}
-	
-					$this->DB->query( $query );
-
-					if ( $this->DB->error )
-					{
-						$this->registry->output->addError( $query."<br /><br />".$this->DB->error );
-					}
-					else
-					{
-						$this->sqlcount++;
-					}
-				}
-			}
-		
-			$this->registry->output->addMessage("{$this->sqlcount} запросов выполнено....");
-		}
-		
-		//--------------------------------
-		// Next page...
-		//--------------------------------
-		
-		$this->request['st'] = 0;
-		
-		if ( $id != 4 )
-		{
-			$nextid = $id + 1;
-			$this->request['workact'] = 'sql'.$nextid;	
-		}
-		else
-		{
-			$this->request['workact'] = 'polls';	
-		}
-		
-		if ( IPSSetUp::getSavedData('man') AND $output )
-		{
-			/* Create source file */
-			if ( $this->registry->dbFunctions()->getDriverType() == 'mysql' )
-			{
-				$sourceFile = IPSSetUp::createSqlSourceFile( $output, '21003', $id );
-			}
-			
-			$this->_output = $this->registry->output->template()->upgrade_manual_queries( $output, $sourceFile );
-		}	
-	}	
-	
-	
-	/*-------------------------------------------------------------------------*/
-	// POLLS
-	/*-------------------------------------------------------------------------*/
-	
-	function convert_polls()
-	{
-		$start     = intval($this->request['st']) > 0 ? intval($this->request['st']) : 0;
-		$lend      = 50;
-		$end       = $start + $lend;
-		$max       = intval(IPSSetUp::getSavedData('max'));
-		$converted = intval(IPSSetUp::getSavedData('conv'));
-		
-		//-----------------------------------------
-		// First off.. grab number of polls to convert
-		//-----------------------------------------
-		
-		if ( ! $max )
-		{
-			$total = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as max',
-																	   'from'   => 'topics',
-																	   'where'  => "poll_state IN ('open', 'close', 'closed')" ) );
-																	   
-			$max   = $total['max'];
-		}
-		
-		//-----------------------------------------
-		// In steps...
-		//-----------------------------------------
-		
-		$this->DB->build( array( 'select' => '*',
-													  'from'   => 'topics',
-													  'where'  => "poll_state IN ('open', 'close', 'closed' )",
-													  'limit'  => array( 0, $lend ) ) );
-		$o = $this->DB->execute();
-	
-		//-----------------------------------------
-		// Do it...
-		//-----------------------------------------
-		
-		if ( $this->DB->getTotalRows($o) )
-		{
-			//-----------------------------------------
-			// Got some to convert!
-			//-----------------------------------------
-			
-			while ( $r = $this->DB->fetch($o) )
-			{
-				$converted++;
-				
-				//-----------------------------------------
-				// All done?
-				//-----------------------------------------
-				
-				if ( $converted >= $max )
-				{
-					$done = 1;
-				}				
-				
-				$new_poll  = array( 1 => array() );
-				
-				$poll_data = $this->DB->buildAndFetch( array( 'select' => '*',
-																			   'from'   => 'polls',
-																			   'where'  => "tid=".$r['tid']
-																	  )      );
-				if ( ! $poll_data['pid'] )
-				{
-					continue;
-				}
-				
-				if ( ! $poll_data['poll_question'] )
-				{
-					$poll_data['poll_question'] = $r['title'];
-				}
-				
-				//-----------------------------------------
-				// Kick start new poll
-				//-----------------------------------------
-				
-				$new_poll[1]['question'] = $poll_data['poll_question'];
-        
-				//-----------------------------------------
-				// Get OLD polls
-				//-----------------------------------------
-				
-				$poll_answers = unserialize( stripslashes( $poll_data['choices'] ) );
-        	
-				reset($poll_answers);
-				
-				foreach ( $poll_answers as $entry )
-				{
-					$id     = $entry[0];
-					$choice = $entry[1];
-					$votes  = $entry[2];
-					
-					$total_votes += $votes;
-					
-					if ( strlen($choice) < 1 )
-					{
-						continue;
-					}
-					
-					$new_poll[ 1 ]['choice'][ $id ] = $choice;
-					$new_poll[ 1 ]['votes'][ $id  ] = $votes;
-				}
-				
-				//-----------------------------------------
-				// Got something?
-				//-----------------------------------------
-				
-				if ( count( $new_poll[1]['choice'] ) )
-				{
-					$this->DB->update( 'polls' , array( 'choices'    => serialize( $new_poll ) ), 'tid='.$r['tid'] );
-					$this->DB->update( 'topics', array( 'poll_state' => 1 ), 'tid='.$r['tid'] );
-				}
-			}
-		}
-		else
-		{
-			$done = 1;
-		}
-		
-		
-		if ( ! $done )
-		{
-			$this->registry->output->addMessage("Опрос: $start по $end сконвертированы....");
-			$this->request['workact'] 	= 'polls';	
-			$this->request['st'] 		= $end;
-			IPSSetUp::setSavedData('max', $max);
-			IPSSetUp::setSavedData('conv', $converted);
-			return FALSE;			
-		}
-		else
-		{
-			$this->registry->output->addMessage("Опросы сконвертированы, переходим к событиям календаря...");
-			$this->request['workact'] 	= 'calevents';	
-			$this->request['st'] 		= '0';	
-			return FALSE;						
-		}
-	}
-	
-	
-	/*-------------------------------------------------------------------------*/
-	// CALENDAR EVENTS
-	/*-------------------------------------------------------------------------*/
-	
-	function convert_calevents()
-	{
-		$start     = intval($this->request['st']) > 0 ? intval($this->request['st']) : 0;
-		$lend      = 50;
-		$end       = $start + $lend;
-	
-		//-----------------------------------------
-		// In steps...
-		//-----------------------------------------
-		
-		$this->DB->build( array( 'select' => '*',
-													  'from'   => 'calendar_events',
-													  'limit'  => array( $start, $lend ) ) );
-		$o = $this->DB->execute();
-	
-		//-----------------------------------------
-		// Do it...
-		//-----------------------------------------
-		
-		if ( $this->DB->getTotalRows($o) )
-		{
-			//-----------------------------------------
-			// Got some to convert!
-			//-----------------------------------------
-			
-			while ( $r = $this->DB->fetch($o) )
-			{
-				$recur_remap = array( 'w' => 1,
-									  'm' => 2,
-									  'y' => 3 );
-				
-				$begin_date        = IPSTime::date_getgmdate( $r['unix_stamp']     );
-				$end_date          = IPSTime::date_getgmdate( $r['end_unix_stamp'] );
-				
-				if ( ! $begin_date OR ! $end_date )
-				{
-					continue;
-				}
-				
-				$day               = $begin_date['mday'];
-				$month             = $begin_date['mon'];
-				$year              = $begin_date['year'];
-				
-				$end_day           = $end_date['mday'];
-				$end_month         = $end_date['mon'];
-				$end_year          = $end_date['year'];
-		
-				$_final_unix_from  = gmmktime(0, 0, 0, $month, $day, $year );
-				
-				//-----------------------------------------
-				// Recur or ranged...
-				//-----------------------------------------
-				
-				if ( $r['event_repeat'] OR $r['event_ranged'] )
-				{
-					$_final_unix_to = gmmktime(11, 59, 59, $end_month, $end_day, $end_year);
-				}
-				else
-				{
-					$_final_unix_to = 0;
-				}
-				
-				$new_event = array( 'event_calendar_id' => 1,
-									'event_member_id'   => $r['userid'],
-									'event_content'     => $r['event_text'],
-									'event_title'       => $r['title'],
-									'event_smilies'     => $r['show_emoticons'],
-									'event_perms'       => $r['read_perms'],
-									'event_private'     => $r['priv_event'],
-									'event_approved'    => 1,
-									'event_unixstamp'   => $r['unix_stamp'],
-									'event_recurring'   => ( $r['event_repeat'] && $recur_remap[ $r['repeat_unit'] ] ) ? $recur_remap[ $r['repeat_unit'] ] : 0,
-									'event_tz'          => 0,
-									'event_unix_from'   => $_final_unix_from,
-									'event_unix_to'     => $_final_unix_to );
-				
-				//-----------------------------------------
-				// INSERT
-				//-----------------------------------------
-				
-				$this->DB->insert( 'cal_events', $new_event );
-			}
-			
-			$this->registry->output->addMessage("События календаря: $start по $end сконвертированы....");
-			$this->request['workact'] 	= 'calevents';	
-			$this->request['st'] 		= $end;
-			return FALSE;		
-		}
-		else
-		{
-			$this->registry->output->addMessage("События календаря сконвертированы,  переходим к созданию стиля IPB 2.1...");
-			$this->request['workact'] 	= 'skin';	
-			return FALSE;		
-		}
-	}
-		
-		
-	
-	/*-------------------------------------------------------------------------*/
-	// CALENDAR EVENTS
-	/*-------------------------------------------------------------------------*/
-	
-	function add_skin()
-	{
-		$this->registry->output->addMessage("Пропускаем создание стиля 2.1...");
-		unset($this->request['workact']);
-		return TRUE;
-	}
+<?php
+
+/*
+--------------------------------------------------------------------------
+|   IP.Board v3.3.4
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
+---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE MODULE:: IPB 2.0.2 -> IPB 2.0.3
+|   > Script written by Matt Mecham
+|   > Date started: 23rd April 2004
+|   > "So what, pop is dead - it's no great loss.
+	   So many facelifts, it's face flew off"
+--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	/**
+	 * Custom HTML to show
+	 *
+	 * @var		string
+	 */
+	protected $_output = '';
+	
+	/**
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
+	public function fetchOutput()
+	{
+		return $this->_output;
+	}
+		
+	/**
+	 * Execute selected method
+	 *
+	 * @param	object		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry ) 
+	{
+		/* Make object */
+		$this->registry =  $registry;
+		$this->DB       =  $this->registry->DB();
+		$this->settings =& $this->registry->fetchSettings();
+		$this->request  =& $this->registry->fetchRequest();
+		$this->cache    =  $this->registry->cache();
+		$this->caches   =& $this->registry->cache()->fetchCaches();
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+
+		switch( $this->request['workact'] )
+		{
+			case 'sql':
+				$this->upgrade_sql(1);
+				break;
+			case 'sql1':
+				$this->upgrade_sql(1);
+				break;
+			case 'sql2':
+				$this->upgrade_sql(2);
+				break;
+			case 'sql3':
+				$this->upgrade_sql(3);
+				break;
+			case 'sql4':
+				$this->upgrade_sql(4);
+				break;
+			case 'polls':
+				$this->convert_polls();
+				break;
+			case 'calevents':
+				$this->convert_calevents();
+				break;
+			case 'skin':
+				$this->add_skin();
+				break;				
+			
+			default:
+				$this->upgrade_sql(1);
+				break;
+		}
+		
+		if ( $this->request['workact'] )
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL: 0
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql( $id=1 )
+	{
+		$man     = 0; // Manual upgrade ? intval( $this->request['man'] );
+		$cnt     = 0;
+		$SQL     = array();
+		$file    = '_updates_'.$id.'.php';
+		$output  = "";
+		$path    = IPSLib::getAppDir( 'core' ) . '/setup/versions/upg_21003/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . $file;
+		$prefix  = $this->registry->dbFunctions()->getPrefix();
+	
+		if ( is_file( $path ) )
+		{
+			require( $path );/*noLibHook*/
+		
+			$this->error   = array();
+			$this->sqlcount 		= 0;
+			$output					= "";
+			
+			$this->DB->return_die = 1;
+			
+			foreach( $SQL as $query )
+			{
+				$this->DB->allow_sub_select 	= 1;
+				$this->DB->error				= '';
+				
+				$query = str_replace( "<%time%>", time(), $query );
+							
+				/* Need to tack on a prefix? */
+				if ( $prefix )
+				{
+					$query = IPSSetUp::addPrefixToQuery( $query, $prefix );
+				}
+				
+				if ( IPSSetUp::getSavedData('man') )
+				{
+					$output .= preg_replace( "/\s{1,}/", " ", $query ) . "\n\n";
+				}
+				else
+				{
+					if( ! $query )
+					{
+						continue;
+					}
+	
+					$this->DB->query( $query );
+
+					if ( $this->DB->error )
+					{
+						$this->registry->output->addError( $query."<br /><br />".$this->DB->error );
+					}
+					else
+					{
+						$this->sqlcount++;
+					}
+				}
+			}
+		
+			$this->registry->output->addMessage("{$this->sqlcount} queries ran....");
+		}
+		
+		//--------------------------------
+		// Next page...
+		//--------------------------------
+		
+		$this->request['st'] = 0;
+		
+		if ( $id != 4 )
+		{
+			$nextid = $id + 1;
+			$this->request['workact'] = 'sql'.$nextid;	
+		}
+		else
+		{
+			$this->request['workact'] = 'polls';	
+		}
+		
+		if ( IPSSetUp::getSavedData('man') AND $output )
+		{
+			/* Create source file */
+			if ( $this->registry->dbFunctions()->getDriverType() == 'mysql' )
+			{
+				$sourceFile = IPSSetUp::createSqlSourceFile( $output, '21003', $id );
+			}
+			
+			$this->_output = $this->registry->output->template()->upgrade_manual_queries( $output, $sourceFile );
+		}	
+	}	
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// POLLS
+	/*-------------------------------------------------------------------------*/
+	
+	function convert_polls()
+	{
+		$start     = intval($this->request['st']) > 0 ? intval($this->request['st']) : 0;
+		$lend      = 50;
+		$end       = $start + $lend;
+		$max       = intval(IPSSetUp::getSavedData('max'));
+		$converted = intval(IPSSetUp::getSavedData('conv'));
+		
+		//-----------------------------------------
+		// First off.. grab number of polls to convert
+		//-----------------------------------------
+		
+		if ( ! $max )
+		{
+			$total = $this->DB->buildAndFetch( array( 'select' => 'COUNT(*) as max',
+																	   'from'   => 'topics',
+																	   'where'  => "poll_state IN ('open', 'close', 'closed')" ) );
+																	   
+			$max   = $total['max'];
+		}
+		
+		//-----------------------------------------
+		// In steps...
+		//-----------------------------------------
+		
+		$this->DB->build( array( 'select' => '*',
+													  'from'   => 'topics',
+													  'where'  => "poll_state IN ('open', 'close', 'closed' )",
+													  'limit'  => array( 0, $lend ) ) );
+		$o = $this->DB->execute();
+	
+		//-----------------------------------------
+		// Do it...
+		//-----------------------------------------
+		
+		if ( $this->DB->getTotalRows($o) )
+		{
+			//-----------------------------------------
+			// Got some to convert!
+			//-----------------------------------------
+			
+			while ( $r = $this->DB->fetch($o) )
+			{
+				$converted++;
+				
+				//-----------------------------------------
+				// All done?
+				//-----------------------------------------
+				
+				if ( $converted >= $max )
+				{
+					$done = 1;
+				}				
+				
+				$new_poll  = array( 1 => array() );
+				
+				$poll_data = $this->DB->buildAndFetch( array( 'select' => '*',
+																			   'from'   => 'polls',
+																			   'where'  => "tid=".$r['tid']
+																	  )      );
+				if ( ! $poll_data['pid'] )
+				{
+					continue;
+				}
+				
+				if ( ! $poll_data['poll_question'] )
+				{
+					$poll_data['poll_question'] = $r['title'];
+				}
+				
+				//-----------------------------------------
+				// Kick start new poll
+				//-----------------------------------------
+				
+				$new_poll[1]['question'] = $poll_data['poll_question'];
+        
+				//-----------------------------------------
+				// Get OLD polls
+				//-----------------------------------------
+				
+				$poll_answers = unserialize( stripslashes( $poll_data['choices'] ) );
+        	
+				reset($poll_answers);
+				
+				foreach ( $poll_answers as $entry )
+				{
+					$id     = $entry[0];
+					$choice = $entry[1];
+					$votes  = $entry[2];
+					
+					$total_votes += $votes;
+					
+					if ( strlen($choice) < 1 )
+					{
+						continue;
+					}
+					
+					$new_poll[ 1 ]['choice'][ $id ] = $choice;
+					$new_poll[ 1 ]['votes'][ $id  ] = $votes;
+				}
+				
+				//-----------------------------------------
+				// Got something?
+				//-----------------------------------------
+				
+				if ( count( $new_poll[1]['choice'] ) )
+				{
+					$this->DB->update( 'polls' , array( 'choices'    => serialize( $new_poll ) ), 'tid='.$r['tid'] );
+					$this->DB->update( 'topics', array( 'poll_state' => 1 ), 'tid='.$r['tid'] );
+				}
+			}
+		}
+		else
+		{
+			$done = 1;
+		}
+		
+		
+		if ( ! $done )
+		{
+			$this->registry->output->addMessage("Polls: $start to $end completed....");
+			$this->request['workact'] 	= 'polls';	
+			$this->request['st'] 		= $end;
+			IPSSetUp::setSavedData('max', $max);
+			IPSSetUp::setSavedData('conv', $converted);
+			return FALSE;			
+		}
+		else
+		{
+			$this->registry->output->addMessage("Polls converted, proceeding to calendar events...");
+			$this->request['workact'] 	= 'calevents';	
+			$this->request['st'] 		= '0';	
+			return FALSE;						
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// CALENDAR EVENTS
+	/*-------------------------------------------------------------------------*/
+	
+	function convert_calevents()
+	{
+		$start     = intval($this->request['st']) > 0 ? intval($this->request['st']) : 0;
+		$lend      = 50;
+		$end       = $start + $lend;
+	
+		//-----------------------------------------
+		// In steps...
+		//-----------------------------------------
+		
+		$this->DB->build( array( 'select' => '*',
+													  'from'   => 'calendar_events',
+													  'limit'  => array( $start, $lend ) ) );
+		$o = $this->DB->execute();
+	
+		//-----------------------------------------
+		// Do it...
+		//-----------------------------------------
+		
+		if ( $this->DB->getTotalRows($o) )
+		{
+			//-----------------------------------------
+			// Got some to convert!
+			//-----------------------------------------
+			
+			while ( $r = $this->DB->fetch($o) )
+			{
+				$recur_remap = array( 'w' => 1,
+									  'm' => 2,
+									  'y' => 3 );
+				
+				$begin_date        = IPSTime::date_getgmdate( $r['unix_stamp']     );
+				$end_date          = IPSTime::date_getgmdate( $r['end_unix_stamp'] );
+				
+				if ( ! $begin_date OR ! $end_date )
+				{
+					continue;
+				}
+				
+				$day               = $begin_date['mday'];
+				$month             = $begin_date['mon'];
+				$year              = $begin_date['year'];
+				
+				$end_day           = $end_date['mday'];
+				$end_month         = $end_date['mon'];
+				$end_year          = $end_date['year'];
+		
+				$_final_unix_from  = gmmktime(0, 0, 0, $month, $day, $year );
+				
+				//-----------------------------------------
+				// Recur or ranged...
+				//-----------------------------------------
+				
+				if ( $r['event_repeat'] OR $r['event_ranged'] )
+				{
+					$_final_unix_to = gmmktime(11, 59, 59, $end_month, $end_day, $end_year);
+				}
+				else
+				{
+					$_final_unix_to = 0;
+				}
+				
+				$new_event = array( 'event_calendar_id' => 1,
+									'event_member_id'   => $r['userid'],
+									'event_content'     => $r['event_text'],
+									'event_title'       => $r['title'],
+									'event_smilies'     => $r['show_emoticons'],
+									'event_perms'       => $r['read_perms'],
+									'event_private'     => $r['priv_event'],
+									'event_approved'    => 1,
+									'event_unixstamp'   => $r['unix_stamp'],
+									'event_recurring'   => ( $r['event_repeat'] && $recur_remap[ $r['repeat_unit'] ] ) ? $recur_remap[ $r['repeat_unit'] ] : 0,
+									'event_tz'          => 0,
+									'event_unix_from'   => $_final_unix_from,
+									'event_unix_to'     => $_final_unix_to );
+				
+				//-----------------------------------------
+				// INSERT
+				//-----------------------------------------
+				
+				$this->DB->insert( 'cal_events', $new_event );
+			}
+			
+			$this->registry->output->addMessage("Calendar events: $start to $end completed....");
+			$this->request['workact'] 	= 'calevents';	
+			$this->request['st'] 		= $end;
+			return FALSE;		
+		}
+		else
+		{
+			$this->registry->output->addMessage("Calendar events converted,  Creating new IPB 2.1 skin...");
+			$this->request['workact'] 	= 'skin';	
+			return FALSE;		
+		}
+	}
+		
+		
+	
+	/*-------------------------------------------------------------------------*/
+	// CALENDAR EVENTS
+	/*-------------------------------------------------------------------------*/
+	
+	function add_skin()
+	{
+		$this->registry->output->addMessage("Skipping 2.1 skin creation (latest skin will be inserted later)...");
+		unset($this->request['workact']);
+		return TRUE;
+	}
 }
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,93 +1,93 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   IP.Board v3.2.3
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
-|   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
-+---------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class version_upgrade
-{
-	/**
-	 * Custom HTML to show
-	 *
-	 * @var		string
-	 */
-	protected $_output = '';
-	
-	/**
-	 * fetchs output
-	 * 
-	 * @return	string
-	 */
-	public function fetchOutput()
-	{
-		return $this->_output;
-	}
-	
-	/**
-	 * Execute selected method
-	 *
-	 * @param	object		Registry object
-	 * @return	@e void
-	 */
-	public function doExecute( ipsRegistry $registry ) 
-	{
-		/* Make object */
-		$this->registry =  $registry;
-		$this->DB       =  $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->cache    =  $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-		
-		//-----------------------------------------
-		// Remove dupe categories
-		//-----------------------------------------
-		
-		$title_id_to_keep    = array();
-		$title_id_to_delete  = array();
-		$title_deleted_count = 0;
-		$msg                 = '';
-		
-		$this->DB->build( array( 'select' => '*', 'from' => 'conf_settings_titles', 'order' => 'conf_title_id DESC' ) );
-		$this->DB->execute();
-		
-		while ( $r = $this->DB->fetch() )
-		{
-			if ( $title_id_to_keep[ $r['conf_title_title'] ] )
-			{
-				$title_id_to_delete[ $r['conf_title_id'] ] = $r['conf_title_id'];
-			}
-			else
-			{
-				$title_id_to_keep[ $r['conf_title_title'] ] = $r['conf_title_id'];
-			}
-		}
-		
-		if ( count( $title_id_to_delete ) )
-		{
-			$this->DB->delete( 'conf_settings_titles', 'conf_title_id IN ('.implode( ',', $title_id_to_delete ).')' );
-		}
-		
-		$title_deleted_count = intval( count($title_id_to_delete) );
-		
-		$this->registry->output->addMessage("$title_deleted_count дубликатов настроек удалено");
-		
-		return true;
-	}
+<?php
+
+/*
+--------------------------------------------------------------------------
+|   IP.Board v3.3.4
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
+---------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	/**
+	 * Custom HTML to show
+	 *
+	 * @var		string
+	 */
+	protected $_output = '';
+	
+	/**
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
+	public function fetchOutput()
+	{
+		return $this->_output;
+	}
+	
+	/**
+	 * Execute selected method
+	 *
+	 * @param	object		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry ) 
+	{
+		/* Make object */
+		$this->registry =  $registry;
+		$this->DB       =  $this->registry->DB();
+		$this->settings =& $this->registry->fetchSettings();
+		$this->request  =& $this->registry->fetchRequest();
+		$this->cache    =  $this->registry->cache();
+		$this->caches   =& $this->registry->cache()->fetchCaches();
+		
+		//-----------------------------------------
+		// Remove dupe categories
+		//-----------------------------------------
+		
+		$title_id_to_keep    = array();
+		$title_id_to_delete  = array();
+		$title_deleted_count = 0;
+		$msg                 = '';
+		
+		$this->DB->build( array( 'select' => '*', 'from' => 'conf_settings_titles', 'order' => 'conf_title_id DESC' ) );
+		$this->DB->execute();
+		
+		while ( $r = $this->DB->fetch() )
+		{
+			if ( $title_id_to_keep[ $r['conf_title_title'] ] )
+			{
+				$title_id_to_delete[ $r['conf_title_id'] ] = $r['conf_title_id'];
+			}
+			else
+			{
+				$title_id_to_keep[ $r['conf_title_title'] ] = $r['conf_title_id'];
+			}
+		}
+		
+		if ( count( $title_id_to_delete ) )
+		{
+			$this->DB->delete( 'conf_settings_titles', 'conf_title_id IN ('.implode( ',', $title_id_to_delete ).')' );
+		}
+		
+		$title_deleted_count = intval( count($title_id_to_delete) );
+		
+		$this->registry->output->addMessage("$title_deleted_count duplicate settings deleted");
+		
+		return true;
+	}
 }
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,386 +1,386 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   IP.Board v3.2.3
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
-|   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
-+---------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class version_upgrade
-{
-	/**
-	 * Custom HTML to show
-	 *
-	 * @var		string
-	 */
-	private $_output = '';
-	
-	/**
-	 * fetchs output
-	 * 
-	 * @return	string
-	 */
-	public function fetchOutput()
-	{
-		return $this->_output;
-	}
-	
-	/**
-	 * Execute selected method
-	 *
-	 * @param	object		Registry object
-	 * @return	@e void
-	 */
-	public function doExecute( ipsRegistry $registry ) 
-	{
-		/* Make object */
-		$this->registry =  $registry;
-		$this->DB       =  $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->cache    =  $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-		
-		/* Set DB driver to return any errors */
-		$this->DB->return_die = 1;
-		
-		//--------------------------------
-		// What are we doing?
-		//--------------------------------
-
-		switch( $this->request['workact'] )
-		{
-			case 'sql':
-				$this->upgrade_sql(1);
-				break;
-			case 'sql1':
-				$this->upgrade_sql(1);
-				break;
-			case 'sql2':
-				$this->upgrade_sql(2);
-				break;
-			case 'sql3':
-				$this->upgrade_sql(3);
-				break;
-			case 'sql4':
-				$this->upgrade_sql(4);
-				break;
-			case 'forums':
-				$this->update_forums();
-				break;
-			case 'finish':
-				$this->finish_up();
-				break;
-			case 'skin':
-				$this->add_skin();
-				break;
-			case 'update_template_bits':
-				$this->update_template_bits();
-				break;
-			
-			default:
-				$this->upgrade_sql(1);
-				break;
-		}
-		
-		if ( $this->request['workact'] )
-		{
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-	
-	
-	/*-------------------------------------------------------------------------*/
-	// SQL: 0
-	/*-------------------------------------------------------------------------*/
-	
-	function upgrade_sql( $id=1 )
-	{
-		$man     = 0; // Manual upgrade ? intval( $this->install->ipsclass->input['man'] );
-		$cnt     = 0;
-		$SQL     = array();
-		$file    = '_updates_'.$id.'.php';
-		$output  = "";
-		$path    = IPSLib::getAppDir( 'core' ) . '/setup/versions/upg_22005/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . $file;
-		$prefix  = $this->registry->dbFunctions()->getPrefix();
-		
-		if ( is_file( $path ) )
-		{
-			require_once( $path );/*noLibHook*/
-		
-			$this->sqlcount 		= 0;
-			$output					= "";
-			
-			$this->DB->return_die = 1;
-			
-			foreach( $SQL as $query )
-			{
-				$this->DB->allow_sub_select 	= 1;
-				$this->DB->error				= '';
-				
-				$query = str_replace( "<%time%>", time(), $query );
-				
-				if( $this->settings['mysql_tbl_type'] )
-				{
-					if( preg_match( "/^create table(.+?)/i", $query ) )
-					{
-						$query = preg_replace( "/^(.+?)\);$/is", "\\1) ENGINE={$this->settings['mysql_tbl_type']};", $query );
-					}
-				}					
-				
-				/* Need to tack on a prefix? */
-				if ( $prefix )
-				{
-					$query = IPSSetUp::addPrefixToQuery( $query, $prefix );
-				}
-					
-				if ( IPSSetUp::getSavedData('man') )
-				{
-					$output .= preg_replace( "/\s{1,}/", " ", $query ) ."\n\n";
-				}
-				else
-				{			
-					$this->DB->query( $query );
-					
-					if ( $this->DB->error )
-					{
-						$this->registry->output->addError( $query."<br /><br />".$this->DB->error );
-					}
-					else
-					{
-						$this->sqlcount++;
-					}
-				}
-			}
-		
-			$this->registry->output->addMessage("$this->sqlcount запросов выполнено....");
-		}
-		
-		//--------------------------------
-		// Next page...
-		//--------------------------------
-		
-		$this->request['st'] = 0;
-		
-		if ( $id != 4 )
-		{
-			$nextid = $id + 1;
-			$this->request['workact'] = 'sql'.$nextid;	
-		}
-		else
-		{
-			$this->request['workact'] = 'forums';	
-		}
-		
-		if ( IPSSetUp::getSavedData('man') AND $output )
-		{
-			/* Create source file */
-			if ( $this->registry->dbFunctions()->getDriverType() == 'mysql' )
-			{
-				$sourceFile = IPSSetUp::createSqlSourceFile( $output, '22005', $id );
-			}
-			
-			$this->_output = $this->registry->output->template()->upgrade_manual_queries( $output, $sourceFile );
-		}
-	}	
-	
-	
-	/*-------------------------------------------------------------------------*/
-	// Update forums
-	/*-------------------------------------------------------------------------*/
-	
-	function update_forums()
-	{
-		//-----------------------------------------
-		// Update latest news...
-		//-----------------------------------------
-	
-		$this->DB->update( "forums", "newest_title=last_title, newest_id=last_id", 'last_title IS NOT NULL AND last_id IS NOT NULL', false, true );
-		$this->DB->execute();
-		
-		//-----------------------------------------
-		// INIT
-		//-----------------------------------------
-		
-		$ignore_me = array( 'redirect_url', 'redirect_loc', 'rules_text', 'permission_custom_error', 'notify_modq_emails' );
-		
-		if ( !empty($this->settings['forum_cache_minimum']) )
-		{
-			$ignore_me[] = 'description';
-			$ignore_me[] = 'rules_title';
-		}
-		
-		$this->caches['forum_cache'] = array();
-			
-		$this->DB->build( array( 'select' => '*',
-													  'from'   => 'forums',
-													  'order'  => 'parent_id, position'
-											   )      );
-		$o = $this->DB->execute();
-		
-		while( $f = $this->DB->fetch( $o ) )
-		{
-			$fr = array();
-			
-			$perms = unserialize(stripslashes($f['permission_array']));
-			
-			//-----------------------------------------
-			// Stuff we don't need...
-			//-----------------------------------------
-			
-			if ( $f['parent_id'] == -1 )
-			{
-				$fr['id']				    = $f['id'];
-				$fr['sub_can_post']         = $f['sub_can_post'];
-				$fr['name'] 		        = $f['name'];
-				$fr['parent_id']	        = $f['parent_id'];
-				$fr['show_perms']	        = $perms['show_perms'];
-				$fr['skin_id']		        = $f['skin_id'];
-				$fr['permission_showtopic'] = $f['permission_showtopic'];
-			}
-			else
-			{
-				foreach( $f as $k => $v )
-				{
-					if ( in_array( $k, $ignore_me ) )
-					{
-						continue;
-					}
-					else
-					{
-						if ( $v != "" )
-						{
-							$fr[ $k ] = $v;
-						}
-					}
-				}
-				
-				$fr['read_perms']   	= isset($perms['read_perms']) 		? $perms['read_perms'] 		: '';
-				$fr['reply_perms']  	= isset($perms['reply_perms']) 		? $perms['reply_perms'] 	: '';
-				$fr['start_perms']  	= isset($perms['start_perms']) 		? $perms['start_perms'] 	: '';
-				$fr['upload_perms'] 	= isset($perms['upload_perms']) 	? $perms['upload_perms'] 	: '';
-				$fr['download_perms'] 	= $perms['upload_perms'];
-				$fr['show_perms']   	= isset($perms['show_perms']) 		? $perms['show_perms'] 		: '';
-				
-				unset($fr['permission_array']);
-			}
-			
-			$this->caches['forum_cache'][ $fr['id'] ] = $fr;
-			
-			$perm_array = addslashes(serialize(array(
-													   'start_perms'    => $fr['start_perms'],
-													   'reply_perms'    => $fr['reply_perms'],
-													   'read_perms'     => $fr['read_perms'],
-													   'upload_perms'   => $fr['upload_perms'],
-													   'download_perms' => $fr['download_perms'],
-													   'show_perms'     => $fr['show_perms']
-									 )		  )     );
-									 
-			//-----------------------------------------
-			// Add to save array
-			//-----------------------------------------
-			
-			$this->DB->update( 'forums', array( 'permission_array' => $perm_array ), 'id='.$fr['id'] );
-			
-		}
-		
-		$this->cache->setCache( 'forum_cache', $this->caches['forum_cache'], array( 'array' => 1 ) );
-		
-		$this->registry->output->addMessage("Права доступа обновлены, переходим к конвертации HTML логики в шаблонах...");
-		$this->request['workact'] 	= 'update_template_bits';
-	}
-	
-	/*-------------------------------------------------------------------------*/
-	// Update template bits
-	/*-------------------------------------------------------------------------*/
-	
-	function update_template_bits()
-	{
-		$this->registry->output->addMessage("Шаблоны пропущены, завершаем обновление...");
-		$this->request['workact'] 	= 'finish';	
-		return FALSE;						
-	}
-
-	/*-------------------------------------------------------------------------*/
-	// Update forums
-	/*-------------------------------------------------------------------------*/
-	
-	function finish_up()
-	{
-		//-----------------------------------------
-		// Has gallery?
-		//-----------------------------------------
-		
-		$this->DB->return_die = 1;
-		$this->DB->error		 = '';
-		
-		$table = 'members';
-		
-		if ( ! $this->DB->checkForField( 'has_gallery', $table ) )
-		{
-			$this->DB->addField( 'members', 'has_gallery', 'INT(1)', '0' );
-			
-			if ( $this->DB->error )
-			{
-				$this->registry->output->addError( "ALTER TABLE {$this->DB->obj['sql_tbl_prefix']}members ADD has_gallery INT(1) default 0<br /><br />".$this->DB->error );
-			}
-		}
-		
-		if( $this->settings['conv_configured'] != 1 OR $this->settings['conv_chosen'] == "" )
-		{
-			if( $this->DB->checkForField( "legacy_password", "members" ) )
-			{
-				$this->DB->dropField( 'members', 'legacy_password' );
-				
-				if ( $this->DB->error )
-				{
-					$this->registry->output->addError( "ALTER TABLE {$this->DB->obj['sql_tbl_prefix']}members DROP legacy_password<br /><br />".$this->DB->error );
-				}
-			}
-		}
-		
-		$test = $this->DB->buildAndFetch( array( 'select' 	=> 'count(*) as numrows',
-																	'from'	=> 'cache_store',
-																	'where'	=> "cs_key='calendars'"
-														)		);
-
-		if ( ! $test['numrows'] )
-		{
-			$this->DB->insert( 'cache_store', array( 'cs_key' => 'calendars' ) );
-		}
-		
-		$this->registry->output->addMessage("Очистка завершена,  переходим к созданию нового IPB 2.2.0 стиля...");
-		$this->request['workact'] 	= 'skin';
-	}
-	
-	/*-------------------------------------------------------------------------*/
-	// Add new skin
-	/*-------------------------------------------------------------------------*/
-	
-	function add_skin()
-	{
-		$this->registry->output->addMessage("Добавление стиля 2.2.0 пропущено...");
-		unset($this->request['workact']);
-		
-		return TRUE;	
-	}
-	
+<?php
+
+/*
+--------------------------------------------------------------------------
+|   IP.Board v3.3.4
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
+---------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	/**
+	 * Custom HTML to show
+	 *
+	 * @var		string
+	 */
+	private $_output = '';
+	
+	/**
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
+	public function fetchOutput()
+	{
+		return $this->_output;
+	}
+	
+	/**
+	 * Execute selected method
+	 *
+	 * @param	object		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry ) 
+	{
+		/* Make object */
+		$this->registry =  $registry;
+		$this->DB       =  $this->registry->DB();
+		$this->settings =& $this->registry->fetchSettings();
+		$this->request  =& $this->registry->fetchRequest();
+		$this->cache    =  $this->registry->cache();
+		$this->caches   =& $this->registry->cache()->fetchCaches();
+		
+		/* Set DB driver to return any errors */
+		$this->DB->return_die = 1;
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+
+		switch( $this->request['workact'] )
+		{
+			case 'sql':
+				$this->upgrade_sql(1);
+				break;
+			case 'sql1':
+				$this->upgrade_sql(1);
+				break;
+			case 'sql2':
+				$this->upgrade_sql(2);
+				break;
+			case 'sql3':
+				$this->upgrade_sql(3);
+				break;
+			case 'sql4':
+				$this->upgrade_sql(4);
+				break;
+			case 'forums':
+				$this->update_forums();
+				break;
+			case 'finish':
+				$this->finish_up();
+				break;
+			case 'skin':
+				$this->add_skin();
+				break;
+			case 'update_template_bits':
+				$this->update_template_bits();
+				break;
+			
+			default:
+				$this->upgrade_sql(1);
+				break;
+		}
+		
+		if ( $this->request['workact'] )
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL: 0
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql( $id=1 )
+	{
+		$man     = 0; // Manual upgrade ? intval( $this->request['man'] );
+		$cnt     = 0;
+		$SQL     = array();
+		$file    = '_updates_'.$id.'.php';
+		$output  = "";
+		$path    = IPSLib::getAppDir( 'core' ) . '/setup/versions/upg_22005/' . strtolower( $this->registry->dbFunctions()->getDriverType() ) . $file;
+		$prefix  = $this->registry->dbFunctions()->getPrefix();
+		
+		if ( is_file( $path ) )
+		{
+			require_once( $path );/*noLibHook*/
+		
+			$this->sqlcount 		= 0;
+			$output					= "";
+			
+			$this->DB->return_die = 1;
+			
+			foreach( $SQL as $query )
+			{
+				$this->DB->allow_sub_select 	= 1;
+				$this->DB->error				= '';
+				
+				$query = str_replace( "<%time%>", time(), $query );
+				
+				if( $this->settings['mysql_tbl_type'] )
+				{
+					if( preg_match( "/^create table(.+?)/i", $query ) )
+					{
+						$query = preg_replace( "/^(.+?)\);$/is", "\\1) ENGINE={$this->settings['mysql_tbl_type']};", $query );
+					}
+				}					
+				
+				/* Need to tack on a prefix? */
+				if ( $prefix )
+				{
+					$query = IPSSetUp::addPrefixToQuery( $query, $prefix );
+				}
+					
+				if ( IPSSetUp::getSavedData('man') )
+				{
+					$output .= preg_replace( "/\s{1,}/", " ", $query ) ."\n\n";
+				}
+				else
+				{			
+					$this->DB->query( $query );
+					
+					if ( $this->DB->error )
+					{
+						$this->registry->output->addError( $query."<br /><br />".$this->DB->error );
+					}
+					else
+					{
+						$this->sqlcount++;
+					}
+				}
+			}
+		
+			$this->registry->output->addMessage("$this->sqlcount queries ran....");
+		}
+		
+		//--------------------------------
+		// Next page...
+		//--------------------------------
+		
+		$this->request['st'] = 0;
+		
+		if ( $id != 4 )
+		{
+			$nextid = $id + 1;
+			$this->request['workact'] = 'sql'.$nextid;	
+		}
+		else
+		{
+			$this->request['workact'] = 'forums';	
+		}
+		
+		if ( IPSSetUp::getSavedData('man') AND $output )
+		{
+			/* Create source file */
+			if ( $this->registry->dbFunctions()->getDriverType() == 'mysql' )
+			{
+				$sourceFile = IPSSetUp::createSqlSourceFile( $output, '22005', $id );
+			}
+			
+			$this->_output = $this->registry->output->template()->upgrade_manual_queries( $output, $sourceFile );
+		}
+	}	
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// Update forums
+	/*-------------------------------------------------------------------------*/
+	
+	function update_forums()
+	{
+		//-----------------------------------------
+		// Update latest news...
+		//-----------------------------------------
+	
+		$this->DB->update( "forums", "newest_title=last_title, newest_id=last_id", 'last_title IS NOT NULL AND last_id IS NOT NULL', false, true );
+		$this->DB->execute();
+		
+		//-----------------------------------------
+		// INIT
+		//-----------------------------------------
+		
+		$ignore_me = array( 'redirect_url', 'redirect_loc', 'rules_text', 'permission_custom_error', 'notify_modq_emails' );
+		
+		if ( !empty($this->settings['forum_cache_minimum']) )
+		{
+			$ignore_me[] = 'description';
+			$ignore_me[] = 'rules_title';
+		}
+		
+		$this->caches['forum_cache'] = array();
+			
+		$this->DB->build( array( 'select' => '*',
+													  'from'   => 'forums',
+													  'order'  => 'parent_id, position'
+											   )      );
+		$o = $this->DB->execute();
+		
+		while( $f = $this->DB->fetch( $o ) )
+		{
+			$fr = array();
+			
+			$perms = unserialize(stripslashes($f['permission_array']));
+			
+			//-----------------------------------------
+			// Stuff we don't need...
+			//-----------------------------------------
+			
+			if ( $f['parent_id'] == -1 )
+			{
+				$fr['id']				    = $f['id'];
+				$fr['sub_can_post']         = $f['sub_can_post'];
+				$fr['name'] 		        = $f['name'];
+				$fr['parent_id']	        = $f['parent_id'];
+				$fr['show_perms']	        = $perms['show_perms'];
+				$fr['skin_id']		        = $f['skin_id'];
+				$fr['permission_showtopic'] = $f['permission_showtopic'];
+			}
+			else
+			{
+				foreach( $f as $k => $v )
+				{
+					if ( in_array( $k, $ignore_me ) )
+					{
+						continue;
+					}
+					else
+					{
+						if ( $v != "" )
+						{
+							$fr[ $k ] = $v;
+						}
+					}
+				}
+				
+				$fr['read_perms']   	= isset($perms['read_perms']) 		? $perms['read_perms'] 		: '';
+				$fr['reply_perms']  	= isset($perms['reply_perms']) 		? $perms['reply_perms'] 	: '';
+				$fr['start_perms']  	= isset($perms['start_perms']) 		? $perms['start_perms'] 	: '';
+				$fr['upload_perms'] 	= isset($perms['upload_perms']) 	? $perms['upload_perms'] 	: '';
+				$fr['download_perms'] 	= $perms['upload_perms'];
+				$fr['show_perms']   	= isset($perms['show_perms']) 		? $perms['show_perms'] 		: '';
+				
+				unset($fr['permission_array']);
+			}
+			
+			$this->caches['forum_cache'][ $fr['id'] ] = $fr;
+			
+			$perm_array = addslashes(serialize(array(
+													   'start_perms'    => $fr['start_perms'],
+													   'reply_perms'    => $fr['reply_perms'],
+													   'read_perms'     => $fr['read_perms'],
+													   'upload_perms'   => $fr['upload_perms'],
+													   'download_perms' => $fr['download_perms'],
+													   'show_perms'     => $fr['show_perms']
+									 )		  )     );
+									 
+			//-----------------------------------------
+			// Add to save array
+			//-----------------------------------------
+			
+			$this->DB->update( 'forums', array( 'permission_array' => $perm_array ), 'id='.$fr['id'] );
+			
+		}
+		
+		$this->cache->setCache( 'forum_cache', $this->caches['forum_cache'], array( 'array' => 1 ) );
+		
+		$this->registry->output->addMessage("Download permissions added,  Converting template bit HTML logic...");
+		$this->request['workact'] 	= 'update_template_bits';
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Update template bits
+	/*-------------------------------------------------------------------------*/
+	
+	function update_template_bits()
+	{
+		$this->registry->output->addMessage("Template bits skipped, finishing up...");
+		$this->request['workact'] 	= 'finish';	
+		return FALSE;						
+	}
+
+	/*-------------------------------------------------------------------------*/
+	// Update forums
+	/*-------------------------------------------------------------------------*/
+	
+	function finish_up()
+	{
+		//-----------------------------------------
+		// Has gallery?
+		//-----------------------------------------
+		
+		$this->DB->return_die = 1;
+		$this->DB->error		 = '';
+		
+		$table = 'members';
+		
+		if ( ! $this->DB->checkForField( 'has_gallery', $table ) )
+		{
+			$this->DB->addField( 'members', 'has_gallery', 'INT(1)', '0' );
+			
+			if ( $this->DB->error )
+			{
+				$this->registry->output->addError( "ALTER TABLE {$this->DB->obj['sql_tbl_prefix']}members ADD has_gallery INT(1) default 0<br /><br />".$this->DB->error );
+			}
+		}
+		
+		if( $this->settings['conv_configured'] != 1 OR $this->settings['conv_chosen'] == "" )
+		{
+			if( $this->DB->checkForField( "legacy_password", "members" ) )
+			{
+				$this->DB->dropField( 'members', 'legacy_password' );
+				
+				if ( $this->DB->error )
+				{
+					$this->registry->output->addError( "ALTER TABLE {$this->DB->obj['sql_tbl_prefix']}members DROP legacy_password<br /><br />".$this->DB->error );
+				}
+			}
+		}
+		
+		$test = $this->DB->buildAndFetch( array( 'select' 	=> 'count(*) as numrows',
+																	'from'	=> 'cache_store',
+																	'where'	=> "cs_key='calendars'"
+														)		);
+
+		if ( ! $test['numrows'] )
+		{
+			$this->DB->insert( 'cache_store', array( 'cs_key' => 'calendars' ) );
+		}
+		
+		$this->registry->output->addMessage("Clean up performed,  Creating new IPB 2.2.0 skin...");
+		$this->request['workact'] 	= 'skin';
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Add new skin
+	/*-------------------------------------------------------------------------*/
+	
+	function add_skin()
+	{
+		$this->registry->output->addMessage("2.2.0 skin skipped...");
+		unset($this->request['workact']);
+		
+		return TRUE;	
+	}
+	
 }
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,27 +1,27 @@
-<?php
-/*
-+--------------------------------------------------------------------------
-|   IP.Board v3.2.3
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
-|   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
-+---------------------------------------------------------------------------
-*/
-
-
-$SQL[] = "ALTER TABLE attachments_type ADD index(atype_extension);";
-$SQL[] = "DELETE FROM admin_permission_keys WHERE perm_key='content:mem:add';";
-
-$SQL[] = "ALTER TABLE upgrade_history CHANGE upgrade_notes upgrade_notes TEXT NULL;";
-
-$SQL[] = "ALTER TABLE attachments_type ADD INDEX atype ( atype_post , atype_photo );";
-
-$SQL[] = "ALTER TABLE moderator_logs CHANGE query_string query_string TEXT NULL;";
-
-$SQL[] = "ALTER TABLE rss_import CHANGE rss_import_url rss_import_url TEXT NULL;";
-
+<?php
+/*
+--------------------------------------------------------------------------
+|   IP.Board v3.3.4
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
+---------------------------------------------------------------------------
+*/
+
+
+$SQL[] = "ALTER TABLE attachments_type ADD index(atype_extension);";
+$SQL[] = "DELETE FROM admin_permission_keys WHERE perm_key='content:mem:add';";
+
+$SQL[] = "ALTER TABLE upgrade_history CHANGE upgrade_notes upgrade_notes TEXT NULL;";
+
+$SQL[] = "ALTER TABLE attachments_type ADD INDEX atype ( atype_post , atype_photo );";
+
+$SQL[] = "ALTER TABLE moderator_logs CHANGE query_string query_string TEXT NULL;";
+
+$SQL[] = "ALTER TABLE rss_import CHANGE rss_import_url rss_import_url TEXT NULL;";
+
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,42 +1,42 @@
-<?php
-/*
-+--------------------------------------------------------------------------
-|   IP.Board v3.2.3
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
-|   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
-+---------------------------------------------------------------------------
-*/
-
-
-$SQL[] = "ALTER TABLE forums CHANGE last_title last_title VARCHAR( 250 ) NULL DEFAULT NULL ,
-CHANGE newest_title newest_title VARCHAR( 250 ) NULL DEFAULT NULL ;";
-
-$SQL[] = "CREATE TABLE skin_url_mapping (
-	map_id			INT(10) NOT NULL auto_increment,
-	map_title		VARCHAR(200) NOT NULL default '',
-	map_match_type	VARCHAR(10) NOT NULL default 'contains',
-	map_url			VARCHAR(200) NOT NULL default '',
-	map_skin_set_id	INT(10) UNSIGNED NOT NULL default '0',
-	map_date_added	INT(10) UNSIGNED NOT NULL default '0',
-	PRIMARY KEY (map_id)
-);";
-
-$SQL[] = "ALTER TABLE mail_queue ADD mail_html_on	INT(1) NOT NULL default '0';";
-
-$SQL[] = "ALTER TABLE skin_templates ADD group_names_secondary TEXT NULL;";
-
-$SQL[] = "CREATE TABLE skin_template_links (
-	link_id				INT(10) UNSIGNED NOT NULL auto_increment,
-	link_set_id			INT(10) UNSIGNED NOT NULL default '0',
-	link_group_name		VARCHAR(255) NOT NULL default '',
-	link_template_name	VARCHAR(255) NOT NULL default '',
-	link_used_in		VARCHAR(255) NOT NULL default '',
-	PRIMARY KEY (link_id)
-);";
-
+<?php
+/*
+--------------------------------------------------------------------------
+|   IP.Board v3.3.4
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
+---------------------------------------------------------------------------
+*/
+
+
+$SQL[] = "ALTER TABLE forums CHANGE last_title last_title VARCHAR( 250 ) NULL DEFAULT NULL ,
+CHANGE newest_title newest_title VARCHAR( 250 ) NULL DEFAULT NULL ;";
+
+$SQL[] = "CREATE TABLE skin_url_mapping (
+	map_id			INT(10) NOT NULL auto_increment,
+	map_title		VARCHAR(200) NOT NULL default '',
+	map_match_type	VARCHAR(10) NOT NULL default 'contains',
+	map_url			VARCHAR(200) NOT NULL default '',
+	map_skin_set_id	INT(10) UNSIGNED NOT NULL default '0',
+	map_date_added	INT(10) UNSIGNED NOT NULL default '0',
+	PRIMARY KEY (map_id)
+);";
+
+$SQL[] = "ALTER TABLE mail_queue ADD mail_html_on	INT(1) NOT NULL default '0';";
+
+$SQL[] = "ALTER TABLE skin_templates ADD group_names_secondary TEXT NULL;";
+
+$SQL[] = "CREATE TABLE skin_template_links (
+	link_id				INT(10) UNSIGNED NOT NULL auto_increment,
+	link_set_id			INT(10) UNSIGNED NOT NULL default '0',
+	link_group_name		VARCHAR(255) NOT NULL default '',
+	link_template_name	VARCHAR(255) NOT NULL default '',
+	link_used_in		VARCHAR(255) NOT NULL default '',
+	PRIMARY KEY (link_id)
+);";
+
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,44 +1,44 @@
-<?php
-/*
-+--------------------------------------------------------------------------
-|   IP.Board v3.2.3
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
-|   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
-+---------------------------------------------------------------------------
-*/
-
-
-$SQL[] = "delete from conf_settings where conf_key='csite_search_show';";
-$SQL[] = "delete from conf_settings where conf_key='csite_skinchange_show';";
-
-$SQL[] = "ALTER TABLE forums CHANGE last_poster_name last_poster_name VARCHAR( 255 ) NULL DEFAULT NULL;";
-
-$SQL[] = "ALTER TABLE announcements ADD announce_nlbr_enabled TINYINT( 1 ) NOT NULL DEFAULT '0';";
-$SQL[] = "ALTER TABLE subscription_trans CHANGE subtrans_start_date subtrans_start_date VARCHAR( 13 ) NOT NULL DEFAULT '0', CHANGE subtrans_end_date subtrans_end_date VARCHAR( 13 ) NOT NULL DEFAULT '0';";
-
-$SQL[] = "CREATE TABLE api_log (
-  api_log_id 		int(10) unsigned NOT NULL auto_increment,
-  api_log_key 		VARCHAR(32) NOT NULL,
-  api_log_ip 		VARCHAR(16) NOT NULL,
-  api_log_date 		INT(10) NOT NULL,
-  api_log_query 	TEXT NOT NULL,
-  api_log_allowed 	TINYINT(1) unsigned NOT NULL,
-  PRIMARY KEY  (api_log_id)
-);";
-
-$SQL[] = "CREATE TABLE api_users (
-  api_user_id		INT(4) unsigned NOT NULL auto_increment,
-  api_user_key		CHAR(32) NOT NULL,
-  api_user_name		VARCHAR(32) NOT NULL,
-  api_user_perms 	TEXT NOT NULL,
-  api_user_ip 		VARCHAR(16) NOT NULL,
-  PRIMARY KEY  (api_user_id)
-);";
-
-$SQL[] = "ALTER TABLE skin_sets ADD set_protected TINYINT( 1 ) NOT NULL DEFAULT '0';";
+<?php
+/*
+--------------------------------------------------------------------------
+|   IP.Board v3.3.4
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
+---------------------------------------------------------------------------
+*/
+
+
+$SQL[] = "delete from conf_settings where conf_key='csite_search_show';";
+$SQL[] = "delete from conf_settings where conf_key='csite_skinchange_show';";
+
+$SQL[] = "ALTER TABLE forums CHANGE last_poster_name last_poster_name VARCHAR( 255 ) NULL DEFAULT NULL;";
+
+$SQL[] = "ALTER TABLE announcements ADD announce_nlbr_enabled TINYINT( 1 ) NOT NULL DEFAULT '0';";
+$SQL[] = "ALTER TABLE subscription_trans CHANGE subtrans_start_date subtrans_start_date VARCHAR( 13 ) NOT NULL DEFAULT '0', CHANGE subtrans_end_date subtrans_end_date VARCHAR( 13 ) NOT NULL DEFAULT '0';";
+
+$SQL[] = "CREATE TABLE api_log (
+  api_log_id 		int(10) unsigned NOT NULL auto_increment,
+  api_log_key 		VARCHAR(32) NOT NULL,
+  api_log_ip 		VARCHAR(16) NOT NULL,
+  api_log_date 		INT(10) NOT NULL,
+  api_log_query 	TEXT NOT NULL,
+  api_log_allowed 	TINYINT(1) unsigned NOT NULL,
+  PRIMARY KEY  (api_log_id)
+);";
+
+$SQL[] = "CREATE TABLE api_users (
+  api_user_id		INT(4) unsigned NOT NULL auto_increment,
+  api_user_key		CHAR(32) NOT NULL,
+  api_user_name		VARCHAR(32) NOT NULL,
+  api_user_perms 	TEXT NOT NULL,
+  api_user_ip 		VARCHAR(16) NOT NULL,
+  PRIMARY KEY  (api_user_id)
+);";
+
+$SQL[] = "ALTER TABLE skin_sets ADD set_protected TINYINT( 1 ) NOT NULL DEFAULT '0';";
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -645,23 +645,19 @@ $SQL[] = "CREATE TABLE core_sys_module (
  sys_module_key varchar(32) NOT NULL default '',
  sys_module_description varchar(100) NOT NULL default '',
  sys_module_version varchar(10) NOT NULL default '',
-  sys_module_parent varchar(32) NOT NULL default '',
  sys_module_protected tinyint(1) unsigned NOT NULL default '0',
  sys_module_visible tinyint(1) unsigned NOT NULL default '1',
-  sys_module_tables varchar(255) NOT NULL default '',
-  sys_module_hooks varchar(255) NOT NULL default '',
  sys_module_position int(5) NOT NULL default '0',
  sys_module_admin int(1) NOT NULL default '0',
  PRIMARY KEY  (sys_module_id),
  KEY sys_module_application (sys_module_application),
  KEY sys_module_visible (sys_module_visible),
-  KEY sys_module_key (sys_module_key),
-  KEY sys_module_parent (sys_module_parent)
+  KEY sys_module_key (sys_module_key)
 );";

 $SQL[] = "CREATE TABLE core_sys_lang (
  lang_id mediumint(4) unsigned NOT NULL auto_increment,
-  lang_short varchar(25) NOT NULL default '',
+  lang_short varchar(10) NOT NULL default '',
  lang_title varchar(60) NOT NULL default '',
  lang_currency_name varchar(4) NOT NULL default '',
  lang_currency_symbol char(2) NOT NULL default '',
@@ -1,20 +1,21 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */


 # ALTER MEMBER TABLES
+$SQL[] = "DELETE FROM members WHERE id=0;"; // http://community.invisionpower.com/tracker/issue-34479-upgrade-fails-if-there-is-a-member-id-0
 $SQL[] = "ALTER TABLE members CHANGE id member_id MEDIUMINT(8) NOT NULL auto_increment;";
 $SQL[] = "ALTER TABLE members CHANGE mgroup member_group_id smallint(3) NOT NULL default '0';";
 $SQL[] = "ALTER TABLE members ADD members_pass_hash varchar(32) NOT NULL default '', ADD members_pass_salt varchar(5) NOT NULL default '';";
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,22 +1,22 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */


 # INSERTS AND UPDATES
 $SQL[] = <<<EOF
-INSERT INTO core_sys_lang VALUES(1, 'ru_RU.UTF-8', 'Русский (RU)', 'USD', '$', '.', ',', 1, 0);
+INSERT INTO core_sys_lang VALUES (1, 'en_US', 'English (USA)', 'USD', '$', '.', ',', 1, 0);
 EOF;

 $SQL[] = <<<EOF
@@ -24,27 +24,27 @@ INSERT INTO cache_store ( cs_key , cs_value , cs_extra , cs_array , cs_updated )
 EOF;

 $SQL[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Пример плагина', 'Плагин, не требующий написания кода, но требующий настройки.', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'default', ',3,4,6,', ',4,6,', 'a:5:{s:14:"required_input";a:1:{s:8:"video_id";s:13:"[^A-Za-z0-9_]";}s:10:"string_url";s:41:"http://www.youtube.com/watch?v={video_id}";s:12:"string_title";s:25:"#PAGE_TITLE# ({video_id})";s:13:"section_title";s:7:"YouTube";s:11:"section_url";s:22:"http://www.youtube.com";}', 1);
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Simple Plugin Example', 'Plugin that does not require any programming, but does need to be configured.', 'Invision Power Services, Inc', 'http://invisionpower.com', 'v1.0', 'default', ',1,2,3,4,6,', ',4,6,', 'a:5:{s:14:"required_input";a:1:{s:8:"video_id";s:13:"[^A-Za-z0-9_]";}s:10:"string_url";s:41:"http://www.youtube.com/watch?v={video_id}";s:12:"string_title";s:25:"#PAGE_TITLE# ({video_id})";s:13:"section_title";s:7:"YouTube";s:11:"section_url";s:22:"http://www.youtube.com";}', 1);
 EOF;
 $SQL[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Плагин форума', 'Плагин жалоб на сообщения и темы в форумах.', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'post', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:15:"report_supermod";i:1;}', 1);
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Forum Plugin', 'This is the plugin used for reporting posts on the forum.', 'Invision Power Services, Inc', 'http://invisionpower.com', 'v1.0', 'post', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:15:"report_supermod";i:1;}', 1);
 EOF;
 $SQL[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Плагин личных сообщений', 'Плагин жалоб на личные сообщения', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'messages', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:18:"plugi_messages_add";s:5:"4";}', 1);
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Private Messages Plugin', 'This plugin allows private messages to be reported', 'Invision Power Services, Inc', 'http://invisionpower.com', 'v1.0', 'messages', ',1,2,3,4,6,', ',4,6,', 'a:1:{s:18:"plugi_messages_add";s:5:"4,6,8";}', 1);
 EOF;
 $SQL[] = <<<EOF
-INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Плагин пользовательских профилей', 'Плагин жалоб на профили пользователей', 'Invision Power Services, Inc', 'http://www.invisionpower.com', 'v1.0', 'profiles', ',1,2,3,4,6,', ',4,6,', 'N;', 1);
+INSERT INTO rc_classes (onoff, class_title, class_desc, author, author_url, pversion, my_class, group_can_report, mod_group_perm, extra_data, lockd) VALUES(1, 'Member Profiles', 'Allows you to report member profiles', 'Invision Power Services, Inc', 'http://invisionpower.com', 'v1.0', 'profiles', ',1,2,3,4,6,', ',4,6,', 'N;', 1);
 EOF;


 $SQL[] = <<<EOF
-INSERT INTO rc_status VALUES (1, 'Новая', 1, 5, 1, 0, 1, 1);
+INSERT INTO rc_status VALUES (1, 'New Report', 1, 5, 1, 0, 1, 1);
 EOF;
 $SQL[] = <<<EOF
-INSERT INTO rc_status VALUES (2, 'Рассматривается', 1, 5, 0, 0, 1, 2);
+INSERT INTO rc_status VALUES (2, 'Under Review', 1, 5, 0, 0, 1, 2);
 EOF;
 $SQL[] = <<<EOF
-INSERT INTO rc_status VALUES (3, 'Завершена', 0, 0, 0, 1, 0, 3);
+INSERT INTO rc_status VALUES (3, 'Complete', 0, 0, 0, 1, 0, 3);
 EOF;

 $SQL[] = <<<EOF
@@ -64,20 +64,20 @@ EOF;

 $SQL[] = <<<EOF
 INSERT INTO pfields_groups (pf_group_id, pf_group_name, pf_group_key) VALUES
-(1, 'Контакты', 'contact'),
-(2, 'Информация', 'profile_info'),
-(3, 'Старые поля', 'previous' );
+(1, 'Contact Methods', 'contact'),
+(2, 'Profile Information', 'profile_info'),
+(3, 'Previous Fields', 'previous' );
 EOF;

 $SQL[] = <<<EOF
 INSERT INTO pfields_data (pf_id, pf_title, pf_desc, pf_content, pf_type, pf_not_null, pf_member_hide, pf_max_input, pf_member_edit, pf_position, pf_show_on_reg, pf_input_format, pf_admin_only, pf_topic_format, pf_group_id, pf_icon, pf_key) VALUES
 (NULL, 'AIM', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_aim.gif', 'aim'),
 (NULL, 'MSN', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_msn.gif', 'msn'),
-(NULL, 'Сайт', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_website.gif', 'website'),
+(NULL, 'Website URL', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_website.gif', 'website'),
 (NULL, 'ICQ', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_icq.gif', 'icq'),
-(NULL, 'Пол', '', 'm=Мужчина|f=Женщина|u=Не определился', 'drop', 0, 0, 0, 1, 0, 0, '', 0, '<dt>{title}:</dt><dd>{content}</dd>', 2, '', 'gender'),
-(NULL, 'Город', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '<dt>{title}:</dt><dd>{content}</dd>', 2, '', 'location'),
-(NULL, 'Интересы', '', '', 'textarea', 0, 0, 0, 1, 0, 0, '', 0, '<dt>{title}:</dt><dd>{content}</dd>', 2, '', 'interests'),
+(NULL, 'Gender', '', 'm=Male|f=Female|u=Not Telling', 'drop', 0, 0, 0, 1, 0, 0, '', 0, '<dt>{title}:</dt><dd>{content}</dd>', 2, '', 'gender'),
+(NULL, 'Location', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '<dt>{title}:</dt><dd>{content}</dd>', 2, '', 'location'),
+(NULL, 'Interests', '', '', 'textarea', 0, 0, 0, 1, 0, 0, '', 0, '<dt>{title}:</dt><dd>{content}</dd>', 2, '', 'interests'),
 (NULL, 'Yahoo', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_yahoo.gif', 'yahoo'),
 (NULL, 'Jabber', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_jabber.gif', 'jabber'),
 (NULL, 'Skype', '', '', 'input', 0, 0, 0, 1, 0, 0, '', 0, '', 1, 'style_extra/cprofile_icons/profile_skype.gif', 'skype');
@@ -100,10 +100,10 @@ $SQL[] = "TRUNCATE TABLE task_manager;";
 $SQL[] = "DELETE FROM cache_store WHERE cs_key='skin_id_cache';";
 $SQL[] = "DELETE FROM cache_store WHERE cs_key='forum_cache';";

-$SQL[] = "INSERT INTO reputation_levels VALUES(1, -20, 'Очень плохой', '');";
-$SQL[] = "INSERT INTO reputation_levels VALUES(2, -10, 'Плохой', '');";
-$SQL[] = "INSERT INTO reputation_levels VALUES(3, 0, 'Обычный', '');";
-$SQL[] = "INSERT INTO reputation_levels VALUES(4, 10, 'Хороший', '');";
-$SQL[] = "INSERT INTO reputation_levels VALUES(5, 20, 'Очень хороший', '');";
+$SQL[] = "INSERT INTO reputation_levels VALUES(1, -20, 'Bad', '');";
+$SQL[] = "INSERT INTO reputation_levels VALUES(2, -10, 'Poor', '');";
+$SQL[] = "INSERT INTO reputation_levels VALUES(3, 0, 'Neutral', '');";
+$SQL[] = "INSERT INTO reputation_levels VALUES(4, 10, 'Good', '');";
+$SQL[] = "INSERT INTO reputation_levels VALUES(5, 20, 'Excellent', '');";

 ?>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,160 +1,161 @@
-<?php
-
-/**
- * <pre>
- * Invision Power Services
- * IP.Board v3.2.3
- * Upgrade Class
- *
- * Class to add options and notices for IP.Board upgrade
- * Last Updated: $Date: 2011-05-24 15:40:20 -0400 (Tue, 24 May 2011) $
- * </pre>
- * 
- * @author		Matt Mecham
- * @version		$Rev: 8884 $
- * @since		3.0
- * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		This is NULLED!
- * @link		http://hatynka.in
- * @package		IP.Board
- */ 
-
-class version_class_core_30001
-{
-	/**
-	 * Constructor
-	 *
-	 * @param	object		$registry		Registry object
-	 * @return	@e void
-	 */
-	public function __construct( ipsRegistry $registry ) 
-	{
-		/* Make object */
-		$this->registry =  $registry;
-		$this->DB       =  $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->cache    =  $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-	}
-	
-	/**
-	 * Add pre-upgrade options: Form
-	 * 
-	 * @return	string	 HTML block
-	 */
-	public function preInstallOptionsForm()
-	{
-return <<<EOF
-	<ul>
-		<li>
-			<input type='checkbox' name='exportSkins' value='1' />
-			Экспортировать текущие шаблоны и CSS? (Будут сохранены в директории /cache/previousSkinFiles)
-		</li>
-		<li>
-			<input type='checkbox' name='exportLangs' value='1' />
-			Скопировать старые директории языков в /cache/previousLangFiles ?
-		</li>
-		<li>
-			<input type='checkbox' name='skipPms' value='1' />
-			<strong>Пропустить</strong> конвертацию личных сообщений? Старые сообщения будут оставлены, вы в любой момент сможете сконвертировать ЛС при помощи shell или утилиты в админцентре.
-		</li>
-		<li>
-			<input type='checkbox' name='rootAdmins' value='1' />
-			<strong>Снять все ограничения администраторов?</strong> В систему распеределния прав в IP.Board 3 внесены изменения, поэтому больше нет необходимости разделять администраторов и главных администраторов на разные группы.
-			Если отметить эту опцию при обновлении все администраторы из второстепенных групп потеряют доступ к АЦ, после обновления вы сможете снова выставить им возможность доступа. Если опцию не отметить - все пользователи из второстепенных групп администраторов получат ПОЛНЫЙ доступ к админцентру.
-		</li>
-	</ul>
-EOF;
-		
-	}
-	
-	/**
-	 * Add pre-upgrade options: Save
-	 *
-	 * Data will be saved in saved data array as: appOptions[ app ][ versionLong ] = ( key => value );
-	 * 
-	 * @return	array	 Key / value pairs to save
-	 */
-	public function preInstallOptionsSave()
-	{
-		/* Return */
-		return array( 'exportSkins' => intval( $_REQUEST['exportSkins'] ),
-					  'exportLangs' => intval( $_REQUEST['exportLangs'] ),
-					  'skipPms'     => intval( $_REQUEST['skipPms'] )
-					);
-		
-	}
-	
-	/**
-	 * Return any post-installation notices
-	 * 
-	 * @return	array	 Array of notices
-	 */
-	public function postInstallNotices()
-	{
-		$options    = IPSSetUp::getSavedData('custom_options');
-		$_doSkin    = $options['core'][30001]['exportSkins'];
-		$_doLang    = $options['core'][30001]['exportLangs'];
-		$rootAdmins = $options['core'][30001]['rootAdmins'];
-		$skipPms    = $options['core'][30001]['skipPms'];
-		
-		$notices   = array();
-		
-		if ( $_doSkin )
-		{
-			$notices[] = "Все старые стили сохранены в 'cache/previousSkinFiles'";
-		}
-		
-		if ( $_doLang )
-		{
-			$notices[] = "Все старые языки сохранены в 'cache/previousLangFiles'";
-		}
-		
-		if ( $skipPms )
-		{
-			$notices[] = "Конвертация личных сообщений пропущена.";
-		}
-		
-		/* Notice about post content */
-		$notices[] = "Теперь вам необходимо обновить содержимое всех сообщений через админцентр (Система &gt; Пересчет и обновление). <br />";
-		
-		/* Notice about admin restrictions */
-		$notices[] = "Права администраторов.";
-		
-		/* Notice about admin restrictions */
-		if ( $rootAdmins )
-		{
-			$notices[] = "Были сброшены все ограничения для доступа в админцентр Вы можете восстановить их через АЦ.<br />";
-		}
-		else
-		{
-			$notices[] = "Все администраторы получили полный доступ к админцентру. Вы можете ограничить их доступ через АЦ.<br />";
-		}
-			
-		/* Notice about custom time settings */
-		$notices[] = "Формат показа времени изменен в настройках.<br />";
-		
-		/* Notice about FURLs */
-		$notices[] = "Для использования Friendly URLs (ЧПУ), добавьте в ваш conf_global.php строчку: \$INFO['use_friendly_urls'] = '1';.";
-		
-		return $notices;
-	}
-	
-	
-	/**
-	 * Return any pre-installation notices
-	 * 
-	 * @return	array	 Array of notices
-	 */
-	public function preInstallNotices()
-	{
-		$notices = array();
-		
-		$notices[] = "Skins made for prior versions will not be compatible with this version. The default skin will be restored.";
-		
-		return $notices;
-		
-	}
-}
-	
+<?php
+
+/**
+ * <pre>
+ * Invision Power Services
+ * IP.Board v3.3.4
+ * Upgrade Class
+ *
+ * Class to add options and notices for IP.Board upgrade
+ * Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
+ * </pre>
+ * 
+ * @author		Matt Mecham <matt@invisionpower.com>
+ * @version		$Rev: 10914 $
+ * @since		3.0
+ * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/company/standards.php#license
+ * @link		http://www.invisionpower.com
+ * @package		IP.Board
+ */ 
+
+class version_class_core_30001
+{
+	/**
+	 * Constructor
+	 *
+	 * @param	object		$registry		Registry object
+	 * @return	@e void
+	 */
+	public function __construct( ipsRegistry $registry ) 
+	{
+		/* Make object */
+		$this->registry =  $registry;
+		$this->DB       =  $this->registry->DB();
+		$this->settings =& $this->registry->fetchSettings();
+		$this->request  =& $this->registry->fetchRequest();
+		$this->cache    =  $this->registry->cache();
+		$this->caches   =& $this->registry->cache()->fetchCaches();
+	}
+	
+	/**
+	 * Add pre-upgrade options: Form
+	 * 
+	 * @return	string	 HTML block
+	 */
+	public function preInstallOptionsForm()
+	{
+return <<<EOF
+	<ul>
+		<li>
+			<input type='checkbox' name='exportSkins' value='1' />
+			Export current skin's modified template bits and CSS? (This will be saved in /cache/previousSkinFiles)
+		</li>
+		<li>
+			<input type='checkbox' name='exportLangs' value='1' />
+			Copy language PHP files into /cache/previousLangFiles before upgrading?
+		</li>
+		<li>
+			<input type='checkbox' name='skipPms' value='1' />
+			<strong>Skip</strong> PM Conversion? If so, old tables will not be removed and you can use the provided shell tool post-upgrade
+		</li>
+		<li>
+			<input type='checkbox' name='rootAdmins' value='1' />
+			<strong>Remove all "non-root" admin ACP permissions?</strong> Due to the change in permission models, root admins and admins have the same default permissions.
+			You have the option to restrict all non-root admins and then manually set up their permissions after the upgrade. Not ticking this box will effectively give all
+			administrators full access regardless of administrator type.
+		</li>
+	</ul>
+EOF;
+		
+	}
+	
+	/**
+	 * Add pre-upgrade options: Save
+	 *
+	 * Data will be saved in saved data array as: appOptions[ app ][ versionLong ] = ( key => value );
+	 * 
+	 * @return	array	 Key / value pairs to save
+	 */
+	public function preInstallOptionsSave()
+	{
+		/* Return */
+		return array( 'exportSkins' => intval( $_REQUEST['exportSkins'] ),
+					  'exportLangs' => intval( $_REQUEST['exportLangs'] ),
+					  'skipPms'     => intval( $_REQUEST['skipPms'] )
+					);
+		
+	}
+	
+	/**
+	 * Return any post-installation notices
+	 * 
+	 * @return	array	 Array of notices
+	 */
+	public function postInstallNotices()
+	{
+		$options    = IPSSetUp::getSavedData('custom_options');
+		$_doSkin    = $options['core'][30001]['exportSkins'];
+		$_doLang    = $options['core'][30001]['exportLangs'];
+		$rootAdmins = $options['core'][30001]['rootAdmins'];
+		$skipPms    = $options['core'][30001]['skipPms'];
+		
+		$notices   = array();
+		
+		if ( $_doSkin )
+		{
+			$notices[] = "All previous skins have been exported into 'cache/previousSkinFiles'";
+		}
+		
+		if ( $_doLang )
+		{
+			$notices[] = "All previous language files have been exported into 'cache/previousLangFiles'";
+		}
+		
+		if ( $skipPms )
+		{
+			$notices[] = "PM Conversion was skipped. If you want to convert PMs, please use the provided shell tool found in your 'tools' directory of the download";
+		}
+		
+		/* Notice about post content */
+		$notices[] = "You should now log into your Admin CP and rebuild post content (System &gt; Recount &amp; Rebuild)";
+		
+		/* Notice about admin restrictions */
+		$notices[] = "Due to the change in permission systems, any admins that had restrictions have been updated to have no access to any module until you edit them.";
+		
+		/* Notice about admin restrictions */
+		if ( $rootAdmins )
+		{
+			$notices[] = "Due to the change in permission systems, 'Root Admins' and 'Administrators' both have full access to the ACP including SQL toolbox, etc. You chose to remove all ACP permissions on upgrade. You can restore selective permissions via the ACP.";
+		}
+		else
+		{
+			$notices[] = "Due to the change in permission systems, 'Root Admins' and 'Administrators' both have full access to the ACP including SQL toolbox, etc. You can restrict individual admins using the ACP permission system.";
+		}
+			
+		/* Notice about custom time settings */
+		$notices[] = "Due to the change in how times are shown, all custom time/clock formats have been reset.";
+		
+		/* Notice about FURLs */
+		$notices[] = "If you wish to use Friendly URLs, you will need to edit your conf_global.php file and add: \$INFO['use_friendly_urls'] = '1';. Once this is done run also the tool in \"ACP -> System TAB -> Recount &amp; Rebuild -> Resynchronize Forums\".";
+		
+		return $notices;
+	}
+	
+	
+	/**
+	 * Return any pre-installation notices
+	 * 
+	 * @return	array	 Array of notices
+	 */
+	public function preInstallNotices()
+	{
+		$notices = array();
+		
+		$notices[] = "Skins made for prior versions will not be compatible with this version. The default skin will be restored.";
+		
+		return $notices;
+		
+	}
+}
+	
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -33,6 +33,6 @@ $SQL[] = "ALTER TABLE groups ADD g_pm_flood_mins INT(5) UNSIGNED NOT NULL defaul

 $SQL[] = "ALTER TABLE message_topics ADD INDEX mt_date (mt_date); ";
 $SQL[] = "ALTER TABLE faq ADD app VARCHAR(32) NOT NULL default 'core';";
-$SQL[] = "ALTER TABLE core_sys_lang CHANGE lang_short lang_short VARCHAR( 25 ) NOT NULL;";
+$SQL[] = "ALTER TABLE core_sys_lang CHANGE lang_short lang_short VARCHAR( 18 ) NOT NULL;";

 ?>
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,84 +1,84 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   IP.Board v3.2.3
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2004 Invision Power Services
-|   http://hatynka.in
-|   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
-+---------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_IPB' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
-	exit();
-}
-
-class version_upgrade
-{
-	/**
-	 * Custom HTML to show
-	 *
-	 * @var		string
-	 */
-	protected $_output = '';
-	
-	/**
-	 * fetchs output
-	 * 
-	 * @return	string
-	 */
-	public function fetchOutput()
-	{
-		return $this->_output;
-	}
-	
-	/**
-	 * Execute selected method
-	 *
-	 * @param	object		Registry object
-	 * @return	@e void
-	 */
-	public function doExecute( ipsRegistry $registry ) 
-	{
-		/* Make object */
-		$this->registry =  $registry;
-		$this->DB       =  $this->registry->DB();
-		$this->settings =& $this->registry->fetchSettings();
-		$this->request  =& $this->registry->fetchRequest();
-		$this->cache    =  $this->registry->cache();
-		$this->caches   =& $this->registry->cache()->fetchCaches();
-		
-		
-		/* Now make add a key */
-		$this->DB->build( array( 'select' => '*',
-								 'from'   => 'pfields_data' ) );
-		
-		$o = $this->DB->execute();
-		
-		while( $row = $this->DB->fetch( $o ) )
-		{
-			/* Attempt conversion of dd / dt microformats */
-			if ( stristr( $row['pf_topic_format'], '<dt>' ) OR stristr( $row['pf_topic_format'], '<dd>' ) )
-			{
-				$row['pf_topic_format'] = str_replace( '<dt>', "<span class='ft'>", $row['pf_topic_format'] );
-				$row['pf_topic_format'] = str_replace( '<dd>', "<span class='fc'>", $row['pf_topic_format'] );
-				$row['pf_topic_format'] = str_replace( array( '</dt>', '</dd>' ), "</span>", $row['pf_topic_format'] );
-				
-				$this->DB->update( 'pfields_data', array( 'pf_topic_format' => $row['pf_topic_format'] ), 'pf_id=' . $row['pf_id'] );
-			}
-		}
-		
-		$this->registry->output->addMessage( "Обновление пользовательских полей профиля");
-		
-		return true;
-	}
-}
-	
+<?php
+
+/*
+--------------------------------------------------------------------------
+|   IP.Board v3.3.4
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
+---------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	/**
+	 * Custom HTML to show
+	 *
+	 * @var		string
+	 */
+	protected $_output = '';
+	
+	/**
+	 * fetchs output
+	 * 
+	 * @return	string
+	 */
+	public function fetchOutput()
+	{
+		return $this->_output;
+	}
+	
+	/**
+	 * Execute selected method
+	 *
+	 * @param	object		Registry object
+	 * @return	@e void
+	 */
+	public function doExecute( ipsRegistry $registry ) 
+	{
+		/* Make object */
+		$this->registry =  $registry;
+		$this->DB       =  $this->registry->DB();
+		$this->settings =& $this->registry->fetchSettings();
+		$this->request  =& $this->registry->fetchRequest();
+		$this->cache    =  $this->registry->cache();
+		$this->caches   =& $this->registry->cache()->fetchCaches();
+		
+		
+		/* Now make add a key */
+		$this->DB->build( array( 'select' => '*',
+								 'from'   => 'pfields_data' ) );
+		
+		$o = $this->DB->execute();
+		
+		while( $row = $this->DB->fetch( $o ) )
+		{
+			/* Attempt conversion of dd / dt microformats */
+			if ( stristr( $row['pf_topic_format'], '<dt>' ) OR stristr( $row['pf_topic_format'], '<dd>' ) )
+			{
+				$row['pf_topic_format'] = str_replace( '<dt>', "<span class='ft'>", $row['pf_topic_format'] );
+				$row['pf_topic_format'] = str_replace( '<dd>', "<span class='fc'>", $row['pf_topic_format'] );
+				$row['pf_topic_format'] = str_replace( array( '</dt>', '</dd>' ), "</span>", $row['pf_topic_format'] );
+				
+				$this->DB->update( 'pfields_data', array( 'pf_topic_format' => $row['pf_topic_format'] ), 'pf_id=' . $row['pf_id'] );
+			}
+		}
+		
+		$this->registry->output->addMessage( "Updated custom profile fields");
+		
+		return true;
+	}
+}
+	
 ?>
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -27,6 +27,14 @@ if ( ! ipsRegistry::DB()->checkForField( 'app_hide_tab', 'core_applications' ) )
 	$SQL[] = "ALTER TABLE core_applications ADD app_hide_tab TINYINT(1) NOT NULL DEFAULT '0';";
 }

+if( ! ipsRegistry::DB()->checkForField( 'app_tab_groups', 'core_applications' ) )
+{
+	$SQL[] = "ALTER TABLE core_applications ADD app_website VARCHAR(255) NULL DEFAULT NULL,
+		ADD app_update_check VARCHAR(255) NULL DEFAULT NULL,
+		ADD app_global_caches VARCHAR(255) NULL DEFAULT NULL,
+		ADD app_tab_groups TEXT NULL DEFAULT NULL AFTER app_hide_tab;";
+}
+
 # Bug 17345 Removes unrequired task files
 $SQL[] = "DELETE FROM task_manager WHERE task_key IN ('doexpiresubs', 'expiresubs') AND task_application != 'subscriptions';";

@@ -40,4 +48,3 @@ $SQL[] = "CREATE TABLE spam_service_log (
  PRIMARY KEY  (id)
 );";

-?>
@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */

@@ -1,10 +1,10 @@
-<html>
-<head><title>IP.Board - Bulletin Board System</title></head>
-<body>
-<h1>403: IP.Board -&gt; Forbidden</h1>
-<hr>
-You have reached this page in error, please use your back button to return to the forum.
-<hr>
-<a href="http://www.invisionpower.com">IP.Board</a>
-</body>
+<html>
+<head><title>IP.Board - Bulletin Board System</title></head>
+<body>
+<h1>403: IP.Board -&gt; Forbidden</h1>
+<hr>
+You have reached this page in error, please use your back button to return to the forum.
+<hr>
+<a href="http://www.invisionpower.com">IP.Board</a>
+</body>
 </html>
@@ -1,15 +1,15 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   IP.Board v3.2.3
+|   IP.Board v3.3.4
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001 - 2009 Invision Power Services
-|   http://hatynka.in
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://hatynka.in
-|   Email: info@hatynka.in
-|   Licence Info: This is NULLED!
+|   Web: http://www.invisionboard.com
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 */