From f3faa89ccb01b34f5fa77d2e57773eaadcaf930c Mon Sep 17 00:00:00 2001
From: Gigik <gigi@mybboard.pl>
Date: Tue, 15 Mar 2016 21:04:04 +0100
Subject: [PATCH] Aktualizacja PPM do wersji 1.8.7

---
 Upload/admin/inc/class_form.php               |   11 +-
 Upload/admin/inc/class_page.php               |   26 +-
 Upload/admin/inc/functions.php                |    2 +-
 Upload/admin/index.php                        |   10 +-
 Upload/admin/modules/config/settings.php      |   83 +-
 Upload/admin/modules/forum/management.php     |    3 +-
 Upload/admin/modules/style/themes.php         |   23 +-
 Upload/admin/modules/tools/adminlog.php       |    3 +-
 Upload/admin/modules/tools/backupdb.php       |    8 +-
 Upload/admin/modules/tools/modlog.php         |    3 +-
 .../admin/modules/tools/recount_rebuild.php   |    8 +-
 Upload/admin/modules/tools/spamlog.php        |    3 +-
 Upload/admin/modules/tools/system_health.php  |   16 +-
 .../admin/modules/user/admin_permissions.php  |  173 +--
 Upload/admin/modules/user/banning.php         |    5 +-
 Upload/admin/modules/user/groups.php          |    3 +-
 Upload/admin/modules/user/users.php           | 1026 ++++++++---------
 Upload/admin/styles/default/login.css         |  380 +++---
 Upload/admin/styles/default/style.php         |  164 +--
 Upload/archive/index.php                      |   15 +-
 Upload/calendar.php                           |   34 +-
 Upload/contact.php                            |    2 +-
 Upload/editpost.php                           |    2 +-
 Upload/forumdisplay.php                       |    9 +-
 Upload/global.php                             |    2 +-
 Upload/inc/3rdparty/ayah/ayah.php             |  482 --------
 Upload/inc/3rdparty/ayah/index.html           |    8 -
 Upload/inc/3rdparty/diff/Diff/Op/index.html   |   14 +-
 .../3rdparty/diff/Diff/ThreeWay/Op/index.html |   14 +-
 .../3rdparty/diff/Diff/ThreeWay/index.html    |   14 +-
 Upload/inc/cachehandlers/apc.php              |   10 +-
 Upload/inc/cachehandlers/disk.php             |   17 +-
 Upload/inc/cachehandlers/eaccelerator.php     |   10 +-
 Upload/inc/cachehandlers/interface.php        |   61 +
 Upload/inc/cachehandlers/memcache.php         |   10 +-
 Upload/inc/cachehandlers/memcached.php        |   12 +-
 Upload/inc/cachehandlers/xcache.php           |   10 +-
 Upload/inc/class_captcha.php                  |   73 +-
 Upload/inc/class_core.php                     |    4 +-
 Upload/inc/class_custommoderation.php         |    4 +-
 Upload/inc/class_datacache.php                |   47 +-
 Upload/inc/class_error.php                    |    2 +-
 Upload/inc/class_language.php                 |    2 +-
 Upload/inc/class_mailhandler.php              |   14 +
 Upload/inc/class_moderation.php               |    6 +-
 Upload/inc/class_parser.php                   |  111 +-
 Upload/inc/class_session.php                  |    6 +-
 Upload/inc/datahandlers/post.php              |   26 +-
 Upload/inc/datahandlers/user.php              |   41 +-
 Upload/inc/datahandlers/warnings.php          |    7 +-
 Upload/inc/db_mysql.php                       |   48 +-
 Upload/inc/db_mysqli.php                      |   50 +-
 Upload/inc/functions.php                      |  353 +++---
 Upload/inc/functions_forumlist.php            |    4 +-
 Upload/inc/functions_post.php                 |   40 +-
 Upload/inc/functions_search.php               |   16 +-
 Upload/inc/functions_task.php                 |   13 +
 Upload/inc/functions_upload.php               |    6 +
 Upload/inc/functions_user.php                 |    4 +-
 Upload/inc/functions_warnings.php             |    8 +-
 Upload/inc/languages/polish.php               |    2 +-
 .../polish/admin/config_settings.lang.php     |    2 +
 .../languages/polish/admin/global.lang.php    |    2 +
 .../polish/admin/user_banning.lang.php        |    1 -
 Upload/inc/languages/polish/archive.lang.php  |    3 +-
 .../languages/polish/forumdisplay.lang.php    |    1 +
 Upload/inc/languages/polish/global.lang.php   |    3 +-
 .../inc/languages/polish/managegroup.lang.php |    3 +-
 Upload/inc/languages/polish/member.lang.php   |    1 -
 .../inc/languages/polish/memberlist.lang.php  |    1 -
 Upload/inc/languages/polish/messages.lang.php |   11 +-
 Upload/inc/languages/polish/misc.lang.php     |    9 +-
 Upload/inc/languages/polish/modcp.lang.php    |    1 -
 .../inc/languages/polish/newthread.lang.php   |    1 +
 Upload/inc/languages/polish/private.lang.php  |    2 -
 Upload/inc/languages/polish/search.lang.php   |    1 -
 Upload/inc/languages/polish/usercp.lang.php   |    1 -
 Upload/inc/mailhandlers/php.php               |   13 +
 Upload/inc/mailhandlers/smtp.php              |   14 -
 Upload/inc/tasks/dailycleanup.php             |    2 +-
 Upload/install/index.php                      |   49 +-
 Upload/install/resources/mybb_theme.xml       |  215 ++--
 Upload/install/resources/mysql_db_tables.php  |   93 +-
 Upload/install/resources/output.php           |    2 +-
 Upload/install/resources/pgsql_db_tables.php  |   11 +-
 Upload/install/resources/settings.xml         |   39 +-
 Upload/install/resources/sqlite_db_tables.php |  173 ++-
 Upload/install/resources/tasks.xml            |    4 +-
 Upload/install/resources/upgrade13.php        |    2 +-
 Upload/install/resources/upgrade26.php        |    9 +-
 Upload/install/resources/upgrade35.php        |  188 +++
 Upload/jscripts/general.js                    |   21 +
 Upload/jscripts/inline_moderation.js          |   10 +-
 Upload/jscripts/jeditable/jeditable.min.js    |   74 +-
 .../editor_themes/emoticons/credits.txt       |   16 +-
 Upload/jscripts/select2/select2.css           |    6 +-
 Upload/managegroup.php                        |   13 +-
 Upload/member.php                             |   19 +-
 Upload/misc.php                               |   30 +-
 Upload/modcp.php                              |   89 +-
 Upload/newreply.php                           |   65 +-
 Upload/newthread.php                          |   25 +-
 Upload/polls.php                              |   25 +-
 Upload/printthread.php                        |   23 +-
 Upload/private.php                            |    7 -
 Upload/ratethread.php                         |    9 +-
 Upload/reputation.php                         |    4 +-
 Upload/search.php                             |   92 +-
 Upload/sendthread.php                         |    2 +-
 Upload/showthread.php                         |    2 +-
 Upload/usercp.php                             |   24 +-
 Upload/usercp2.php                            |   27 +-
 Upload/warnings.php                           |   13 +-
 Upload/xmlhttp.php                            |    5 +-
 114 files changed, 2547 insertions(+), 2474 deletions(-)
 delete mode 100644 Upload/inc/3rdparty/ayah/ayah.php
 delete mode 100644 Upload/inc/3rdparty/ayah/index.html
 create mode 100644 Upload/inc/cachehandlers/interface.php
 create mode 100644 Upload/install/resources/upgrade35.php

diff --git a/Upload/admin/inc/class_form.php b/Upload/admin/inc/class_form.php
index 4d33aca..37e7e83 100644
--- a/Upload/admin/inc/class_form.php
+++ b/Upload/admin/inc/class_form.php
@@ -130,7 +130,16 @@ function generate_text_box($name, $value="", $options=array())
 	 */
 	function generate_numeric_field($name, $value=0, $options=array())
 	{
-		$input = "<input type=\"number\" name=\"".$name."\" value=\"".(int)$value."\"";
+		if(is_numeric($value))
+		{
+			$value = (float)$value;
+		}
+		else
+		{
+			$value = '';
+		}
+
+		$input = "<input type=\"number\" name=\"{$name}\" value=\"{$value}\"";
 		if(isset($options['min']))
 		{
 			$input .= " min=\"".$options['min']."\"";
diff --git a/Upload/admin/inc/class_page.php b/Upload/admin/inc/class_page.php
index d6a3971..f3eb024 100644
--- a/Upload/admin/inc/class_page.php
+++ b/Upload/admin/inc/class_page.php
@@ -108,7 +108,7 @@ function output_header($title="")
 
 		echo "	<script type=\"text/javascript\" src=\"../jscripts/jquery.js\"></script>\n";
 		echo "	<script type=\"text/javascript\" src=\"../jscripts/jquery.plugins.min.js\"></script>\n";
-		echo "	<script type=\"text/javascript\" src=\"../jscripts/general.js?ver=1806\"></script>\n";
+		echo "	<script type=\"text/javascript\" src=\"../jscripts/general.js?ver=1807\"></script>\n";
 		echo "	<script type=\"text/javascript\" src=\"./jscripts/admincp.js\"></script>\n";
 		echo "	<script type=\"text/javascript\" src=\"./jscripts/tabs.js\"></script>\n";
 
@@ -390,7 +390,7 @@ function show_login($message="", $class="success")
 <meta name="copyright" content="Copyright {$copy_year} MyBB Group." />
 <link rel="stylesheet" href="./styles/{$cp_style}/login.css" type="text/css" />
 <script type="text/javascript" src="../jscripts/jquery.js"></script>
-<script type="text/javascript" src="../jscripts/general.js?ver=1806"></script>
+<script type="text/javascript" src="../jscripts/general.js?ver=1807"></script>
 <script type="text/javascript" src="./jscripts/admincp.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -522,7 +522,7 @@ function show_2fa()
 <meta name="copyright" content="Copyright {$copy_year} MyBB Group." />
 <link rel="stylesheet" href="./styles/{$cp_style}/login.css" type="text/css" />
 <script type="text/javascript" src="../jscripts/jquery.js"></script>
-<script type="text/javascript" src="../jscripts/general.js?ver=1806"></script>
+<script type="text/javascript" src="../jscripts/general.js?ver=1807"></script>
 <script type="text/javascript" src="./jscripts/admincp.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -767,26 +767,6 @@ function _build_submenu($title, $items)
 		}
 	}
 
-	/**
-	 * Switch between two different alternating background colours.
-	 *
-	 * @return string
-	 */
-	function get_alt_bg()
-	{
-		static $alt_bg;
-		if($alt_bg == "alt1")
-		{
-			$alt_bg = "alt2";
-			return "alt1";
-		}
-		else
-		{
-			$alt_bg = "alt1";
-			return $alt_bg;
-		}
-	}
-
 	/**
 	 * Output a Javascript based tab control on to the page.
 	 *
diff --git a/Upload/admin/inc/functions.php b/Upload/admin/inc/functions.php
index 24bf7a7..295c3e0 100644
--- a/Upload/admin/inc/functions.php
+++ b/Upload/admin/inc/functions.php
@@ -655,7 +655,7 @@ function is_mobile($useragent)
 function check_template($template)
 {
 	// Check to see if our database password is in the template
-	if(preg_match("#database'?\\s*\]\\s*\[\\s*'?password#", $template))
+	if(preg_match('#\$config\[(([\'|"]database[\'|"])|([^\'"].*?))\]\[(([\'|"](database|hostname|password|table_prefix|username)[\'|"])|([^\'"].*?))\]#i', $template)) 
 	{
 		return true;
 	}
diff --git a/Upload/admin/index.php b/Upload/admin/index.php
index 26724c6..6b67577 100644
--- a/Upload/admin/index.php
+++ b/Upload/admin/index.php
@@ -20,6 +20,8 @@
 
 send_page_headers();
 
+header('X-Frame-Options: SAMEORIGIN');
+
 if(!isset($config['admin_dir']) || !file_exists(MYBB_ROOT.$config['admin_dir']."/inc/class_page.php"))
 {
 	$config['admin_dir'] = basename(dirname(__FILE__));
@@ -50,6 +52,7 @@
 
 // Load global language phrases
 $lang->load("global");
+$lang->load("messages", true);
 
 if(function_exists('mb_internal_encoding') && !empty($lang->settings['charset']))
 {
@@ -237,12 +240,12 @@
 
 		$db->delete_query("adminsessions", "uid='{$mybb->user['uid']}'");
 
-		$sid = md5(uniqid(microtime(true), true));
+		$sid = md5(random_str(50));
 
 		$useragent = $_SERVER['HTTP_USER_AGENT'];
-		if(my_strlen($useragent) > 100)
+		if(my_strlen($useragent) > 200)
 		{
-			$useragent = my_substr($useragent, 0, 100);
+			$useragent = my_substr($useragent, 0, 200);
 		}
 
 		// Create a new admin session for this user
@@ -472,6 +475,7 @@
 		$cp_language = $admin_options['cplanguage'];
 		$lang->set_language($cp_language, "admin");
 		$lang->load("global"); // Reload global language vars
+		$lang->load("messages", true);
 	}
 
 	if(!empty($admin_options['cpstyle']) && file_exists(MYBB_ADMIN_DIR."/styles/{$admin_options['cpstyle']}/main.css"))
diff --git a/Upload/admin/modules/config/settings.php b/Upload/admin/modules/config/settings.php
index fb9fbc7..b466477 100644
--- a/Upload/admin/modules/config/settings.php
+++ b/Upload/admin/modules/config/settings.php
@@ -441,7 +441,7 @@
 	echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1804"></script>
 	<script type="text/javascript">
 		$(document).ready(function() {
-			var peeker = new Peeker($("#type"), $("#row_extra"), /select|radio|checkbox|php/, false);
+			new Peeker($("#type"), $("#row_extra"), /^(select|radio|checkbox|php)$/, false);
 		});
 		// Add a star to the extra row since the "extra" is required if the box is shown
 		add_star("row_extra");
@@ -659,7 +659,7 @@
 	echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1804"></script>
 	<script type="text/javascript">
 		$(document).ready(function() {
-			var peeker = new Peeker($("#type"), $("#row_extra"), /select|radio|checkbox|php/, false);
+			new Peeker($("#type"), $("#row_extra"), /^(select|radio|checkbox|php)$/, false);
 		});
 		// Add a star to the extra row since the "extra" is required if the box is shown
 		add_star("row_extra");
@@ -893,6 +893,9 @@
 				'email',
 				'email2',
 				'imagestring',
+				'imagehash',
+				'answer',
+				'question_id',
 				'allownotices',
 				'hideemail',
 				'receivepms',
@@ -905,6 +908,10 @@
 				'language',
 				'step',
 				'action',
+				'agree',
+				'regtime',
+				'regcheck1',
+				'regcheck2',
 				'regsubmit'
 			);
 
@@ -918,20 +925,41 @@
 			}
 		}
 
-		// Get settings which optionscode is a forum/group select
+		// Get settings which optionscode is a forum/group select, checkbox or numeric
 		// We cannot rely on user input to decide this
-		$forum_group_select = array();
-		$query = $db->simple_select('settings', 'name', 'optionscode IN (\'forumselect\', \'groupselect\')');
-		while($name = $db->fetch_field($query, 'name'))
+		$checkbox_settings = $forum_group_select = array();
+		$query = $db->simple_select('settings', 'name, optionscode', "optionscode IN('forumselect', 'groupselect', 'numeric') OR optionscode LIKE 'checkbox%'");
+		
+		while($multisetting = $db->fetch_array($query))
 		{
-			$forum_group_select[] = $name;
+			if(substr($multisetting['optionscode'], 0, 8) == 'checkbox')
+			{
+				$checkbox_settings[] = $multisetting['name'];
+				
+				// All checkboxes deselected = no $mybb->input['upsetting'] for them, we need to initialize it manually then, but only on pages where the setting is shown
+				if(empty($mybb->input['upsetting'][$multisetting['name']]) && isset($mybb->input["isvisible_{$multisetting['name']}"]))
+				{
+					$mybb->input['upsetting'][$multisetting['name']] = array();
+				}
+			}
+			elseif($multisetting['optionscode'] == 'numeric')
+			{
+				if(isset($mybb->input['upsetting'][$multisetting['name']]))
+				{
+					$mybb->input['upsetting'][$multisetting['name']] = (int)$mybb->input['upsetting'][$multisetting['name']];
+				}
+			}
+			else
+			{
+				$forum_group_select[] = $multisetting['name'];
+			}
 		}
 
 		if(is_array($mybb->input['upsetting']))
 		{
 			foreach($mybb->input['upsetting'] as $name => $value)
 			{
-				if(!empty($forum_group_select) && in_array($name, $forum_group_select))
+				if($forum_group_select && in_array($name, $forum_group_select))
 				{
 					if($value == 'all')
 					{
@@ -947,7 +975,7 @@
 							}
 							unset($val);
 
-							$value = implode(',', (array)$mybb->input['select'][$name]);
+							$value = implode(',', $mybb->input['select'][$name]);
 						}
 						else
 						{
@@ -959,9 +987,17 @@
 						$value = '';
 					}
 				}
-
-				$value = $db->escape_string($value);
-				$db->update_query("settings", array('value' => $value), "name='".$db->escape_string($name)."'");
+				elseif($checkbox_settings && in_array($name, $checkbox_settings))
+				{
+					$value = '';
+					
+					if(is_array($mybb->input['upsetting'][$name]))
+					{
+						$value = implode(',', $mybb->input['upsetting'][$name]);
+					}
+				}
+				
+				$db->update_query("settings", array('value' => $db->escape_string($value)), "name='".$db->escape_string($name)."'");
 			}
 		}
 
@@ -1343,7 +1379,14 @@
 			}
 			else
 			{
-				for($i=0; $i < count($type); $i++)
+				$typecount = count($type);
+				
+				if($type[0] == 'checkbox')
+				{
+					$multivalue = explode(',', $setting['value']);
+				}
+				
+				for($i = 0; $i < $typecount; $i++)
 				{
 					$optionsexp = explode("=", $type[$i]);
 					if(!isset($optionsexp[1]))
@@ -1373,16 +1416,17 @@
 					}
 					else if($type[0] == "checkbox")
 					{
-						if($setting['value'] == $optionsexp[0])
+						if(in_array($optionsexp[0], $multivalue))
 						{
-							$option_list[$i] = $form->generate_check_box($element_name, $optionsexp[0], htmlspecialchars_uni($optionsexp[1]), array('id' => $element_id.'_'.$i, "checked" => 1, 'class' => $element_id));
+							$option_list[$i] = $form->generate_check_box("{$element_name}[]", $optionsexp[0], htmlspecialchars_uni($optionsexp[1]), array('id' => $element_id.'_'.$i, "checked" => 1, 'class' => $element_id));
 						}
 						else
 						{
-							$option_list[$i] = $form->generate_check_box($element_name, $optionsexp[0], htmlspecialchars_uni($optionsexp[1]), array('id' => $element_id.'_'.$i, 'class' => $element_id));
+							$option_list[$i] = $form->generate_check_box("{$element_name}[]", $optionsexp[0], htmlspecialchars_uni($optionsexp[1]), array('id' => $element_id.'_'.$i, 'class' => $element_id));
 						}
 					}
 				}
+				
 				if($type[0] == "select")
 				{
 					$setting_code = $form->generate_select_box($element_name, $option_list, $setting['value'], array('id' => $element_id));
@@ -1390,9 +1434,15 @@
 				else
 				{
 					$setting_code = implode("<br />", $option_list);
+					
+					if($type[0] == 'checkbox')
+					{
+						$setting_code .= $form->generate_hidden_field("isvisible_{$setting['name']}", 1);
+					}
 				}
 				$option_list = array();
 			}
+			
 			// Do we have a custom language variable for this title or description?
 			$title_lang = "setting_".$setting['name'];
 			$desc_lang = $title_lang."_desc";
@@ -1628,7 +1678,6 @@ function print_setting_peekers()
 		'new Peeker($("#setting_mail_handler"), $("#row_setting_smtp_host, #row_setting_smtp_port, #row_setting_smtp_user, #row_setting_smtp_pass, #row_setting_secure_smtp"), "smtp", false)',
 		'new Peeker($("#setting_mail_handler"), $("#row_setting_mail_parameters"), "mail", false)',
 		'new Peeker($("#setting_captchaimage"), $("#row_setting_captchapublickey, #row_setting_captchaprivatekey"), /(2|4)/, false)',
-		'new Peeker($("#setting_captchaimage"), $("#row_setting_ayahpublisherkey, #row_setting_ayahscoringkey"), 3, false)',
 		'new Peeker($(".setting_contact"), $("#row_setting_contact_guests, #row_setting_contact_badwords, #row_setting_contact_maxsubjectlength, #row_setting_contact_minmessagelength, #row_setting_contact_maxmessagelength"), 1, true)',
 		'new Peeker($(".setting_enablepruning"), $("#row_setting_enableprunebyposts, #row_setting_pruneunactived, #row_setting_prunethreads"), 1, true)',
 		'new Peeker($(".setting_enableprunebyposts"), $("#row_setting_prunepostcount, #row_setting_dayspruneregistered, #row_setting_prunepostcountall"), 1, true)',
diff --git a/Upload/admin/modules/forum/management.php b/Upload/admin/modules/forum/management.php
index bde662f..9f26928 100644
--- a/Upload/admin/modules/forum/management.php
+++ b/Upload/admin/modules/forum/management.php
@@ -2593,8 +2593,7 @@
 		<!--
 		$("#username").select2({
 			placeholder: "'.$lang->search_for_a_user.'",
-			minimumInputLength: 3,
-			maximumSelectionSize: 3,
+			minimumInputLength: 2,
 			multiple: false,
 			ajax: { // instead of writing the function to execute the request we use Select2\'s convenient helper
 				url: "../xmlhttp.php?action=get_users",
diff --git a/Upload/admin/modules/style/themes.php b/Upload/admin/modules/style/themes.php
index c11920b..1b97d0f 100644
--- a/Upload/admin/modules/style/themes.php
+++ b/Upload/admin/modules/style/themes.php
@@ -614,7 +614,7 @@ function checkAction(id)
 		{
 			if(strpos($filename, 'css.php?stylesheet=') !== false)
 			{
-				$style['sid'] = (integer)str_replace('css.php?stylesheet=', '', $filename);
+				$style['sid'] = (int)str_replace('css.php?stylesheet=', '', $filename);
 				$filename = $theme_stylesheets[$style['sid']];
 			}
 			else
@@ -756,7 +756,7 @@ function checkAction(id)
 		{
 			$query = $db->simple_select("themes", "COUNT(tid) as numthemes", "name = '".$db->escape_string($mybb->get_input('name'))."'");
 			$numthemes = $db->fetch_field($query, 'numthemes');
-			
+
 			if($numthemes)
 			{
 				$errors[] = $lang->error_theme_already_exists;
@@ -1010,6 +1010,9 @@ function checkAction(id)
 		while($cachefile = $db->fetch_array($query))
 		{
 			@unlink(MYBB_ROOT."cache/themes/theme{$theme['tid']}/{$cachefile['cachefile']}");
+
+			$filename_min = str_replace('.css', '.min.css', $cachefile['cachefile']);
+			@unlink(MYBB_ROOT."cache/themes/theme{$theme['tid']}/{$filename_min}");
 		}
 		@unlink(MYBB_ROOT."cache/themes/theme{$theme['tid']}/index.html");
 
@@ -1092,10 +1095,14 @@ function checkAction(id)
 		}
 
 		$theme_properties = my_unserialize($theme['properties']);
-		if($theme_properties['disporder'])
+		if(is_array($theme_properties['disporder']))
 		{
 			$properties['disporder'] = $theme_properties['disporder'];
 		}
+		else
+		{
+			$errors[] = $lang->error_no_display_order;
+		}
 
 		$allowedgroups = array();
 		if(is_array($mybb->input['allowedgroups']))
@@ -1339,7 +1346,7 @@ function checkAction(id)
 		{
 			if(strpos($filename, 'css.php?stylesheet=') !== false)
 			{
-				$style['sid'] = (integer)str_replace('css.php?stylesheet=', '', $filename);
+				$style['sid'] = (int)str_replace('css.php?stylesheet=', '', $filename);
 				$filename = $theme_stylesheets[$style['sid']];
 			}
 
@@ -1356,7 +1363,7 @@ function checkAction(id)
 	{
 		if(strpos($filename, 'css.php?stylesheet=') !== false)
 		{
-			$style['sid'] = (integer)str_replace('css.php?stylesheet=', '', $filename);
+			$style['sid'] = (int)str_replace('css.php?stylesheet=', '', $filename);
 			$filename = $theme_stylesheets[$style['sid']];
 		}
 		else
@@ -1744,6 +1751,9 @@ function checkAction(id)
 					$db->update_query("themestylesheets", array('cachefile' => "css.php?stylesheet={$stylesheet['sid']}"), "sid='{$stylesheet['sid']}'", 1);
 				}
 				@unlink(MYBB_ROOT."cache/themes/theme{$theme['tid']}/{$stylesheet['cachefile']}");
+
+				$filename_min = str_replace('.css', '.min.css', $stylesheet['cachefile']);
+				@unlink(MYBB_ROOT."cache/themes/theme{$theme['tid']}/{$filename_min}");
 			}
 
 			// Update the CSS file list for this theme
@@ -2460,6 +2470,9 @@ function checkAction(id)
 		$db->delete_query("themestylesheets", "sid='{$stylesheet['sid']}'", 1);
 		@unlink(MYBB_ROOT."cache/themes/theme{$theme['tid']}/{$stylesheet['cachefile']}");
 
+		$filename_min = str_replace('.css', '.min.css', $stylesheet['cachefile']);
+		@unlink(MYBB_ROOT."cache/themes/theme{$theme['tid']}/{$filename_min}");
+
 		// Update the CSS file list for this theme
 		update_theme_stylesheet_list($theme['tid'], $theme, true);
 
diff --git a/Upload/admin/modules/tools/adminlog.php b/Upload/admin/modules/tools/adminlog.php
index 05847d0..5acc1b7 100644
--- a/Upload/admin/modules/tools/adminlog.php
+++ b/Upload/admin/modules/tools/adminlog.php
@@ -42,12 +42,13 @@
 	if($mybb->request_method == 'post')
 	{
 		$is_today = false;
+		$mybb->input['older_than'] = $mybb->get_input('older_than', MyBB::INPUT_INT);
 		if($mybb->input['older_than'] <= 0)
 		{
 			$is_today = true;
 			$mybb->input['older_than'] = 1;
 		}
-		$where = 'dateline < '.(TIME_NOW-($mybb->get_input('older_than', MyBB::INPUT_INT)*86400));
+		$where = 'dateline < '.(TIME_NOW-($mybb->input['older_than']*86400));
 
 		// Searching for entries by a particular user
 		if($mybb->input['uid'])
diff --git a/Upload/admin/modules/tools/backupdb.php b/Upload/admin/modules/tools/backupdb.php
index 52af3b6..38a5a25 100644
--- a/Upload/admin/modules/tools/backupdb.php
+++ b/Upload/admin/modules/tools/backupdb.php
@@ -77,7 +77,13 @@ function clear_overflow($fp, &$contents)
 		header('Content-disposition: attachment; filename='.$file);
 		header("Content-type: ".$ext);
 		header("Content-length: ".filesize(MYBB_ADMIN_DIR.'backups/'.$file));
-		echo file_get_contents(MYBB_ADMIN_DIR.'backups/'.$file);
+
+		$handle = fopen(MYBB_ADMIN_DIR.'backups/'.$file, 'rb');
+		while(!feof($handle))
+		{
+			echo fread($handle, 8192);
+		}
+		fclose($handle);
 	}
 	else
 	{
diff --git a/Upload/admin/modules/tools/modlog.php b/Upload/admin/modules/tools/modlog.php
index e850e97..0578c79 100644
--- a/Upload/admin/modules/tools/modlog.php
+++ b/Upload/admin/modules/tools/modlog.php
@@ -36,12 +36,13 @@
 	if($mybb->request_method == 'post')
 	{
 		$is_today = false;
+		$mybb->input['older_than'] = $mybb->get_input('older_than', MyBB::INPUT_INT);
 		if($mybb->input['older_than'] <= 0)
 		{
 			$is_today = true;
 			$mybb->input['older_than'] = 1;
 		}
-		$where = 'dateline < '.(TIME_NOW-($mybb->get_input('older_than', MyBB::INPUT_INT)*86400));
+		$where = 'dateline < '.(TIME_NOW-($mybb->input['older_than']*86400));
 
 		// Searching for entries by a particular user
 		if($mybb->input['uid'])
diff --git a/Upload/admin/modules/tools/recount_rebuild.php b/Upload/admin/modules/tools/recount_rebuild.php
index b0f038a..56998db 100644
--- a/Upload/admin/modules/tools/recount_rebuild.php
+++ b/Upload/admin/modules/tools/recount_rebuild.php
@@ -396,6 +396,12 @@ function acp_rebuild_attachment_thumbnails()
 	$start = ($page-1) * $per_page;
 	$end = $start + $per_page;
 
+	$uploadspath = $mybb->settings['uploadspath'];
+	if(my_substr($uploadspath, 0, 1) == '.')
+	{
+		$uploadspath = MYBB_ROOT . $mybb->settings['uploadspath'];
+	}
+
 	require_once MYBB_ROOT."inc/functions_image.php";
 
 	$query = $db->simple_select("attachments", "*", '', array('order_by' => 'aid', 'order_dir' => 'asc', 'limit_start' => $start, 'limit' => $per_page));
@@ -405,7 +411,7 @@ function acp_rebuild_attachment_thumbnails()
 		if($ext == "gif" || $ext == "png" || $ext == "jpg" || $ext == "jpeg" || $ext == "jpe")
 		{
 			$thumbname = str_replace(".attach", "_thumb.$ext", $attachment['attachname']);
-			$thumbnail = generate_thumbnail(MYBB_ROOT."uploads/".$attachment['attachname'], MYBB_ROOT."uploads/", $thumbname, $mybb->settings['attachthumbh'], $mybb->settings['attachthumbw']);
+			$thumbnail = generate_thumbnail($uploadspath."/".$attachment['attachname'], $uploadspath, $thumbname, $mybb->settings['attachthumbh'], $mybb->settings['attachthumbw']);
 			if($thumbnail['code'] == 4)
 			{
 				$thumbnail['filename'] = "SMALL";
diff --git a/Upload/admin/modules/tools/spamlog.php b/Upload/admin/modules/tools/spamlog.php
index 6ebc36d..8df4bb4 100644
--- a/Upload/admin/modules/tools/spamlog.php
+++ b/Upload/admin/modules/tools/spamlog.php
@@ -41,12 +41,13 @@
 	if($mybb->request_method == 'post')
 	{
 		$is_today = false;
+		$mybb->input['older_than'] = $mybb->get_input('older_than', MyBB::INPUT_INT);
 		if($mybb->input['older_than'] <= 0)
 		{
 			$is_today = true;
 			$mybb->input['older_than'] = 1;
 		}
-		$where = 'dateline < '.(TIME_NOW-($mybb->get_input('older_than', MyBB::INPUT_INT)*86400));
+		$where = 'dateline < '.(TIME_NOW-($mybb->input['older_than']*86400));
 
 		// Searching for entries in a specific module
 		if($mybb->input['filter_username'])
diff --git a/Upload/admin/modules/tools/system_health.php b/Upload/admin/modules/tools/system_health.php
index 09121a1..0002d58 100644
--- a/Upload/admin/modules/tools/system_health.php
+++ b/Upload/admin/modules/tools/system_health.php
@@ -345,7 +345,7 @@
 				$convert_to_binary .= $comma.$names.preg_replace('/'.$type.'/i', $types[$type], $column['Type']).' '.$attributes;
 				$convert_to_utf8 .= "{$comma}{$names}{$column['Type']} CHARACTER SET {$character_set} COLLATE {$collation} {$attributes}";
 
-				$comma = $lang->comma;
+				$comma = ',';
 			}
 		}
 
@@ -850,7 +850,12 @@
 		++$errors;
 	}
 
-	if(is_writable('.'.$mybb->settings['uploadspath']))
+	$uploadspath = $mybb->settings['uploadspath'];
+	if(my_substr($uploadspath, 0, 1) == '.')
+	{
+		$uploadspath = MYBB_ROOT . $mybb->settings['uploadspath'];
+	}
+	if(is_writable($uploadspath))
 	{
 		$message_upload = "<span style=\"color: green;\">{$lang->writable}</span>";
 	}
@@ -860,7 +865,12 @@
 		++$errors;
 	}
 
-	if(is_writable('../'.$mybb->settings['avataruploadpath']))
+	$avataruploadpath = $mybb->settings['avataruploadpath'];
+	if(my_substr($avataruploadpath, 0, 1) == '.')
+	{
+		$avataruploadpath = MYBB_ROOT . $mybb->settings['avataruploadpath'];
+	}
+	if(is_writable($avataruploadpath))
 	{
 		$message_avatar = "<span style=\"color: green;\">{$lang->writable}</span>";
 	}
diff --git a/Upload/admin/modules/user/admin_permissions.php b/Upload/admin/modules/user/admin_permissions.php
index 270ed1f..b75be01 100644
--- a/Upload/admin/modules/user/admin_permissions.php
+++ b/Upload/admin/modules/user/admin_permissions.php
@@ -398,118 +398,121 @@
 		$usergroups[$usergroup['gid']] = $usergroup;
 	}
 
-	// Get users whose primary or secondary usergroup has ACP access
-	$comma = $primary_group_list = $secondary_group_list = '';
-	foreach($usergroups as $gid => $group_info)
+	if(!empty($usergroups))
 	{
-		$primary_group_list .= $comma.$gid;
-		switch($db->type)
+		// Get users whose primary or secondary usergroup has ACP access
+		$comma = $primary_group_list = $secondary_group_list = '';
+		foreach($usergroups as $gid => $group_info)
 		{
-			case "pgsql":
-			case "sqlite":
-				$secondary_group_list .= " OR ','|| u.additionalgroups||',' LIKE '%,{$gid},%'";
-				break;
-			default:
-				$secondary_group_list .= " OR CONCAT(',', u.additionalgroups,',') LIKE '%,{$gid},%'";
-		}
-
-		$comma = ',';
-	}
-
-	$group_list = implode(',', array_keys($usergroups));
-	$secondary_groups = ','.$group_list.',';
+			$primary_group_list .= $comma.$gid;
+			switch($db->type)
+			{
+				case "pgsql":
+				case "sqlite":
+					$secondary_group_list .= " OR ','|| u.additionalgroups||',' LIKE '%,{$gid},%'";
+					break;
+				default:
+					$secondary_group_list .= " OR CONCAT(',', u.additionalgroups,',') LIKE '%,{$gid},%'";
+			}
 
-	// Get usergroups with ACP access
-	$query = $db->query("
-		SELECT g.title, g.cancp, a.permissions, g.gid
-		FROM ".TABLE_PREFIX."usergroups g
-		LEFT JOIN ".TABLE_PREFIX."adminoptions a ON (a.uid = -g.gid)
-		WHERE g.cancp = 1
-		ORDER BY g.title ASC
-	");
-	while($group = $db->fetch_array($query))
-	{
-		$group_permissions[$group['gid']] = $group['permissions'];
-	}
+			$comma = ',';
+		}
 
-	$query = $db->query("
-		SELECT u.uid, u.username, u.lastactive, u.usergroup, u.additionalgroups, a.permissions
-		FROM ".TABLE_PREFIX."users u
-		LEFT JOIN ".TABLE_PREFIX."adminoptions a ON (a.uid=u.uid)
-		WHERE u.usergroup IN ({$primary_group_list}) {$secondary_group_list}
-		ORDER BY u.username ASC
-	");
-	while($admin = $db->fetch_array($query))
-	{
-		if($admin['permissions'] != "")
+		$group_list = implode(',', array_keys($usergroups));
+		$secondary_groups = ','.$group_list.',';
+
+		// Get usergroups with ACP access
+		$query = $db->query("
+			SELECT g.title, g.cancp, a.permissions, g.gid
+			FROM ".TABLE_PREFIX."usergroups g
+			LEFT JOIN ".TABLE_PREFIX."adminoptions a ON (a.uid = -g.gid)
+			WHERE g.cancp = 1
+			ORDER BY g.title ASC
+		");
+		while($group = $db->fetch_array($query))
 		{
-			$perm_type = "user";
+			$group_permissions[$group['gid']] = $group['permissions'];
 		}
-		else
+
+		$query = $db->query("
+			SELECT u.uid, u.username, u.lastactive, u.usergroup, u.additionalgroups, a.permissions
+			FROM ".TABLE_PREFIX."users u
+			LEFT JOIN ".TABLE_PREFIX."adminoptions a ON (a.uid=u.uid)
+			WHERE u.usergroup IN ({$primary_group_list}) {$secondary_group_list}
+			ORDER BY u.username ASC
+		");
+		while($admin = $db->fetch_array($query))
 		{
-			$groups = explode(",", $admin['additionalgroups'].",".$admin['usergroup']);
-			foreach($groups as $group)
+			if($admin['permissions'] != "")
+			{
+				$perm_type = "user";
+			}
+			else
 			{
-				if($group == "") continue;
-				if($group_permissions[$group] != "")
+				$groups = explode(",", $admin['additionalgroups'].",".$admin['usergroup']);
+				foreach($groups as $group)
 				{
-					$perm_type = "group";
-					break;
+					if($group == "") continue;
+					if($group_permissions[$group] != "")
+					{
+						$perm_type = "group";
+						break;
+					}
 				}
-			}
 
-			if(!$group_permissions)
-			{
-				$perm_type = "default";
+				if(!$group_permissions)
+				{
+					$perm_type = "default";
+				}
 			}
-		}
 
-		$usergroup_list = array();
+			$usergroup_list = array();
 
-		// Build a list of group memberships that have access to the Admin CP
-		// Primary usergroup?
-		if($usergroups[$admin['usergroup']]['cancp'] == 1)
-		{
-			$usergroup_list[] = "<i>".$usergroups[$admin['usergroup']]['title']."</i>";
-		}
+			// Build a list of group memberships that have access to the Admin CP
+			// Primary usergroup?
+			if($usergroups[$admin['usergroup']]['cancp'] == 1)
+			{
+				$usergroup_list[] = "<i>".$usergroups[$admin['usergroup']]['title']."</i>";
+			}
 
-		// Secondary usergroups?
-		$additional_groups = explode(',', $admin['additionalgroups']);
-		if(is_array($additional_groups))
-		{
-			foreach($additional_groups as $gid)
+			// Secondary usergroups?
+			$additional_groups = explode(',', $admin['additionalgroups']);
+			if(is_array($additional_groups))
 			{
-				if($usergroups[$gid]['cancp'] == 1)
+				foreach($additional_groups as $gid)
 				{
-					$usergroup_list[] = $usergroups[$gid]['title'];
+					if($usergroups[$gid]['cancp'] == 1)
+					{
+						$usergroup_list[] = $usergroups[$gid]['title'];
+					}
 				}
 			}
-		}
-		$usergroup_list = implode($lang->comma, $usergroup_list);
+			$usergroup_list = implode($lang->comma, $usergroup_list);
 
-		$table->construct_cell("<div class=\"float_right\"><img src=\"styles/{$page->style}/images/icons/{$perm_type}.png\" title=\"{$lang->perms_type_user}\" alt=\"{$perm_type}\" /></div><div><strong><a href=\"index.php?module=user-admin_permissions&amp;action=edit&amp;uid={$admin['uid']}\" title=\"{$lang->edit_user}\">{$admin['username']}</a></strong><br /><small>{$usergroup_list}</small></div>");
+			$table->construct_cell("<div class=\"float_right\"><img src=\"styles/{$page->style}/images/icons/{$perm_type}.png\" title=\"{$lang->perms_type_user}\" alt=\"{$perm_type}\" /></div><div><strong><a href=\"index.php?module=user-admin_permissions&amp;action=edit&amp;uid={$admin['uid']}\" title=\"{$lang->edit_user}\">{$admin['username']}</a></strong><br /><small>{$usergroup_list}</small></div>");
 
-		$table->construct_cell(my_date('relative', $admin['lastactive']), array("class" => "align_center"));
+			$table->construct_cell(my_date('relative', $admin['lastactive']), array("class" => "align_center"));
 
-		$popup = new PopupMenu("adminperm_{$admin['uid']}", $lang->options);
-		if(!is_super_admin($admin['uid']))
-		{
-			if($admin['permissions'] != "")
-			{
-				$popup->add_item($lang->edit_permissions, "index.php?module=user-admin_permissions&amp;action=edit&amp;uid={$admin['uid']}");
-				$popup->add_item($lang->revoke_permissions, "index.php?module=user-admin_permissions&amp;action=delete&amp;uid={$admin['uid']}&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_perms_deletion2}')");
-			}
-			else
+			$popup = new PopupMenu("adminperm_{$admin['uid']}", $lang->options);
+			if(!is_super_admin($admin['uid']))
 			{
-				$popup->add_item($lang->set_permissions, "index.php?module=user-admin_permissions&amp;action=edit&amp;uid={$admin['uid']}");
+				if($admin['permissions'] != "")
+				{
+					$popup->add_item($lang->edit_permissions, "index.php?module=user-admin_permissions&amp;action=edit&amp;uid={$admin['uid']}");
+					$popup->add_item($lang->revoke_permissions, "index.php?module=user-admin_permissions&amp;action=delete&amp;uid={$admin['uid']}&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_perms_deletion2}')");
+				}
+				else
+				{
+					$popup->add_item($lang->set_permissions, "index.php?module=user-admin_permissions&amp;action=edit&amp;uid={$admin['uid']}");
+				}
 			}
+			$popup->add_item($lang->view_log, "index.php?module=tools-adminlog&amp;uid={$admin['uid']}");
+			$table->construct_cell($popup->fetch(), array("class" => "align_center"));
+			$table->construct_row();
 		}
-		$popup->add_item($lang->view_log, "index.php?module=tools-adminlog&amp;uid={$admin['uid']}");
-		$table->construct_cell($popup->fetch(), array("class" => "align_center"));
-		$table->construct_row();
 	}
 
-	if($table->num_rows() == 0)
+	if(empty($usergroups) || $table->num_rows() == 0)
 	{
 		$table->construct_cell($lang->no_user_perms, array("colspan" => "3"));
 		$table->construct_row();
diff --git a/Upload/admin/modules/user/banning.php b/Upload/admin/modules/user/banning.php
index b6589c9..d27a3b8 100644
--- a/Upload/admin/modules/user/banning.php
+++ b/Upload/admin/modules/user/banning.php
@@ -561,9 +561,8 @@
 	<script type="text/javascript">
 	<!--
 	$("#username").select2({
-		placeholder: "'.$lang->search_user.'",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		placeholder: "'.$lang->search_for_a_user.'",
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2\'s convenient helper
 			url: "../xmlhttp.php?action=get_users",
diff --git a/Upload/admin/modules/user/groups.php b/Upload/admin/modules/user/groups.php
index b9a1967..661a41c 100644
--- a/Upload/admin/modules/user/groups.php
+++ b/Upload/admin/modules/user/groups.php
@@ -496,8 +496,7 @@
 	<!--
 	$("#username").select2({
 		placeholder: "'.$lang->search_for_a_user.'",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2\'s convenient helper
 			url: "../xmlhttp.php?action=get_users",
diff --git a/Upload/admin/modules/user/users.php b/Upload/admin/modules/user/users.php
index 93865b7..20cac06 100644
--- a/Upload/admin/modules/user/users.php
+++ b/Upload/admin/modules/user/users.php
@@ -524,7 +524,6 @@
 			"signature" => $mybb->input['signature'],
 			"dateformat" => $mybb->get_input('dateformat', MyBB::INPUT_INT),
 			"timeformat" => $mybb->get_input('timeformat', MyBB::INPUT_INT),
-			"language" => $mybb->input['language'],
 			"usernotes" => $mybb->input['usernotes'],
 			"away" => array(
 				"away" => $mybb->input['away'],
@@ -646,7 +645,7 @@
 					$maxheight = (int)$maxwidth;
 
 					$extra_user_updates = array(
-						"avatar" => "http://www.gravatar.com/avatar/{$email}{$s}",
+						"avatar" => "https://www.gravatar.com/avatar/{$email}{$s}",
 						"avatardimensions" => "{$maxheight}|{$maxheight}",
 						"avatartype" => "gravatar"
 					);
@@ -831,6 +830,11 @@
 
 				$plugins->run_hooks("admin_user_users_edit_commit");
 
+				if($user['usergroup'] == 5 && $mybb->input['usergroup'] != 5)
+				{
+					$cache->update_awaitingactivation();
+				}
+
 				// Log admin action
 				log_admin_action($user['uid'], $mybb->input['username']);
 
@@ -2144,8 +2148,7 @@ function toggleBox(action)
 	<!--
 	$("#source_username").select2({
 		placeholder: "'.$lang->search_for_a_user.'",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2\'s convenient helper
 			url: "../xmlhttp.php?action=get_users",
@@ -2174,8 +2177,7 @@ function toggleBox(action)
 	});
 	$("#destination_username").select2({
 		placeholder: "'.$lang->search_for_a_user.'",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2\'s convenient helper
 			url: "../xmlhttp.php?action=get_users",
@@ -2383,631 +2385,621 @@ function toggleBox(action)
 		}
 	}
 
-	// If there isn't anything to select, then output an error
-	if(!is_array($selected))
+	// Verify incoming POST request
+	if(!verify_post_check($mybb->input['my_post_key']))
 	{
-		if($mybb->input['inline_action'] != "multilift" && $mybb->request_method != "post")
-		{
-			$errors[] = $lang->error_inline_no_users_selected;
-		}
+		flash_message($lang->invalid_post_verify_key2, 'error');
+		admin_redirect("index.php?module=user-user");
 	}
+	$sub_tabs['manage_users'] = array(
+		"title" => $lang->manage_users,
+		"link" => "./",
+		"description" => $lang->manage_users_desc
+	);
+	$page->add_breadcrumb_item($lang->manage_users);
 
-	if($errors)
+	if(!is_array($selected))
 	{
-		// Don't show views, but show the user list if there's errors
-		$inline = true;
-		$mybb->input['action'] = '';
+		// Not selected any users, show error
+		flash_message($lang->error_inline_no_users_selected, 'error');
+		admin_redirect("index.php?module=user-users".$vid_url);
 	}
-	else
-	{
-		// Let's continue!
-		// Verify incoming POST request
-		if(!verify_post_check($mybb->input['my_post_key']))
-		{
-			flash_message($lang->invalid_post_verify_key2, 'error');
-			admin_redirect("index.php?module=user-user");
-		}
-		$sub_tabs['manage_users'] = array(
-			"title" => $lang->manage_users,
-			"link" => "./",
-			"description" => $lang->manage_users_desc
-		);
-		$page->add_breadcrumb_item($lang->manage_users);
 
-		if(!is_array($selected))
-		{
-			// Not selected any users, show error
-			flash_message($lang->error_inline_no_users_selected, 'error');
-			admin_redirect("index.php?module=user-users".$vid_url);
-		}
-
-		switch($mybb->input['inline_action'])
-		{
-			case 'multiactivate':
-				// Run through the activating users, so that users already registered (but have been selected) aren't affected
-				if(is_array($selected))
+	switch($mybb->input['inline_action'])
+	{
+		case 'multiactivate':
+			// Run through the activating users, so that users already registered (but have been selected) aren't affected
+			if(is_array($selected))
+			{
+				$sql_array = implode(",", $selected);
+				$query = $db->simple_select("users", "uid, username, email", "usergroup = '5' AND uid IN (".$sql_array.")");
+				$user_mail_data = array();
+				while($user = $db->fetch_array($query))
 				{
-					$sql_array = implode(",", $selected);
-					$query = $db->simple_select("users", "uid", "usergroup = '5' AND uid IN (".$sql_array.")");
-					while($user = $db->fetch_array($query))
-					{
-						$to_update[] = $user['uid'];
-					}
+					$to_update[] = $user['uid'];
+					$user_mail_data[] = array('username' => $user['username'], 'email' => $user['email']);
 				}
+			}
 
-				if(is_array($to_update))
-				{
-					$sql_array = implode(",", $to_update);
-					$db->write_query("UPDATE ".TABLE_PREFIX."users SET usergroup = '2' WHERE uid IN (".$sql_array.")");
-
-					$cache->update_awaitingactivation();
+			if(is_array($to_update))
+			{
+				$sql_array = implode(",", $to_update);
+				$db->write_query("UPDATE ".TABLE_PREFIX."users SET usergroup = '2' WHERE uid IN (".$sql_array.")");
 
-					// Action complete, grab stats and show success message - redirect user
-					$to_update_count = count($to_update);
-					$lang->inline_activated = $lang->sprintf($lang->inline_activated, my_number_format($to_update_count));
+				$cache->update_awaitingactivation();
 
-					if($to_update_count != count($selected))
-					{
-						// The update count is different to how many we selected!
-						$not_updated_count = count($selected) - $to_update_count;
-						$lang->inline_activated_more = $lang->sprintf($lang->inline_activated_more, my_number_format($not_updated_count));
-						$lang->inline_activated = $lang->inline_activated."<br />".$lang->inline_activated_more; // Add these stats to the message
-					}
+				// send activation mail
+				foreach($user_mail_data as $mail_data)
+				{
+					$message = $lang->sprintf($lang->email_adminactivateaccount, $mail_data['username'], $mybb->settings['bbname'], $mybb->settings['bburl']);
+					my_mail($mail_data['email'], $lang->sprintf($lang->emailsubject_activateaccount, $mybb->settings['bbname']), $message);
+				}
 
-					$mybb->input['action'] = "inline_activated"; // Force a change to the action so we can add it to the adminlog
-					log_admin_action($to_update_count); // Add to adminlog
-					my_unsetcookie("inlinemod_useracp"); // Unset the cookie, so that the users aren't still selected when we're redirected
+				// Action complete, grab stats and show success message - redirect user
+				$to_update_count = count($to_update);
+				$lang->inline_activated = $lang->sprintf($lang->inline_activated, my_number_format($to_update_count));
 
-					flash_message($lang->inline_activated, 'success');
-					admin_redirect("index.php?module=user-users".$vid_url);
-				}
-				else
+				if($to_update_count != count($selected))
 				{
-					// Nothing was updated, show an error
-					flash_message($lang->inline_activated_failed, 'error');
-					admin_redirect("index.php?module=user-users".$vid_url);
+					// The update count is different to how many we selected!
+					$not_updated_count = count($selected) - $to_update_count;
+					$lang->inline_activated_more = $lang->sprintf($lang->inline_activated_more, my_number_format($not_updated_count));
+					$lang->inline_activated = $lang->inline_activated."<br />".$lang->inline_activated_more; // Add these stats to the message
 				}
-				break;
-			case 'multilift':
-				// Get the users that are banned, and check that they have been selected
-				if($mybb->input['no'])
+
+				$mybb->input['action'] = "inline_activated"; // Force a change to the action so we can add it to the adminlog
+				log_admin_action($to_update_count); // Add to adminlog
+				my_unsetcookie("inlinemod_useracp"); // Unset the cookie, so that the users aren't still selected when we're redirected
+
+				flash_message($lang->inline_activated, 'success');
+				admin_redirect("index.php?module=user-users".$vid_url);
+			}
+			else
+			{
+				// Nothing was updated, show an error
+				flash_message($lang->inline_activated_failed, 'error');
+				admin_redirect("index.php?module=user-users".$vid_url);
+			}
+			break;
+		case 'multilift':
+			// Get the users that are banned, and check that they have been selected
+			if($mybb->input['no'])
+			{
+				admin_redirect("index.php?module=user-users".$vid_url); // User clicked on 'No'
+			}
+
+			if($mybb->request_method == "post")
+			{
+				$sql_array = implode(",", $selected);
+				$query = $db->simple_select("banned", "*", "uid IN (".$sql_array.")");
+				$to_be_unbanned = $db->num_rows($query);
+				while($ban = $db->fetch_array($query))
 				{
-					admin_redirect("index.php?module=user-users".$vid_url); // User clicked on 'No'
+					$updated_group = array(
+						"usergroup" => $ban['oldgroup'],
+						"additionalgroups" => $ban['oldadditionalgroups'],
+						"displaygroup" => $ban['olddisplaygroup']
+					);
+					$db->update_query("users", $updated_group, "uid = '".$ban['uid']."'");
+					$db->delete_query("banned", "uid = '".$ban['uid']."'");
 				}
 
-				if($mybb->request_method == "post")
-				{
-					$sql_array = implode(",", $selected);
-					$query = $db->simple_select("banned", "*", "uid IN (".$sql_array.")");
-					$to_be_unbanned = $db->num_rows($query);
-					while($ban = $db->fetch_array($query))
-					{
-						$updated_group = array(
-							"usergroup" => $ban['oldgroup'],
-							"additionalgroups" => $ban['oldadditionalgroups'],
-							"displaygroup" => $ban['olddisplaygroup']
-						);
-						$db->update_query("users", $updated_group, "uid = '".$ban['uid']."'");
-						$db->delete_query("banned", "uid = '".$ban['uid']."'");
-					}
+				$cache->update_banned();
+				$cache->update_moderators();
 
-					$cache->update_banned();
-					$cache->update_moderators();
+				$mybb->input['action'] = "inline_lift";
+				log_admin_action($to_be_unbanned);
+				my_unsetcookie("inlinemod_useracp");
 
-					$mybb->input['action'] = "inline_lift";
-					log_admin_action($to_be_unbanned);
-					my_unsetcookie("inlinemod_useracp");
+				$lang->success_ban_lifted = $lang->sprintf($lang->success_ban_lifted, my_number_format($to_be_unbanned));
+				flash_message($lang->success_ban_lifted, 'success');
+				admin_redirect("index.php?module=user-users".$vid_url);
+			}
+			else
+			{
+				$page->output_confirm_action("index.php?module=user-users&amp;action=inline_edit&amp;inline_action=multilift", $lang->confirm_multilift);
+			}
 
-					$lang->success_ban_lifted = $lang->sprintf($lang->success_ban_lifted, my_number_format($to_be_unbanned));
-					flash_message($lang->success_ban_lifted, 'success');
-					admin_redirect("index.php?module=user-users".$vid_url);
+			break;
+		case 'multiban':
+			if($mybb->input['processed'] == 1)
+			{
+				// We've posted ban information!
+				// Build an array of users to ban, =D
+				$sql_array = implode(",", $selected);
+				// Build a cache array for this users that have been banned already
+				$query = $db->simple_select("banned", "uid", "uid IN (".$sql_array.")");
+				while($user = $db->fetch_array($query))
+				{
+					$bannedcache[] = "u_".$user['uid'];
+				}
+
+				// Collect the users
+				$query = $db->simple_select("users", "uid, username, usergroup, additionalgroups, displaygroup", "uid IN (".$sql_array.")");
+
+				if($mybb->input['bantime'] == '---')
+				{
+					$lifted = 0;
 				}
 				else
 				{
-					$page->output_confirm_action("index.php?module=user-users&amp;action=inline_edit&amp;inline_action=multilift", $lang->confirm_multilift);
+					$lifted = ban_date2timestamp($mybb->input['bantime']);
 				}
 
-				break;
-			case 'multiban':
-				if($mybb->input['processed'] == 1)
+				$reason = my_substr($mybb->input['reason'], 0, 255);
+
+				$banned_count = 0;
+				while($user = $db->fetch_array($query))
 				{
-					// We've posted ban information!
-					// Build an array of users to ban, =D
-					$sql_array = implode(",", $selected);
-					// Build a cache array for this users that have been banned already
-					$query = $db->simple_select("banned", "uid", "uid IN (".$sql_array.")");
-					while($user = $db->fetch_array($query))
+					if($user['uid'] == $mybb->user['uid'] || is_super_admin($user['uid']))
 					{
-						$bannedcache[] = "u_".$user['uid'];
+						// We remove ourselves and Super Admins from the mix
+						continue;
 					}
 
-					// Collect the users
-					$query = $db->simple_select("users", "uid, username, usergroup, additionalgroups, displaygroup", "uid IN (".$sql_array.")");
-
-					if($mybb->input['bantime'] == '---')
+					if(is_array($bannedcache) && in_array("u_".$user['uid'], $bannedcache))
 					{
-						$lifted = 0;
+						// User already has a ban, update it!
+						$update_array = array(
+							"admin" => (int)$mybb->user['uid'],
+							"dateline" => TIME_NOW,
+							"bantime" => $db->escape_string($mybb->input['bantime']),
+							"lifted" => $db->escape_string($lifted),
+							"reason" => $db->escape_string($reason)
+						);
+						$db->update_query("banned", $update_array, "uid = '".$user['uid']."'");
 					}
 					else
 					{
-						$lifted = ban_date2timestamp($mybb->input['bantime']);
-					}
-
-					$reason = my_substr($mybb->input['reason'], 0, 255);
-
-					$banned_count = 0;
-					while($user = $db->fetch_array($query))
-					{
-						if($user['uid'] == $mybb->user['uid'] || is_super_admin($user['uid']))
-						{
-							// We remove ourselves and Super Admins from the mix
-							continue;
-						}
-
-						if(is_array($bannedcache) && in_array("u_".$user['uid'], $bannedcache))
-						{
-							// User already has a ban, update it!
-							$update_array = array(
-								"admin" => (int)$mybb->user['uid'],
-								"dateline" => TIME_NOW,
-								"bantime" => $db->escape_string($mybb->input['bantime']),
-								"lifted" => $db->escape_string($lifted),
-								"reason" => $db->escape_string($reason)
-							);
-							$db->update_query("banned", $update_array, "uid = '".$user['uid']."'");
-						}
-						else
-						{
-							// Not currently banned - insert the ban
-							$insert_array = array(
-								'uid' => $user['uid'],
-								'gid' => $mybb->get_input('usergroup', MyBB::INPUT_INT),
-								'oldgroup' => $user['usergroup'],
-								'oldadditionalgroups' => $user['additionalgroups'],
-								'olddisplaygroup' => $user['displaygroup'],
-								'admin' => (int)$mybb->user['uid'],
-								'dateline' => TIME_NOW,
-								'bantime' => $db->escape_string($mybb->input['bantime']),
-								'lifted' => $db->escape_string($lifted),
-								'reason' => $db->escape_string($reason)
-							);
-							$db->insert_query('banned', $insert_array);
-						}
-
-						// Moved the user to the 'Banned' Group
-						$update_array = array(
-							'usergroup' => 7,
-							'displaygroup' => 0,
-							'additionalgroups' => '',
+						// Not currently banned - insert the ban
+						$insert_array = array(
+							'uid' => $user['uid'],
+							'gid' => $mybb->get_input('usergroup', MyBB::INPUT_INT),
+							'oldgroup' => $user['usergroup'],
+							'oldadditionalgroups' => $user['additionalgroups'],
+							'olddisplaygroup' => $user['displaygroup'],
+							'admin' => (int)$mybb->user['uid'],
+							'dateline' => TIME_NOW,
+							'bantime' => $db->escape_string($mybb->input['bantime']),
+							'lifted' => $db->escape_string($lifted),
+							'reason' => $db->escape_string($reason)
 						);
-						$db->update_query('users', $update_array, "uid = '{$user['uid']}'");
+						$db->insert_query('banned', $insert_array);
+					}
 
-						$db->delete_query("forumsubscriptions", "uid = '{$user['uid']}'");
-						$db->delete_query("threadsubscriptions", "uid = '{$user['uid']}'");
+					// Moved the user to the 'Banned' Group
+					$update_array = array(
+						'usergroup' => 7,
+						'displaygroup' => 0,
+						'additionalgroups' => '',
+					);
+					$db->update_query('users', $update_array, "uid = '{$user['uid']}'");
 
-						$cache->update_banned();
-						++$banned_count;
-					}
-					$mybb->input['action'] = "inline_banned";
-					log_admin_action($banned_count, $lifted);
-					my_unsetcookie("inlinemod_useracp"); // Remove the cookie of selected users as we've finished with them
+					$db->delete_query("forumsubscriptions", "uid = '{$user['uid']}'");
+					$db->delete_query("threadsubscriptions", "uid = '{$user['uid']}'");
 
-					$lang->users_banned = $lang->sprintf($lang->users_banned, $banned_count);
-					flash_message($lang->users_banned, 'success');
-					admin_redirect("index.php?module=user-users".$vid_url);
+					$cache->update_banned();
+					++$banned_count;
 				}
+				$mybb->input['action'] = "inline_banned";
+				log_admin_action($banned_count, $lifted);
+				my_unsetcookie("inlinemod_useracp"); // Remove the cookie of selected users as we've finished with them
 
-				$page->output_header($lang->manage_users);
-				$page->output_nav_tabs($sub_tabs, 'manage_users');
+				$lang->users_banned = $lang->sprintf($lang->users_banned, $banned_count);
+				flash_message($lang->users_banned, 'success');
+				admin_redirect("index.php?module=user-users".$vid_url);
+			}
 
-				// Provide the user with a warning of what they're about to do
-				$table = new Table;
-				$lang->mass_ban_info = $lang->sprintf($lang->mass_ban_info, count($selected));
-				$table->construct_cell($lang->mass_ban_info);
-				$table->construct_row();
-				$table->output($lang->important);
+			$page->output_header($lang->manage_users);
+			$page->output_nav_tabs($sub_tabs, 'manage_users');
 
-				// If there's any errors, display inline
-				if($errors)
-				{
-					$page->output_inline_error($errors);
-				}
+			// Provide the user with a warning of what they're about to do
+			$table = new Table;
+			$lang->mass_ban_info = $lang->sprintf($lang->mass_ban_info, count($selected));
+			$table->construct_cell($lang->mass_ban_info);
+			$table->construct_row();
+			$table->output($lang->important);
 
-				$form = new Form("index.php?module=user-users", "post");
-				echo $form->generate_hidden_field('action', 'inline_edit');
-				echo $form->generate_hidden_field('inline_action', 'multiban');
-				echo $form->generate_hidden_field('processed', '1');
+			// If there's any errors, display inline
+			if($errors)
+			{
+				$page->output_inline_error($errors);
+			}
 
-				$form_container = new FormContainer('<div class="float_right"><a href="index.php?module=user-users&amp;action=inline_edit&amp;inline_action=multilift&amp;my_post_key='.$mybb->post_code.'">'.$lang->lift_bans.'</a></div>'.$lang->mass_ban);
-				$form_container->output_row($lang->ban_reason, "", $form->generate_text_area('reason', $mybb->input['reason'], array('id' => 'reason', 'maxlength' => '255')), 'reason');
-				$ban_times = fetch_ban_times();
-				foreach($ban_times as $time => $period)
-				{
-					if($time != '---')
-					{
-						$friendly_time = my_date("D, jS M Y @ g:ia", ban_date2timestamp($time));
-						$period = "{$period} ({$friendly_time})";
-					}
-					$length_list[$time] = $period;
-				}
-				$form_container->output_row($lang->ban_time, "", $form->generate_select_box('bantime', $length_list, $mybb->input['bantime'], array('id' => 'bantime')), 'bantime');
-				$form_container->end();
+			$form = new Form("index.php?module=user-users", "post");
+			echo $form->generate_hidden_field('action', 'inline_edit');
+			echo $form->generate_hidden_field('inline_action', 'multiban');
+			echo $form->generate_hidden_field('processed', '1');
 
-				$buttons[] = $form->generate_submit_button($lang->ban_users);
-				$form->output_submit_wrapper($buttons);
-				$form->end();
-				$page->output_footer();
-				break;
-			case 'multidelete':
-				if($mybb->input['no'])
+			$form_container = new FormContainer('<div class="float_right"><a href="index.php?module=user-users&amp;action=inline_edit&amp;inline_action=multilift&amp;my_post_key='.$mybb->post_code.'">'.$lang->lift_bans.'</a></div>'.$lang->mass_ban);
+			$form_container->output_row($lang->ban_reason, "", $form->generate_text_area('reason', $mybb->input['reason'], array('id' => 'reason', 'maxlength' => '255')), 'reason');
+			$ban_times = fetch_ban_times();
+			foreach($ban_times as $time => $period)
+			{
+				if($time != '---')
 				{
-					admin_redirect("index.php?module=user-users".$vid_url); // User clicked on 'No
+					$friendly_time = my_date("D, jS M Y @ g:ia", ban_date2timestamp($time));
+					$period = "{$period} ({$friendly_time})";
 				}
-				else
+				$length_list[$time] = $period;
+			}
+			$form_container->output_row($lang->ban_time, "", $form->generate_select_box('bantime', $length_list, $mybb->input['bantime'], array('id' => 'bantime')), 'bantime');
+			$form_container->end();
+
+			$buttons[] = $form->generate_submit_button($lang->ban_users);
+			$form->output_submit_wrapper($buttons);
+			$form->end();
+			$page->output_footer();
+			break;
+		case 'multidelete':
+			if($mybb->input['no'])
+			{
+				admin_redirect("index.php?module=user-users".$vid_url); // User clicked on 'No
+			}
+			else
+			{
+				if($mybb->input['processed'] == 1)
 				{
-					if($mybb->input['processed'] == 1)
-					{
-						// Set up user handler.
-						require_once MYBB_ROOT.'inc/datahandlers/user.php';
-						$userhandler = new UserDataHandler('delete');
+					// Set up user handler.
+					require_once MYBB_ROOT.'inc/datahandlers/user.php';
+					$userhandler = new UserDataHandler('delete');
 
-						// Delete users
-						$deleted = $userhandler->delete_user($selected);
-						$to_be_deleted = $deleted['deleted_users']; // Get the correct number of deleted users
+					// Delete users
+					$deleted = $userhandler->delete_user($selected);
+					$to_be_deleted = $deleted['deleted_users']; // Get the correct number of deleted users
 
-						// Update forum stats, remove the cookie and redirect the user
-						my_unsetcookie("inlinemod_useracp");
-						$mybb->input['action'] = "inline_delete";
-						log_admin_action($to_be_deleted);
+					// Update forum stats, remove the cookie and redirect the user
+					my_unsetcookie("inlinemod_useracp");
+					$mybb->input['action'] = "inline_delete";
+					log_admin_action($to_be_deleted);
 
-						$lang->users_deleted = $lang->sprintf($lang->users_deleted, $to_be_deleted);
+					$lang->users_deleted = $lang->sprintf($lang->users_deleted, $to_be_deleted);
 
-						$cache->update_awaitingactivation();
+					$cache->update_awaitingactivation();
 
-						flash_message($lang->users_deleted, 'success');
-						admin_redirect("index.php?module=user-users".$vid_url);
-					}
+					flash_message($lang->users_deleted, 'success');
+					admin_redirect("index.php?module=user-users".$vid_url);
+				}
 
-					$to_be_deleted = count($selected);
-					$lang->confirm_multidelete = $lang->sprintf($lang->confirm_multidelete, my_number_format($to_be_deleted));
-					$page->output_confirm_action("index.php?module=user-users&amp;action=inline_edit&amp;inline_action=multidelete&amp;my_post_key={$mybb->post_code}&amp;processed=1", $lang->confirm_multidelete);
+				$to_be_deleted = count($selected);
+				$lang->confirm_multidelete = $lang->sprintf($lang->confirm_multidelete, my_number_format($to_be_deleted));
+				$page->output_confirm_action("index.php?module=user-users&amp;action=inline_edit&amp;inline_action=multidelete&amp;my_post_key={$mybb->post_code}&amp;processed=1", $lang->confirm_multidelete);
+			}
+			break;
+		case 'multiprune':
+			if($mybb->input['processed'] == 1)
+			{
+				if(($mybb->input['day'] || $mybb->input['month'] || $mybb->input['year']) && $mybb->input['set'])
+				{
+					$errors[] = $lang->multi_selected_dates;
 				}
-				break;
-			case 'multiprune':
-				if($mybb->input['processed'] == 1)
+
+				$day = $mybb->get_input('day', MyBB::INPUT_INT);
+				$month = $mybb->get_input('month', MyBB::INPUT_INT);
+				$year = $mybb->get_input('year', MyBB::INPUT_INT);
+
+				// Selected a date - check if the date the user entered is valid
+				if($mybb->input['day'] || $mybb->input['month'] || $mybb->input['year'])
 				{
-					if(($mybb->input['day'] || $mybb->input['month'] || $mybb->input['year']) && $mybb->input['set'])
+					// Is the date sort of valid?
+					if($day < 1 || $day > 31 || $month < 1 || $month > 12 || ($month == 2 && $day > 29))
 					{
-						$errors[] = $lang->multi_selected_dates;
+						$errors[] = $lang->incorrect_date;
 					}
 
-					$day = $mybb->get_input('day', MyBB::INPUT_INT);
-					$month = $mybb->get_input('month', MyBB::INPUT_INT);
-					$year = $mybb->get_input('year', MyBB::INPUT_INT);
-
-					// Selected a date - check if the date the user entered is valid
-					if($mybb->input['day'] || $mybb->input['month'] || $mybb->input['year'])
+					// Check the month
+					$months = get_bdays($year);
+					if($day > $months[$month-1])
 					{
-						// Is the date sort of valid?
-						if($day < 1 || $day > 31 || $month < 1 || $month > 12 || ($month == 2 && $day > 29))
-						{
-							$errors[] = $lang->incorrect_date;
-						}
-
-						// Check the month
-						$months = get_bdays($year);
-						if($day > $months[$month-1])
-						{
-							$errors[] = $lang->incorrect_date;
-						}
-
-						// Check the year
-						if($year != 0 && ($year < (date("Y")-100)) || $year > date("Y"))
-						{
-							$errors[] = $lang->incorrect_date;
-						}
+						$errors[] = $lang->incorrect_date;
+					}
 
-						if(!$errors)
-						{
-							// No errors, so let's continue and set the date to delete from
-							$date = mktime(date('H'), date('i'), date('s'), $month, $day, $year); // Generate a unix time stamp
-						}
+					// Check the year
+					if($year != 0 && ($year < (date("Y")-100)) || $year > date("Y"))
+					{
+						$errors[] = $lang->incorrect_date;
 					}
-					elseif($mybb->input['set'] > 0)
+
+					if(!$errors)
 					{
-						// Set options
-						// For this purpose, 1 month = 31 days
-						$base_time = 24 * 60 * 60;
+						// No errors, so let's continue and set the date to delete from
+						$date = mktime(date('H'), date('i'), date('s'), $month, $day, $year); // Generate a unix time stamp
+					}
+				}
+				elseif($mybb->input['set'] > 0)
+				{
+					// Set options
+					// For this purpose, 1 month = 31 days
+					$base_time = 24 * 60 * 60;
 
-						switch($mybb->input['set'])
-						{
-							case '1':
-								$threshold = $base_time * 31; // 1 month = 31 days, in the standard terms
-								break;
-							case '2':
-								$threshold = $base_time * 93; // 3 months = 31 days * 3
-								break;
-							case '3':
-								$threshold = $base_time * 183; // 6 months = 365 days / 2
-								break;
-							case '4':
-								$threshold = $base_time * 365; // 1 year = 365 days
-								break;
-							case '5':
-								$threshold = $base_time * 548; // 18 months = 365 + 183
-								break;
-							case '6':
-								$threshold = $base_time * 730; // 2 years = 365 * 2
-								break;
-						}
+					switch($mybb->input['set'])
+					{
+						case '1':
+							$threshold = $base_time * 31; // 1 month = 31 days, in the standard terms
+							break;
+						case '2':
+							$threshold = $base_time * 93; // 3 months = 31 days * 3
+							break;
+						case '3':
+							$threshold = $base_time * 183; // 6 months = 365 days / 2
+							break;
+						case '4':
+							$threshold = $base_time * 365; // 1 year = 365 days
+							break;
+						case '5':
+							$threshold = $base_time * 548; // 18 months = 365 + 183
+							break;
+						case '6':
+							$threshold = $base_time * 730; // 2 years = 365 * 2
+							break;
+					}
 
-						if(!$threshold)
-						{
-							// An option was entered that isn't in the dropdown box
-							$errors[] = $lang->no_set_option;
-						}
-						else
-						{
-							$date = TIME_NOW - $threshold;
-						}
+					if(!$threshold)
+					{
+						// An option was entered that isn't in the dropdown box
+						$errors[] = $lang->no_set_option;
 					}
 					else
 					{
-						$errors[] = $lang->no_prune_option;
+						$date = TIME_NOW - $threshold;
 					}
+				}
+				else
+				{
+					$errors[] = $lang->no_prune_option;
+				}
 
-					if(!$errors)
+				if(!$errors)
+				{
+					$sql_array = implode(",", $selected);
+					$prune_array = array();
+					$query = $db->simple_select("users", "uid", "uid IN (".$sql_array.")");
+					while($user = $db->fetch_array($query))
 					{
-						$sql_array = implode(",", $selected);
-						$prune_array = array();
-						$query = $db->simple_select("users", "uid", "uid IN (".$sql_array.")");
-						while($user = $db->fetch_array($query))
+						// Protect Super Admins
+						if(is_super_admin($user['uid']) && !is_super_admin($mybb->user['uid']))
 						{
-							// Protect Super Admins
-							if(is_super_admin($user['uid']) && !is_super_admin($mybb->user['uid']))
-							{
-								continue;
-							}
-
-							$return_array = delete_user_posts($user['uid'], $date); // Delete user posts, and grab a list of threads to delete
-							if($return_array && is_array($return_array))
-							{
-								$prune_array = array_merge_recursive($prune_array, $return_array);
-							}
+							continue;
 						}
 
-						// No posts were found for the user, return error
-						if(!is_array($prune_array) || count($prune_array) == 0)
+						$return_array = delete_user_posts($user['uid'], $date); // Delete user posts, and grab a list of threads to delete
+						if($return_array && is_array($return_array))
 						{
-							flash_message($lang->prune_fail, 'error');
-							admin_redirect("index.php?module=user-users".$vid_url);
+							$prune_array = array_merge_recursive($prune_array, $return_array);
 						}
+					}
+
+					// No posts were found for the user, return error
+					if(!is_array($prune_array) || count($prune_array) == 0)
+					{
+						flash_message($lang->prune_fail, 'error');
+						admin_redirect("index.php?module=user-users".$vid_url);
+					}
 
-						// Require the rebuild functions
-						require_once MYBB_ROOT.'/inc/functions.php';
-						require_once MYBB_ROOT.'/inc/functions_rebuild.php';
+					// Require the rebuild functions
+					require_once MYBB_ROOT.'/inc/functions.php';
+					require_once MYBB_ROOT.'/inc/functions_rebuild.php';
 
-						// We've finished deleting user's posts, so let's delete the threads
-						if(is_array($prune_array['to_delete']) && count($prune_array['to_delete']) > 0)
+					// We've finished deleting user's posts, so let's delete the threads
+					if(is_array($prune_array['to_delete']) && count($prune_array['to_delete']) > 0)
+					{
+						foreach($prune_array['to_delete'] as $tid)
 						{
-							foreach($prune_array['to_delete'] as $tid)
-							{
-								$db->delete_query("threads", "tid='$tid'");
-								$db->delete_query("threads", "closed='moved|$tid'");
-								$db->delete_query("threadsubscriptions", "tid='$tid'");
-								$db->delete_query("polls", "tid='$tid'");
-								$db->delete_query("threadsread", "tid='$tid'");
-								$db->delete_query("threadratings", "tid='$tid'");
-							}
+							$db->delete_query("threads", "tid='$tid'");
+							$db->delete_query("threads", "closed='moved|$tid'");
+							$db->delete_query("threadsubscriptions", "tid='$tid'");
+							$db->delete_query("polls", "tid='$tid'");
+							$db->delete_query("threadsread", "tid='$tid'");
+							$db->delete_query("threadratings", "tid='$tid'");
 						}
+					}
 
-						// After deleting threads, rebuild the thread counters for the affected threads
-						if(is_array($prune_array['thread_update']) && count($prune_array['thread_update']) > 0)
+					// After deleting threads, rebuild the thread counters for the affected threads
+					if(is_array($prune_array['thread_update']) && count($prune_array['thread_update']) > 0)
+					{
+						$sql_array = implode(",", $prune_array['thread_update']);
+						$query = $db->simple_select("threads", "tid", "tid IN (".$sql_array.")", array('order_by' => 'tid', 'order_dir' => 'asc'));
+						while($thread = $db->fetch_array($query))
 						{
-							$sql_array = implode(",", $prune_array['thread_update']);
-							$query = $db->simple_select("threads", "tid", "tid IN (".$sql_array.")", array('order_by' => 'tid', 'order_dir' => 'asc'));
-							while($thread = $db->fetch_array($query))
-							{
-								rebuild_thread_counters($thread['tid']);
-							}
+							rebuild_thread_counters($thread['tid']);
 						}
+					}
 
-						// After updating thread counters, update the affected forum counters
-						if(is_array($prune_array['forum_update']) && count($prune_array['forum_update']) > 0)
+					// After updating thread counters, update the affected forum counters
+					if(is_array($prune_array['forum_update']) && count($prune_array['forum_update']) > 0)
+					{
+						$sql_array = implode(",", $prune_array['forum_update']);
+						$query = $db->simple_select("forums", "fid", "fid IN (".$sql_array.")", array('order_by' => 'fid', 'order_dir' => 'asc'));
+						while($forum = $db->fetch_array($query))
 						{
-							$sql_array = implode(",", $prune_array['forum_update']);
-							$query = $db->simple_select("forums", "fid", "fid IN (".$sql_array.")", array('order_by' => 'fid', 'order_dir' => 'asc'));
-							while($forum = $db->fetch_array($query))
+							// Because we have a recursive array merge, check to see if there isn't a duplicated forum to update
+							if($looped_forum == $forum['fid'])
 							{
-								// Because we have a recursive array merge, check to see if there isn't a duplicated forum to update
-								if($looped_forum == $forum['fid'])
-								{
-									continue;
-								}
-								$looped_forum = $forum['fid'];
-								rebuild_forum_counters($forum['fid']);
+								continue;
 							}
+							$looped_forum = $forum['fid'];
+							rebuild_forum_counters($forum['fid']);
 						}
-
-						//log_admin_action();
-						my_unsetcookie("inlinemod_useracp"); // We've got our users, remove the cookie
-						flash_message($lang->prune_complete, 'success');
-						admin_redirect("index.php?module=user-users".$vid_url);
 					}
+
+					//log_admin_action();
+					my_unsetcookie("inlinemod_useracp"); // We've got our users, remove the cookie
+					flash_message($lang->prune_complete, 'success');
+					admin_redirect("index.php?module=user-users".$vid_url);
 				}
+			}
 
-				$page->output_header($lang->manage_users);
-				$page->output_nav_tabs($sub_tabs, 'manage_users');
+			$page->output_header($lang->manage_users);
+			$page->output_nav_tabs($sub_tabs, 'manage_users');
 
-				// Display a table warning
-				$table = new Table;
-				$lang->mass_prune_info = $lang->sprintf($lang->mass_prune_info, count($selected));
-				$table->construct_cell($lang->mass_prune_info);
-				$table->construct_row();
-				$table->output($lang->important);
+			// Display a table warning
+			$table = new Table;
+			$lang->mass_prune_info = $lang->sprintf($lang->mass_prune_info, count($selected));
+			$table->construct_cell($lang->mass_prune_info);
+			$table->construct_row();
+			$table->output($lang->important);
 
-				if($errors)
-				{
-					$page->output_inline_error($errors);
-				}
+			if($errors)
+			{
+				$page->output_inline_error($errors);
+			}
 
-				// Display the prune options
-				$form = new Form("index.php?module=user-users", "post");
-				echo $form->generate_hidden_field('action', 'inline_edit');
-				echo $form->generate_hidden_field('inline_action', 'multiprune');
-				echo $form->generate_hidden_field('processed', '1');
+			// Display the prune options
+			$form = new Form("index.php?module=user-users", "post");
+			echo $form->generate_hidden_field('action', 'inline_edit');
+			echo $form->generate_hidden_field('inline_action', 'multiprune');
+			echo $form->generate_hidden_field('processed', '1');
 
-				$form_container = new FormContainer($lang->mass_prune_posts);
+			$form_container = new FormContainer($lang->mass_prune_posts);
 
-				// Generate a list of days (1 - 31)
-				$day_options = array();
-				$day_options[] = "&nbsp;";
-				for($i = 1; $i <= 31; ++$i)
-				{
-					$day_options[] = $i;
-				}
+			// Generate a list of days (1 - 31)
+			$day_options = array();
+			$day_options[] = "&nbsp;";
+			for($i = 1; $i <= 31; ++$i)
+			{
+				$day_options[] = $i;
+			}
 
-				// Generate a list of months (1 - 12)
-				$month_options = array();
-				$month_options[] = "&nbsp;";
-				for($i = 1; $i <= 12; ++$i)
-				{
-					$string = "month_{$i}";
-					$month_options[] = $lang->$string;
-				}
-				$date_box = $form->generate_select_box('day', $day_options, $mybb->input['day']);
-				$month_box = $form->generate_select_box('month', $month_options, $mybb->input['month']);
-				$year_box = $form->generate_numeric_field('year', $mybb->input['year'], array('id' => 'year', 'style' => 'width: 50px;', 'min' => 0));
+			// Generate a list of months (1 - 12)
+			$month_options = array();
+			$month_options[] = "&nbsp;";
+			for($i = 1; $i <= 12; ++$i)
+			{
+				$string = "month_{$i}";
+				$month_options[] = $lang->$string;
+			}
+			$date_box = $form->generate_select_box('day', $day_options, $mybb->input['day']);
+			$month_box = $form->generate_select_box('month', $month_options, $mybb->input['month']);
+			$year_box = $form->generate_numeric_field('year', $mybb->input['year'], array('id' => 'year', 'style' => 'width: 50px;', 'min' => 0));
 
-				$prune_select = $date_box.$month_box.$year_box;
-				$form_container->output_row($lang->manual_date, "", $prune_select, 'date');
+			$prune_select = $date_box.$month_box.$year_box;
+			$form_container->output_row($lang->manual_date, "", $prune_select, 'date');
 
-				// Generate the set date box
-				$set_options = array();
-				$set_options[] = $lang->set_an_option;
-				for($i = 1; $i <= 6; ++$i)
-				{
-					$string = "option_{$i}";
-					$set_options[] = $lang->$string;
-				}
+			// Generate the set date box
+			$set_options = array();
+			$set_options[] = $lang->set_an_option;
+			for($i = 1; $i <= 6; ++$i)
+			{
+				$string = "option_{$i}";
+				$set_options[] = $lang->$string;
+			}
 
-				$form_container->output_row($lang->relative_date, "", $lang->delete_posts." ".$form->generate_select_box('set', $set_options, $mybb->input['set']), 'set');
-				$form_container->end();
+			$form_container->output_row($lang->relative_date, "", $lang->delete_posts." ".$form->generate_select_box('set', $set_options, $mybb->input['set']), 'set');
+			$form_container->end();
 
-				$buttons[] = $form->generate_submit_button($lang->prune_posts);
-				$form->output_submit_wrapper($buttons);
-				$form->end();
-				$page->output_footer();
-				break;
-			case 'multiusergroup':
-				if($mybb->input['processed'] == 1)
+			$buttons[] = $form->generate_submit_button($lang->prune_posts);
+			$form->output_submit_wrapper($buttons);
+			$form->end();
+			$page->output_footer();
+			break;
+		case 'multiusergroup':
+			if($mybb->input['processed'] == 1)
+			{
+				// Determine additional usergroups
+				if(is_array($mybb->input['additionalgroups']))
 				{
-					// Determine additional usergroups
-					if(is_array($mybb->input['additionalgroups']))
+					foreach($mybb->input['additionalgroups'] as $key => $gid)
 					{
-						foreach($mybb->input['additionalgroups'] as $key => $gid)
+						if($gid == $mybb->input['usergroup'])
 						{
-							if($gid == $mybb->input['usergroup'])
-							{
-								unset($mybb->input['additionalgroups'][$key]);
-							}
+							unset($mybb->input['additionalgroups'][$key]);
 						}
-
-						$additionalgroups = implode(",", array_map('intval', $mybb->input['additionalgroups']));
-					}
-					else
-					{
-						$additionalgroups = '';
 					}
 
-					// Create an update array
-					$update_array = array(
-						"usergroup" => $mybb->get_input('usergroup', MyBB::INPUT_INT),
-						"additionalgroups" => $additionalgroups,
-						"displaygroup" => $mybb->get_input('displaygroup', MyBB::INPUT_INT)
-					);
+					$additionalgroups = implode(",", array_map('intval', $mybb->input['additionalgroups']));
+				}
+				else
+				{
+					$additionalgroups = '';
+				}
 
-					// Do the usergroup update for all those selected
-					// If the a selected user is a super admin, don't update that user
-					foreach($selected as $user)
-					{
-						if(!is_super_admin($user))
-						{
-							$users_to_update[] = $user;
-						}
-					}
+				// Create an update array
+				$update_array = array(
+					"usergroup" => $mybb->get_input('usergroup', MyBB::INPUT_INT),
+					"additionalgroups" => $additionalgroups,
+					"displaygroup" => $mybb->get_input('displaygroup', MyBB::INPUT_INT)
+				);
 
-					$to_update_count = count($users_to_update);
-					if($to_update_count > 0 && is_array($users_to_update))
-					{
-						// Update the users in the database
-						$sql = implode(",", $users_to_update);
-						$db->update_query("users", $update_array, "uid IN (".$sql.")");
-
-						// Redirect the admin...
-						$mybb->input['action'] = "inline_usergroup";
-						log_admin_action($to_update_count);
-						my_unsetcookie("inlinemod_useracp");
-						flash_message($lang->success_mass_usergroups, 'success');
-						admin_redirect("index.php?module=user-users".$vid_url);
-					}
-					else
+				// Do the usergroup update for all those selected
+				// If the a selected user is a super admin, don't update that user
+				foreach($selected as $user)
+				{
+					if(!is_super_admin($user))
 					{
-						// They tried to edit super admins! Uh-oh!
-						$errors[] = $lang->no_usergroup_changed;
+						$users_to_update[] = $user;
 					}
 				}
 
-				$page->output_header($lang->manage_users);
-				$page->output_nav_tabs($sub_tabs, 'manage_users');
-
-				// Display a table warning
-				$table = new Table;
-				$lang->usergroup_info = $lang->sprintf($lang->usergroup_info, count($selected));
-				$table->construct_cell($lang->usergroup_info);
-				$table->construct_row();
-				$table->output($lang->important);
+				$to_update_count = count($users_to_update);
+				if($to_update_count > 0 && is_array($users_to_update))
+				{
+					// Update the users in the database
+					$sql = implode(",", $users_to_update);
+					$db->update_query("users", $update_array, "uid IN (".$sql.")");
 
-				if($errors)
+					// Redirect the admin...
+					$mybb->input['action'] = "inline_usergroup";
+					log_admin_action($to_update_count);
+					my_unsetcookie("inlinemod_useracp");
+					flash_message($lang->success_mass_usergroups, 'success');
+					admin_redirect("index.php?module=user-users".$vid_url);
+				}
+				else
 				{
-					$page->output_inline_error($errors);
+					// They tried to edit super admins! Uh-oh!
+					$errors[] = $lang->no_usergroup_changed;
 				}
+			}
 
-				// Display the usergroup options
-				$form = new Form("index.php?module=user-users", "post");
-				echo $form->generate_hidden_field('action', 'inline_edit');
-				echo $form->generate_hidden_field('inline_action', 'multiusergroup');
-				echo $form->generate_hidden_field('processed', '1');
+			$page->output_header($lang->manage_users);
+			$page->output_nav_tabs($sub_tabs, 'manage_users');
 
-				$form_container = new FormContainer($lang->mass_usergroups);
+			// Display a table warning
+			$table = new Table;
+			$lang->usergroup_info = $lang->sprintf($lang->usergroup_info, count($selected));
+			$table->construct_cell($lang->usergroup_info);
+			$table->construct_row();
+			$table->output($lang->important);
 
-				// Usergroups
-				$display_group_options[0] = $lang->use_primary_user_group;
-				$options = array();
-				$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
-				while($usergroup = $db->fetch_array($query))
-				{
-					$options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
-					$display_group_options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
-				}
+			if($errors)
+			{
+				$page->output_inline_error($errors);
+			}
 
-				if(!is_array($mybb->input['additionalgroups']))
-				{
-					$mybb->input['additionalgroups'] = explode(',', $mybb->input['additionalgroups']);
-				}
+			// Display the usergroup options
+			$form = new Form("index.php?module=user-users", "post");
+			echo $form->generate_hidden_field('action', 'inline_edit');
+			echo $form->generate_hidden_field('inline_action', 'multiusergroup');
+			echo $form->generate_hidden_field('processed', '1');
 
-				$form_container->output_row($lang->primary_user_group, "", $form->generate_select_box('usergroup', $options, $mybb->input['usergroup'], array('id' => 'usergroup')), 'usergroup');
-				$form_container->output_row($lang->additional_user_groups, $lang->additional_user_groups_desc, $form->generate_select_box('additionalgroups[]', $options, $mybb->input['additionalgroups'], array('id' => 'additionalgroups', 'multiple' => true, 'size' => 5)), 'additionalgroups');
-				$form_container->output_row($lang->display_user_group, "", $form->generate_select_box('displaygroup', $display_group_options, $mybb->input['displaygroup'], array('id' => 'displaygroup')), 'displaygroup');
+			$form_container = new FormContainer($lang->mass_usergroups);
 
-				$form_container->end();
+			// Usergroups
+			$display_group_options[0] = $lang->use_primary_user_group;
+			$options = array();
+			$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
+			while($usergroup = $db->fetch_array($query))
+			{
+				$options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
+				$display_group_options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
+			}
 
-				$buttons[] = $form->generate_submit_button($lang->alter_usergroups);
-				$form->output_submit_wrapper($buttons);
-				$form->end();
-				$page->output_footer();
-				break;
-		}
+			if(!is_array($mybb->input['additionalgroups']))
+			{
+				$mybb->input['additionalgroups'] = explode(',', $mybb->input['additionalgroups']);
+			}
+
+			$form_container->output_row($lang->primary_user_group, "", $form->generate_select_box('usergroup', $options, $mybb->input['usergroup'], array('id' => 'usergroup')), 'usergroup');
+			$form_container->output_row($lang->additional_user_groups, $lang->additional_user_groups_desc, $form->generate_select_box('additionalgroups[]', $options, $mybb->input['additionalgroups'], array('id' => 'additionalgroups', 'multiple' => true, 'size' => 5)), 'additionalgroups');
+			$form_container->output_row($lang->display_user_group, "", $form->generate_select_box('displaygroup', $display_group_options, $mybb->input['displaygroup'], array('id' => 'displaygroup')), 'displaygroup');
+
+			$form_container->end();
+
+			$buttons[] = $form->generate_submit_button($lang->alter_usergroups);
+			$form->output_submit_wrapper($buttons);
+			$form->end();
+			$page->output_footer();
+			break;
 	}
 }
 
@@ -3959,7 +3951,6 @@ function output_custom_profile_fields($fields, $values, &$form_container, &$form
 	{
 		$profile_field['name'] = htmlspecialchars_uni($profile_field['name']);
 		$profile_field['description'] = htmlspecialchars_uni($profile_field['description']);
-		$profile_field['type'] = htmlspecialchars_uni($profile_field['type']);
 		list($type, $options) = explode("\n", $profile_field['type'], 2);
 		$type = trim($type);
 		$field_name = "fid{$profile_field['fid']}";
@@ -3979,7 +3970,7 @@ function output_custom_profile_fields($fields, $values, &$form_container, &$form
 				$selected_options = array();
 				foreach($user_options as $val)
 				{
-					$selected_options[$val] = $val;
+					$selected_options[$val] = htmlspecialchars_uni($val);
 				}
 
 				$select_options = explode("\n", $options);
@@ -3991,7 +3982,7 @@ function output_custom_profile_fields($fields, $values, &$form_container, &$form
 
 				foreach($select_options as $val)
 				{
-					$val = trim($val);
+					$val = htmlspecialchars_uni(trim($val));
 					$options[$val] = $val;
 				}
 				if(!$profile_field['length'])
@@ -4010,7 +4001,7 @@ function output_custom_profile_fields($fields, $values, &$form_container, &$form
 				$options = array();
 				foreach($select_options as $val)
 				{
-					$val = trim($val);
+					$val = htmlspecialchars_uni(trim($val));
 					$options[$val] = $val;
 				}
 				if(!$profile_field['length'])
@@ -4019,11 +4010,11 @@ function output_custom_profile_fields($fields, $values, &$form_container, &$form
 				}
 				if($search == true)
 				{
-					$code = $form->generate_select_box("profile_fields[{$field_name}][{$field_name}]", $options, $values[$field_name], array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length']));
+					$code = $form->generate_select_box("profile_fields[{$field_name}][{$field_name}]", $options, htmlspecialchars_uni($values[$field_name]), array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length']));
 				}
 				else
 				{
-					$code = $form->generate_select_box("profile_fields[{$field_name}]", $options, $values[$field_name], array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length']));
+					$code = $form->generate_select_box("profile_fields[{$field_name}]", $options, htmlspecialchars_uni($values[$field_name]), array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length']));
 				}
 				break;
 			case "radio":
@@ -4037,7 +4028,7 @@ function output_custom_profile_fields($fields, $values, &$form_container, &$form
 				foreach($radio_options as $val)
 				{
 					$val = trim($val);
-					$code .= $form->generate_radio_button("profile_fields[{$field_name}]", $val, $val, array('id' => "profile_field_{$field_name}", 'checked' => ($val == $values[$field_name] ? true : false)))."<br />";
+					$code .= $form->generate_radio_button("profile_fields[{$field_name}]", $val, htmlspecialchars_uni($val), array('id' => "profile_field_{$field_name}", 'checked' => ($val == $values[$field_name] ? true : false)))."<br />";
 				}
 				break;
 			case "checkbox":
@@ -4063,7 +4054,7 @@ function output_custom_profile_fields($fields, $values, &$form_container, &$form
 				foreach($select_options as $val)
 				{
 					$val = trim($val);
-					$code .= $form->generate_check_box("profile_fields[{$field_name}][]", $val, $val, array('id' => "profile_field_{$field_name}", 'checked' => ($val == $selected_options[$val] ? true : false)))."<br />";
+					$code .= $form->generate_check_box("profile_fields[{$field_name}][]", $val, htmlspecialchars_uni($val), array('id' => "profile_field_{$field_name}", 'checked' => ($val == $selected_options[$val] ? true : false)))."<br />";
 				}
 				break;
 			case "textarea":
@@ -4187,8 +4178,7 @@ function user_search_conditions($input=array(), &$form)
 <!--
 $("#username").select2({
 	placeholder: "'.$lang->search_for_a_user.'",
-	minimumInputLength: 3,
-	maximumSelectionSize: 3,
+	minimumInputLength: 2,
 	multiple: false,
 	ajax: { // instead of writing the function to execute the request we use Select2\'s convenient helper
 		url: "../xmlhttp.php?action=get_users",
diff --git a/Upload/admin/styles/default/login.css b/Upload/admin/styles/default/login.css
index 6bd2b79..7ac5cdc 100644
--- a/Upload/admin/styles/default/login.css
+++ b/Upload/admin/styles/default/login.css
@@ -1,191 +1,191 @@
-/* MyBB Admin CP
- *
- * Login CSS
- */
-
-body {
-	font-family: 'Lucida Grande', Tahoma, Verdana, Arial, sans-serif;
-	font-size: 12px;
-	background: #fff;
-	color: #000000;
-	margin: 0;
-}
-
-a {
-	color: #0072BC;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #0072BC;
-	text-decoration: underline;
-}
-
-.invisible {
-	display: none;
-}
-
-#container {
-	width: 410px;
-	margin: 100px auto;
-}
-
-#logo h1 {
-	height: 82px;
-	background: transparent url(images/login_logo.png) bottom left no-repeat;
-	margin: 10px;
-	padding: 0;
-}
-
-#header h1 a {
-	float: left;
-	height: 82px;
-	width: 410px;
-}
-
-#content {
-	border: 1px solid #ccc;
-	background: #fff;
-	padding: 1px;
-	border-radius: 6px;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-}
-
-p, form {
-	padding: 0 10px 10px 10px;
-}
-
-form {
-	padding-bottom: 0;
-}
-
-p {
-	margin-bottom: 0;
-}
-
-form p {
-	padding: 0 0 10px 0;
-}
-
-h2 {
-	background: #02426c url(images/thead.png) repeat-x top left;
-	border-bottom: 1px solid #263c30;
-	color:#fff;
-	margin: 0;
-	padding: 8px;
-	font-size: 14px;
-	border-radius: 5px 5px 0 0;
-	-moz-border-radius: 5px 5px 0 0;
-	-webkit-border-radius: 5px 5px 0 0;
-}
-
-input.text_input {
-	border: 1px solid #aaa;
-	width: 255px;
-	padding: 4px;
-	font-size: 13px;
-	font-family: 'Lucida Grande', Tahoma, Verdana, Arial, sans-serif;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	outline: 0;
-}
-
-input.text_input:focus {
-	border: 1px solid #777;
-}
-
-#message {
-	margin: 10px 10px 0 10px;
-	padding: 10px;
-	font-weight: bold;
-	background: #efefef;
-	border: 1px solid #ccc;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-}
-
-#message.error {
-	border: 1px solid #FC6;
-	background: #FFC;
-	color: #C00;
-}
-
-#message.success {
-	border: #080 1px solid;
-	background-color: #E8FCDC;
-	color: #080;
-}
-
-form .label {
-	margin-bottom: 3px;
-	width: 112px;
-	clear: left;
-	float: left;
-	padding: 15px 0 0 8px;
-	border-top: 1px solid #ddd;
-}
-
-form label {
-	font-weight: bold;
-}
-
-.form_container .field {
-	float: left;
-	padding: 8px 0;
-	border-top: 1px solid #ddd;
-}
-
-p.submit {
-	clear: both;
-	background: #efefef;
-	border-top: 1px solid #ddd;
-	padding: 8px 10px;
-	margin: 8px -10px 0;
-	text-align: right;
-	border-radius: 0 0 5px 5px;
-	-moz-border-radius: 0 0 5px 5px;
-	-webkit-border-radius: 0 0 5px 5px;
-}
-
-p.submit input {
-	border: 1px solid #999;
-	padding: 4px 7px;
-	background: #e3e3e3 url(images/submit_bg.png) repeat-x top;
-	color: #444;
-	font-weight: bold;
-	font-family: 'Lucida Grande', Tahoma, Verdana, Arial, sans-serif;
-	margin-right: 3px;
-	font-size: 1.1em;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-}
-
-p.submit input:hover {
-	border: 1px solid #666;
-	cursor: pointer;
-}
-
-.forgot_password {
-	float: left;
-	padding-top: 8px;
-	font-size: 11px;
-}
-
-.forgot_password a {
-	color: #555;
-}
-
-.alert {
-	padding: 5px 10px;
-	border: #FC6 1px solid;
-	background-color: #ffc;
-	color: #900;
-	font-style: normal;
-	font-weight: bold;
-	padding-left: 10px;
-	display: block;
+/* MyBB Admin CP
+ *
+ * Login CSS
+ */
+
+body {
+	font-family: 'Lucida Grande', Tahoma, Verdana, Arial, sans-serif;
+	font-size: 12px;
+	background: #fff;
+	color: #000000;
+	margin: 0;
+}
+
+a {
+	color: #0072BC;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #0072BC;
+	text-decoration: underline;
+}
+
+.invisible {
+	display: none;
+}
+
+#container {
+	width: 410px;
+	margin: 100px auto;
+}
+
+#logo h1 {
+	height: 82px;
+	background: transparent url(images/login_logo.png) bottom left no-repeat;
+	margin: 10px;
+	padding: 0;
+}
+
+#header h1 a {
+	float: left;
+	height: 82px;
+	width: 410px;
+}
+
+#content {
+	border: 1px solid #ccc;
+	background: #fff;
+	padding: 1px;
+	border-radius: 6px;
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+}
+
+p, form {
+	padding: 0 10px 10px 10px;
+}
+
+form {
+	padding-bottom: 0;
+}
+
+p {
+	margin-bottom: 0;
+}
+
+form p {
+	padding: 0 0 10px 0;
+}
+
+h2 {
+	background: #02426c url(images/thead.png) repeat-x top left;
+	border-bottom: 1px solid #263c30;
+	color:#fff;
+	margin: 0;
+	padding: 8px;
+	font-size: 14px;
+	border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-radius: 5px 5px 0 0;
+}
+
+input.text_input {
+	border: 1px solid #aaa;
+	width: 255px;
+	padding: 4px;
+	font-size: 13px;
+	font-family: 'Lucida Grande', Tahoma, Verdana, Arial, sans-serif;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	outline: 0;
+}
+
+input.text_input:focus {
+	border: 1px solid #777;
+}
+
+#message {
+	margin: 10px 10px 0 10px;
+	padding: 10px;
+	font-weight: bold;
+	background: #efefef;
+	border: 1px solid #ccc;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+}
+
+#message.error {
+	border: 1px solid #FC6;
+	background: #FFC;
+	color: #C00;
+}
+
+#message.success {
+	border: #080 1px solid;
+	background-color: #E8FCDC;
+	color: #080;
+}
+
+form .label {
+	margin-bottom: 3px;
+	width: 112px;
+	clear: left;
+	float: left;
+	padding: 15px 0 0 8px;
+	border-top: 1px solid #ddd;
+}
+
+form label {
+	font-weight: bold;
+}
+
+.form_container .field {
+	float: left;
+	padding: 8px 0;
+	border-top: 1px solid #ddd;
+}
+
+p.submit {
+	clear: both;
+	background: #efefef;
+	border-top: 1px solid #ddd;
+	padding: 8px 10px;
+	margin: 8px -10px 0;
+	text-align: right;
+	border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	-webkit-border-radius: 0 0 5px 5px;
+}
+
+p.submit input {
+	border: 1px solid #999;
+	padding: 4px 7px;
+	background: #e3e3e3 url(images/submit_bg.png) repeat-x top;
+	color: #444;
+	font-weight: bold;
+	font-family: 'Lucida Grande', Tahoma, Verdana, Arial, sans-serif;
+	margin-right: 3px;
+	font-size: 1.1em;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+}
+
+p.submit input:hover {
+	border: 1px solid #666;
+	cursor: pointer;
+}
+
+.forgot_password {
+	float: left;
+	padding-top: 8px;
+	font-size: 11px;
+}
+
+.forgot_password a {
+	color: #555;
+}
+
+.alert {
+	padding: 5px 10px;
+	border: #FC6 1px solid;
+	background-color: #ffc;
+	color: #900;
+	font-style: normal;
+	font-weight: bold;
+	padding-left: 10px;
+	display: block;
 }
\ No newline at end of file
diff --git a/Upload/admin/styles/default/style.php b/Upload/admin/styles/default/style.php
index 40b1086..f0de3c6 100644
--- a/Upload/admin/styles/default/style.php
+++ b/Upload/admin/styles/default/style.php
@@ -1,82 +1,82 @@
-<?php
-/**
- * This is an example style file for Admin CP styles.
- *
- * It allows you to override our existing layout generation
- * classes with your own to further customise the Admin CP
- * layout beyond CSS.
- *
- * Your class name      Should extend
- * ---------------      -------------
- * Page                 DefaultPage
- * SidebarItem          DefaultSidebarItem
- * PopupMenu            DefaultPopupMenu
- * Table                DefaultTable
- * Form                 DefaultForm
- * FormContainer        DefaultFormContainer
- *
- * For example, to output your own custom header:
- *
- * class Page extends DefaultPage
- * {
- *   function output_header($title)
- *   {
- *      echo "<h1>{$title}</h1>";
- *   }
- * }
- *
- */
-
-// Disallow direct access to this file for security reasons
-if(!defined("IN_MYBB"))
-{
-	die("Direct initialization of this file is not allowed.<br /><br />Please make sure IN_MYBB is defined.");
-}
-
-class Page extends DefaultPage
-{
-	function _generate_breadcrumb()
-	{
-		if(!is_array($this->_breadcrumb_trail))
-		{
-			return false;
-		}
-		$trail = "";
-		foreach($this->_breadcrumb_trail as $key => $crumb)
-		{
-			if($this->_breadcrumb_trail[$key+1])
-			{
-				$trail .= "<a href=\"".$crumb['url']."\">".$crumb['name']."</a>";
-				if($this->_breadcrumb_trail[$key+2])
-				{
-					$trail .= " &raquo; ";
-				}
-			}
-			else
-			{
-				$trail .= " &raquo; <span class=\"active\">".$crumb['name']."</span>";
-			}
-		}
-		return $trail;
-	}
-}
-
-class SidebarItem extends DefaultSidebarItem
-{
-}
-
-class PopupMenu extends DefaultPopupMenu
-{
-}
-
-class Table extends DefaultTable
-{
-}
-
-class Form extends DefaultForm
-{
-}
-
-class FormContainer extends DefaultFormContainer
-{
-}
+<?php
+/**
+ * This is an example style file for Admin CP styles.
+ *
+ * It allows you to override our existing layout generation
+ * classes with your own to further customise the Admin CP
+ * layout beyond CSS.
+ *
+ * Your class name      Should extend
+ * ---------------      -------------
+ * Page                 DefaultPage
+ * SidebarItem          DefaultSidebarItem
+ * PopupMenu            DefaultPopupMenu
+ * Table                DefaultTable
+ * Form                 DefaultForm
+ * FormContainer        DefaultFormContainer
+ *
+ * For example, to output your own custom header:
+ *
+ * class Page extends DefaultPage
+ * {
+ *   function output_header($title)
+ *   {
+ *      echo "<h1>{$title}</h1>";
+ *   }
+ * }
+ *
+ */
+
+// Disallow direct access to this file for security reasons
+if(!defined("IN_MYBB"))
+{
+	die("Direct initialization of this file is not allowed.<br /><br />Please make sure IN_MYBB is defined.");
+}
+
+class Page extends DefaultPage
+{
+	function _generate_breadcrumb()
+	{
+		if(!is_array($this->_breadcrumb_trail))
+		{
+			return false;
+		}
+		$trail = "";
+		foreach($this->_breadcrumb_trail as $key => $crumb)
+		{
+			if($this->_breadcrumb_trail[$key+1])
+			{
+				$trail .= "<a href=\"".$crumb['url']."\">".$crumb['name']."</a>";
+				if($this->_breadcrumb_trail[$key+2])
+				{
+					$trail .= " &raquo; ";
+				}
+			}
+			else
+			{
+				$trail .= " &raquo; <span class=\"active\">".$crumb['name']."</span>";
+			}
+		}
+		return $trail;
+	}
+}
+
+class SidebarItem extends DefaultSidebarItem
+{
+}
+
+class PopupMenu extends DefaultPopupMenu
+{
+}
+
+class Table extends DefaultTable
+{
+}
+
+class Form extends DefaultForm
+{
+}
+
+class FormContainer extends DefaultFormContainer
+{
+}
diff --git a/Upload/archive/index.php b/Upload/archive/index.php
index 7722960..b9fa413 100644
--- a/Upload/archive/index.php
+++ b/Upload/archive/index.php
@@ -256,10 +256,19 @@
 		build_forum_breadcrumb($forum['fid'], 1);
 
 		// No threads and not a category? Error!
-		if(($threadcount < 1 || $forumpermissions['canviewthreads'] != 1) && $forum['type'] != 'c')
+		if($forum['type'] != 'c')
 		{
-			archive_header(strip_tags($forum['name']), $forum['name'], $mybb->settings['bburl']."/".get_forum_link($id, $page)."");
-			archive_error($lang->error_nothreads);
+			if($forumpermissions['canviewthreads'] != 1)
+			{
+				archive_header(strip_tags($forum['name']), $forum['name'], $mybb->settings['bburl']."/".get_forum_link($id, $page)."");
+				archive_error($lang->error_nopermission);
+			}
+
+			if($threadcount < 1 && $forumpermissions['canviewthreads'] == 1)
+			{
+				archive_header(strip_tags($forum['name']), $forum['name'], $mybb->settings['bburl']."/".get_forum_link($id, $page)."");
+				archive_error($lang->error_nothreads);
+			}
 		}
 
 		// Build the archive header.
diff --git a/Upload/calendar.php b/Upload/calendar.php
index e39f967..f90def6 100644
--- a/Upload/calendar.php
+++ b/Upload/calendar.php
@@ -1463,27 +1463,22 @@
 	{
 		$event['profilelink'] = build_profile_link(format_name($event['username'], $event['usergroup'], $event['displaygroup']), $event['uid']);
 
-		$hascustomtitle = 0;
 		if(trim($event['usertitle']) != "")
 		{
-			$hascustomtitle = 1;
+			// Do nothing, no need for an extra variable..
 		}
-
-		if($user_usergroup['usertitle'] != "" && !$hascustomtitle)
+		elseif($user_usergroup['usertitle'] != "")
 		{
 			$event['usertitle'] = $user_usergroup['usertitle'];
 		}
 		elseif(is_array($titles_cache) && !$user_usergroup['usertitle'])
 		{
 			reset($titles_cache);
-			foreach($titles_cache as $key => $title)
+			foreach($titles_cache as $title)
 			{
-				if($event['postnum'] >= $key)
+				if($event['postnum'] >= $title['posts'])
 				{
-					if(!$hascustomtitle)
-					{
-						$event['usertitle'] = $title['title'];
-					}
+					$event['usertitle'] = $title['title'];
 					$event['stars'] = $title['stars'];
 					$event['starimage'] = $title['starimage'];
 					break;
@@ -1534,7 +1529,7 @@
 		$event['userstars'] = '';
 	}
 
-	$event['usertitle'] = htmlspecialchars_uni($event['usertitle']); 
+	$event['usertitle'] = htmlspecialchars_uni($event['usertitle']);
 
 	if($event['ignoretimezone'] == 0)
 	{
@@ -1807,27 +1802,22 @@
 			{
 				$event['profilelink'] = build_profile_link(format_name($event['username'], $event['usergroup'], $event['displaygroup']), $event['uid']);
 
-				$hascustomtitle = 0;
 				if(trim($event['usertitle']) != "")
 				{
-					$hascustomtitle = 1;
+					// Do nothing, no need for an extra variable..
 				}
-
-				if($user_usergroup['usertitle'] != "" && !$hascustomtitle)
+				elseif($user_usergroup['usertitle'] != "")
 				{
 					$event['usertitle'] = $user_usergroup['usertitle'];
 				}
 				elseif(is_array($titles_cache) && !$user_usergroup['usertitle'])
 				{
 					reset($titles_cache);
-					foreach($titles_cache as $key => $title)
+					foreach($titles_cache as $title)
 					{
-						if($event['postnum'] >= $key)
+						if($event['postnum'] >= $title['posts'])
 						{
-							if(!$hascustomtitle)
-							{
-								$event['usertitle'] = $title['title'];
-							}
+							$event['usertitle'] = $title['title'];
 							$event['stars'] = $title['stars'];
 							$event['starimage'] = $title['starimage'];
 							break;
@@ -1878,7 +1868,7 @@
 				$event['userstars'] = '';
 			}
 
-			$event['usertitle'] = htmlspecialchars_uni($event['usertitle']); 
+			$event['usertitle'] = htmlspecialchars_uni($event['usertitle']);
 
 			if($event['ignoretimezone'] == 0)
 			{
diff --git a/Upload/contact.php b/Upload/contact.php
index 1bf7848..96a3d80 100644
--- a/Upload/contact.php
+++ b/Upload/contact.php
@@ -11,7 +11,7 @@
 define("IN_MYBB", 1);
 define('THIS_SCRIPT', 'contact.php');
 
-$templatelist = "contact,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,post_captcha_ayah";
+$templatelist = "contact,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha";
 
 require_once "./global.php";
 require_once MYBB_ROOT.'inc/class_captcha.php';
diff --git a/Upload/editpost.php b/Upload/editpost.php
index a42050d..8bae77e 100644
--- a/Upload/editpost.php
+++ b/Upload/editpost.php
@@ -844,7 +844,7 @@
 			$mybb->input['threadprefix'] = $thread['prefix'];
 		}
 
-		$prefixselect = build_prefix_select($forum['fid'], $mybb->get_input('threadprefix', MyBB::INPUT_INT));
+		$prefixselect = build_prefix_select($forum['fid'], $mybb->get_input('threadprefix', MyBB::INPUT_INT), 0, $thread['prefix']);
 	}
 	else
 	{
diff --git a/Upload/forumdisplay.php b/Upload/forumdisplay.php
index 77fc2c4..316807a 100644
--- a/Upload/forumdisplay.php
+++ b/Upload/forumdisplay.php
@@ -18,7 +18,7 @@
 $templatelist .= ",forumdisplay_usersbrowsing_user,forumdisplay_usersbrowsing,forumdisplay_inlinemoderation,forumdisplay_thread_modbit,forumdisplay_inlinemoderation_col,forumdisplay_inlinemoderation_selectall,forumdisplay_threadlist_clearpass,forumdisplay_thread_rating_moved";
 $templatelist .= ",forumdisplay_announcements_announcement,forumdisplay_announcements,forumdisplay_threads_sep,forumbit_depth3_statusicon,forumbit_depth3,forumdisplay_sticky_sep,forumdisplay_thread_attachment_count,forumdisplay_rssdiscovery,forumdisplay_announcement_rating,forumbit_moderators_group";
 $templatelist .= ",forumdisplay_inlinemoderation_openclose,forumdisplay_inlinemoderation_stickunstick,forumdisplay_inlinemoderation_softdelete,forumdisplay_inlinemoderation_restore,forumdisplay_inlinemoderation_delete,forumdisplay_inlinemoderation_manage,forumdisplay_inlinemoderation_approveunapprove";
-$templatelist .= ",forumbit_depth2_forum_unapproved_posts,forumbit_depth2_forum_unapproved_threads,forumbit_moderators_user,forumdisplay_inlinemoderation_standard,forumdisplay_threadlist_prefixes_prefix,forumdisplay_threadlist_prefixes";
+$templatelist .= ",forumbit_depth2_forum_unapproved_posts,forumbit_depth2_forum_unapproved_threads,forumbit_moderators_user,forumdisplay_inlinemoderation_standard,forumdisplay_threadlist_prefixes_prefix,forumdisplay_threadlist_prefixes,forumdisplay_nopermission";
 
 require_once "./global.php";
 require_once MYBB_ROOT."inc/functions_post.php";
@@ -1438,7 +1438,12 @@
 // Is this a real forum with threads?
 if($foruminfo['type'] != "c")
 {
-	if(!$threadcount)
+	if($fpermissions['canviewthreads'] != 1)
+	{
+		eval("\$threads = \"".$templates->get("forumdisplay_nopermission")."\";");
+	}
+
+	if(!$threadcount && $fpermissions['canviewthreads'] == 1)
 	{
 		eval("\$threads = \"".$templates->get("forumdisplay_nothreads")."\";");
 	}
diff --git a/Upload/global.php b/Upload/global.php
index aa76220..7045340 100644
--- a/Upload/global.php
+++ b/Upload/global.php
@@ -363,7 +363,7 @@
 }
 unset($actions);
 
-if(!empty($theme_stylesheets))
+if(!empty($theme_stylesheets) && is_array($theme['disporder']))
 {
 	foreach($theme['disporder'] as $style_name => $order)
 	{
diff --git a/Upload/inc/3rdparty/ayah/ayah.php b/Upload/inc/3rdparty/ayah/ayah.php
deleted file mode 100644
index 3d2acc6..0000000
--- a/Upload/inc/3rdparty/ayah/ayah.php
+++ /dev/null
@@ -1,482 +0,0 @@
-<?php 
-/*
- * Are You A Human
- * PHP Integration Library
- *
- * @version 1.1.8
- *
- *    - Documentation and latest version
- *	  http://portal.areyouahuman.com/help
- *    - Get an AYAH Publisher Key
- *	  https://portal.areyouahuman.com
- *    - Discussion group
- *	  http://getsatisfaction.com/areyouahuman
- *
- * Copyright (c) 2013 AYAH LLC -- http://www.areyouahuman.com
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- */
-
-// Only define the AYAH class if it does not already exist.
-if ( ! class_exists('AYAH')):
-
-class AYAH {
-	// Set defaults for values that can be specified via the config file or passed in via __construct.
-	protected $ayah_publisher_key = '';
-	protected $ayah_scoring_key = '';
-	protected $ayah_web_service_host = 'ws.areyouahuman.com';
-	protected $ayah_debug_mode = FALSE;
-	protected $ayah_use_curl = TRUE;
-
-	protected $session_secret;
-
-	protected $__valid_construct_params = array('publisher_key', 'scoring_key', 'web_service_host', 'debug_mode', 'use_curl');
-	protected $__message_buffer = array();
-	protected $__version_number = '1.1.7';
-
-	/**
-	 * Constructor
-	 * If the session secret exists in input, it grabs it
-	 * @param $params associative array with keys publisher_key, scoring_key, web_service_host
-	 *
-	 */
-	public function __construct($params = array())
-	{
-		// Try to load the ayah_config.php file.
-		if ( ! $this->__load_config_file())
-		{
-			$this->__log("DEBUG", __FUNCTION__, "The ayah_config.php file is missing.");
-		}
-
-		// Get and use any valid parameters that were passed in via the $params array.
-		foreach ((array)$this->__valid_construct_params as $partial_variable_name)
-		{
-			// Build the full variable name...and create an upper case version.
-			$variable_name = "ayah_" . $partial_variable_name;
-			$uc_variable_name = strtoupper($variable_name);
-
-			// Check to see if it was passed in via $params.
-			if (isset($params[$partial_variable_name]))
-			{
-				$this->{$variable_name} = $params[$partial_variable_name];
-			}
-			// Check to see if it was defined in the ayah_config file.
-			elseif (defined($uc_variable_name))
-			{
-				$this->{$variable_name} = constant($uc_variable_name);
-			}
-		}
-
-		// Generate some warnings/errors if needed variables are not set.
-		if ($this->ayah_publisher_key == "")
-		{
-			$this->__log("ERROR", __FUNCTION__, "Warning: Publisher key is not defined.  This won't work.");
-		}
-		else
-		{
-			$this->__log("DEBUG", __FUNCTION__, "Publisher key: '$this->ayah_publisher_key'");
-		}
-		if ($this->ayah_scoring_key == "")
-		{
-			$this->__log("ERROR", __FUNCTION__, "Warning: Scoring key is not defined.  This won't work.");
-		}
-		else
-		{
-			// For security reasons, don't output the scoring key as part of the debug info.
-		}
-		if ($this->ayah_web_service_host == "")
-		{
-			$this->__log("ERROR", __FUNCTION__, "Warning: Web service host is not defined.  This won't work.");
-		}
-		else
-		{
-			$this->__log("DEBUG", __FUNCTION__, "AYAH Webservice host: '$this->ayah_web_service_host'");
-		}
-
-		// If available, set the session secret.
-		if(array_key_exists("session_secret", $_REQUEST)) {
-			$this->session_secret = $_REQUEST["session_secret"];
-		}
-	}
-
-	/**
-	 * Returns the markup for the PlayThru
-	 *
-	 * @return string
-	 */
-	public function getPublisherHTML($config = array())
-	{
-		// Initialize.
-		$session_secret = "";
-		$fields = array('config' => $config);
-		$webservice_url = '/ws/setruntimeoptions/' . $this->ayah_publisher_key;
-
-		// If necessary, process the config data.
-		if ( ! empty($config))
-		{
-			// Log it.
-			$this->__log("DEBUG", __FUNCTION__, "Setting runtime options...config data='".implode(",", $config)."'");
-			
-			// Add the gameid to the options url.
-			if (array_key_exists("gameid", $config))
-			{
-				$webservice_url .= '/' . $config['gameid'];
-			}
-		}
-
-		// Call the webservice and get the response.
-		$resp = $this->doHttpsPostReturnJSONArray($this->ayah_web_service_host, $webservice_url, $fields);
-		if ($resp)
-		{
-			// Get the session secret from the response.
-			$session_secret = $resp->session_secret;
-		
-			// Build the url to the AYAH webservice.
-			$url = 'https://';						// The AYAH webservice API requires https.
-			$url.= $this->ayah_web_service_host;				// Add the host.
-			$url.= "/ws/script/";						// Add the path to the API script.
-			$url.= urlencode($this->ayah_publisher_key);			// Add the encoded publisher key.
-			$url.= (empty($session_secret))? "" : "/".$session_secret;	// If set, add the session_secret.
-
-			// Build and return the needed HTML code.
-			return "<div id='AYAH'></div><script src='". $url ."' type='text/javascript' language='JavaScript'></script>";
-		}
-		else
-		{
-			// Build and log a detailed message.
-			$url = "https://".$this->ayah_web_service_host.$webservice_url;
-			$message = "Unable to connect to the AYAH webservice server.  url='$url'";
-			$this->__log("ERROR", __FUNCTION__, $message);
-
-			// Build and display a helpful message to the site user.
-			$style = "padding: 10px; border: 1px solid #EED3D7; background: #F2DEDE; color: #B94A48;";
-			$message = "Unable to load the <i>Are You a Human</i> PlayThru&trade;.  Please contact the site owner to report the problem.";
-			echo "<p style=\"$style\">$message</p>\n";
-		}
-	}
-
-	/**
-	 * Check whether the user is a human
-	 * Wrapper for the scoreGame API call
-	 *
-	 * @return boolean
-	 */
-	public function scoreResult() {
-		$result = false;
-		if ($this->session_secret) {
-			$fields = array(
-				'session_secret' => urlencode($this->session_secret),
-				'scoring_key' => $this->ayah_scoring_key
-			);
-			$resp = $this->doHttpsPostReturnJSONArray($this->ayah_web_service_host, "/ws/scoreGame", $fields);
-			if ($resp) {
-				$result = ($resp->status_code == 1);
-			}
-		}
-		else
-		{
-			$this->__log("DEBUG", __FUNCTION__, "Unable to score the result.  Please check that your ayah_config.php file contains your correct publisher key and scoring key.");
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Records a conversion
-	 * Called on the goal page that A and B redirect to
-	 * A/B Testing Specific Function
-	 *
-	 * @return boolean
-	 */
-	public function recordConversion() {
-		// Build the url to the AYAH webservice..
-		$url = 'https://';				// The AYAH webservice API requires https.
-		$url.= $this->ayah_web_service_host;		// Add the host.
-		$url.= "/ws/recordConversion/";			// Add the path to the API script.
-		$url.= urlencode($this->ayah_publisher_key);	// Add the encoded publisher key.
-
-		if( isset( $this->session_secret ) ){
-			return '<iframe style="border: none;" height="0" width="0" src="' . $url . '"></iframe>';
-		} else {
-			$this->__log("ERROR", __FUNCTION__, 'AYAH Conversion Error: No Session Secret');
-			return FALSE;
-		}
-	}
-
-	/**
-	 * Do a HTTPS POST, return some JSON decoded as array (Internal function)
-	 * @param $host hostname
-	 * @param $path path
-	 * @param $fields associative array of fields
-	 * return JSON decoded data structure or empty data structure
-	 */
-	protected function doHttpsPostReturnJSONArray($hostname, $path, $fields) {
-		$result = $this->doHttpsPost($hostname, $path, $fields);
-
-		if ($result) {
-			$result = $this->doJSONArrayDecode($result);
-		} else {
-			$this->__log("ERROR", __FUNCTION__, "Post to https://$hostname$path returned no result.");
-			$result = array();
-		}
-
-		return $result;
-	}
-
-	// Internal function; does an HTTPS post
-	protected function doHttpsPost($hostname, $path, $fields) {
-		$result = "";
-		// URLencode the post string
-		$fields_string = "";
-		foreach($fields as $key=>$value) {
-			if (is_array($value)) {
-				if ( ! empty($value)) {
-					foreach ($value as $k => $v) {
-						$fields_string .= $key . '['. $k .']=' . $v . '&';
-					}
-				} else {
-					$fields_string .= $key . '=&';
-				}
-			} else {
-				$fields_string .= $key.'='.$value.'&';
-			}
-		}
-		rtrim($fields_string,'&');
-
-		// Use cURL?
-		if ($this->__use_curl())
-		{
-			// Build the cURL url.
-			$curl_url = "https://" . $hostname . $path;
-
-			// Log it.
-			$this->__log("DEBUG", __FUNCTION__, "Using cURl: url='$curl_url', fields='$fields_string'");
-
-			// Initialize cURL session.
-			if ($ch = curl_init($curl_url))
-			{
-				// Set the cURL options.
-				curl_setopt($ch, CURLOPT_POST, count($fields));
-				curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
-				curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-				curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-				curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-
-				// Execute the cURL request.
-				$result = curl_exec($ch);
-
-				// Close the curl session.
-				curl_close($ch);
-			}
-			else
-			{
-				// Log it.
-				$this->__log("DEBUG", __FUNCTION__, "Unable to initialize cURL: url='$curl_url'");
-			}
-		}
-		else
-		{
-			// Log it.
-			$this->__log("DEBUG", __FUNCTION__, "Using fsockopen(): fields='$fields_string'");
-
-			// Build a header
-			$http_request  = "POST $path HTTP/1.1\r\n";
-			$http_request .= "Host: $hostname\r\n";
-			$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-			$http_request .= "Content-Length: " . strlen($fields_string) . "\r\n";
-			$http_request .= "User-Agent: AreYouAHuman/PHP " . $this->get_version_number() . "\r\n";
-			$http_request .= "Connection: Close\r\n";
-			$http_request .= "\r\n";
-			$http_request .= $fields_string ."\r\n";
-
-			$result = '';
-			$errno = $errstr = "";
-			$fs = fsockopen("ssl://" . $hostname, 443, $errno, $errstr, 10);
-			if( false == $fs ) {
-				$this->__log("ERROR", __FUNCTION__, "Could not open socket");
-			} else {
-				fwrite($fs, $http_request);
-				while (!feof($fs)) {
-					$result .= fgets($fs, 4096);
-				}
-
-				$result = explode("\r\n\r\n", $result, 2);
-				$result = $result[1];
-			}
-		}
-
-		// Log the result.
-		$this->__log("DEBUG", __FUNCTION__, "result='$result'");
-
-		// Return the result.
-		return $result;
-	}
-
-	// Internal function: does a JSON decode of the string
-	protected function doJSONArrayDecode($string) {
-		$result = array();
-
-		if (function_exists("json_decode")) {
-			try {
-				$result = json_decode( $string);
-			} catch (Exception $e) {
-				$this->__log("ERROR", __FUNCTION__, "Exception when calling json_decode: " . $e->getMessage());
-				$result = null;
-			}
-		} elseif (file_Exists("json.php")) {
-			require_once('json.php');
-			$json = new Services_JSON();
-			$result = $json->decode($string);
-
-			if (!is_array($result)) {
-				$this->__log("ERROR", __FUNCTION__, "Expected array; got something else: $result");
-				$result = array();
-			}
-		} else {
-			$this->__log("ERROR", __FUNCTION__, "No JSON decode function available.");
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Get the current debug mode (TRUE or FALSE)
-	 *
-	 * @return boolean
-	 */
-	public function debug_mode($mode=null)
-	{
-		// Set it if the mode is passed.
-		if (null !== $mode)
-		{
-			// Save it.
-			$this->ayah_debug_mode = $mode;
-
-			// Display a message if debug_mode is TRUE.
-			if ($mode)
-			{
-				$version_number = $this->get_version_number();
-				$this->__log("DEBUG", "", "Debug mode is now on. (ayah.php version=$version_number)");
-
-				// Flush the buffer.
-				$this->__flush_message_buffer();
-			}
-		}
-
-		// If necessary, set the default.
-		if ( ! isset($this->ayah_debug_mode) or (null == $this->ayah_debug_mode)) $this->ayah_debug_mode = FALSE;
-
-		// Return TRUE or FALSE.
-		return ($this->ayah_debug_mode)? TRUE : FALSE;
-	}
-
-	/**
-	 * Get the current version number
-	 *
-	 * @return string
-	 */
-	public function get_version_number()
-	{
-		return (isset($this->__version_number))? $this->__version_number : FALSE;
-	}
-
-	/**
-	 * Determine whether or not cURL is available to use.
-	 *
-	 * @return boolean
-	 */
-	private function __use_curl()
-	{
-		if (FALSE === $this->ayah_use_curl)
-		{
-			return FALSE;
-		}
-		elseif (function_exists('curl_init') and function_exists('curl_exec'))
-		{
-			return TRUE;
-		}
-		return FALSE;
-	}
-
-	/**
-	 * Load the config file.
-	 *
-	 * @return boolean
-	 */
-	private function __load_config_file()
-	{
-		// Initialize.
-		$name = 'ayah_config.php';
-		$locations = array(
-			'./',
-			dirname(__FILE__)."/",
-		);
-
-		// Look for the config file in each location.
-		foreach ($locations as $location)
-		{
-			if (file_exists($location.$name))
-			{
-				require_once($location.$name);
-				return TRUE;
-			}
-		}
-
-		// Could not find the config file.
-		return FALSE;
-	}
-
-	/**
-	 * Log a message
-	 *
-	 * @return null
-	 */
-	protected function __log($type, $function, $message)
-	{
-		// Add a prefix to the message.
-		$message = __CLASS__ . "::$function: " . $message;
-
-		// Is it an error message?
-		if (FALSE !== stripos($type, "error"))
-		{
-			error_log($message);
-		}
-
-		// Build the full message.
-		$message_style = "padding: 10px; border: 1px solid #EED3D7; background: #F2DEDE; color: #B94A48;";
-		$full_message = "<p style=\"$message_style\"><strong>$type:</strong> $message</p>\n";
-
-		// Output to the screen too?
-		if ($this->debug_mode())
-		{
-			echo "$full_message";
-		}
-		else
-		{
-			// Add the message to the buffer in case we need it later.
-			$this->__message_buffer[] = $full_message;
-		}
-	}
-
-	private function __flush_message_buffer()
-	{		
-		// Flush the buffer.
-		if ( ! empty($this->__message_buffer))
-		{
-			foreach ($this->__message_buffer as $buffered_message)
-			{
-				// Print the buffered message.
-				echo "$buffered_message";
-			}
-		}
-	}
-}
-
-endif;	// if ( ! class_exists('AYAH')):
diff --git a/Upload/inc/3rdparty/ayah/index.html b/Upload/inc/3rdparty/ayah/index.html
deleted file mode 100644
index efd2f36..0000000
--- a/Upload/inc/3rdparty/ayah/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title></title>
-</head>
-<body>
-&nbsp;
-</body>
-</html>
\ No newline at end of file
diff --git a/Upload/inc/3rdparty/diff/Diff/Op/index.html b/Upload/inc/3rdparty/diff/Diff/Op/index.html
index efd2f36..d3a291c 100644
--- a/Upload/inc/3rdparty/diff/Diff/Op/index.html
+++ b/Upload/inc/3rdparty/diff/Diff/Op/index.html
@@ -1,8 +1,8 @@
-<html>
-<head>
-<title></title>
-</head>
-<body>
-&nbsp;
-</body>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+&nbsp;
+</body>
 </html>
\ No newline at end of file
diff --git a/Upload/inc/3rdparty/diff/Diff/ThreeWay/Op/index.html b/Upload/inc/3rdparty/diff/Diff/ThreeWay/Op/index.html
index efd2f36..d3a291c 100644
--- a/Upload/inc/3rdparty/diff/Diff/ThreeWay/Op/index.html
+++ b/Upload/inc/3rdparty/diff/Diff/ThreeWay/Op/index.html
@@ -1,8 +1,8 @@
-<html>
-<head>
-<title></title>
-</head>
-<body>
-&nbsp;
-</body>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+&nbsp;
+</body>
 </html>
\ No newline at end of file
diff --git a/Upload/inc/3rdparty/diff/Diff/ThreeWay/index.html b/Upload/inc/3rdparty/diff/Diff/ThreeWay/index.html
index efd2f36..d3a291c 100644
--- a/Upload/inc/3rdparty/diff/Diff/ThreeWay/index.html
+++ b/Upload/inc/3rdparty/diff/Diff/ThreeWay/index.html
@@ -1,8 +1,8 @@
-<html>
-<head>
-<title></title>
-</head>
-<body>
-&nbsp;
-</body>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+&nbsp;
+</body>
 </html>
\ No newline at end of file
diff --git a/Upload/inc/cachehandlers/apc.php b/Upload/inc/cachehandlers/apc.php
index c8643d4..d9869ee 100644
--- a/Upload/inc/cachehandlers/apc.php
+++ b/Upload/inc/cachehandlers/apc.php
@@ -11,7 +11,7 @@
 /**
  * APC Cache Handler
  */
-class apcCacheHandler
+class apcCacheHandler implements CacheHandlerInterface
 {
 	/**
 	 * Unique identifier representing this copy of MyBB
@@ -20,10 +20,7 @@ class apcCacheHandler
 	 */
 	public $unique_id;
 
-	/**
-	 * @param bool $silent ignored
-	 */
-	function __construct($silent=false)
+	function __construct()
 	{
 		global $mybb;
 
@@ -56,10 +53,9 @@ function connect()
 	 * Connect and initialize this handler.
 	 *
 	 * @param string $name
-	 * @param bool $hard_refresh ignored
 	 * @return boolean True if successful, false on failure
 	 */
-	function fetch($name, $hard_refresh=false)
+	function fetch($name)
 	{
 		if(apc_exists($this->unique_id."_".$name))
 		{
diff --git a/Upload/inc/cachehandlers/disk.php b/Upload/inc/cachehandlers/disk.php
index 934d887..030ac47 100644
--- a/Upload/inc/cachehandlers/disk.php
+++ b/Upload/inc/cachehandlers/disk.php
@@ -11,15 +11,14 @@
 /**
  * Disk Cache Handler
  */
-class diskCacheHandler
+class diskCacheHandler implements CacheHandlerInterface
 {
 	/**
 	 * Connect and initialize this handler.
 	 *
-	 * @param bool $silent ignored
 	 * @return boolean True if successful, false on failure
 	 */
-	function connect($silent=false)
+	function connect()
 	{
 		if(!@is_writable(MYBB_ROOT."cache"))
 		{
@@ -33,24 +32,16 @@ function connect($silent=false)
 	 * Retrieve an item from the cache.
 	 *
 	 * @param string $name The name of the cache
-	 * @param boolean $hard_refresh True if we should do a hard refresh
 	 * @return mixed Cache data if successful, false if failure
 	 */
-	function fetch($name, $hard_refresh=false)
+	function fetch($name)
 	{
 		if(!@file_exists(MYBB_ROOT."/cache/{$name}.php"))
 		{
 			return false;
 		}
 
-		if(!isset($this->cache[$name]) || $hard_refresh == true)
-		{
-			@include(MYBB_ROOT."/cache/{$name}.php");
-		}
-		else
-		{
-			@include_once(MYBB_ROOT."/cache/{$name}.php");
-		}
+		@include(MYBB_ROOT."/cache/{$name}.php");
 
 		// Return data
 		return $$name;
diff --git a/Upload/inc/cachehandlers/eaccelerator.php b/Upload/inc/cachehandlers/eaccelerator.php
index 86a3d7e..7f4e404 100644
--- a/Upload/inc/cachehandlers/eaccelerator.php
+++ b/Upload/inc/cachehandlers/eaccelerator.php
@@ -11,7 +11,7 @@
 /**
  * eAccelerator Cache Handler
  */
-class eacceleratorCacheHandler
+class eacceleratorCacheHandler implements CacheHandlerInterface
 {
 	/**
 	 * Unique identifier representing this copy of MyBB
@@ -20,10 +20,7 @@ class eacceleratorCacheHandler
 	 */
 	public $unique_id;
 
-	/**
-	 * @param bool $silent ignored
-	 */
-	function eacceleratorCacheHandler($silent=false)
+	function __construct()
 	{
 		global $mybb;
 
@@ -56,10 +53,9 @@ function connect()
 	 * Retrieve an item from the cache.
 	 *
 	 * @param string $name The name of the cache
-	 * @param boolean $hard_refresh True if we should do a hard refresh
 	 * @return mixed Cache data if successful, false if failure
 	 */
-	function fetch($name, $hard_refresh=false)
+	function fetch($name)
 	{
 		$data = eaccelerator_get($this->unique_id."_".$name);
 		if($data === false)
diff --git a/Upload/inc/cachehandlers/interface.php b/Upload/inc/cachehandlers/interface.php
new file mode 100644
index 0000000..f751f50
--- /dev/null
+++ b/Upload/inc/cachehandlers/interface.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * MyBB 1.8
+ * Copyright 2014 MyBB Group, All Rights Reserved
+ *
+ * Website: http://www.mybb.com
+ * License: http://www.mybb.com/about/license
+ *
+ */
+
+/**
+ * Cache Handler Interface
+ */
+interface CacheHandlerInterface
+{
+	/**
+	 * Connect and initialize this handler.
+	 *
+	 * @return boolean True if successful, false on failure
+	 */
+	function connect();
+
+	/**
+	 * Connect and initialize this handler.
+	 *
+	 * @param string $name
+	 * @return boolean True if successful, false on failure
+	 */
+	function fetch($name);
+
+	/**
+	 * Write an item to the cache.
+	 *
+	 * @param string $name The name of the cache
+	 * @param mixed $contents The data to write to the cache item
+	 * @return boolean True on success, false on failure
+	 */
+	function put($name, $contents);
+
+	/**
+	 * Delete a cache
+	 *
+	 * @param string $name The name of the cache
+	 * @return boolean True on success, false on failure
+	 */
+	function delete($name);
+
+	/**
+	 * Disconnect from the cache
+	 *
+	 * @return bool
+	 */
+	function disconnect();
+
+	/**
+	 * @param string $name
+	 *
+	 * @return string
+	 */
+	function size_of($name);
+}
diff --git a/Upload/inc/cachehandlers/memcache.php b/Upload/inc/cachehandlers/memcache.php
index 57610eb..82a2ae1 100644
--- a/Upload/inc/cachehandlers/memcache.php
+++ b/Upload/inc/cachehandlers/memcache.php
@@ -11,7 +11,7 @@
 /**
  * Memcache Cache Handler
  */
-class memcacheCacheHandler
+class memcacheCacheHandler implements CacheHandlerInterface
 {
 	/**
 	 * The memcache server resource
@@ -27,10 +27,7 @@ class memcacheCacheHandler
 	 */
 	public $unique_id;
 
-	/**
-	 * @param bool $silent
-	 */
-	function memcacheCacheHandler($silent=false)
+	function __construct()
 	{
 		global $mybb;
 
@@ -98,10 +95,9 @@ function connect()
 	 * Retrieve an item from the cache.
 	 *
 	 * @param string $name The name of the cache
-	 * @param boolean $hard_refresh True if we should do a hard refresh
 	 * @return mixed Cache data if successful, false if failure
 	 */
-	function fetch($name, $hard_refresh=false)
+	function fetch($name)
 	{
 		$data = $this->memcache->get($this->unique_id."_".$name);
 
diff --git a/Upload/inc/cachehandlers/memcached.php b/Upload/inc/cachehandlers/memcached.php
index 65920bb..2f8d71d 100644
--- a/Upload/inc/cachehandlers/memcached.php
+++ b/Upload/inc/cachehandlers/memcached.php
@@ -11,7 +11,7 @@
 /**
  * Memcached Cache Handler
  */
-class memcachedCacheHandler
+class memcachedCacheHandler implements CacheHandlerInterface
 {
 	/**
 	 * The memcached server resource
@@ -27,10 +27,7 @@ class memcachedCacheHandler
 	 */
 	public $unique_id;
 
-	/**
-	 * @param bool $silent ignored
-	 */
-	function memcachedCacheHandler($silent=false)
+	function __construct()
 	{
 		global $mybb;
 
@@ -98,10 +95,9 @@ function connect()
 	 * Retrieve an item from the cache.
 	 *
 	 * @param string $name The name of the cache
-	 * @param boolean $hard_refresh True if we should do a hard refresh
 	 * @return mixed Cache data if successful, false if failure
 	 */
-	function fetch($name, $hard_refresh=false)
+	function fetch($name)
 	{
 		$data = $this->memcached->get($this->unique_id."_".$name);
 
@@ -143,7 +139,7 @@ function delete($name)
 	 */
 	function disconnect()
 	{
-		@$this->memcached->close();
+		@$this->memcached->quit();
 	}
 
 	/**
diff --git a/Upload/inc/cachehandlers/xcache.php b/Upload/inc/cachehandlers/xcache.php
index e703d06..5d778fd 100644
--- a/Upload/inc/cachehandlers/xcache.php
+++ b/Upload/inc/cachehandlers/xcache.php
@@ -11,7 +11,7 @@
 /**
  * Xcache Cache Handler
  */
-class xcacheCacheHandler
+class xcacheCacheHandler implements CacheHandlerInterface
 {
 	/**
 	 * Unique identifier representing this copy of MyBB
@@ -20,10 +20,7 @@ class xcacheCacheHandler
 	 */
 	public $unique_id;
 
-	/**
-	 * @param bool $silent ignored
-	 */
-	function xcacheCacheHandler($silent=false)
+	function __construct()
 	{
 		global $mybb;
 
@@ -56,10 +53,9 @@ function connect()
 	 * Retrieve an item from the cache.
 	 *
 	 * @param string $name The name of the cache
-	 * @param boolean $hard_refresh True if we should do a hard refresh
 	 * @return mixed Cache data if successful, false if failure
 	 */
-	function fetch($name, $hard_refresh=false)
+	function fetch($name)
 	{
 		if(!xcache_isset($this->unique_id."_".$name))
 		{
diff --git a/Upload/inc/class_captcha.php b/Upload/inc/class_captcha.php
index 92c20c1..82d727a 100644
--- a/Upload/inc/class_captcha.php
+++ b/Upload/inc/class_captcha.php
@@ -40,7 +40,6 @@ class captcha
 	 *
 	 * 1 = Default CAPTCHA
 	 * 2 = reCAPTCHA
-	 * 3 = Are You a Human
 	 * 4 = NoCATPCHA reCAPTCHA
 	 *
 	 * @var int
@@ -52,7 +51,7 @@ class captcha
 	 *
 	 * @var string
 	 */
-	 public $captch_template = '';
+	 public $captcha_template = '';
 
 	/**
 	 * CAPTCHA Server URL
@@ -68,17 +67,6 @@ class captcha
 	 */
 	public $verify_server = '';
 
-	/**
-	 * Are You a Human configuration
-	 *
-	 * @var string
-	 */
-	public $ayah_web_service_host = '';
-	public $ayah_publisher_key = '';
-	public $ayah_scoring_key = '';
-	public $ayah_debug_mode = '';
-	public $ayah_use_curl = '';
-
 	/**
 	 * HTML of the built CAPTCHA
 	 *
@@ -120,31 +108,13 @@ function __construct($build = false, $template = "")
 			{
 				$this->captcha_template .= "_recaptcha";
 			}
-			else if($this->type == 3)
-			{
-				$this->captcha_template .= "_ayah";
-			}
 			else if($this->type == 4){
 				$this->captcha_template .= "_nocaptcha";
 			}
 		}
 
 		// Work on which CAPTCHA we've got installed
-		if($this->type == 3 && $mybb->settings['ayahpublisherkey'] && $mybb->settings['ayahscoringkey'])
-		{
-			// We want to use Are You a Human, set configuration options
-			$this->ayah_web_service_host = "ws.areyouahuman.com";
-			$this->ayah_publisher_key = $mybb->settings['ayahpublisherkey'];
-			$this->ayah_scoring_key = $mybb->settings['ayahscoringkey'];
-			$this->ayah_debug_mode = false;
-			$this->ayah_use_curl = true;
-
-			if($build == true)
-			{
-				$this->build_ayah();
-			}
-		}
-		else if($this->type == 2 && $mybb->settings['captchapublickey'] && $mybb->settings['captchaprivatekey'])
+		if($this->type == 2 && $mybb->settings['captchapublickey'] && $mybb->settings['captchaprivatekey'])
 		{
 			// We want to use reCAPTCHA, set the server options
 			$this->server = "//www.google.com/recaptcha/api";
@@ -216,27 +186,6 @@ function build_recaptcha()
 		//eval("\$this->html = \"".$templates->get("member_register_regimage_recaptcha")."\";");
 	}
 
-	function build_ayah()
-	{
-		global $lang, $mybb, $templates;
-
-		define('AYAH_PUBLISHER_KEY', $this->ayah_publisher_key);
-		define('AYAH_SCORING_KEY', $this->ayah_scoring_key);
-		define('AYAH_USE_CURL', $this->ayah_use_curl);
-		define('AYAH_DEBUG_MODE', $this->ayah_debug_mode);
-		define('AYAH_WEB_SERVICE_HOST', $this->ayah_web_service_host);
-
-		require_once MYBB_ROOT."inc/3rdparty/ayah/ayah.php";
-		$ayah = new AYAH();
-		$output = $ayah->getPublisherHTML();
-
-		if(!empty($output))
-		{
-			eval("\$this->html = \"".$templates->get($this->captcha_template, 1, 0)."\";");
-			//eval("\$this->html = \"".$templates->get("member_register_regimage_ayah")."\";");
-		}
-	}
-
 	/**
 	 * @return string
 	 */
@@ -401,24 +350,6 @@ function validate_captcha()
 				}
 			}
 		}
-		elseif($this->type == 3)
-		{
-			define('AYAH_PUBLISHER_KEY', $this->ayah_publisher_key);
-			define('AYAH_SCORING_KEY', $this->ayah_scoring_key);
-			define('AYAH_USE_CURL', $this->ayah_use_curl);
-			define('AYAH_DEBUG_MODE', $this->ayah_debug_mode);
-			define('AYAH_WEB_SERVICE_HOST', $this->ayah_web_service_host);
-
-			require_once MYBB_ROOT."inc/3rdparty/ayah/ayah.php";
-			$ayah = new AYAH();
-
-			$result = $ayah->scoreResult();
-
-			if($result == false)
-			{
-				$this->set_error($lang->invalid_ayah_result);
-			}
-		}
 
 		$plugins->run_hooks('captcha_validate_end', $this);
 
diff --git a/Upload/inc/class_core.php b/Upload/inc/class_core.php
index 751a6dc..4aa32bb 100644
--- a/Upload/inc/class_core.php
+++ b/Upload/inc/class_core.php
@@ -14,14 +14,14 @@ class MyBB {
 	 *
 	 * @var string
 	 */
-	public $version = "1.8.6";
+	public $version = "1.8.7";
 
 	/**
 	 * The version code of MyBB we're running.
 	 *
 	 * @var integer
 	 */
-	public $version_code = 1806;
+	public $version_code = 1807;
 
 	/**
 	 * The current working directory.
diff --git a/Upload/inc/class_custommoderation.php b/Upload/inc/class_custommoderation.php
index 1a51889..8fe1d1c 100644
--- a/Upload/inc/class_custommoderation.php
+++ b/Upload/inc/class_custommoderation.php
@@ -241,7 +241,7 @@ function execute_post_moderation($post_options, $pids, $tid)
 						"uid" => $mybb->user['uid'],
 						"username" => $mybb->user['username'],
 						"message" => $post_options['splitpostsaddreply'],
-						"ipaddress" => $db->escape_binary(my_inet_pton(get_ip())),
+						"ipaddress" => my_inet_pton(get_ip()),
 					);
 					// Set up the post options from the input.
 					$post['options'] = array(
@@ -413,7 +413,7 @@ function execute_thread_moderation($thread_options, $tids)
 						"uid" => $mybb->user['uid'],
 						"username" => $mybb->user['username'],
 						"message" => $thread_options['addreply'],
-						"ipaddress" => $db->escape_binary(my_inet_pton(get_ip())),
+						"ipaddress" => my_inet_pton(get_ip()),
 					);
 
 					// Set up the post options from the input.
diff --git a/Upload/inc/class_datacache.php b/Upload/inc/class_datacache.php
index 679f0cf..4f95f8a 100644
--- a/Upload/inc/class_datacache.php
+++ b/Upload/inc/class_datacache.php
@@ -20,17 +20,10 @@ class datacache
 	/**
 	 * The current cache handler we're using
 	 *
-	 * @var apcCacheHandler|diskCacheHandler|eacceleratorCacheHandler|memcacheCacheHandler|memcachedCacheHandler|xcacheCacheHandler
+	 * @var CacheHandlerInterface
 	 */
 	public $handler = null;
 
-	/**
-	 * Whether or not to exit the script if we cannot load the specified extension
-	 *
-	 * @var boolean
-	 */
-	var $silent = false;
-
 	/**
 	 * A count of the number of calls.
 	 *
@@ -67,48 +60,47 @@ function cache()
 	{
 		global $db, $mybb;
 
+		require_once MYBB_ROOT."/inc/cachehandlers/interface.php";
+
 		switch($mybb->config['cache_store'])
 		{
 			// Disk cache
 			case "files":
 				require_once MYBB_ROOT."/inc/cachehandlers/disk.php";
-				$this->handler = new diskCacheHandler($this->silent);
+				$this->handler = new diskCacheHandler();
 				break;
 			// Memcache cache
 			case "memcache":
 				require_once MYBB_ROOT."/inc/cachehandlers/memcache.php";
-				$this->handler = new memcacheCacheHandler($this->silent);
+				$this->handler = new memcacheCacheHandler();
 				break;
 			// Memcached cache
 			case "memcached":
 				require_once MYBB_ROOT."/inc/cachehandlers/memcached.php";
-				$this->handler = new memcachedCacheHandler($this->silent);
+				$this->handler = new memcachedCacheHandler();
 				break;
 			// eAccelerator cache
 			case "eaccelerator":
 				require_once MYBB_ROOT."/inc/cachehandlers/eaccelerator.php";
-				$this->handler = new eacceleratorCacheHandler($this->silent);
+				$this->handler = new eacceleratorCacheHandler();
 				break;
 			// Xcache cache
 			case "xcache":
 				require_once MYBB_ROOT."/inc/cachehandlers/xcache.php";
-				$this->handler = new xcacheCacheHandler($this->silent);
+				$this->handler = new xcacheCacheHandler();
 				break;
 			// APC cache
 			case "apc":
 				require_once MYBB_ROOT."/inc/cachehandlers/apc.php";
-				$this->handler = new apcCacheHandler($this->silent);
+				$this->handler = new apcCacheHandler();
 				break;
 		}
 
-		if(is_object($this->handler))
+		if($this->handler instanceof CacheHandlerInterface)
 		{
-			if(method_exists($this->handler, "connect"))
+			if(!$this->handler->connect())
 			{
-				if(!$this->handler->connect())
-				{
-					$this->handler = null;
-				}
+				$this->handler = null;
 			}
 		}
 		else
@@ -140,12 +132,12 @@ function read($name, $hard=false)
 		}
 		// If we're not hard refreshing, and this cache doesn't exist, return false
 		// It would have been loaded pre-global if it did exist anyway...
-		else if($hard == false && !is_object($this->handler))
+		else if($hard == false && !($this->handler instanceof CacheHandlerInterface))
 		{
 			return false;
 		}
 
-		if(is_object($this->handler))
+		if($this->handler instanceof CacheHandlerInterface)
 		{
 			get_execution_time();
 
@@ -239,7 +231,7 @@ function update($name, $contents)
 		$db->replace_query("datacache", $replace_array, "", false);
 
 		// Do we have a cache handler we're using?
-		if(is_object($this->handler))
+		if($this->handler instanceof CacheHandlerInterface)
 		{
 			get_execution_time();
 
@@ -273,7 +265,7 @@ function delete($name, $greedy = false)
 		$where = "title = '{$dbname}'";
 
 		// Delete on-demand or handler cache
-		if($this->handler)
+		if($this->handler instanceof CacheHandlerInterface)
 		{
 			get_execution_time();
 
@@ -314,7 +306,7 @@ function delete($name, $greedy = false)
 
 			$where .= " OR title LIKE '{$ldbname}=_%' ESCAPE '='";
 
-			if($this->handler)
+			if($this->handler instanceof CacheHandlerInterface)
 			{
 				$query = $db->simple_select("datacache", "title", $where);
 
@@ -413,7 +405,7 @@ function size_of($name='')
 	{
 		global $db;
 
-		if(is_object($this->handler))
+		if($this->handler instanceof CacheHandlerInterface)
 		{
 			$size = $this->handler->size_of($name);
 			if(!$size)
@@ -648,8 +640,6 @@ private function build_forum_permissions($permissions=array(), $pid=0)
 	 */
 	function update_stats()
 	{
-		global $db;
-
 		require_once MYBB_ROOT."inc/functions_rebuild.php";
 		rebuild_stats();
 	}
@@ -897,7 +887,6 @@ function update_reportedcontent()
 	{
 		global $db, $mybb;
 
-		$reports = array();
 		$query = $db->simple_select("reportedcontent", "COUNT(rid) AS unreadcount", "reportstatus='0'");
 		$num = $db->fetch_array($query);
 
diff --git a/Upload/inc/class_error.php b/Upload/inc/class_error.php
index 4b1f8cd..b656426 100644
--- a/Upload/inc/class_error.php
+++ b/Upload/inc/class_error.php
@@ -516,7 +516,7 @@ function output_error($type, $message, $file, $line)
 			@header('Status: 503 Service Temporarily Unavailable');
 			@header('Retry-After: 1800');
 			@header("Content-type: text/html; charset={$charset}");
-			$file_name = basename(__FILE__);
+			$file_name = htmlspecialchars_uni(basename($_SERVER['SCRIPT_FILENAME']));
 
 			echo <<<EOF
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
diff --git a/Upload/inc/class_language.php b/Upload/inc/class_language.php
index 9a98ca0..a864a96 100644
--- a/Upload/inc/class_language.php
+++ b/Upload/inc/class_language.php
@@ -237,6 +237,6 @@ function parse($contents)
 	 */
 	function parse_replace($matches)
 	{
-		return $this->$matches[1];
+		return $this->{$matches[1]};
 	}
 }
diff --git a/Upload/inc/class_mailhandler.php b/Upload/inc/class_mailhandler.php
index 009be77..f4026d3 100644
--- a/Upload/inc/class_mailhandler.php
+++ b/Upload/inc/class_mailhandler.php
@@ -91,6 +91,20 @@ class MailHandler
 	 */
 	public $parse_format = 'text';
 
+	/**
+	 * The last received response from the SMTP server.
+	 *
+	 * @var string
+	 */
+	public $data = '';
+
+	/**
+	 * The last received response code from the SMTP server.
+	 *
+	 * @var string
+	 */
+	public $code = 0;
+
 	/**
 	 * Selects between AdminEmail and ReturnEmail, dependant on if ReturnEmail is filled.
 	 * 
diff --git a/Upload/inc/class_moderation.php b/Upload/inc/class_moderation.php
index ed954d0..35e60f5 100644
--- a/Upload/inc/class_moderation.php
+++ b/Upload/inc/class_moderation.php
@@ -1223,12 +1223,12 @@ function move_thread($tid, $new_fid, $method="redirect", $redirect_expire=0)
 							'pid' => $pid,
 							'uid' => $attachment['uid'],
 							'filename' => $db->escape_string($attachment['filename']),
-							'filetype' => $attachment['filetype'],
+							'filetype' => $db->escape_string($attachment['filetype']),
 							'filesize' => $attachment['filesize'],
-							'attachname' => $attachment['attachname'],
+							'attachname' => $db->escape_string($attachment['attachname']),
 							'downloads' => $attachment['downloads'],
 							'visible' => $attachment['visible'],
-							'thumbnail' => $attachment['thumbnail']
+							'thumbnail' => $db->escape_string($attachment['thumbnail'])
 						);
 						$new_aid = $db->insert_query("attachments", $attachment_array);
 
diff --git a/Upload/inc/class_parser.php b/Upload/inc/class_parser.php
index 58d5a76..0d834d0 100644
--- a/Upload/inc/class_parser.php
+++ b/Upload/inc/class_parser.php
@@ -115,7 +115,7 @@ function parse_message($message, $options=array())
 
 		$message = $plugins->run_hooks("parse_message_start", $message);
 
-		// Get rid of cartridge returns for they are the workings of the devil
+		// Get rid of carriage returns for they are the workings of the devil
 		$message = str_replace("\r", "", $message);
 
 		// Filter bad words if requested.
@@ -130,32 +130,32 @@ function parse_message($message, $options=array())
 			$message = $this->parse_cdata($message);
 		}
 
+		// If MyCode needs to be replaced, first filter out [code] and [php] tags.
+		if(!empty($this->options['allow_mycode']) && $mybb->settings['allowcodemycode'] == 1)
+		{
+			// This code is reserved and could break codes
+			$message = str_replace("<mybb-code>\n", "<mybb_code>\n", $message);
+
+			preg_match_all("#\[(code|php)\](.*?)\[/\\1\](\r\n?|\n?)#si", $message, $code_matches, PREG_SET_ORDER);
+			$message = preg_replace("#\[(code|php)\](.*?)\[/\\1\](\r\n?|\n?)#si", "<mybb-code>\n", $message);
+		}
+
 		if(empty($this->options['allow_html']))
 		{
 			$message = $this->parse_html($message);
+			$message = str_replace("&lt;mybb-code&gt;\n", "<mybb-code>\n", $message);
 		}
 		else
 		{
-			while(preg_match("#<s(cript|tyle)(.*)>(.*)</s(cript|tyle)(.*)>#is", $message))
-			{
-				$message = preg_replace("#<s(cript|tyle)(.*)>(.*)</s(cript|tyle)(.*)>#is", "&lt;s$1$2&gt;$3&lt;/s$4$5&gt;", $message);
-			}
+			// Replace base, meta,script and style tags in our post - these are > dangerous <
+			$message = preg_replace('#<(/?)(base|meta|script|style)([^>]*)>#i', '&lt;$1$2$3&gt;', $message);
+			$message = $this->fix_javascript($message);
 
-			$find = array('<?php', '<!--', '-->', '?>', "<br />\n", "<br>\n");
-			$replace = array('&lt;?php', '&lt;!--', '--&gt;', '?&gt;', "\n", "\n");
+			$find = array("<br />\n", "<br>\n");
+			$replace = array("\n", "\n");
 			$message = str_replace($find, $replace, $message);
 		}
 
-		// If MyCode needs to be replaced, first filter out [code] and [php] tags.
-		if(!empty($this->options['allow_mycode']) && $mybb->settings['allowcodemycode'] == 1)
-		{
-			preg_match_all("#\[(code|php)\](.*?)\[/\\1\](\r\n?|\n?)#si", $message, $code_matches, PREG_SET_ORDER);
-			$message = preg_replace("#\[(code|php)\](.*?)\[/\\1\](\r\n?|\n?)#si", "<mybb-code>\n", $message);
-		}
-
-		// Always fix bad Javascript in the message.
-		$message = $this->fix_javascript($message);
-
 		// Replace "me" code and slaps if we have a username
 		if(!empty($this->options['me_username']) && $mybb->settings['allowmemycode'] == 1)
 		{
@@ -193,14 +193,11 @@ function parse_message($message, $options=array())
 			{
 				foreach($code_matches as $text)
 				{
-					// Fix up HTML inside the code tags so it is clean
-					if(!empty($this->options['allow_html']))
+					if(my_strtolower($text[1]) == "code")
 					{
+						// Fix up HTML inside the code tags so it is clean
 						$text[2] = $this->parse_html($text[2]);
-					}
 
-					if(my_strtolower($text[1]) == "code")
-					{
 						$code = $this->mycode_parse_code($text[2]);
 					}
 					elseif(my_strtolower($text[1]) == "php")
@@ -212,15 +209,6 @@ function parse_message($message, $options=array())
 			}
 		}
 
-		// Replace meta and base tags in our post - these are > dangerous <
-		if(!empty($this->options['allow_html']))
-		{
-			$message = preg_replace_callback("#<((m[^a])|(b[^diloru>])|(s[^aemptu>]))(\s*[^>]*)>#si", create_function(
-				'$matches',
-				'return htmlspecialchars_uni($matches[0]);'
-			), $message);
-		}
-
 		if(!isset($this->options['nl2br']) || $this->options['nl2br'] != 0)
 		{
 			$message = nl2br($message);
@@ -306,7 +294,7 @@ function cache_mycode()
 			$callback_mycode['url_complex']['regex'] = "#\[url=([a-z]+?://)([^\r\n\"<]+?)\](.+?)\[/url\]#si";
 			$callback_mycode['url_complex']['replacement'] = array($this, 'mycode_parse_url_callback1');
 
-			$callback_mycode['url_complex2']['regex'] = "#\[url=([^\r\n\"<&\(\)]+?)\](.+?)\[/url\]#si";
+			$callback_mycode['url_complex2']['regex'] = "#\[url=([^\r\n\"<]+?)\](.+?)\[/url\]#si";
 			$callback_mycode['url_complex2']['replacement'] = array($this, 'mycode_parse_url_callback2');
 
 			++$callback_count;
@@ -663,34 +651,18 @@ function parse_cdata($message)
 	/**
  	 * Attempts to move any javascript references in the specified message.
 	 *
-	 * @param string $message The message to be parsed.
+	 * @param string The message to be parsed.
 	 * @return string The parsed message.
 	 */
 	function fix_javascript($message)
 	{
 		$js_array = array(
 			"#(&\#(0*)106;?|&\#(0*)74;?|&\#x(0*)4a;?|&\#x(0*)6a;?|j)((&\#(0*)97;?|&\#(0*)65;?|a)(&\#(0*)118;?|&\#(0*)86;?|v)(&\#(0*)97;?|&\#(0*)65;?|a)(\s)?(&\#(0*)115;?|&\#(0*)83;?|s)(&\#(0*)99;?|&\#(0*)67;?|c)(&\#(0*)114;?|&\#(0*)82;?|r)(&\#(0*)105;?|&\#(0*)73;?|i)(&\#112;?|&\#(0*)80;?|p)(&\#(0*)116;?|&\#(0*)84;?|t)(&\#(0*)58;?|\:))#i",
-			"#(o)(nmouseover\s?=)#i",
-			"#(o)(nmouseout\s?=)#i",
-			"#(o)(nmousedown\s?=)#i",
-			"#(o)(nmousemove\s?=)#i",
-			"#(o)(nmouseup\s?=)#i",
-			"#(o)(nclick\s?=)#i",
-			"#(o)(ndblclick\s?=)#i",
-			"#(o)(nload\s?=)#i",
-			"#(o)(nsubmit\s?=)#i",
-			"#(o)(nblur\s?=)#i",
-			"#(o)(nchange\s?=)#i",
-			"#(o)(nfocus\s?=)#i",
-			"#(o)(nselect\s?=)#i",
-			"#(o)(nunload\s?=)#i",
-			"#(o)(nkeypress\s?=)#i",
-			"#(o)(nerror\s?=)#i",
-			"#(o)(nreset\s?=)#i",
-			"#(o)(nabort\s?=)#i"
+			"#(on)([a-z]+\s?=)#i",
 		);
 
-		$message = preg_replace($js_array, "$1<strong></strong>$2$6", $message);
+		// Add invisible white space
+		$message = preg_replace($js_array, "$1\xE2\x80\x8C$2$6", $message);
 
 		return $message;
 	}
@@ -960,10 +932,6 @@ function mycode_parse_php($str, $bare_return = false, $text_only = false)
 			return;
 		}
 
-		$str = str_replace('&amp;', '&', $str);
-		$str = str_replace('&lt;', '<', $str);
-		$str = str_replace('&gt;', '>', $str);
-
 		// See if open and close tags are provided.
 		$added_open_tag = false;
 		if(!preg_match("#^\s*<\?#si", $str))
@@ -1355,7 +1323,18 @@ function mycode_parse_video($video, $url)
 				$id = $path[4]; // http://www.myspace.com/video/fds/fds/123
 				break;
 			case "facebook":
-				$id = $input['v']; // http://www.facebook.com/video/video.php?v=123
+				if(isset($input['v']))
+				{
+					$id = $input['v']; // http://www.facebook.com/video/video.php?v=123
+				}
+				elseif(substr($path[3], 0, 3) == 'vb.')
+				{
+					$id = $path[4]; // https://www.facebook.com/fds/videos/vb.123/123/
+				}
+				else
+				{
+					$id = $path[3]; // https://www.facebook.com/fds/videos/123/
+				}
 				break;
 			case "veoh":
 				$id = $path[2]; // http://www.veoh.com/watch/123
@@ -1364,7 +1343,14 @@ function mycode_parse_video($video, $url)
 				$id = $input['i']; // http://www.liveleak.com/view?i=123
 				break;
 			case "yahoo":
-				$id = $path[1]; // http://xy.screen.yahoo.com/fds-123.html
+				if(isset($path[2]))
+				{
+					$id = $path[2]; // http://xy.screen.yahoo.com/fds/fds-123.html
+				}
+				else
+				{
+					$id = $path[1]; // http://xy.screen.yahoo.com/fds-123.html
+				}
 				// Support for localized portals
 				$domain = explode('.', $parsed_url['host']);
 				if($domain[0] != 'screen' && preg_match('#^([a-z-]+)$#', $domain[0]))
@@ -1377,7 +1363,14 @@ function mycode_parse_video($video, $url)
 				}
 				break;
 			case "vimeo":
-				$id = $path[1]; // http://vimeo.com/fds123
+				if(isset($path[3]))
+				{
+					$id = $path[3]; // http://vimeo.com/fds/fds/fds123
+				}
+				else
+				{
+					$id = $path[1]; // http://vimeo.com/fds123
+				}
 				break;
 			case "youtube":
 				if($fragments[0])
diff --git a/Upload/inc/class_session.php b/Upload/inc/class_session.php
index 7839fe6..aa71e25 100644
--- a/Upload/inc/class_session.php
+++ b/Upload/inc/class_session.php
@@ -467,7 +467,7 @@ function update_session($sid, $uid=0)
 		$onlinedata['time'] = TIME_NOW;
 		
 		$onlinedata['location'] = $db->escape_string(substr(get_current_location(), 0, 150));
-		$onlinedata['useragent'] = $db->escape_string(my_substr($this->useragent, 0, 100));
+		$onlinedata['useragent'] = $db->escape_string(my_substr($this->useragent, 0, 200));
 		
 		$onlinedata['location1'] = (int)$speciallocs['1'];
 		$onlinedata['location2'] = (int)$speciallocs['2'];
@@ -512,13 +512,13 @@ function create_session($uid=0)
 		}
 		else
 		{
-			$onlinedata['sid'] = md5(uniqid(microtime(true), true));
+			$onlinedata['sid'] = md5(random_str(50));
 		}
 		$onlinedata['time'] = TIME_NOW;
 		$onlinedata['ip'] = $db->escape_binary($this->packedip);
 		
 		$onlinedata['location'] = $db->escape_string(substr(get_current_location(), 0, 150));
-		$onlinedata['useragent'] = $db->escape_string(my_substr($this->useragent, 0, 100));
+		$onlinedata['useragent'] = $db->escape_string(my_substr($this->useragent, 0, 200));
 		
 		$onlinedata['location1'] = (int)$speciallocs['1'];
 		$onlinedata['location2'] = (int)$speciallocs['2'];
diff --git a/Upload/inc/datahandlers/post.php b/Upload/inc/datahandlers/post.php
index 152d3a0..bdcda63 100644
--- a/Upload/inc/datahandlers/post.php
+++ b/Upload/inc/datahandlers/post.php
@@ -626,6 +626,12 @@ function verify_prefix()
 		}
 		else
 		{
+			if(!empty($this->data['tid']))
+			{
+				// Fetch the thread
+				$thread = get_thread($this->data['tid']);
+			}
+
 			$prefix_cache = build_prefixes($prefix);
 
 			if(empty($prefix_cache))
@@ -645,7 +651,7 @@ function verify_prefix()
 					$user = get_user($this->data['uid']);
 				}
 
-				if(!is_member($prefix_cache['groups'], array('usergroup' => $user['usergroup'], 'additionalgroups' => $user['additionalgroups'])))
+				if(!is_member($prefix_cache['groups'], array('usergroup' => $user['usergroup'], 'additionalgroups' => $user['additionalgroups'])) && (empty($this->data['tid']) || $prefix != $thread['prefix']))
 				{
 					$this->set_error('invalid_prefix');
 					return false;
@@ -656,7 +662,7 @@ function verify_prefix()
 				// Decide whether this prefix can be used in our forum
 				$forums = explode(",", $prefix_cache['forums']);
 
-				if(!in_array($this->data['fid'], $forums))
+				if(!in_array($this->data['fid'], $forums) && (empty($this->data['tid']) || $prefix != $thread['prefix']))
 				{
 					$this->set_error('invalid_prefix');
 					return false;
@@ -699,14 +705,7 @@ function verify_prefix()
 						}
 					}
 
-					if($required['groups'] != "-1")
-					{
-						if(!is_member($required['groups'], array('usergroup' => $user['usergroup'], 'additionalgroups' => $user['additionalgroups'])))
-						{
-							$num_prefixes = true;
-						}
-					}
-					else
+					if(is_member($required['groups'], array('usergroup' => $user['usergroup'], 'additionalgroups' => $user['additionalgroups'])))
 					{
 						$num_prefixes = true;
 					}
@@ -1123,7 +1122,7 @@ function insert_post()
 
 			// Fetch any users subscribed to this thread receiving instant notification and queue up their subscription notices
 			$query = $db->query("
-				SELECT u.username, u.email, u.uid, u.language, u.loginkey, u.salt, u.regdate, s.subscriptionkey, s.notification
+				SELECT u.username, u.email, u.uid, u.language, u.loginkey, u.salt, u.regdate, s.notification
 				FROM ".TABLE_PREFIX."threadsubscriptions s
 				LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=s.uid)
 				WHERE (s.notification='1' OR s.notification='2') AND s.tid='{$post['tid']}'
@@ -1205,7 +1204,7 @@ function insert_post()
 					$emailsubject = $lang->sprintf($emailsubject, $subject);
 
 					$post_code = md5($subscribedmember['loginkey'].$subscribedmember['salt'].$subscribedmember['regdate']);
-					$emailmessage = $lang->sprintf($emailmessage, $subscribedmember['username'], $post['username'], $mybb->settings['bbname'], $subject, $excerpt, $mybb->settings['bburl'], str_replace("&amp;", "&", get_thread_link($thread['tid'], 0, "newpost")), $thread['tid'], $subscribedmember['subscriptionkey'], $post_code);
+					$emailmessage = $lang->sprintf($emailmessage, $subscribedmember['username'], $post['username'], $mybb->settings['bbname'], $subject, $excerpt, $mybb->settings['bburl'], str_replace("&amp;", "&", get_thread_link($thread['tid'], 0, "newpost")), $thread['tid'], $post_code);
 					$new_email = array(
 						"mailto" => $db->escape_string($subscribedmember['email']),
 						"mailfrom" => '',
@@ -1222,7 +1221,7 @@ function insert_post()
 					$post_code = md5($subscribedmember['loginkey'].$subscribedmember['salt'].$subscribedmember['regdate']);
 					$pm = array(
 						'subject' => array('pmsubject_subscription', $subject),
-						'message' => array('pm_subscription', $subscribedmember['username'], $post['username'], $subject, $excerpt, $mybb->settings['bburl'], str_replace("&amp;", "&", get_thread_link($thread['tid'], 0, "newpost")), $thread['tid'], $subscribedmember['subscriptionkey'], $post_code),
+						'message' => array('pm_subscription', $subscribedmember['username'], $post['username'], $subject, $excerpt, $mybb->settings['bburl'], str_replace("&amp;", "&", get_thread_link($thread['tid'], 0, "newpost")), $thread['tid'], $post_code),
 						'touid' => $subscribedmember['uid'],
 						'language' => $subscribedmember['language'],
 						'language_file' => 'messages'
@@ -1472,6 +1471,7 @@ function insert_thread()
 				"dateline" => (int)$thread['dateline'],
 				"lastpost" => (int)$thread['dateline'],
 				"lastposter" => $db->escape_string($thread['username']),
+				"lastposteruid" => $thread['uid'],
 				"views" => 0,
 				"replies" => 0,
 				"visible" => $visible,
diff --git a/Upload/inc/datahandlers/user.php b/Upload/inc/datahandlers/user.php
index 200bfe4..8140f2c 100644
--- a/Upload/inc/datahandlers/user.php
+++ b/Upload/inc/datahandlers/user.php
@@ -1517,7 +1517,17 @@ function delete_user($delete_uids, $prunecontent=0)
 		$plugins->run_hooks('datahandler_user_delete_start', $this);
 
 		$this->delete_uids = implode(',', $this->delete_uids);
-		
+
+		if(empty($this->delete_uids))
+		{
+			$this->deleted_users = 0;
+			$this->return_values = array(
+				"deleted_users" => $this->deleted_users
+			);
+
+			return $this->return_values;
+		}
+
 		$this->delete_content();
 
 		// Delete the user
@@ -1611,6 +1621,11 @@ function delete_content($delete_uids=false)
 
 		$plugins->run_hooks('datahandler_user_delete_content', $this);
 
+		if(empty($this->delete_uids))
+		{
+			return;
+		}
+
 		$db->delete_query('userfields', "ufid IN({$this->delete_uids})");
 		$db->delete_query('privatemessages', "uid IN({$this->delete_uids})");
 		$db->delete_query('events', "uid IN({$this->delete_uids})");
@@ -1641,11 +1656,10 @@ function delete_content($delete_uids=false)
 		$db->update_query('reportedcontent', array('uid' => 0), "uid IN({$this->delete_uids})");
 
 		// Remove any of the user(s) uploaded avatars
-		$query = $db->simple_select('users', 'avatar', "uid IN({$this->delete_uids}) AND avatartype='upload'");
-		while($avatar = $db->fetch_field($query, 'avatar'))
+		require_once MYBB_ROOT.'inc/functions_upload.php';
+		foreach(explode(',', $this->delete_uids) as $uid)
 		{
-			$avatar = substr($avatar, 2, -20);
-			@unlink(MYBB_ROOT.$avatar);
+			remove_avatars($uid);
 		}
 	}
 
@@ -1679,6 +1693,11 @@ function delete_posts($delete_uids=false)
 
 		$plugins->run_hooks('datahandler_user_delete_posts', $this);
 
+		if(empty($this->delete_uids))
+		{
+			return;
+		}
+
 		// Threads
 		$query = $db->simple_select('threads', 'tid', "uid IN({$this->delete_uids})");
 		while($tid = $db->fetch_field($query, 'tid'))
@@ -1749,7 +1768,19 @@ function clear_profile($delete_uids=false, $gid=0)
 
 		$plugins->run_hooks('datahandler_user_clear_profile', $this);
 
+		if(empty($this->delete_uids))
+		{
+			return;
+		}
+
 		$db->update_query("users", $update, "uid IN({$this->delete_uids})");
 		$db->delete_query('userfields', "ufid IN({$this->delete_uids})");
+
+		// Remove any of the user(s) uploaded avatars
+		require_once MYBB_ROOT.'inc/functions_upload.php';
+		foreach(explode(',', $this->delete_uids) as $uid)
+		{
+			remove_avatars($uid);
+		}
 	}
 }
diff --git a/Upload/inc/datahandlers/warnings.php b/Upload/inc/datahandlers/warnings.php
index 37a9c5e..97d9a85 100644
--- a/Upload/inc/datahandlers/warnings.php
+++ b/Upload/inc/datahandlers/warnings.php
@@ -362,13 +362,18 @@ function expire_warnings()
 	*/
 	function update_user($method='insert')
 	{
-		global $db, $mybb, $lang;
+		global $db, $mybb, $lang, $cache, $groupscache;
 
 		if($mybb->settings['maxwarningpoints'] < 1)
 		{
 			$mybb->settings['maxwarningpoints'] = 10;
 		}
 
+		if(!is_array($groupscache))
+		{
+			$groupscache = $cache->read("usergroups");
+		}
+
 		$warning = &$this->data;
 
 		$user = get_user($warning['uid']);
diff --git a/Upload/inc/db_mysql.php b/Upload/inc/db_mysql.php
index 9de1b19..ebcb301 100644
--- a/Upload/inc/db_mysql.php
+++ b/Upload/inc/db_mysql.php
@@ -73,6 +73,13 @@ class DB_MySQL implements DB_Base
 	 */
 	public $current_link;
 
+	/**
+	 * The database name.
+	 *
+	 * @var string
+	 */
+	public $database;
+
 	/**
 	 * Explanation of a query.
 	 *
@@ -259,6 +266,8 @@ function connect($config)
 	 */
 	function select_db($database)
 	{
+		$this->database = $database;
+
 		$this->current_link = &$this->read_link;
 		$read_success = @mysql_select_db($database, $this->read_link) or $this->error("[READ] Unable to select database", $this->read_link);
 		if($this->write_link)
@@ -636,18 +645,25 @@ function list_tables($database, $prefix='')
 	{
 		if($prefix)
 		{
-			$query = $this->query("
-				SELECT `TABLE_NAME` FROM INFORMATION_SCHEMA.TABLES 
-				WHERE `TABLE_SCHEMA` = '$database' AND `TABLE_TYPE` = 'BASE TABLE' 
-				AND `TABLE_NAME` LIKE '".$this->escape_string($prefix)."%'
-			");
+			if(version_compare($this->get_version(), '5.0.2', '>='))
+			{
+				$query = $this->query("SHOW FULL TABLES FROM `$database` WHERE table_type = 'BASE TABLE' AND `Tables_in_$database` LIKE '".$this->escape_string($prefix)."%'");
+			}
+			else
+			{
+				$query = $this->query("SHOW TABLES FROM `$database` LIKE '".$this->escape_string($prefix)."%'");
+			}
 		}
 		else
 		{
-			$query = $this->query("
-				SELECT `TABLE_NAME` FROM INFORMATION_SCHEMA.TABLES 
-				WHERE `TABLE_SCHEMA` = '$database' AND `TABLE_TYPE` = 'BASE TABLE'
-			");
+			if(version_compare($this->get_version(), '5.0.2', '>='))
+			{
+				$query = $this->query("SHOW FULL TABLES FROM `$database` WHERE table_type = 'BASE TABLE'");
+			}
+			else
+			{
+				$query = $this->query("SHOW TABLES FROM `$database`");
+			}
 		}
 
 		$tables = array();
@@ -668,11 +684,15 @@ function list_tables($database, $prefix='')
 	function table_exists($table)
 	{
 		// Execute on master server to ensure if we've just created a table that we get the correct result
-		$query = $this->write_query("
-			SELECT `TABLE_NAME` FROM INFORMATION_SCHEMA.TABLES 
-			WHERE `TABLE_TYPE` = 'BASE TABLE' 
-			AND `TABLE_NAME` LIKE '{$this->table_prefix}$table'
-		");
+		if(version_compare($this->get_version(), '5.0.2', '>='))
+		{
+			$query = $this->query("SHOW FULL TABLES FROM `".$this->database."` WHERE table_type = 'BASE TABLE' AND `Tables_in_".$this->database."` = '{$this->table_prefix}$table'");
+		}
+		else
+		{
+			$query = $this->query("SHOW TABLES LIKE '{$this->table_prefix}$table'");
+		}
+
 		$exists = $this->num_rows($query);
 		if($exists > 0)
 		{
diff --git a/Upload/inc/db_mysqli.php b/Upload/inc/db_mysqli.php
index 61fd1a5..dd2e804 100644
--- a/Upload/inc/db_mysqli.php
+++ b/Upload/inc/db_mysqli.php
@@ -73,6 +73,13 @@ class DB_MySQLi implements DB_Base
 	 */
 	public $current_link;
 
+	/**
+	 * The database name.
+	 *
+	 * @var string
+	 */
+	public $database;
+
 	/**
 	 * Explanation of a query.
 	 *
@@ -273,6 +280,8 @@ function connect($config)
 	 */
 	function select_db($database)
 	{
+		$this->database = $database;
+
 		$master_success = @mysqli_select_db($this->read_link, $database) or $this->error("[READ] Unable to select database", $this->read_link);
 		if($this->write_link)
 		{
@@ -632,18 +641,25 @@ function list_tables($database, $prefix='')
 	{
 		if($prefix)
 		{
-			$query = $this->query("
-				SELECT `TABLE_NAME` FROM INFORMATION_SCHEMA.TABLES 
-				WHERE `TABLE_SCHEMA` = '$database' AND `TABLE_TYPE` = 'BASE TABLE' 
-				AND `TABLE_NAME` LIKE '".$this->escape_string($prefix)."%'
-			");
+			if(version_compare($this->get_version(), '5.0.2', '>='))
+			{
+				$query = $this->query("SHOW FULL TABLES FROM `$database` WHERE table_type = 'BASE TABLE' AND `Tables_in_$database` LIKE '".$this->escape_string($prefix)."%'");
+			}
+			else
+			{
+				$query = $this->query("SHOW TABLES FROM `$database` LIKE '".$this->escape_string($prefix)."%'");
+			}
 		}
 		else
 		{
-			$query = $this->query("
-				SELECT `TABLE_NAME` FROM INFORMATION_SCHEMA.TABLES 
-				WHERE `TABLE_SCHEMA` = '$database' AND `TABLE_TYPE` = 'BASE TABLE'
-			");
+			if(version_compare($this->get_version(), '5.0.2', '>='))
+			{
+				$query = $this->query("SHOW FULL TABLES FROM `$database` WHERE table_type = 'BASE TABLE'");
+			}
+			else
+			{
+				$query = $this->query("SHOW TABLES FROM `$database`");
+			}
 		}
 
 		$tables = array();
@@ -651,6 +667,7 @@ function list_tables($database, $prefix='')
 		{
 			$tables[] = $table;
 		}
+
 		return $tables;
 	}
 
@@ -663,13 +680,16 @@ function list_tables($database, $prefix='')
 	function table_exists($table)
 	{
 		// Execute on master server to ensure if we've just created a table that we get the correct result
-		$query = $this->write_query("
-			SELECT `TABLE_NAME` FROM INFORMATION_SCHEMA.TABLES 
-			WHERE `TABLE_TYPE` = 'BASE TABLE' 
-			AND `TABLE_NAME` LIKE '{$this->table_prefix}$table'
-		");
-		$exists = $this->num_rows($query);
+		if(version_compare($this->get_version(), '5.0.2', '>='))
+		{
+			$query = $this->query("SHOW FULL TABLES FROM `".$this->database."` WHERE table_type = 'BASE TABLE' AND `Tables_in_".$this->database."` = '{$this->table_prefix}$table'");
+		}
+		else
+		{
+			$query = $this->query("SHOW TABLES LIKE '{$this->table_prefix}$table'");
+		}
 
+		$exists = $this->num_rows($query);
 		if($exists > 0)
 		{
 			return true;
diff --git a/Upload/inc/functions.php b/Upload/inc/functions.php
index 5c68ea0..f588cd7 100644
--- a/Upload/inc/functions.php
+++ b/Upload/inc/functions.php
@@ -2432,9 +2432,9 @@ function update_stats($changes=array(), $force=false)
 	// Update stats row for today in the database
 	$todays_stats = array(
 		"dateline" => mktime(0, 0, 0, date("m"), date("j"), date("Y")),
-		"numusers" => $stats['numusers'],
-		"numthreads" => $stats['numthreads'],
-		"numposts" => $stats['numposts']
+		"numusers" => (int)$stats['numusers'],
+		"numthreads" => (int)$stats['numthreads'],
+		"numposts" => (int)$stats['numposts']
 	);
 	$db->replace_query("stats", $todays_stats, "dateline");
 
@@ -3367,11 +3367,8 @@ function build_clickable_smilies()
 			}
 			foreach($smilie_cache as $smilie)
 			{
-				if($smilie['showclickable'] != 0)
-				{
-					$smilie['image'] = str_replace("{theme}", $theme['imgdir'], $smilie['image']);
-					$smiliecache[$smilie['sid']] = $smilie;
-				}
+				$smilie['image'] = str_replace("{theme}", $theme['imgdir'], $smilie['image']);
+				$smiliecache[$smilie['sid']] = $smilie;
 			}
 		}
 
@@ -3399,7 +3396,7 @@ function build_clickable_smilies()
 			$extra_class = '';
 			foreach($smiliecache as $smilie)
 			{
-				if($i < $mybb->settings['smilieinsertertot'])
+				if($i < $mybb->settings['smilieinsertertot'] && $smilie['showclickable'] != 0)
 				{
 					if($counter == 0)
 					{
@@ -3505,14 +3502,15 @@ function build_prefixes($pid=0)
 }
 
 /**
- * Build the thread prefix selection menu
+ * Build the thread prefix selection menu for the current user
  *
  *  @param int|string $fid The forum ID (integer ID or string all)
  *  @param int|string $selected_pid The selected prefix ID (integer ID or string any)
  *  @param int $multiple Allow multiple prefix selection
+ *  @param int $previous_pid The previously selected prefix ID
  *  @return string The thread prefix selection menu
  */
-function build_prefix_select($fid, $selected_pid=0, $multiple=0)
+function build_prefix_select($fid, $selected_pid=0, $multiple=0, $previous_pid=0)
 {
 	global $cache, $db, $lang, $mybb, $templates;
 
@@ -3524,18 +3522,8 @@ function build_prefix_select($fid, $selected_pid=0, $multiple=0)
 	$prefix_cache = build_prefixes(0);
 	if(empty($prefix_cache))
 	{
-		return false; // We've got no prefixes to show
-	}
-
-	$groups = array($mybb->user['usergroup']);
-	if($mybb->user['additionalgroups'])
-	{
-		$exp = explode(",", $mybb->user['additionalgroups']);
-
-		foreach($exp as $group)
-		{
-			$groups[] = $group;
-		}
+		// We've got no prefixes to show
+		return '';
 	}
 
 	// Go through each of our prefixes and decide which ones we can use
@@ -3547,36 +3535,23 @@ function build_prefix_select($fid, $selected_pid=0, $multiple=0)
 			// Decide whether this prefix can be used in our forum
 			$forums = explode(",", $prefix['forums']);
 
-			if(!in_array($fid, $forums))
+			if(!in_array($fid, $forums) && $prefix['pid'] != $previous_pid)
 			{
 				// This prefix is not in our forum list
 				continue;
 			}
 		}
 
-		if($prefix['groups'] != "-1")
+		if(is_member($prefix['groups']) || $prefix['pid'] == $previous_pid)
 		{
-			$prefix_groups = explode(",", $prefix['groups']);
-
-			foreach($groups as $group)
-			{
-				if(in_array($group, $prefix_groups) && !isset($prefixes[$prefix['pid']]))
-				{
-					// Our group can use this prefix!
-					$prefixes[$prefix['pid']] = $prefix;
-				}
-			}
-		}
-		else
-		{
-			// This prefix is for anybody to use...
+			// The current user can use this prefix
 			$prefixes[$prefix['pid']] = $prefix;
 		}
 	}
 
 	if(empty($prefixes))
 	{
-		return false;
+		return '';
 	}
 
 	$prefixselect = $prefixselect_prefix = '';
@@ -3621,10 +3596,11 @@ function build_prefix_select($fid, $selected_pid=0, $multiple=0)
 }
 
 /**
- * Build the thread prefix selection menu for a forum
+ * Build the thread prefix selection menu for a forum without group permission checks
  *
  *  @param int $fid The forum ID (integer ID)
  *  @param int $selected_pid The selected prefix ID (integer ID)
+ *  @return string The thread prefix selection menu
  */
 function build_forum_prefix_select($fid, $selected_pid=0)
 {
@@ -3635,7 +3611,8 @@ function build_forum_prefix_select($fid, $selected_pid=0)
 	$prefix_cache = build_prefixes(0);
 	if(empty($prefix_cache))
 	{
-		return false; // We've got no prefixes to show
+		// We've got no prefixes to show
+		return '';
 	}
 
 	// Go through each of our prefixes and decide which ones we can use
@@ -3662,7 +3639,7 @@ function build_forum_prefix_select($fid, $selected_pid=0)
 
 	if(empty($prefixes))
 	{
-		return false;
+		return '';
 	}
 
 	$default_selected = array();
@@ -4837,14 +4814,7 @@ function leave_usergroup($uid, $leavegroup)
 {
 	global $db, $mybb, $cache;
 
-	if($uid == $mybb->user['uid'])
-	{
-		$user = $mybb->user;
-	}
-	else
-	{
-		$user = get_user($uid);
-	}
+	$user = get_user($uid);
 
 	$groupslist = $comma = '';
 	$usergroups = $user['additionalgroups'].",";
@@ -6779,10 +6749,13 @@ function build_timezone_select($name, $selected=0, $short=false)
  *
  * @param string $url The URL of the remote file
  * @param array $post_data The array of post data
+ * @param int $max_redirects Number of maximum redirects
  * @return string|bool The remote file contents. False on failure
  */
-function fetch_remote_file($url, $post_data=array())
+function fetch_remote_file($url, $post_data=array(), $max_redirects=20)
 {
+	global $mybb;
+
 	$post_body = '';
 	if(!empty($post_data))
 	{
@@ -6795,18 +6768,56 @@ function fetch_remote_file($url, $post_data=array())
 
 	if(function_exists("curl_init"))
 	{
+		$can_followlocation = @ini_get('open_basedir') === '' && !$mybb->safemode;
+
+		$request_header = $max_redirects != 0 && !$can_followlocation;
+
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_HEADER, 0);
+		curl_setopt($ch, CURLOPT_HEADER, $request_header);
 		curl_setopt($ch, CURLOPT_TIMEOUT, 10);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+
+		if($max_redirects != 0 && $can_followlocation)
+		{
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+			curl_setopt($ch, CURLOPT_MAXREDIRS, $max_redirects);
+		}
+
 		if(!empty($post_body))
 		{
 			curl_setopt($ch, CURLOPT_POST, 1);
 			curl_setopt($ch, CURLOPT_POSTFIELDS, $post_body);
 		}
-		$data = curl_exec($ch);
+
+		$response = curl_exec($ch);
+
+		if($request_header)
+		{
+			$header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+			$header = substr($response, 0, $header_size);
+			$body = substr($response, $header_size);
+
+			if(in_array(curl_getinfo($ch, CURLINFO_HTTP_CODE), array(301, 302)))
+			{
+				preg_match('/Location:(.*?)(?:\n|$)/', $header, $matches);
+
+				if($matches)
+				{
+					$data = fetch_remote_file(trim(array_pop($matches)), $post_data, --$max_redirects);
+				}
+			}
+			else
+			{
+				$data = $body;
+			}
+		}
+		else
+		{
+			$data = $response;
+		}
+
 		curl_close($ch);
 		return $data;
 	}
@@ -6817,15 +6828,15 @@ function fetch_remote_file($url, $post_data=array())
 		{
 			return false;
 		}
-		if(!$url['port'])
+		if(!isset($url['port']))
 		{
 			$url['port'] = 80;
 		}
-		if(!$url['path'])
+		if(!isset($url['path']))
 		{
 			$url['path'] = "/";
 		}
-		if($url['query'])
+		if(isset($url['query']))
 		{
 			$url['path'] .= "?{$url['query']}";
 		}
@@ -6878,13 +6889,36 @@ function fetch_remote_file($url, $post_data=array())
 		{
 			return false;
 		}
+
+		$data = null;
+
 		while(!feof($fp))
 		{
 			$data .= fgets($fp, 12800);
 		}
 		fclose($fp);
+
 		$data = explode("\r\n\r\n", $data, 2);
-		return $data[1];
+
+		$header = $data[0];
+		$status_line = current(explode("\n\n", $header, 1));
+		$body = $data[1];
+
+		if($max_redirects != 0 && (strstr($status_line, ' 301 ') || strstr($status_line, ' 302 ')))
+		{
+			preg_match('/Location:(.*?)(?:\n|$)/', $header, $matches);
+
+			if($matches)
+			{
+				$data = fetch_remote_file(trim(array_pop($matches)), $post_data, --$max_redirects);
+			}
+		}
+		else
+		{
+			$data = $body;
+		}
+
+		return $data;
 	}
 	else if(empty($post_data))
 	{
@@ -7651,129 +7685,186 @@ function signed($int)
 }
 
 /**
- * Returns a securely generated seed for PHP's RNG (Random Number Generator)
+ * Returns a securely generated seed
  *
- * @param int $count Length of the seed bytes (8 is default. Provides good cryptographic variance)
- * @return int An integer equivalent of a secure hexadecimal seed
+ * @return string A secure binary seed
  */
-function secure_seed_rng($count=8)
+function secure_binary_seed_rng($bytes)
 {
-	$output = '';
-	// DIRECTORY_SEPARATOR checks if running windows
-	if(DIRECTORY_SEPARATOR != '\\')
+	$output = null;
+
+	if(version_compare(PHP_VERSION, '7.0', '>='))
 	{
-		// Unix/Linux
-		// Use OpenSSL when available
-		if(function_exists('openssl_random_pseudo_bytes'))
-		{
-			$output = openssl_random_pseudo_bytes($count);
-		}
-		// Try mcrypt
-		elseif(function_exists('mcrypt_create_iv'))
+		try
 		{
-			$output = mcrypt_create_iv($count, MCRYPT_DEV_URANDOM);
+			$output = random_bytes($bytes);
+		} catch (Exception $e) {
 		}
-		// Try /dev/urandom
-		elseif(@is_readable('/dev/urandom') && ($handle = @fopen('/dev/urandom', 'rb')))
+	}
+
+	if(strlen($output) < $bytes)
+	{
+		if(@is_readable('/dev/urandom') && ($handle = @fopen('/dev/urandom', 'rb')))
 		{
-			$output = @fread($handle, $count);
+			$output = @fread($handle, $bytes);
 			@fclose($handle);
 		}
 	}
 	else
 	{
-		// Windows
-		// Use OpenSSL when available
-		// PHP <5.3.4 had a bug which makes that function unusable on Windows
-		if(function_exists('openssl_random_pseudo_bytes') && version_compare(PHP_VERSION, '5.3.4', '>='))
+		return $output;
+	}
+
+	if(strlen($output) < $bytes)
+	{
+		if(function_exists('mcrypt_create_iv'))
 		{
-			$output = openssl_random_pseudo_bytes($count);
+			if (DIRECTORY_SEPARATOR == '/')
+			{
+				$source = MCRYPT_DEV_URANDOM;
+			}
+			else
+			{
+				$source = MCRYPT_RAND;
+			}
+
+			$output = @mcrypt_create_iv($bytes, $source);
 		}
-		// Try mcrypt
-		elseif(function_exists('mcrypt_create_iv'))
+	}
+	else
+	{
+		return $output;
+	}
+
+	if(strlen($output) < $bytes)
+	{
+		if(function_exists('openssl_random_pseudo_bytes'))
 		{
-			$output = mcrypt_create_iv($count, MCRYPT_RAND);
+			// PHP <5.3.4 had a bug which makes that function unusable on Windows
+			if ((DIRECTORY_SEPARATOR == '/') || version_compare(PHP_VERSION, '5.3.4', '>='))
+			{
+				$output = openssl_random_pseudo_bytes($bytes, $crypto_strong);
+				if ($crypto_strong == false)
+				{
+					$output = null;
+				}
+			}
 		}
-		// Try Windows CAPICOM before using our own generator
-		elseif(class_exists('COM'))
+	}
+	else
+	{
+		return $output;
+	}
+
+	if(strlen($output) < $bytes)
+	{
+		if(class_exists('COM'))
 		{
 			try
 			{
 				$CAPI_Util = new COM('CAPICOM.Utilities.1');
 				if(is_callable(array($CAPI_Util, 'GetRandom')))
 				{
-					$output = $CAPI_Util->GetRandom($count, 0);
+					$output = $CAPI_Util->GetRandom($bytes, 0);
 				}
 			} catch (Exception $e) {
 			}
 		}
 	}
-
-	// Didn't work? Do we still not have enough bytes? Use our own (less secure) rng generator
-	if(strlen($output) < $count)
+	else
 	{
-		$output = '';
+		return $output;
+	}
 
+	if(strlen($output) < $bytes)
+	{
 		// Close to what PHP basically uses internally to seed, but not quite.
 		$unique_state = microtime().@getmypid();
 
-		for($i = 0; $i < $count; $i += 16)
+		$rounds = ceil($bytes / 16);
+
+		for($i = 0; $i < $rounds; $i++)
 		{
 			$unique_state = md5(microtime().$unique_state);
-			$output .= pack('H*', md5($unique_state));
+			$output .= md5($unique_state);
 		}
-	}
 
-	// /dev/urandom and openssl will always be twice as long as $count. base64_encode will roughly take up 33% more space but crc32 will put it to 32 characters
-	$output = hexdec(substr(dechex(crc32(base64_encode($output))), 0, $count));
+		$output = substr($output, 0, ($bytes * 2));
 
-	return $output;
+		$output = pack('H*', $output);
+
+		return $output;
+	}
+	else
+	{
+		return $output;
+	}
 }
 
 /**
- * Wrapper function for mt_rand. Automatically seeds using a secure seed once.
+ * Returns a securely generated seed integer
  *
- * @param int $min Optional lowest value to be returned (default: 0)
- * @param int $max Optional highest value to be returned (default: mt_getrandmax())
- * @param boolean $force_seed True forces it to reseed the RNG first
  * @return int An integer equivalent of a secure hexadecimal seed
  */
-function my_rand($min=null, $max=null, $force_seed=false)
+function secure_seed_rng()
 {
-	static $seeded = false;
-	static $obfuscator = 0;
+	$bytes = PHP_INT_SIZE;
 
-	if($seeded == false || $force_seed == true)
+	do
 	{
-		mt_srand(secure_seed_rng());
-		$seeded = true;
 
-		$obfuscator = abs((int) secure_seed_rng());
+		$output = secure_binary_seed_rng($bytes);
 
-		// Ensure that $obfuscator is <= mt_getrandmax() for 64 bit systems.
-		if($obfuscator > mt_getrandmax())
+		// convert binary data to a decimal number
+		if ($bytes == 4)
 		{
-			$obfuscator -= mt_getrandmax();
+			$elements = unpack('i', $output);
+			$output = abs($elements[1]);
 		}
+		else
+		{
+			$elements = unpack('N2', $output);
+			$output = abs($elements[1] << 32 | $elements[2]);
+		}
+
+	} while($output > PHP_INT_MAX);
+
+	return $output;
+}
+
+/**
+ * Generates a cryptographically secure random number.
+ *
+ * @param int $min Optional lowest value to be returned (default: 0)
+ * @param int $max Optional highest value to be returned (default: PHP_INT_MAX)
+ */
+function my_rand($min=0, $max=PHP_INT_MAX)
+{
+	// backward compatibility
+	if($min === null || $max === null || $max < $min)
+	{
+		$min = 0;
+		$max = PHP_INT_MAX;
 	}
 
-	if($min !== null && $max !== null)
+	if(version_compare(PHP_VERSION, '7.0', '>='))
 	{
-		$distance = $max - $min;
-		if($distance > 0)
+		try
 		{
-			return $min + (int)((float)($distance + 1) * (float)(mt_rand() ^ $obfuscator) / (mt_getrandmax() + 1));
+			$result = random_int($min, $max);
+		} catch (Exception $e) {
 		}
-		else
+
+		if(isset($result))
 		{
-			return mt_rand($min, $max);
+			return $result;
 		}
 	}
-	else
-	{
-		$val = mt_rand() ^ $obfuscator;
-		return $val;
-	}
+
+	$seed = secure_seed_rng();
+
+	$distance = $max - $min;
+	return $min + floor($distance * ($seed / PHP_INT_MAX) );
 }
 
 /**
@@ -8112,20 +8203,22 @@ function send_pm($pm, $fromid = 0, $admin_override=false)
 
 		foreach(array('subject', 'message') as $key)
 		{
-			$lang_string = $pm[$key];
 			if(is_array($pm[$key]))
 			{
+				$lang_string = $lang->{$pm[$key][0]};
 				$num_args = count($pm[$key]);
 
 				for($i = 1; $i < $num_args; $i++)
 				{
-					$lang->{$pm[$key][0]} = str_replace('{'.$i.'}', $pm[$key][$i], $lang->{$pm[$key][0]});
+					$lang_string = str_replace('{'.$i.'}', $pm[$key][$i], $lang_string);
 				}
-
-				$lang_string = $pm[$key][0];
+			}
+			else
+			{
+				$lang_string = $lang->{$pm[$key]};
 			}
 
-			$pm[$key] = $lang->{$lang_string};
+			$pm[$key] = $lang_string;
 		}
 
 		if(isset($revert))
@@ -8141,8 +8234,6 @@ function send_pm($pm, $fromid = 0, $admin_override=false)
 		return false;
 	}
 
-	$lang->load('messages');
-
 	require_once MYBB_ROOT."inc/datahandlers/pm.php";
 
 	$pmhandler = new PMDataHandler();
diff --git a/Upload/inc/functions_forumlist.php b/Upload/inc/functions_forumlist.php
index c74c422..40c4df7 100644
--- a/Upload/inc/functions_forumlist.php
+++ b/Upload/inc/functions_forumlist.php
@@ -184,8 +184,8 @@ function build_forumbits($pid=0, $depth=1)
 				);
 			}
 
-			// If the current forums lastpost is greater than other child forums of the current parent, overwrite it
-			if(!isset($parent_lastpost) || $lastpost_data['lastpost'] > $parent_lastpost['lastpost'])
+			// If the current forums lastpost is greater than other child forums of the current parent and forum info isn't hidden, overwrite it
+			if((!isset($parent_lastpost) || $lastpost_data['lastpost'] > $parent_lastpost['lastpost']) && $hideinfo != true)
 			{
 				$parent_lastpost = $lastpost_data;
 			}
diff --git a/Upload/inc/functions_post.php b/Upload/inc/functions_post.php
index 4561150..2082c99 100644
--- a/Upload/inc/functions_post.php
+++ b/Upload/inc/functions_post.php
@@ -265,7 +265,7 @@ function build_postbit($post, $post_type=0)
 				}
 			}
 		}
-		
+
 		$post['usertitle'] = htmlspecialchars_uni($post['usertitle']);
 
 		if($usergroup['stars'])
@@ -321,7 +321,11 @@ function build_postbit($post, $post_type=0)
 			eval("\$post['useravatar'] = \"".$templates->get("postbit_avatar")."\";");
 		}
 
-		eval("\$post['button_find'] = \"".$templates->get("postbit_find")."\";");
+		$post['button_find'] = '';
+		if($mybb->usergroup['cansearch'] == 1)
+		{
+			eval("\$post['button_find'] = \"".$templates->get("postbit_find")."\";");
+		}
 
 		if($mybb->settings['enablepms'] == 1 && $post['receivepms'] != 0 && $mybb->usergroup['cansendpms'] == 1 && my_strpos(",".$post['ignorelist'].",", ",".$mybb->user['uid'].",") === false)
 		{
@@ -329,7 +333,7 @@ function build_postbit($post, $post_type=0)
 		}
 
 		$post['button_rep'] = '';
-		if($post_type != 3 && $mybb->settings['enablereputation'] == 1 && $mybb->settings['postrep'] == 1 && $mybb->usergroup['cangivereputations'] == 1 && $usergroup['usereputationsystem'] == 1 && ($mybb->settings['posrep'] || $mybb->settings['neurep'] || $mybb->settings['negrep']) && $post['uid'] != $mybb->user['uid'])
+		if($post_type != 3 && $mybb->settings['enablereputation'] == 1 && $mybb->settings['postrep'] == 1 && $mybb->usergroup['cangivereputations'] == 1 && $usergroup['usereputationsystem'] == 1 && ($mybb->settings['posrep'] || $mybb->settings['neurep'] || $mybb->settings['negrep']) && $post['uid'] != $mybb->user['uid'] && (!isset($post['visible']) || $post['visible'] == 1) && (!isset($thread['visible']) || $thread['visible'] == 1))
 		{
 			if(!$post['pid'])
 			{
@@ -478,7 +482,7 @@ function build_postbit($post, $post_type=0)
 		{
 			$post['usertitle'] = $lang->guest;
 		}
-		
+
 		$post['usertitle'] = htmlspecialchars_uni($post['usertitle']);
 
 		$usergroup['title'] = $lang->na;
@@ -525,6 +529,11 @@ function build_postbit($post, $post_type=0)
 	$post['editedmsg'] = '';
 	if(!$post_type)
 	{
+		if(!isset($forumpermissions))
+		{
+			$forumpermissions = forum_permissions($fid);
+		}
+		
 		// Figure out if we need to show an "edited by" message
 		if($post['edituid'] != 0 && $post['edittime'] != 0 && $post['editusername'] != "" && (($mybb->settings['showeditedby'] != 0 && $usergroup['cancp'] == 0) || ($mybb->settings['showeditedbyadmin'] != 0 && $usergroup['cancp'] == 1)))
 		{
@@ -610,6 +619,11 @@ function build_postbit($post, $post_type=0)
 			}
 		}
 
+		if(!isset($ismod))
+		{
+			$ismod = is_moderator($fid);
+		}
+
 		// Inline moderation stuff
 		if($ismod)
 		{
@@ -784,6 +798,19 @@ function build_postbit($post, $post_type=0)
 		default: // Regular post
 			$post = $plugins->run_hooks("postbit", $post);
 
+			if(!isset($ignored_users))
+			{
+				$ignored_users = array();
+				if($mybb->user['uid'] > 0 && $mybb->user['ignorelist'] != "")
+				{
+					$ignore_list = explode(',', $mybb->user['ignorelist']);
+					foreach($ignore_list as $uid)
+					{
+						$ignored_users[$uid] = 1;
+					}
+				}
+			}
+
 			// Is this author on the ignore list of the current user? Hide this post
 			if(is_array($ignored_users) && $post['uid'] != 0 && isset($ignored_users[$post['uid']]) && $ignored_users[$post['uid']] == 1)
 			{
@@ -821,6 +848,11 @@ function get_post_attachments($id, &$post)
 	$validationcount = 0;
 	$tcount = 0;
 	$post['attachmentlist'] = $post['thumblist'] = $post['imagelist'] = '';
+	if(!isset($forumpermissions))
+	{
+		$forumpermissions = forum_permissions($post['fid']);
+	}
+	
 	if(isset($attachcache[$id]) && is_array($attachcache[$id]))
 	{ // This post has 1 or more attachments
 		foreach($attachcache[$id] as $aid => $attachment)
diff --git a/Upload/inc/functions_search.php b/Upload/inc/functions_search.php
index 3bda94f..7e4e7b9 100644
--- a/Upload/inc/functions_search.php
+++ b/Upload/inc/functions_search.php
@@ -229,12 +229,14 @@ function get_password_protected_forums($fids=array())
  */
 function clean_keywords($keywords)
 {
+	global $db;
+
 	$keywords = my_strtolower($keywords);
-	$keywords = str_replace("%", "\\%", $keywords);
+	$keywords = $db->escape_string_like($keywords);
 	$keywords = preg_replace("#\*{2,}#s", "*", $keywords);
 	$keywords = str_replace("*", "%", $keywords);
-	$keywords = preg_replace("#([\[\]\|\.\,:'])#s", " ", $keywords);
 	$keywords = preg_replace("#\s+#s", " ", $keywords);
+	$keywords = str_replace('\\"', '"', $keywords);
 
 	// Search for "and" or "or" and remove if it's at the beginning
 	$keywords = trim($keywords);
@@ -1092,7 +1094,10 @@ function perform_search_mysql($search)
 		if($search['matchusername'])
 		{
 			$user = get_user_by_username($search['author']);
-			$userids[] = $user['uid'];
+			if($user)
+			{
+				$userids[] = $user['uid'];
+			}
 		}
 		else
 		{
@@ -1506,7 +1511,10 @@ function perform_search_mysql_ft($search)
 		if($search['matchusername'])
 		{
 			$user = get_user_by_username($search['author']);
-			$userids[] = $user['uid'];
+			if($user)
+			{
+				$userids[] = $user['uid'];
+			}
 		}
 		else
 		{
diff --git a/Upload/inc/functions_task.php b/Upload/inc/functions_task.php
index 61908f7..17b0486 100644
--- a/Upload/inc/functions_task.php
+++ b/Upload/inc/functions_task.php
@@ -58,6 +58,19 @@ function run_task($tid=0)
 		{
 			add_task_log($task, $lang->missing_task);
 		}
+
+		// If task file does not exist, disable task and inform the administrator
+		$updated_task = array(
+			"enabled" => 0,
+			"locked" => 0
+		);
+		$db->update_query("tasks", $updated_task, "tid='{$task['tid']}'");
+
+		$subject = $lang->sprintf($lang->email_broken_task_subject, $mybb->settings['bbname']);
+		$message = $lang->sprintf($lang->email_broken_task, $mybb->settings['bbname'], $mybb->settings['bburl'], $task['title']);
+
+		my_mail($mybb->settings['adminemail'], $subject, $message, $mybb->settings['adminemail']);
+
 		$cache->update_tasks();
 		return false;
 	}
diff --git a/Upload/inc/functions_upload.php b/Upload/inc/functions_upload.php
index 7f702e1..63dfc9a 100644
--- a/Upload/inc/functions_upload.php
+++ b/Upload/inc/functions_upload.php
@@ -473,6 +473,12 @@ function upload_attachment($attachment, $update_attachment=false)
 			{
 				$month_dir = '';
 			}
+			else
+			{
+				$index = @fopen($mybb->settings['uploadspath']."/".$month_dir."/index.html", 'w');
+				@fwrite($index, "<html>\n<head>\n<title></title>\n</head>\n<body>\n&nbsp;\n</body>\n</html>");
+				@fclose($index);
+			}
 		}
 	}
 
diff --git a/Upload/inc/functions_user.php b/Upload/inc/functions_user.php
index c274e81..d7d0746 100644
--- a/Upload/inc/functions_user.php
+++ b/Upload/inc/functions_user.php
@@ -268,9 +268,7 @@ function add_subscribed_thread($tid, $notification=1, $uid=0)
 			'uid' => (int)$uid,
 			'tid' => (int)$tid,
 			'notification' => (int)$notification,
-			'dateline' => TIME_NOW,
-			'subscriptionkey' => md5(TIME_NOW.$uid.$tid)
-
+			'dateline' => TIME_NOW
 		);
 		$db->insert_query("threadsubscriptions", $insert_array);
 	}
diff --git a/Upload/inc/functions_warnings.php b/Upload/inc/functions_warnings.php
index 686bd19..0fdd5f9 100644
--- a/Upload/inc/functions_warnings.php
+++ b/Upload/inc/functions_warnings.php
@@ -9,11 +9,11 @@
  */
 
 /**
- * @param resource|PDOStatement|mysqli_result $query
- * @param array $max_expiration_times Will be overwritten
- * @param array $check_levels Will be overwritten
+ * @param resource|PDOStatement|mysqli_result $query The query to be run. Needs to select the "action" column of the "warninglevels" table
+ * @param array $max_expiration_times Return variable. The maximum expiration time
+ * @param array $check_levels Return variable. Whether those "levels" were checked
  */
-function find_warnlevels_to_check(&$query, &$max_expiration_times, &$check_levels)
+function find_warnlevels_to_check($query, &$max_expiration_times, &$check_levels)
 {
 	global $db;
 
diff --git a/Upload/inc/languages/polish.php b/Upload/inc/languages/polish.php
index 63a8296..06b2b91 100644
--- a/Upload/inc/languages/polish.php
+++ b/Upload/inc/languages/polish.php
@@ -16,7 +16,7 @@
 $langinfo['website'] = "http://www.mybboard.pl/";
 
 // Compatible version of MyBB
-$langinfo['version'] = "1806";
+$langinfo['version'] = "1807";
 
 // Sets if the translation includes the Admin CP (1 = yes, 0 = no)
 $langinfo['admin'] = 1;
diff --git a/Upload/inc/languages/polish/admin/config_settings.lang.php b/Upload/inc/languages/polish/admin/config_settings.lang.php
index ec9e322..4dc7097 100644
--- a/Upload/inc/languages/polish/admin/config_settings.lang.php
+++ b/Upload/inc/languages/polish/admin/config_settings.lang.php
@@ -461,6 +461,8 @@
 $l['setting_group_mailsettings_desc'] = "W tej sekcji masz możliwość zarządzania systemem mailingu w MyBB, zarówno obsługiwanym przez funkcję mail PHP, jak i przez zewnętrzny serwer SMTP.";
 $l['setting_returnemail'] = "Adres zwrotny";
 $l['setting_returnemail_desc'] = "Adres zwrotny dla e-maili wysyłanych za pośrednictwem systemu forum. Pozostaw to pole puste, by użyć adresu e-mail administratora.";
+$l['setting_contactemail'] = "Kontaktowy adres e-mail";
+$l['setting_contactemail_desc'] = "Adres kontaktowy dla e-maili wysyłanych za pośrednictwem formularza kontaktowego (contact.php). Pozostaw to pole puste, by użyć adresu e-mail administratora.";
 $l['setting_cookieprefix'] = "Prefiks cookies";
 $l['setting_cookieprefix_desc'] = "Prefiks dla wszystkich cookies związanych z MyBB. Przydatny, jeżeli chcesz zainstalować więcej niż jedną kopię systemu MyBB w tej samej domenie, albo posiadasz inne oprogramowanie, które używa takich samych nazw cookies. Jeżeli pozostawisz to pole puste, prefiks nie będzie używany.";
 $l['setting_reportmethod_db'] = "Przechowuj w bazie danych";
diff --git a/Upload/inc/languages/polish/admin/global.lang.php b/Upload/inc/languages/polish/admin/global.lang.php
index 2192d5b..f77623e 100644
--- a/Upload/inc/languages/polish/admin/global.lang.php
+++ b/Upload/inc/languages/polish/admin/global.lang.php
@@ -357,6 +357,8 @@
 
 $l['search_for_a_user'] = "Szukaj użytkownika";
 
+$l['mybb_engine'] = "Silnik MyBB";
+
 // If the language string for "Username" is too cramped in the ACP Login box
 // then use this to define how much larger you want the gap to be (in px)
 // $l['login_field_width'] = "0";
diff --git a/Upload/inc/languages/polish/admin/user_banning.lang.php b/Upload/inc/languages/polish/admin/user_banning.lang.php
index 53dcb27..d103ad5 100644
--- a/Upload/inc/languages/polish/admin/user_banning.lang.php
+++ b/Upload/inc/languages/polish/admin/user_banning.lang.php
@@ -61,4 +61,3 @@
 // Buttons
 $l['ban_user'] = "Zbanuj użytkownika";
 $l['update_ban'] = "Aktualizuj bana";
-$l['search_user'] = 'Szukaj użytkownika';
diff --git a/Upload/inc/languages/polish/archive.lang.php b/Upload/inc/languages/polish/archive.lang.php
index 47376e6..b99f2dd 100644
--- a/Upload/inc/languages/polish/archive.lang.php
+++ b/Upload/inc/languages/polish/archive.lang.php
@@ -13,6 +13,7 @@
 $l['archive_note'] = "Aktualnie przeglądasz uproszczoną wersję forum. <a href=\"{1}\">Kliknij tutaj, by zobaczyć wersję z pełnym formatowaniem</a>.";
 $l['archive_nopermission'] = "Nie masz uprawnień do przeglądania tego zasobu.";
 $l['error_nothreads'] = "Aktualnie nie ma wątków w tym dziale.";
+$l['error_nopermission'] = "Nie masz uprawnień do przeglądania wątków w tym dziale.";
 $l['error_unapproved_thread'] = "Ten wątek nie został zatwierdzony. Odwiedź <a href=\"{1}\">wersję z pełnym formatowaniem</a> aby zobaczyć jego treść.";
 $l['archive_not_found'] = "<h1>Błąd 404</h1><p>Określony dokument (plik) nie został znaleziony na serwerze.";
-$l['error_mustlogin'] = "To forum wymaga zalogowania od wszystkich swoich użytkowników.";
\ No newline at end of file
+$l['error_mustlogin'] = "To forum wymaga zalogowania od wszystkich swoich użytkowników.";
diff --git a/Upload/inc/languages/polish/forumdisplay.lang.php b/Upload/inc/languages/polish/forumdisplay.lang.php
index 1201afe..21020a6 100644
--- a/Upload/inc/languages/polish/forumdisplay.lang.php
+++ b/Upload/inc/languages/polish/forumdisplay.lang.php
@@ -9,6 +9,7 @@
 $l['post_thread'] = "Napisz wątek";
 $l['moderated_by'] = "Moderowane przez:";
 $l['nothreads'] = "Aktualnie nie ma wątków spełniających podane warunki.";
+$l['nopermission'] = "Nie masz uprawnień do przeglądania wątków w tym dziale.";
 $l['search_forum'] = "Szukaj w tym dziale:";
 $l['thread'] = "Temat";
 $l['author'] = "Autor";
diff --git a/Upload/inc/languages/polish/global.lang.php b/Upload/inc/languages/polish/global.lang.php
index 1260587..e7b1fbe 100644
--- a/Upload/inc/languages/polish/global.lang.php
+++ b/Upload/inc/languages/polish/global.lang.php
@@ -310,6 +310,8 @@
 $l['pending_joinrequest'] = "Notatka dla lidera grupy: jest jedno zgłoszenie do grupy, której jesteś liderem.";
 $l['pending_joinrequests'] = "Notatka dla lidera grupy: jest {1} zgłoszeń do grupy, której jesteś liderem.";
 
+$l['search_user'] = "Szukaj użytkownika";
+
 $l['year'] = "Rok";
 $l['year_short'] = "r";
 $l['years'] = "Lat";
@@ -428,7 +430,6 @@
 $l['invalid_nocaptcha_transmit'] = "Wystąpił błąd podczas próby weryfikacji bycia człowiekiem. Spróbuj ponownie.";
 $l['captcha_fetch_failure'] = 'Wystąpił błąd podczas wczytywania nowego kodu.';
 $l['question_fetch_failure'] = 'Wystąpił błąd podczas wczytywania nowego pytania';
-$l['invalid_ayah_result'] = "Test \"Are you Human\" nie został ukończony. Spróbuj ponownie.";
 
 $l['timezone_gmt_minus_1200'] = "(GMT -12:00) Wyspy Marshalla";
 $l['timezone_gmt_minus_1100'] = "(GMT -11:00) Wyspa Midway, Nome";
diff --git a/Upload/inc/languages/polish/managegroup.lang.php b/Upload/inc/languages/polish/managegroup.lang.php
index 9bd22e8..666274d 100644
--- a/Upload/inc/languages/polish/managegroup.lang.php
+++ b/Upload/inc/languages/polish/managegroup.lang.php
@@ -45,7 +45,6 @@
 $l['group_private'] = "To jest prywatna grupa. By do niej dołączyć, użytkownik musi zostać dodany przez lidera.";
 $l['group_default'] = "To jest grupa główna.";
 $l['group_leaders'] = "Liderzy grup";
-$l['search_user'] = "Szukaj użytkownika";
 $l['no_users_selected'] = "Nie zaznaczono użytkowników do usunięcia.<br />Wróć i usuń użytkowników do usunięcia z grupy.";
 
 $l['error_alreadyingroup'] = "Wybrany użytkownik już należy do tej grupy.";
@@ -62,4 +61,4 @@
 
 Aby do niej dołączyć, przejdź do sekcji [url={2}/usercp.php?action=usergroups]Grupy użytkowników[/url] w panelu użytkownika i kliknij \"Akceptuj\".
 
-To zaproszenie wygaśnie za {3} dni.";
\ No newline at end of file
+To zaproszenie wygaśnie za {3} dni.";
diff --git a/Upload/inc/languages/polish/member.lang.php b/Upload/inc/languages/polish/member.lang.php
index 35d1196..857e6e9 100644
--- a/Upload/inc/languages/polish/member.lang.php
+++ b/Upload/inc/languages/polish/member.lang.php
@@ -149,7 +149,6 @@
 $l['confirm_password'] = "Potwierdź hasło:";
 $l['referrer'] = "Polecający:";
 $l['referrer_desc'] = "Jeśli ktoś polecił Ci forum, wpisz tutaj jego login. Jeśli nie - pozostaw to pole puste.";
-$l['search_user'] = "Szukaj użytkownika";
 $l['resend_activation'] = "Prześlij kod aktywacyjny";
 $l['request_activation'] = "Poproś o kod aktywacyjny";
 $l['ppp'] = "Postów na stronę:";
diff --git a/Upload/inc/languages/polish/memberlist.lang.php b/Upload/inc/languages/polish/memberlist.lang.php
index 6731468..66407e4 100644
--- a/Upload/inc/languages/polish/memberlist.lang.php
+++ b/Upload/inc/languages/polish/memberlist.lang.php
@@ -48,7 +48,6 @@
 $l['search_options'] = "Opcje wyszukiwania";
 $l['per_page'] = "Wyników na stronę";
 $l['search'] = "Szukaj";
-$l['search_user'] = "Szukaj użytkownika";
 
 $l['error_no_members'] = "<p>Nie znaleziono żadnych użytkowników spełniających kryteria wyszukiwania.</p><p>Podaj inne kryteria i spróbuj jeszcze raz.</p>";
 
diff --git a/Upload/inc/languages/polish/messages.lang.php b/Upload/inc/languages/polish/messages.lang.php
index 2603519..2faa4bd 100644
--- a/Upload/inc/languages/polish/messages.lang.php
+++ b/Upload/inc/languages/polish/messages.lang.php
@@ -348,7 +348,7 @@
 Rezygnacja ze subskrypcji:
 
 Jeśli nie chcesz otrzymywać informacji o nowych odpowiedziach w tym wątku, przejdź pod adres:
-{6}/usercp2.php?action=removesubscription&tid={8}&key={9}&my_post_key={10}
+{6}/usercp2.php?action=removesubscription&tid={8}&my_post_key={9}
 
 ------------------------------------------";
 $l['email_reachedpmquota'] = "{1},
@@ -494,6 +494,13 @@
 Rezygnacja ze subskrypcji:
 
 Jeśli nie chcesz otrzymywać informacji o nowych odpowiedziach w tym wątku, przejdź pod adres:
-[url]{5}/usercp2.php?action=removesubscription&tid={7}&key={8}&my_post_key={9}[/url]
+[url]{5}/usercp2.php?action=removesubscription&tid={7}&my_post_key={8}[/url]
 
 ------------------------------------------";
+
+$l['email_broken_task_subject'] = "Na forum {1} wystąpił błąd zaplanowanego zadania";
+$l['email_broken_task'] = "Twoja kopia MyBB uruchomiona na stronie {1} ({2}) odnotowała błąd związany z systemem zaplanowanych zadań.
+
+Plik zaplanowanego zadania dla {3} nie został odnaleziony.
+
+To zadanie zostało wyłączone do czasu rozwiązania problemu.";
diff --git a/Upload/inc/languages/polish/misc.lang.php b/Upload/inc/languages/polish/misc.lang.php
index 4761198..16987b1 100644
--- a/Upload/inc/languages/polish/misc.lang.php
+++ b/Upload/inc/languages/polish/misc.lang.php
@@ -14,7 +14,6 @@
 $l['skype'] = "Skype";
 $l['yahoo_im'] = "Yahoo IM";
 $l['skype_center'] = "Centrum Skype";
-$l['skype_status'] = "Status Skype";
 $l['chat_on_skype'] = "Napisz wiadomość do {1} na Skype";
 $l['call_on_skype'] = "Zadzwoń do {1} na Skype";
 $l['yahoo_center'] = "Centrum Yahoo!";
@@ -90,7 +89,13 @@
 $l['redirect_forumpasscleared'] = "Przechowywane hasła zostały wyczyszczone.";
 $l['redirect_cookiescleared'] = "Wszystkie ciasteczka zostały wyczyszczone.";
 
-$l['error_invalidimtype'] = "Ten użytkownik nie określił w profilu swoich danych dla tego komunikatora.";
+$l['error_invalidforum'] = "Nieprawidłowy dział";
 $l['error_invalidhelpdoc'] = "Wybrany dokument pomocy nie istnieje.";
+$l['error_invalidimtype'] = "Ten użytkownik nie określił w profilu swoich danych dla tego komunikatora.";
+$l['error_invalidsearch'] = "Wpisano nieprawidłową frazę do wyszukania. Wróć i spróbuj ponownie.";
+$l['error_no_search_support'] = "Ten silnik bazy danych nie wspiera wyszukiwania.";
+$l['error_searchflooding'] = "Możesz wykonać tylko jedno wyszukiwanie w ciągu {1} sekund. Poczekaj {2} sekund przed następną próbą.";
+$l['error_searchflooding_1'] = "Możesz wykonać tylko jedno wyszukiwanie w ciągu {1} sekund. Poczekaj jeszcze 1 sekundę przed następną próbą.";
+
 
 $l['dst_settings_updated'] = "Ustawienia dotyczące czasu zimowego zostały automatycznie zaktualizowane.<br /><br />Teraz nastąpi przeniesienie na stronę główną forum.";
diff --git a/Upload/inc/languages/polish/modcp.lang.php b/Upload/inc/languages/polish/modcp.lang.php
index b1dc0e8..49cdaab 100644
--- a/Upload/inc/languages/polish/modcp.lang.php
+++ b/Upload/inc/languages/polish/modcp.lang.php
@@ -327,4 +327,3 @@
 $l['you_cannot_use_mod_queue'] = "Nie masz uprawnień do korzystania z kolejki moderacji.";
 
 $l['post'] = 'Post';
-$l['search_user'] = "Szukaj użytkownika";
diff --git a/Upload/inc/languages/polish/newthread.lang.php b/Upload/inc/languages/polish/newthread.lang.php
index a0ace30..49dc487 100644
--- a/Upload/inc/languages/polish/newthread.lang.php
+++ b/Upload/inc/languages/polish/newthread.lang.php
@@ -40,6 +40,7 @@
 $l['redirect_newthread'] = "Wątek został umieszczony na forum.";
 $l['redirect_newthread_poll'] = "<br />Teraz nastąpi przeniesienie do ustawień ankiety.";
 $l['redirect_newthread_moderation'] = "<br />Twój wątek przed opublikowaniem zostanie zweryfikowany przez moderatora. Teraz nastąpi przeniesienie do wątku.";
+$l['redirect_newthread_unviewable'] = "<br />Nie masz uprawnień do przeglądania wątków w tym dziale. Teraz nastąpi przeniesienie do działu.";
 $l['redirect_newthread_thread'] = "<br />Teraz nastąpi przeniesienie do nowego wątku.";
 $l['invalidthread'] = "Nie masz uprawnień do edytowania wybranego szkicu.";
 
diff --git a/Upload/inc/languages/polish/private.lang.php b/Upload/inc/languages/polish/private.lang.php
index 2fdcd10..b79fa99 100644
--- a/Upload/inc/languages/polish/private.lang.php
+++ b/Upload/inc/languages/polish/private.lang.php
@@ -142,7 +142,6 @@
 $l['search_pms'] = "Szukaj";
 $l['advanced_private_message_search'] = "Zaawansowane wyszukiwanie prywatnych wiadomości";
 $l['search_criteria'] = "Kryteria wyszukiwania";
-$l['find_users'] = "Szukaj użytkownika";
 $l['keywords'] = "Słowa kluczowe";
 $l['search_in_subject'] = "Wyszukaj w temacie";
 $l['search_in_message'] = "Wyszukaj w treści wiadomości";
@@ -161,7 +160,6 @@
 $l['descending_order'] = "w kolejności malejącej";
 $l['search_private_messages'] = "Szukaj w prywatnych wiadomościach";
 $l['check_all'] = "Zaznacz wszystkie";
-$l['search_user'] = "Szukaj użytkownika";  
 
 $l['error_nopmsarchive'] = "Nie znaleziono prywatnych wiadomości spełniających podane kryteria.";
 $l['error_invalidpmfoldername'] = "Wprowadzona nazwa folderu zawiera niedozwolone znaki.";
diff --git a/Upload/inc/languages/polish/search.lang.php b/Upload/inc/languages/polish/search.lang.php
index c669060..ef7365d 100644
--- a/Upload/inc/languages/polish/search.lang.php
+++ b/Upload/inc/languages/polish/search.lang.php
@@ -94,7 +94,6 @@
 $l['all_selected'] = "Wszystkie <strong>{1}</strong> wyników wyszukiwania zostało zaznaczonych.";
 $l['select_all'] = "Zaznacz wszystkie <strong>{1}</strong> wyniki wyszukiwania.";
 $l['clear_selection'] = "Usuń zaznaczenie";
-$l['search_user'] = "Szukaj użytkownika";  
 
 $l['results'] = "wyniki";
 $l['mod_options'] = "Opcje moderatora";
diff --git a/Upload/inc/languages/polish/usercp.lang.php b/Upload/inc/languages/polish/usercp.lang.php
index 63968a7..a2e610e 100644
--- a/Upload/inc/languages/polish/usercp.lang.php
+++ b/Upload/inc/languages/polish/usercp.lang.php
@@ -393,7 +393,6 @@
 $l['icon_new'] = "Zawiera nowe posty.";
 $l['icon_hot'] = " Gorący wątek.";
 $l['icon_lock'] = " Zamknięty wątek.";
-$l['search_user'] = "Szukaj użytkownika";  
 
 $l['buddylist_error'] = 'Podczas pobierania listy znajomych wystąpił błąd.';
 
diff --git a/Upload/inc/mailhandlers/php.php b/Upload/inc/mailhandlers/php.php
index b2e935e..56a7524 100644
--- a/Upload/inc/mailhandlers/php.php
+++ b/Upload/inc/mailhandlers/php.php
@@ -51,6 +51,14 @@ function send()
 			@ini_set("sendmail_from", $mybb->settings['adminemail']);
 		}
 
+		$dir = "/{$config['admin_dir']}/";
+		$pos = strrpos($_SERVER['PHP_SELF'], $dir);
+		if(defined('IN_ADMINCP') && $pos !== false)
+		{
+			$temp_script_path = $_SERVER['PHP_SELF'];
+			$_SERVER['PHP_SELF'] = substr($_SERVER['PHP_SELF'], $pos + strlen($dir) - 1);
+		}
+
 		// If safe mode is on, don't send the additional parameters as we're not allowed to
 		if($mybb->safemode)
 		{
@@ -62,6 +70,11 @@ function send()
 		}
 		$function_used = 'mail()';
 
+		if(defined('IN_ADMINCP') && $pos !== false)
+		{
+			$_SERVER['PHP_SELF'] = $temp_script_path;
+		}
+
 		if(!$sent)
 		{
 			$this->fatal_error("MyBB was unable to send the email using the PHP {$function_used} function.");
diff --git a/Upload/inc/mailhandlers/smtp.php b/Upload/inc/mailhandlers/smtp.php
index b797e23..9afe44c 100644
--- a/Upload/inc/mailhandlers/smtp.php
+++ b/Upload/inc/mailhandlers/smtp.php
@@ -100,20 +100,6 @@ class SmtpMail extends MailHandler
 	 */
 	public $host = '';
 
-	/**
-	 * The last received response from the SMTP server.
-	 *
-	 * @var string
-	 */
-	public $data = '';
-
-	/**
-	 * The last received response code from the SMTP server.
-	 *
-	 * @var string
-	 */
-	public $code = 0;
-
 	/**
 	 * The last received error message from the SMTP server.
 	 *
diff --git a/Upload/inc/tasks/dailycleanup.php b/Upload/inc/tasks/dailycleanup.php
index b6198fe..5a7a89b 100644
--- a/Upload/inc/tasks/dailycleanup.php
+++ b/Upload/inc/tasks/dailycleanup.php
@@ -77,7 +77,7 @@ function task_dailycleanup($task)
 
 	if(!empty($user_update))
 	{
-		foreach($user_update as $uid)
+		foreach($user_update as $uid => $data)
 		{
 			update_pm_count($uid);
 		}
diff --git a/Upload/install/index.php b/Upload/install/index.php
index d38dc14..41df529 100644
--- a/Upload/install/index.php
+++ b/Upload/install/index.php
@@ -1796,9 +1796,9 @@ function configure()
 	global $output, $mybb, $errors, $lang;
 
 	$output->print_header($lang->board_config, 'config');
-	
+
 	echo <<<EOF
-		<script type="text/javascript">	
+		<script type="text/javascript">
 		function warnUser(inp, warn)
 		{
 			var parenttr = $('#'+inp.id).closest('tr');
@@ -1817,19 +1817,19 @@ function warnUser(inp, warn)
 				}
 			}
 		}
-			
+
 		function revertSetting(defval, inpid)
 		{
-			$(inpid).val(defval);			
+			$(inpid).val(defval);
 			var parenttr = $(inpid).closest('tr');
 			parenttr.next('.setting_peeker').remove();
 			if(parenttr.is(':last-child'))
 			{
 				parenttr.addClass('last');
-			}			
+			}
 		}
 		</script>
-		
+
 EOF;
 
 	// If board configuration errors
@@ -1859,12 +1859,12 @@ function revertSetting(defval, inpid)
 		}
 
 		// Attempt auto-detection
-		if($_SERVER['HTTP_HOST'])
+		if(!empty($_SERVER['HTTP_HOST']))
 		{
 			$hostname = $protocol.$_SERVER['HTTP_HOST'];
 			$cookiedomain = $_SERVER['HTTP_HOST'];
 		}
-		elseif($_SERVER['SERVER_NAME'])
+		elseif(!empty($_SERVER['SERVER_NAME']))
 		{
 			$hostname = $protocol.$_SERVER['SERVER_NAME'];
 			$cookiedomain = $_SERVER['SERVER_NAME'];
@@ -1885,18 +1885,33 @@ function revertSetting(defval, inpid)
 			$cookiedomain = ".{$cookiedomain}";
 		}
 
-		if($_SERVER['SERVER_PORT'] && $_SERVER['SERVER_PORT'] != 80 && !preg_match("#:[0-9]#i", $hostname))
+		if(!empty($_SERVER['SERVER_PORT']))
 		{
-			$hostname .= ':'.$_SERVER['SERVER_PORT'];
+			$port = ":{$_SERVER['SERVER_PORT']}";
+			$pos = strrpos($cookiedomain, $port);
+
+			if($pos !== false)
+			{
+				$cookiedomain = substr($cookiedomain, 0, $pos);
+			}
+
+			if($_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443 && !preg_match("#:[0-9]#i", $hostname))
+			{
+				$hostname .= $port;
+			}
 		}
-		
+
 		$currentlocation = get_current_location('', '', true);
 		$noinstall = substr($currentlocation, 0, strrpos($currentlocation, '/install/'));
-		
+
 		$cookiepath = $noinstall.'/';
 		$bburl = $hostname.$noinstall;
 		$websiteurl = $hostname.'/';
-		$contactemail = $_SERVER['SERVER_ADMIN'];
+
+		if(isset($_SERVER['SERVER_ADMIN']) && filter_var($_SERVER['SERVER_ADMIN'], FILTER_VALIDATE_EMAIL))
+		{
+			$contactemail = $_SERVER['SERVER_ADMIN'];
+		}
 	}
 
 	echo $lang->sprintf($lang->config_step_table, $bbname, $bburl, $websitename, $websiteurl, $cookiedomain, $cookiepath, $contactemail);
@@ -1928,9 +1943,9 @@ function create_admin_user()
 		}
 	}
 	$output->print_header($lang->create_admin, 'admin');
-	
+
 	echo <<<EOF
-		<script type="text/javascript">	
+		<script type="text/javascript">
 		function comparePass()
 		{
 			var parenttr = $('#adminpass2').closest('tr');
@@ -1946,7 +1961,7 @@ function comparePass()
 			}
 		}
 		</script>
-		
+
 EOF;
 
 	if(is_array($errors))
@@ -2274,7 +2289,7 @@ function install_done()
 	);
 	$db->insert_query('users', $newuser);
 
-	$welcome_post_title = "Witamy w MyBB!";
+$welcome_post_title = "Witamy w MyBB!";
 	$welcome_post_message = "Dziękujemy za wybranie MyBB. Instalacja przebiegła poprawnie i Twoje forum jest gotowe do użytku. Jeżeli podczas pracy z MyBB napotkasz jakiś problem, nie bój się zapytać na forum [url=http://forum.mybboard.pl]oficjalnego Polskiego Supportu MyBB[/url]. Zachęcamy Cię także do zapoznania się z naszym [url=http://mybboard.pl]portalem[/url], gdzie możesz znaleźć najnowsze wiadomości ze świata MyBB, oraz do odwiedzenia [url=http://wiki.mybboard.pl]polskiej Wiki[/url]. Powodzenia w przygodzie z MyBB!";
 	
 	$welcome_post = array(
diff --git a/Upload/install/resources/mybb_theme.xml b/Upload/install/resources/mybb_theme.xml
index ff20eb9..8b47fbf 100644
--- a/Upload/install/resources/mybb_theme.xml
+++ b/Upload/install/resources/mybb_theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<theme name="MyBB Master Style" version="1805">
+<theme name="MyBB Master Style" version="1807">
 	<properties>
 		<templateset><![CDATA[1]]></templateset>
 		<imgdir><![CDATA[images]]></imgdir>
@@ -2172,7 +2172,7 @@ ul.thread_tools li.poll {
 .thread_status.newlockfolder {
 	background-position: 0 -320px;
 }]]></stylesheet>
-	<stylesheet name="css3.css" version="1800" disporder="7"><![CDATA[tr td.trow1:first-child,
+	<stylesheet name="css3.css" version="1807" disporder="7"><![CDATA[tr td.trow1:first-child,
 tr td.trow2:first-child,
 tr td.trow_shaded:first-child {
 	border-left: 0;
@@ -2190,17 +2190,17 @@ tr td.trow_shaded:last-child {
 	border-radius: 7px;
 }
 
-.tborder tbody tr:last-child td {
+.tborder tbody tr:last-child > td {
 	border-bottom: 0;
 }
 
-.tborder tbody tr:last-child td:first-child {
+.tborder tbody tr:last-child > td:first-child {
 	-moz-border-radius-bottomleft: 6px;
 	-webkit-border-bottom-left-radius: 6px;
 	border-bottom-left-radius: 6px;
 }
 
-.tborder tbody tr:last-child td:last-child {
+.tborder tbody tr:last-child > td:last-child {
 	-moz-border-radius-bottomright: 6px;
 	-webkit-border-bottom-right-radius: 6px;
 	border-bottom-right-radius: 6px;
@@ -3678,7 +3678,7 @@ var announcement_quickdelete_confirm = "{$lang->announcement_quickdelete_confirm
 		<template name="forumbit_moderators_group" version="1800"><![CDATA[{$comma}{$moderator['title']}]]></template>
 		<template name="forumbit_moderators_user" version="1800"><![CDATA[{$comma}<a href="{$moderator['profilelink']}">{$moderator['username']}</a>]]></template>
 		<template name="forumbit_subforums" version="120"><![CDATA[<br />{$lang->subforums} {$sub_forums}]]></template>
-		<template name="forumdisplay" version="1804"><![CDATA[<html>
+		<template name="forumdisplay" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$foruminfo['name']} </title>
 {$headerinclude}
@@ -3692,7 +3692,7 @@ var announcement_quickdelete_confirm = "{$lang->announcement_quickdelete_confirm
 // -->
 </script>
 <!-- jeditable (jquery) -->
-<script src="{$mybb->asset_url}/jscripts/jeditable/jeditable.min.js"></script>
+<script type="text/javascript" src="{$mybb->asset_url}/jscripts/jeditable/jeditable.min.js"></script>
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/inline_edit.js?ver=1804"></script>
 </head>
 <body>
@@ -3724,7 +3724,7 @@ var announcement_quickdelete_confirm = "{$lang->announcement_quickdelete_confirm
 {$modann}
 </tr>]]></template>
 		<template name="forumdisplay_announcements_announcement_modbit" version="1800"><![CDATA[<td align="center" class="{$bgcolor} forumdisplay_announcement">-</td>]]></template>
-		<template name="forumdisplay_inlinemoderation" version="1804"><![CDATA[<script type="text/javascript" src="{$mybb->asset_url}/jscripts/inline_moderation.js?ver=1804"></script>
+		<template name="forumdisplay_inlinemoderation" version="1807"><![CDATA[<script type="text/javascript" src="{$mybb->asset_url}/jscripts/inline_moderation.js?ver=1807"></script>
 		<form action="moderation.php" method="post">
 <input type="hidden" name="my_post_key" value="{$mybb->post_code}" />
 <input type="hidden" name="fid" value="{$fid}" />
@@ -3777,6 +3777,9 @@ var announcement_quickdelete_confirm = "{$lang->announcement_quickdelete_confirm
 <option value="multiunstickthreads">{$lang->unstick_threads}</option>]]></template>
 		<template name="forumdisplay_moderatedby" version="1600"><![CDATA[<span class="smalltext">{$lang->moderated_by} <strong>{$moderators}</strong></span><br />]]></template>
 		<template name="forumdisplay_newthread" version="1800"><![CDATA[<a href="newthread.php?fid={$fid}" class="button new_thread_button"><span>{$lang->post_thread}</span></a>]]></template>
+		<template name="forumdisplay_nopermission" version="1807"><![CDATA[<tr>
+<td colspan="{$colspan}" class="trow1">{$lang->nopermission}</td>
+</tr>]]></template>
 		<template name="forumdisplay_nothreads" version="120"><![CDATA[<tr>
 <td colspan="{$colspan}" class="trow1">{$lang->nothreads}</td>
 </tr>]]></template>
@@ -4255,7 +4258,7 @@ $(".forumjump").change(function() {
 <td class="trow1"><span class="smalltext">{$lang->online_note}<br />{$onlinemembers}</span></td>
 </tr>]]></template>
 		<template name="index_whosonline_memberbit" version="1400"><![CDATA[{$comma}{$user['profilelink']}{$invisiblemark}]]></template>
-		<template name="managegroup" version="1800"><![CDATA[<html>
+		<template name="managegroup" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->members_of}</title>
 {$headerinclude}
@@ -4282,6 +4285,7 @@ $(".forumjump").change(function() {
 </tr>
 {$users}
 </table>
+{$multipage}
 <br />
 <div align="center">{$remove_users}</div>
 </form>
@@ -4290,7 +4294,7 @@ $(".forumjump").change(function() {
 {$footer}
 </body>
 </html>]]></template>
-		<template name="managegroup_adduser" version="1806"><![CDATA[<br />
+		<template name="managegroup_adduser" version="1807"><![CDATA[<br />
 <form method="post" action="managegroup.php">
 <input type="hidden" name="my_post_key" value="{$mybb->post_code}" />
 <input type="hidden" name="action" value="do_add" />
@@ -4304,7 +4308,7 @@ $(".forumjump").change(function() {
   <td class="trow1"><input type="text" id="username" class="textbox" name="username" size="40" maxlength="{$mybb->settings['maxnamelength']}" style="width: 210px" /></td>
 </tr>
 </table>
-<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1806">
+<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1807">
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/select2/select2.min.js?ver=1806"></script>
 <script type="text/javascript">
 <!--
@@ -4313,8 +4317,7 @@ if(use_xmlhttprequest == "1")
 	MyBB.select2();
 	$("#username").select2({
 		placeholder: "{$lang->search_user}",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 			url: "xmlhttp.php?action=get_users",
@@ -4345,7 +4348,7 @@ if(use_xmlhttprequest == "1")
 <br />
 <div align="center"><input type="submit" class="button" value="{$lang->add_member_submit}" /></div>
 </form>]]></template>
-		<template name="managegroup_inviteuser" version="1806"><![CDATA[<br />
+		<template name="managegroup_inviteuser" version="1807"><![CDATA[<br />
 <form method="post" action="managegroup.php">
 <input type="hidden" name="my_post_key" value="{$mybb->post_code}" />
 <input type="hidden" name="action" value="do_invite" />
@@ -4359,7 +4362,7 @@ if(use_xmlhttprequest == "1")
   <td class="trow1"><input type="text" id="inviteusername" class="textbox" name="inviteusername" size="40" maxlength="{$mybb->settings['maxnamelength']}" style="width: 210px" /></td>
 </tr>
 </table>
-<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1806">
+<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1807">
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/select2/select2.min.js?ver=1806"></script>
 <script type="text/javascript">
 <!--
@@ -4368,8 +4371,7 @@ if(use_xmlhttprequest == "1")
 	MyBB.select2();
 	$("#inviteusername").select2({
 		placeholder: "{$lang->search_user}",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 			url: "xmlhttp.php?action=get_users",
@@ -4649,7 +4651,7 @@ if(use_xmlhttprequest == "1")
 {$footer}
 </body>
 </html>]]></template>
-		<template name="member_profile" version="1804"><![CDATA[<html>
+		<template name="member_profile" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->profile}</title>
 {$headerinclude}
@@ -4696,11 +4698,11 @@ if(use_xmlhttprequest == "1")
 				</tr>
 				<tr>
 					<td class="trow1"><strong>{$lang->total_posts}</strong></td>
-					<td class="trow1">{$memprofile['postnum']} ({$lang->ppd_percent_total})<br /><span class="smalltext">(<a href="search.php?action=finduser&amp;uid={$uid}">{$lang->find_posts}</a>)</span></td>
+					<td class="trow1">{$memprofile['postnum']} ({$lang->ppd_percent_total}){$findposts}</td>
 				</tr>
 				<tr>
 					<td class="trow2"><strong>{$lang->total_threads}</strong></td>
-					<td class="trow2">{$memprofile['threadnum']} ({$lang->tpd_percent_total})<br /><span class="smalltext">(<a href="search.php?action=finduserthreads&amp;uid={$uid}">{$lang->find_threads}</a>)</span></td>
+					<td class="trow2">{$memprofile['threadnum']} ({$lang->tpd_percent_total}){$findthreads}</td>
 				</tr>
 				<tr>
 					<td class="trow1"><strong>{$lang->timeonline}</strong></td>
@@ -4812,6 +4814,8 @@ if(use_xmlhttprequest == "1")
 <td class="{$bgcolor}"><strong>{$lang->email}</strong></td>
 <td class="{$bgcolor}"><a href="member.php?action=emailuser&amp;uid={$memprofile['uid']}">{$lang->send_user_email}</a></td>
 </tr>]]></template>
+		<template name="member_profile_findposts" version="1807"><![CDATA[<br /><span class="smalltext">(<a href="search.php?action=finduser&amp;uid={$uid}">{$lang->find_posts}</a>)</span>]]></template>
+		<template name="member_profile_findthreads" version="1807"><![CDATA[<br /><span class="smalltext">(<a href="search.php?action=finduserthreads&amp;uid={$uid}">{$lang->find_threads}</a>)</span>]]></template>
 		<template name="member_profile_groupimage" version="120"><![CDATA[<img src="{$displaygroup['image']}" alt="{$usertitle}" title="{$usertitle}" /><br />]]></template>
 		<template name="member_profile_modoptions" version="1800"><![CDATA[<table border="0" cellspacing="{$theme['borderwidth']}" cellpadding="{$theme['tablespace']}" width="100%" class="tborder">
 <tr>
@@ -4874,11 +4878,11 @@ if(use_xmlhttprequest == "1")
 	<td class="{$bgcolor}"><strong>{$lang->homepage}</strong></td>
 	<td class="{$bgcolor}"><a href="{$memprofile['website']}" target="_blank">{$memprofile['website']}</a></td>
 </tr>]]></template>
-		<template name="member_register" version="1804"><![CDATA[<html>
+		<template name="member_register" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->registration}</title>
 {$headerinclude}
-<script src="{$mybb->asset_url}/jscripts/validate/jquery.validate.min.js?ver=1804"></script>
+<script type="text/javascript" src="{$mybb->asset_url}/jscripts/validate/jquery.validate.min.js?ver=1804"></script>
 </head>
 <body>
 {$header}
@@ -5257,7 +5261,7 @@ $(document).ready(function() {
 		// -->
 		</script>
 		]]></template>
-		<template name="member_register_referrer" version="1806"><![CDATA[<br />
+		<template name="member_register_referrer" version="1807"><![CDATA[<br />
 <fieldset class="trow2">
 <legend><strong>{$lang->referrer}</strong></legend>
 <table cellspacing="0" cellpadding="{$theme['tablespace']}">
@@ -5270,7 +5274,7 @@ $(document).ready(function() {
 </td>
 </tr></table>
 </fieldset>
-<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1806">
+<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1807">
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/select2/select2.min.js?ver=1806"></script>
 <script type="text/javascript">
 <!--
@@ -5279,8 +5283,7 @@ if(use_xmlhttprequest == "1")
 	MyBB.select2();
 	$("#referrer").select2({
 		placeholder: "{$lang->search_user}",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 			url: "xmlhttp.php?action=get_users",
@@ -5338,15 +5341,6 @@ if(use_xmlhttprequest == "1")
 	<td id="imagestring_status"  style="display: none;" colspan="2">&nbsp;</td>
 </tr>
 </table>
-</fieldset>]]></template>
-		<template name="member_register_regimage_ayah" version="1800"><![CDATA[<br />
-<fieldset class="trow2">
-  <legend><strong>{$lang->image_verification}</strong></legend>
-	<table cellspacing="0" cellpadding="{$theme['tablespace']}">
-	<tr>
-		<td>{$output}</td>
-	</tr>
-</table>
 </fieldset>]]></template>
 		<template name="member_register_regimage_recaptcha" version="1605"><![CDATA[<br />
 <script type="text/javascript">
@@ -5451,7 +5445,7 @@ if(use_xmlhttprequest == "1")
 </table>
 </div>
 </div>]]></template>
-		<template name="memberlist" version="1806"><![CDATA[<html>
+		<template name="memberlist" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->member_list}</title>
 {$headerinclude}
@@ -5552,7 +5546,7 @@ if(use_xmlhttprequest == "1")
 <div align="center"><br /><input type="submit" class="button" name="submit" value="{$lang->search}" /></div>
 </form>
 {$footer}
-<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1806">
+<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1807">
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/select2/select2.min.js?ver=1806"></script>
 <script type="text/javascript">
 <!--
@@ -5561,8 +5555,7 @@ if(use_xmlhttprequest == "1")
 	MyBB.select2();
 	$("#username").select2({
 		placeholder: "{$lang->search_user}",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 			url: "xmlhttp.php?action=get_users",
@@ -5607,7 +5600,7 @@ if(use_xmlhttprequest == "1")
 </html>]]></template>
 		<template name="memberlist_referrals" version="1800"><![CDATA[<td class="tcat" width="10%" align="center"><span class="smalltext"><a href="{$sorturl}&amp;sort=referrals&amp;order=descending"><strong>{$lang->referrals}</strong></a> {$orderarrow['referrals']}</span></td>]]></template>
 		<template name="memberlist_referrals_bit" version="1600"><![CDATA[<td class="{$alt_bg}" align="center">{$user['referrals']}</td>]]></template>
-		<template name="memberlist_search" version="1806"><![CDATA[<html>
+		<template name="memberlist_search" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->search_member_list}</title>
 {$headerinclude}
@@ -5699,7 +5692,7 @@ if(use_xmlhttprequest == "1")
 <div align="center"><br /><input type="submit" class="button" name="submit" value="{$lang->search}" /></div>
 </form>
 {$footer}
-<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1806">
+<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1807">
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/select2/select2.min.js?ver=1806"></script>
 <script type="text/javascript">
 <!--
@@ -5708,8 +5701,7 @@ if(use_xmlhttprequest == "1")
 	MyBB.select2();
 	$("#username").select2({
 		placeholder: "{$lang->search_user}",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 			url: "xmlhttp.php?action=get_users",
@@ -5953,7 +5945,7 @@ if(use_xmlhttprequest == "1")
 </div>
 </div>]]></template>
 		<template name="misc_imcenter_nav" version="1804"><![CDATA[{$navsep}<a href="javascript:;" onclick="MyBB.popupWindow('/misc.php?action=imcenter&amp;imtype={$imtype}&amp;uid={$uid}&amp;modal=1'); return false;">{$imtype_lang}</a>]]></template>
-		<template name="misc_imcenter_skype" version="1800"><![CDATA[<div class="modal">
+		<template name="misc_imcenter_skype" version="1807"><![CDATA[<div class="modal">
 <div style="overflow-y: auto; max-height: 400px;">
 <table width="100%" cellspacing="{$theme['borderwidth']}" cellpadding="{$theme['tablespace']}" border="0" align="center" class="tborder">
 <tr>
@@ -5966,9 +5958,6 @@ if(use_xmlhttprequest == "1")
 <td class="trow1" align="center"><strong>{$user['skype']}</strong></td>
 </tr>
 <tr>
-<td class="trow1" align="center"><img src="http://mystatus.skype.com/smallclassic/{$user['skype']}" alt="{$lang->skype_status}" border="0"></td>
-</tr>
-<tr>
 <td class="trow1" align="center"><span class="smalltext"><a href="skype:{$user['skype']}?chat">{$lang->chat_on_skype}</a>  -  <a href="skype:{$user['skype']}?call">{$lang->call_on_skype}</a></span></td>
 </tr>
 </table>
@@ -6121,8 +6110,8 @@ if(use_xmlhttprequest == "1")
 </table>
 </div>
 </div>]]></template>
-		<template name="misc_whoposted_poster" version="120"><![CDATA[<tr>
-<td class="{$altbg}">{$profile_link}</a></td>
+		<template name="misc_whoposted_poster" version="1807"><![CDATA[<tr>
+<td class="{$altbg}">{$profile_link}</td>
 <td class="{$altbg}">{$poster['posts']}</td>
 </tr>]]></template>
 		<template name="modcp" version="1805"><![CDATA[<html>
@@ -6546,7 +6535,7 @@ if(use_xmlhttprequest == "1")
 		<template name="modcp_banning_nobanned" version="1400"><![CDATA[<tr>
 	<td class="trow1" align="center" colspan="4">{$lang->no_banned}</td>
 </tr>]]></template>
-		<template name="modcp_banuser" version="1806"><![CDATA[<html>
+		<template name="modcp_banuser" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->ban_user}</title>
 {$headerinclude}
@@ -6589,7 +6578,7 @@ if(use_xmlhttprequest == "1")
 		</tr>
 	</table>
 	{$footer}
-<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1806">
+<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1807">
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/select2/select2.min.js?ver=1806"></script>
 <script type="text/javascript">
 <!--
@@ -6598,8 +6587,7 @@ if(use_xmlhttprequest == "1")
 	MyBB.select2();
 	$("#username").select2({
 		placeholder: "{$lang->search_user}",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 			url: "xmlhttp.php?action=get_users",
@@ -7026,7 +7014,7 @@ if(use_xmlhttprequest == "1")
 		<template name="modcp_editprofile_suspensions_info" version="1600"><![CDATA[<tr>
 	<td colspan="2" class="smalltext"><em>{$suspension_info}</em></td>
 </tr>]]></template>
-		<template name="modcp_finduser" version="1806"><![CDATA[<html>
+		<template name="modcp_finduser" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->find_users}</title>
 {$headerinclude}
@@ -7088,7 +7076,7 @@ if(use_xmlhttprequest == "1")
 		</table>
 	</form>
 {$footer}
-<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1806" />
+<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1807" />
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/select2/select2.min.js?ver=1806"></script>
 <script type="text/javascript">
 <!--
@@ -7097,8 +7085,7 @@ if(use_xmlhttprequest == "1")
 	MyBB.select2();
 	$("#username").select2({
 		placeholder: "{$lang->find_users}",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 			url: "xmlhttp.php?action=get_users",
@@ -7732,7 +7719,7 @@ if(use_xmlhttprequest == "1")
 		<template name="modcp_nobanned" version="1613"><![CDATA[<tr>
 		<td class="trow1" align="center" colspan="4">{$lang->no_bans_ending}</td>
 </tr>]]></template>
-		<template name="modcp_warninglogs" version="1806"><![CDATA[<html>
+		<template name="modcp_warninglogs" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->warning_logs}</title>
 {$headerinclude}
@@ -7808,7 +7795,7 @@ if(use_xmlhttprequest == "1")
 		</tr>
 	</table>
 	{$footer}
-<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1806">
+<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1807">
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/select2/select2.min.js?ver=1806"></script>
 <script type="text/javascript">
 <!--
@@ -7817,8 +7804,7 @@ if(use_xmlhttprequest == "1")
 	MyBB.select2();
 	$("#username").select2({
 		placeholder: "{$lang->search_user}",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 			url: "xmlhttp.php?action=get_users",
@@ -8874,7 +8860,7 @@ if(use_xmlhttprequest == "1")
 <td class="trow1"><span class="smalltext">{$this->warnings}</span><br /></td>
 </tr>
 </table><br /><br />]]></template>
-		<template name="polls_editpoll" version="1800"><![CDATA[<html>
+		<template name="polls_editpoll" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->edit_poll}</title>
 {$headerinclude}
@@ -8891,6 +8877,7 @@ if(use_xmlhttprequest == "1")
 <td class="trow1" style="white-space: nowrap"><input type="checkbox" class="checkbox" name="delete" value="1" tabindex="9" /><strong>{$lang->delete_q}</strong></td>
 <td class="trow1" width="100%">{$lang->delete_note}<br /><span class="smalltext">{$lang->delete_note2}</span></td>
 <td class="trow1" style="white-space: nowrap"><input type="submit" class="button" name="submit" value="{$lang->delete_poll}" tabindex="10" /></td>
+</tr>
 </table>
 <input type="hidden" name="action" value="do_deletepoll" />
 <input type="hidden" name="tid" value="{$tid}" />
@@ -9254,9 +9241,9 @@ if(use_xmlhttprequest == "1")
 {$attachments}
 </table>]]></template>
 		<template name="post_attachments_add" version="1614"><![CDATA[<input type="submit" class="button" name="newattachment" value="{$lang->add_attachment}" tabindex="13" />]]></template>
-		<template name="post_attachments_attachment" version="1604"><![CDATA[<tr>
+		<template name="post_attachments_attachment" version="1807"><![CDATA[<tr>
 <td class="trow2" width="1" align="center">{$attachment['icon']}</td>
-<td class="trow2" width="75%" style="white-space: nowrap">{$attachment['filename']} ({$attachment['size']})</td>
+<td class="trow2" width="60%" style="white-space: nowrap">{$attachment['filename']} ({$attachment['size']})</td>
 <td class="trow2" style="white-space: nowrap; text-align: center;">{$attach_mod_options} {$attach_rem_options} {$postinsert}</td>
 </tr>]]></template>
 		<template name="post_attachments_attachment_mod_approve" version="120"><![CDATA[<input type="submit" class="button" name="approveattach" value="{$lang->approve_attachment}" onclick="return Post.attachmentAction({$attachment['aid']},'approve');" />]]></template>
@@ -9268,10 +9255,10 @@ if(use_xmlhttprequest == "1")
 <td class="trow_shaded" style="white-space: nowrap"><em><a href="attachment.php?aid={$attachment['aid']}" target="_blank">{$attachment['filename']}</a> ({$attachment['size']})</em></td>
 <td class="trow_shaded" style="white-space: nowrap; text-align: center;">{$attach_mod_options} <input type="submit" class="button" name="rem" value="{$lang->remove_attachment}" onclick="return Post.removeAttachment({$attachment['aid']});" /> {$postinsert}</td>
 </tr>]]></template>
-		<template name="post_attachments_new" version="1800"><![CDATA[<tr>
+		<template name="post_attachments_new" version="1807"><![CDATA[<tr>
 <td class="trow1" width="1"><img src="{$theme['imgdir']}/paperclip.png" alt="" /></td>
-<td class="trow1" style="white-space: nowrap"><strong>{$lang->new_attachment}</strong> <input type="file" name="attachment" size="30" class="fileupload" /></td><td class="trow1" align="center">{$attach_update_options} {$attach_add_options}
-</td>
+<td class="trow1" style="white-space: nowrap"><strong>{$lang->new_attachment}</strong> <input type="file" name="attachment" size="30" class="fileupload" /></td>
+<td class="trow1" style="white-space: nowrap" align="center">{$attach_update_options} {$attach_add_options}</td>
 </tr>]]></template>
 		<template name="post_attachments_update" version="1604"><![CDATA[<input type="submit" class="button" name="updateattachment" value="{$lang->update_attachment}" tabindex="12" />]]></template>
 		<template name="post_captcha" version="1804"><![CDATA[<tr id="captcha_trow">
@@ -9306,16 +9293,6 @@ if(use_xmlhttprequest == "1")
 	</tr>
 </table>
 </td>
-</tr>]]></template>
-		<template name="post_captcha_ayah" version="1800"><![CDATA[<tr id="captcha_trow">
-<td class="trow1" valign="top"><strong>{$lang->image_verification}</strong></td>
-<td class="trow1">
-	<table cellspacing="0" cellpadding="{$theme['tablespace']}">
-		<tr>
-            <td>{$output}</td>
-		</tr>
-	</table>
-</td>
 </tr>]]></template>
 		<template name="post_captcha_hidden" version="1605"><![CDATA[<input type="hidden" name="{$hash}" value="{$field['hash']}" />
 <input type="hidden" name="{$string}" value="{$field['string']}" />]]></template>
@@ -9667,7 +9644,7 @@ body { font-family: Verdana, Arial, sans-serif; font-size: 13px; }
 {$footer}
 </body>
 </html>]]></template>
-		<template name="private_advanced_search" version="1806"><![CDATA[<html>
+		<template name="private_advanced_search" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->advanced_private_message_search}</title>
 {$headerinclude}
@@ -9745,7 +9722,7 @@ body { font-family: Verdana, Arial, sans-serif; font-size: 13px; }
 </table>
 </form>
 {$footer}
-<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1806" />
+<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1807" />
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/select2/select2.min.js?ver=1806"></script>
 <script type="text/javascript">
 <!--
@@ -9753,9 +9730,8 @@ if(use_xmlhttprequest == "1")
 {
 	MyBB.select2();
 	$("#sender").select2({
-		placeholder: "{$lang->find_users}",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		placeholder: "{$lang->search_user}",
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 			url: "xmlhttp.php?action=get_users",
@@ -10294,7 +10270,7 @@ if(use_xmlhttprequest == "1")
 </script>
 </body>
 </html>]]></template>
-		<template name="private_send_autocomplete" version="1806"><![CDATA[<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1806">
+		<template name="private_send_autocomplete" version="1807"><![CDATA[<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1807">
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/select2/select2.min.js?ver=1806"></script>
 <script type="text/javascript">
 <!--
@@ -10303,8 +10279,8 @@ if(use_xmlhttprequest == "1")
 	MyBB.select2();
 	$("#to").select2({
 		placeholder: "{$lang->search_user}",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
+		maximumSelectionSize: {$mybb->usergroup['maxpmrecipients']},
 		multiple: true,
 		ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 			url: "xmlhttp.php?action=get_users",
@@ -10341,8 +10317,8 @@ if(use_xmlhttprequest == "1")
 
   $("#bcc").select2({
 		placeholder: "{$lang->search_user}",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
+		maximumSelectionSize: {$mybb->usergroup['maxpmrecipients']},
 		multiple: true,
 		ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 			url: "xmlhttp.php?action=get_users",
@@ -10458,7 +10434,7 @@ document.write('<br /><span class="smalltext"><a href="#" onclick="UserCP.openBu
 		<template name="private_tracking_unreadmessage_stop" version="1800"><![CDATA[<tr>
 <td class="tfoot" align="right" colspan="5"><strong><input type="submit" class="button" name="stoptrackingunread" value="{$lang->stop_tracking}" /> / <input type="submit" class="button" name="cancel" value="{$lang->delete}" /> {$lang->selected_messages}</strong></td>
 </tr>]]></template>
-		<template name="report" version="1800"><![CDATA[<div class="modal">
+		<template name="report" version="1807"><![CDATA[<div class="modal">
   <div style="overflow-y: auto; max-height: 400px;" class="modal_{$id}">
   <form action="report.php" method="post" class="reportData_{$id}" onsubmit="javascript: return Report.submitReport({$id});">
 <input type="hidden" name="my_post_key" value="{$mybb->post_code}" />
@@ -10468,7 +10444,7 @@ document.write('<br /><span class="smalltext"><a href="#" onclick="UserCP.openBu
 <input type="hidden" name="no_modal" value="1" />
 <table border="0" cellspacing="{$theme['borderwidth']}" cellpadding="{$theme['tablespace']}" class="tborder">
 <tr>
-	<td class="thead" colspan="2"><strong>{$report_title}</strong>
+	<td class="thead" colspan="2"><strong>{$report_title}</strong></td>
 </tr>
 <tr>
 	<td class="tcat" colspan="2">{$lang->report_to_mod}</td>
@@ -10507,9 +10483,9 @@ document.write('<br /><span class="smalltext"><a href="#" onclick="UserCP.openBu
 		<template name="report_error" version="1800"><![CDATA[<tr>
 	<td colspan="2" class="trow1">{$error}</td>
 </tr>]]></template>
-		<template name="report_error_nomodal" version="1800"><![CDATA[<table border="0" cellspacing="{$theme['borderwidth']}" cellpadding="{$theme['tablespace']}" class="tborder">
+		<template name="report_error_nomodal" version="1807"><![CDATA[<table border="0" cellspacing="{$theme['borderwidth']}" cellpadding="{$theme['tablespace']}" class="tborder">
 <tr>
-	<td class="thead" colspan="2"><strong>{$report_title}</strong>
+	<td class="thead" colspan="2"><strong>{$report_title}</strong></td>
 </tr>
 <tr>
 	<td class="tcat" colspan="2">{$lang->report_to_mod}</td>
@@ -10746,7 +10722,7 @@ document.write('<br /><span class="smalltext"><a href="#" onclick="UserCP.openBu
 			<a href="javascript:Report.reportReputation({$reputation_vote['rid']});" class="postbit_report"><span>{$lang->report_vote}</span></a>
 		</div>]]>
 		</template>
-		<template name="search" version="1806"><![CDATA[<html>
+		<template name="search" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->search}</title>
 {$headerinclude}
@@ -10826,7 +10802,7 @@ document.write('<br /><span class="smalltext"><a href="#" onclick="UserCP.openBu
 <div align="center"><br /><input type="submit" class="button" name="submit" value="{$lang->search}" /></div>
 </form>
 {$footer}
-<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1806">
+<link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1807">
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/select2/select2.min.js?ver=1806"></script>
 <script type="text/javascript">
 <!--
@@ -10835,8 +10811,7 @@ if(use_xmlhttprequest == "1")
 	MyBB.select2();
 	$("#author").select2({
 		placeholder: "{$lang->search_user}",
-		minimumInputLength: 3,
-		maximumSelectionSize: 3,
+		minimumInputLength: 2,
 		multiple: false,
 		ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 			url: "xmlhttp.php?action=get_users",
@@ -10934,7 +10909,7 @@ if(use_xmlhttprequest == "1")
 </body>
 </html>]]></template>
 		<template name="search_results_posts_inlinecheck" version="120"><![CDATA[<td class="{$bgcolor}" align="center" style="white-space: nowrap"><input type="checkbox" class="checkbox" name="inlinemod_{$post['pid']}" id="inlinemod_{$post['pid']}" value="1" style="vertical-align: middle;" {$inlinecheck}  /></td>]]></template>
-		<template name="search_results_posts_inlinemoderation" version="1806"><![CDATA[<script type="text/javascript" src="{$mybb->asset_url}/jscripts/inline_moderation.js?ver=1804"></script>
+		<template name="search_results_posts_inlinemoderation" version="1807"><![CDATA[<script type="text/javascript" src="{$mybb->asset_url}/jscripts/inline_moderation.js?ver=1807"></script>
 <form action="moderation.php" method="post" style="margin-top: 0; margin-bottom: 0;">
 <input type="hidden" name="my_post_key" value="{$mybb->post_code}" />
 <input type="hidden" name="tid" value="0" />
@@ -10970,8 +10945,8 @@ if(use_xmlhttprequest == "1")
 		<template name="search_results_posts_inlinemoderation_custom" version="120"><![CDATA[<optgroup label="{$lang->custom_mod_tools}">{$customposttools}</optgroup>]]></template>
 		<template name="search_results_posts_inlinemoderation_custom_tool" version="120"><![CDATA[<option value="{$tool['tid']}">{$tool['name']}</option>]]></template>
 		<template name="search_results_posts_nocheck" version="120"><![CDATA[<td class="{$bgcolor}" align="center" style="white-space: nowrap">&nbsp;</td>]]></template>
-		<template name="search_results_posts_post" version="1800"><![CDATA[<tr class="inline_row">
-	<td align="center" class="{$bgcolor}" width="2%"><span class="thread_status {$folder}">&nbsp;</span></td>
+		<template name="search_results_posts_post" version="1807"><![CDATA[<tr class="inline_row">
+	<td align="center" class="{$bgcolor}" width="2%"><span class="thread_status {$folder}" title="{$folder_label}">&nbsp;</span></td>
 	<td align="center" class="{$bgcolor}" width="2%">{$icon}</td>
 	<td class="{$bgcolor}">
 		<span class="smalltext">
@@ -11027,7 +11002,7 @@ if(use_xmlhttprequest == "1")
 		</body>
 		</html>]]></template>
 		<template name="search_results_threads_inlinecheck" version="120"><![CDATA[<td class="{$bgcolor}" align="center" style="white-space: nowrap"><input type="checkbox" class="checkbox" name="inlinemod_{$thread['tid']}" id="inlinemod_{$thread['tid']}" value="1" style="vertical-align: middle;" {$inlinecheck}  /></td>]]></template>
-		<template name="search_results_threads_inlinemoderation" version="1806"><![CDATA[<script type="text/javascript" src="{$mybb->asset_url}/jscripts/inline_moderation.js?ver=1804"></script>
+		<template name="search_results_threads_inlinemoderation" version="1807"><![CDATA[<script type="text/javascript" src="{$mybb->asset_url}/jscripts/inline_moderation.js?ver=1807"></script>
 		<form action="moderation.php" method="post">
 <input type="hidden" name="my_post_key" value="{$mybb->post_code}" />
 <input type="hidden" name="fid" value="0" />
@@ -11256,7 +11231,7 @@ if(use_xmlhttprequest == "1")
 			<td class="tcat"><span class="smalltext"><strong>{$lang->message}</strong></span></td>
 		</tr>
 		]]></template>
-		<template name="showthread_inlinemoderation" version="1804"><![CDATA[<script type="text/javascript" src="{$mybb->asset_url}/jscripts/inline_moderation.js?ver=1804"></script>
+		<template name="showthread_inlinemoderation" version="1807"><![CDATA[<script type="text/javascript" src="{$mybb->asset_url}/jscripts/inline_moderation.js?ver=1807"></script>
 <form action="moderation.php" method="post" style="margin-top: 0; margin-bottom: 0;">
 <input type="hidden" name="my_post_key" value="{$mybb->post_code}" />
 <input type="hidden" name="tid" value="{$tid}" />
@@ -11913,7 +11888,7 @@ if(use_xmlhttprequest == "1")
 {$footer}
 </body>
 </html>]]></template>
-		<template name="usercp_currentavatar" version="1800"><![CDATA[<td class="trow1" valign="top" align="center" width="1"><div class="usercp_container"><img src="{$useravatar['image']}" alt="{$mybb->user['username']}" title="{$mybb->user['username']}" {$useravatar['width_height']} /></div></td>]]></template>
+		<template name="usercp_currentavatar" version="1807"><![CDATA[<td class="trow1" valign="top" align="center" width="1"><div class="usercp_container"><img src="{$useravatar['image']}" alt="{$avatar_username}" title="{$avatar_username}" {$useravatar['width_height']} /></div></td>]]></template>
 		<template name="usercp_drafts" version="1804"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->drafts}</title>
@@ -11989,7 +11964,7 @@ if(use_xmlhttprequest == "1")
 		{$lang->no_requests}
 	</td>
 </tr>]]></template>
-		<template name="usercp_editlists" version="1806"><![CDATA[<html>
+		<template name="usercp_editlists" version="1807"><![CDATA[<html>
 <head>
 	<title>{$mybb->settings['bbname']} - {$lang->edit_lists}</title>
 	{$headerinclude}
@@ -12002,7 +11977,7 @@ if(use_xmlhttprequest == "1")
       	lang.buddylist_error = '{$lang->buddylist_error}';
 	</script>
 
-  <link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1806">
+  <link rel="stylesheet" href="{$mybb->asset_url}/jscripts/select2/select2.css?ver=1807">
 	<script type="text/javascript" src="{$mybb->asset_url}/jscripts/select2/select2.min.js?ver=1806"></script>
 
 </head>
@@ -12035,8 +12010,8 @@ if(use_xmlhttprequest == "1")
 									MyBB.select2();
 									$("#buddy_add_username").select2({
 										placeholder: "{$lang->search_user}",
-										minimumInputLength: 3,
-										maximumSelectionSize: 3,
+										minimumInputLength: 2,
+										maximumSelectionSize: 5,
 										multiple: true,
 										ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 											url: "xmlhttp.php?action=get_users",
@@ -12107,8 +12082,8 @@ if(use_xmlhttprequest == "1")
 									MyBB.select2();
 									$("#ignored_add_username").select2({
 										placeholder: "{$lang->search_user}",
-										minimumInputLength: 3,
-										maximumSelectionSize: 3,
+										minimumInputLength: 2,
+										maximumSelectionSize: 5,
 										multiple: true,
 										ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
 											url: "xmlhttp.php?action=get_users",
@@ -12209,8 +12184,8 @@ if(use_xmlhttprequest == "1")
 						</tbody>
 					</table>
 		]]></template>
-		<template name="usercp_editlists_user" version="1800"><![CDATA[<li class="float_left" id="{$type}_{$user['uid']}" style="width: 33%; list-style: none; margin-bottom: 4px;">
-	<a href="usercp.php?action=do_editlists&amp;my_post_key={$mybb->post_code}&amp;manage={$type}&amp;delete={$user['uid']}" onclick="return UserCP.removeBuddy('{$type}', {$user['uid']});" title="{$lang->remove_from_list}"><img src="{$theme['imgdir']}/buddy_delete.png" title="[{$lang->delete}]"  alt="{$lang->remove_from_list}" style="vertical-align: middle;" /></a>
+		<template name="usercp_editlists_user" version="1807"><![CDATA[<li class="float_left" id="{$type}_{$user['uid']}" style="width: 33%; list-style: none; margin-bottom: 4px;">
+	<a href="usercp.php?action=do_editlists&amp;my_post_key={$mybb->post_code}&amp;manage={$type}&amp;delete={$user['uid']}" onclick="return UserCP.removeBuddy('{$type}', {$user['uid']});" title="{$lang->remove_from_list}"><img src="{$theme['imgdir']}/buddy_delete.png" title="{$lang->remove_from_list}"  alt="{$lang->remove_from_list}" style="vertical-align: middle;" /></a>
 	<img src="{$theme['imgdir']}/buddy_{$status}.png" title="{$lang->$status}" alt="" style="vertical-align: middle;" />
 	{$profile_link}
 </li>]]></template>
@@ -13104,7 +13079,7 @@ if(use_xmlhttprequest == "1")
 {$referral_link}]]></template>
 		<template name="usercp_reputation" version="1600"><![CDATA[<strong>{$lang->reputation}</strong> {$reputation_link} [<a href="reputation.php?uid={$mybb->user['uid']}">{$lang->details}</a>]<br />]]></template>
 		<template name="usercp_resendactivation" version="1800"><![CDATA[<br />(<a href="member.php?action=resendactivation">{$lang->resend_activation}</a>)]]></template>
-		<template name="usercp_subscriptions" version="1800"><![CDATA[<html>
+		<template name="usercp_subscriptions" version="1807"><![CDATA[<html>
 <head>
 <title>{$mybb->settings['bbname']} - {$lang->subscriptions}</title>
 {$headerinclude}
@@ -13137,7 +13112,7 @@ if(use_xmlhttprequest == "1")
 <div class="float_left">
 	<div class="float_left">
 		<dl class="thread_legend smalltext">
-			<dd><span class="thread_status newfolder" title="{$lang->new_thread}">&nbsp;</span> {$lang->new_thread}</dd>
+			<dd><span class="thread_status newfolder" title="{$lang->new_posts_thread}">&nbsp;</span> {$lang->new_posts_thread}</dd>
 			<dd><span class="thread_status newhotfolder" title="{$lang->new_hot_thread}">&nbsp;</span> {$lang->new_hot_thread}</dd>
 			<dd><span class="thread_status hotfolder" title="{$lang->hot_thread}">&nbsp;</span> {$lang->hot_thread}</dd>
 		</dl>
@@ -13351,15 +13326,15 @@ if(use_xmlhttprequest == "1")
 				<td class="{$alt_bg}" align="center">{$issuedby}</td>
 	</tr>]]></template>
 		<template name="usercp_warnings_warning_post" version="1800"><![CDATA[<br /><small>{$lang->warning_for_post} <a href="{$warning['postlink']}">{$warning['post_subject']}</a></small>]]></template>
-		<template name="video_metacafe_embed" version="1600"><![CDATA[<embed src="http://www.metacafe.com/fplayer/{$id}/{$title}.swf" width="400" height="345" wmode="transparent" allowFullScreen="true" allowScriptAccess="always" name="Metacafe_{$id}" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed>]]></template>
-		<template name="video_dailymotion_embed" version="1610"><![CDATA[<iframe frameborder="0" width="480" height="270" src="http://www.dailymotion.com/embed/video/{$id}"></iframe>]]></template>
+		<template name="video_metacafe_embed" version="1807"><![CDATA[<iframe src="http://www.metacafe.com/embed/{$id}/" width="440" height="248" allowFullScreen frameborder=0></iframe>]]></template>
+		<template name="video_dailymotion_embed" version="1807"><![CDATA[<iframe frameborder="0" width="480" height="270" src="//www.dailymotion.com/embed/video/{$id}" allowfullscreen></iframe>]]></template>
 		<template name="video_facebook_embed" version="1800"><![CDATA[<iframe src="https://www.facebook.com/video/embed?video_id={$id}" width="625" height="350" frameborder="0"></iframe>]]></template>
 		<template name="video_liveleak_embed" version="1800"><![CDATA[<iframe width="500" height="300" src="http://www.liveleak.com/ll_embed?i={$id}" frameborder="0" allowfullscreen></iframe>]]></template>
-		<template name="video_myspacetv_embed" version="1600"><![CDATA[<object width="425px" height="360px"><param name="allowFullScreen" value="true"/><param name="wmode" value="transparent"/><param name="movie" value="http://mediaservices.myspace.com/services/media/embed.aspx/m={$id},t=1,mt=video"/><embed src="http://mediaservices.myspace.com/services/media/embed.aspx/m={$id},t=1,mt=video" width="425" height="360" allowFullScreen="true" type="application/x-shockwave-flash" wmode="transparent"></embed></object>]]></template>
-		<template name="video_youtube_embed" version="1610"><![CDATA[<iframe width="560" height="315" src="http://www.youtube.com/embed/{$id}" frameborder="0" allowfullscreen></iframe>]]></template>
+		<template name="video_myspacetv_embed" version="1807"><![CDATA[<iframe width="480" height="270" src="//media.myspace.com/play/video/{$id}" frameborder="0" allowtransparency="true" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>]]></template>
+		<template name="video_youtube_embed" version="1807"><![CDATA[<iframe width="560" height="315" src="//www.youtube.com/embed/{$id}" frameborder="0" allowfullscreen></iframe>]]></template>
 		<template name="video_veoh_embed" version="1800"><![CDATA[<object width="410" height="341" id="veohFlashPlayer" name="veohFlashPlayer"><param name="movie" value="http://www.veoh.com/swf/webplayer/WebPlayer.swf?version=AFrontend.5.7.0.1446&permalinkId={$id}&player=videodetailsembedded&videoAutoPlay=0&id=anonymous"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.veoh.com/swf/webplayer/WebPlayer.swf?version=AFrontend.5.7.0.1446&permalinkId={$id}&player=videodetailsembedded&videoAutoPlay=0&id=anonymous" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="410" height="341" id="veohFlashPlayerEmbed" name="veohFlashPlayerEmbed"></embed></object>]]></template>
-		<template name="video_vimeo_embed" version="1610"><![CDATA[<iframe src="http://player.vimeo.com/video/{$id}" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>]]></template>
-		<template name="video_yahoo_embed" version="1610"><![CDATA[<iframe width="624" height="351" scrolling="no" frameborder="0" src="http://{$local}screen.yahoo.com/{$id}?format=embed"></iframe>]]></template>
+		<template name="video_vimeo_embed" version="1807"><![CDATA[<iframe src="//player.vimeo.com/video/{$id}" width="500" height="375" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>]]></template>
+		<template name="video_yahoo_embed" version="1807"><![CDATA[<iframe width="640" height="360" scrolling="no" frameborder="0" src="//{$local}screen.yahoo.com/{$id}?format=embed" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true" allowtransparency="true"></iframe>]]></template>
 		<template name="warnings" version="1400"><![CDATA[<html>
 <head>
 	<title>{$mybb->settings['bbname']} - {$lang->warning_log}</title>
@@ -13815,16 +13790,17 @@ $(function() {
 </html>]]></template>
 		<template name="debug_summary" version="1800"><![CDATA[<div id="debug">{$generated_in} {$debug_weight} <br />{$sql_queries} / {$server_load} / {$memory_usage}<br />[<a href="{$debuglink}" target="_blank">{$lang->debug_advanced_details}</a>]<br /></div>]]></template>
 		<template name="gobutton" version="120"><![CDATA[<input type="submit" class="button" value="{$lang->go}" />]]></template>
-		<template name="headerinclude" version="1806"><![CDATA[<link rel="alternate" type="application/rss+xml" title="{$lang->latest_threads} (RSS 2.0)" href="{$mybb->settings['bburl']}/syndication.php" />
+		<template name="headerinclude" version="1807"><![CDATA[<link rel="alternate" type="application/rss+xml" title="{$lang->latest_threads} (RSS 2.0)" href="{$mybb->settings['bburl']}/syndication.php" />
 <link rel="alternate" type="application/atom+xml" title="{$lang->latest_threads} (Atom 1.0)" href="{$mybb->settings['bburl']}/syndication.php?type=atom1.0" />
 <meta http-equiv="Content-Type" content="text/html; charset={$charset}" />
 <meta http-equiv="Content-Script-Type" content="text/javascript" />
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/jquery.js?ver=1806"></script>
 <script type="text/javascript" src="{$mybb->asset_url}/jscripts/jquery.plugins.min.js?ver=1806"></script>
-<script type="text/javascript" src="{$mybb->asset_url}/jscripts/general.js?ver=1806"></script>
+<script type="text/javascript" src="{$mybb->asset_url}/jscripts/general.js?ver=1807"></script>
 
 {$stylesheets}
 <script type="text/javascript">
+<!--
 	lang.unknown_error = "{$lang->unknown_error}";
 
 	lang.select2_match = "{$lang->select2_match}";
@@ -13856,6 +13832,7 @@ $(function() {
 	var spinner_image = "{$theme['imgdir']}/spinner.gif";
 	var spinner = "<img src='" + spinner_image +"' alt='' />";
 	var modal_zindex = 9999;
+// -->
 </script>]]></template>
 		<template name="htmldoctype" version="120"><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">]]></template>
 		<template name="loginbox" version="1609"><![CDATA[<tr>
diff --git a/Upload/install/resources/mysql_db_tables.php b/Upload/install/resources/mysql_db_tables.php
index 4c8aea3..429d6d5 100644
--- a/Upload/install/resources/mysql_db_tables.php
+++ b/Upload/install/resources/mysql_db_tables.php
@@ -42,7 +42,7 @@
   dateline int unsigned NOT NULL default '0',
   lastactive int unsigned NOT NULL default '0',
   data TEXT NOT NULL,
-  useragent varchar(100) NOT NULL default '',
+  useragent varchar(200) NOT NULL default '',
   authenticated tinyint(1) NOT NULL default '0'
 ) ENGINE=MyISAM;";
 
@@ -57,7 +57,7 @@
 	custom_profile_fields text NOT NULL,
 	sortby varchar(20) NOT NULL default '',
 	sortorder varchar(4) NOT NULL default '',
-	perpage smallint(4) NOT NULL default '0',
+	perpage smallint(4) unsigned NOT NULL default '0',
 	view_type varchar(6) NOT NULL default '',
 	PRIMARY KEY (vid)
 ) ENGINE=MyISAM;";
@@ -84,7 +84,7 @@
   uid int unsigned NOT NULL default '0',
   filename varchar(120) NOT NULL default '',
   filetype varchar(120) NOT NULL default '',
-  filesize int(10) NOT NULL default '0',
+  filesize int(10) unsigned NOT NULL default '0',
   attachname varchar(120) NOT NULL default '',
   downloads int unsigned NOT NULL default '0',
   dateuploaded int unsigned NOT NULL default '0',
@@ -100,7 +100,7 @@
   name varchar(120) NOT NULL default '',
   mimetype varchar(120) NOT NULL default '',
   extension varchar(10) NOT NULL default '',
-  maxsize int(15) NOT NULL default '0',
+  maxsize int(15) unsigned NOT NULL default '0',
   icon varchar(100) NOT NULL default '',
   PRIMARY KEY (atid)
 ) ENGINE=MyISAM;";
@@ -138,7 +138,7 @@
   gid int unsigned NOT NULL default '0',
   oldgroup int unsigned NOT NULL default '0',
   oldadditionalgroups text NOT NULL,
-  olddisplaygroup int NOT NULL default '0',
+  olddisplaygroup int unsigned NOT NULL default '0',
   admin int unsigned NOT NULL default '0',
   dateline int unsigned NOT NULL default '0',
   bantime varchar(50) NOT NULL default '',
@@ -149,13 +149,13 @@
 ) ENGINE=MyISAM;";
 
 $tables[] = "CREATE TABLE mybb_buddyrequests (
- id int(10) UNSIGNED NOT NULL auto_increment,
- uid bigint(30) UNSIGNED NOT NULL,
- touid bigint(30) UNSIGNED NOT NULL,
- date int(11) UNSIGNED NOT NULL,
- KEY (uid),
- KEY (touid),
- PRIMARY KEY (id)
+  id int(10) unsigned NOT NULL auto_increment,
+  uid int unsigned NOT NULL default '0',
+  touid int unsigned NOT NULL default '0',
+  date int unsigned NOT NULL default '0',
+  KEY (uid),
+  KEY (touid),
+  PRIMARY KEY (id)
 ) ENGINE=MyISAM;";
 
 $tables[] = "CREATE TABLE mybb_calendars (
@@ -164,7 +164,7 @@
   disporder smallint unsigned NOT NULL default '0',
   startofweek tinyint(1) NOT NULL default '0',
   showbirthdays tinyint(1) NOT NULL default '0',
-  eventlimit smallint(3) NOT NULL default '0',
+  eventlimit smallint(3) unsigned NOT NULL default '0',
   moderation tinyint(1) NOT NULL default '0',
   allowhtml tinyint(1) NOT NULL default '0',
   allowmycode tinyint(1) NOT NULL default '0',
@@ -383,7 +383,7 @@
 	sentcount int unsigned NOT NULL default '0',
 	totalcount int unsigned NOT NULL default '0',
 	conditions text NOT NULL,
-	perpage smallint(4) NOT NULL default '50',
+	perpage smallint(4) unsigned NOT NULL default '50',
 	PRIMARY KEY (mid)
 ) ENGINE=MyISAM;";
 
@@ -603,19 +603,19 @@
   description text NOT NULL,
   enabled tinyint(1) NOT NULL default '1',
   logging tinyint(1) NOT NULL default '0',
-  posts int NOT NULL default '0',
+  posts int unsigned NOT NULL default '0',
   posttype char(2) NOT NULL default '',
-  threads int NOT NULL default '0',
+  threads int unsigned NOT NULL default '0',
   threadtype char(2) NOT NULL default '',
-  registered int NOT NULL default '0',
+  registered int unsigned NOT NULL default '0',
   registeredtype varchar(20) NOT NULL default '',
-  online int NOT NULL default '0',
+  online int unsigned NOT NULL default '0',
   onlinetype varchar(20) NOT NULL default '',
   reputations int NOT NULL default '0',
   reputationtype char(2) NOT NULL default '',
-  referrals int NOT NULL default '0',
+  referrals int unsigned NOT NULL default '0',
   referralstype char(2) NOT NULL default '',
-  warnings int NOT NULL default '0',
+  warnings int unsigned NOT NULL default '0',
   warningstype char(2) NOT NULL default '',
   requirements varchar(200) NOT NULL default '',
   originalusergroup varchar(120) NOT NULL default '0',
@@ -702,11 +702,11 @@
   ip varbinary(16) NOT NULL default '',
   time int unsigned NOT NULL default '0',
   location varchar(150) NOT NULL default '',
-  useragent varchar(100) NOT NULL default '',
+  useragent varchar(200) NOT NULL default '',
   anonymous tinyint(1) NOT NULL default '0',
   nopermission tinyint(1) NOT NULL default '0',
-  location1 int(10) NOT NULL default '0',
-  location2 int(10) NOT NULL default '0',
+  location1 int(10) unsigned NOT NULL default '0',
+  location2 int(10) unsigned NOT NULL default '0',
   PRIMARY KEY(sid),
   KEY location (location1, location2),
   KEY time (time),
@@ -865,7 +865,7 @@
   rid int unsigned NOT NULL auto_increment,
   tid int unsigned NOT NULL default '0',
   uid int unsigned NOT NULL default '0',
-  rating smallint unsigned NOT NULL default '0',
+  rating tinyint(1) unsigned NOT NULL default '0',
   ipaddress varbinary(16) NOT NULL default '',
   KEY tid (tid, uid),
   PRIMARY KEY (rid)
@@ -890,8 +890,8 @@
   lastpost int unsigned NOT NULL default '0',
   lastposter varchar(120) NOT NULL default '',
   lastposteruid int unsigned NOT NULL default '0',
-  views int(100) NOT NULL default '0',
-  replies int(100) NOT NULL default '0',
+  views int(100) unsigned NOT NULL default '0',
+  replies int(100) unsigned NOT NULL default '0',
   closed varchar(30) NOT NULL default '',
   sticky tinyint(1) NOT NULL default '0',
   numratings smallint unsigned NOT NULL default '0',
@@ -924,7 +924,6 @@
   tid int unsigned NOT NULL default '0',
   notification tinyint(1) NOT NULL default '0',
   dateline int unsigned NOT NULL default '0',
-  subscriptionkey varchar(32) NOT NULL default '',
   KEY uid (uid),
   KEY tid (tid, notification),
   PRIMARY KEY (sid)
@@ -940,12 +939,12 @@
 
 $tables[] = "CREATE TABLE mybb_usergroups (
   gid smallint unsigned NOT NULL auto_increment,
-  type smallint(2) NOT NULL default '2',
+  type tinyint(1) unsigned NOT NULL default '2',
   title varchar(120) NOT NULL default '',
   description text NOT NULL,
   namestyle varchar(200) NOT NULL default '{username}',
   usertitle varchar(120) NOT NULL default '',
-  stars smallint(4) NOT NULL default '0',
+  stars smallint(4) unsigned NOT NULL default '0',
   starimage varchar(120) NOT NULL default '',
   image varchar(120) NOT NULL default '',
   disporder smallint(6) unsigned NOT NULL,
@@ -974,12 +973,12 @@
   cansendpms tinyint(1) NOT NULL default '0',
   cantrackpms tinyint(1) NOT NULL default '0',
   candenypmreceipts tinyint(1) NOT NULL default '0',
-  pmquota int(3) NOT NULL default '0',
-  maxpmrecipients int(4) NOT NULL default '5',
+  pmquota int(3) unsigned NOT NULL default '0',
+  maxpmrecipients int(4) unsigned NOT NULL default '5',
   cansendemail tinyint(1) NOT NULL default '0',
   cansendemailoverride tinyint(1) NOT NULL default '0',
-  maxemails int(3) NOT NULL default '5',
-  emailfloodtime int(3) NOT NULL default '5',
+  maxemails int(3) unsigned NOT NULL default '5',
+  emailfloodtime int(3) unsigned NOT NULL default '5',
   canviewmemberlist tinyint(1) NOT NULL default '0',
   canviewcalendar tinyint(1) NOT NULL default '0',
   canaddevents tinyint(1) NOT NULL default '0',
@@ -1010,15 +1009,15 @@
   cancustomtitle tinyint(1) NOT NULL default '0',
   canwarnusers tinyint(1) NOT NULL default '0',
   canreceivewarnings tinyint(1) NOT NULL default '0',
-  maxwarningsday int(3) NOT NULL default '3',
+  maxwarningsday int(3) unsigned NOT NULL default '3',
   canmodcp tinyint(1) NOT NULL default '0',
   showinbirthdaylist tinyint(1) NOT NULL default '0',
   canoverridepm tinyint(1) NOT NULL default '0',
   canusesig tinyint(1) NOT NULL default '0',
   canusesigxposts smallint unsigned NOT NULL default '0',
   signofollow tinyint(1) NOT NULL default '0',
-  edittimelimit int(4) NOT NULL default '0',
-  maxposts int(4) NOT NULL default '0',
+  edittimelimit int(4) unsigned NOT NULL default '0',
+  maxposts int(4) unsigned NOT NULL default '0',
   showmemberlist tinyint(1) NOT NULL default '1',
   canmanageannounce tinyint(1) NOT NULL default '0',
   canmanagemodqueue tinyint(1) NOT NULL default '0',
@@ -1038,8 +1037,8 @@
   salt varchar(10) NOT NULL default '',
   loginkey varchar(50) NOT NULL default '',
   email varchar(220) NOT NULL default '',
-  postnum int(10) NOT NULL default '0',
-  threadnum int(10) NOT NULL default '0',
+  postnum int(10) unsigned NOT NULL default '0',
+  threadnum int(10) unsigned NOT NULL default '0',
   avatar varchar(200) NOT NULL default '',
   avatardimensions varchar(10) NOT NULL default '',
   avatartype varchar(10) NOT NULL default '0',
@@ -1077,9 +1076,9 @@
   showavatars tinyint(1) NOT NULL default '0',
   showquickreply tinyint(1) NOT NULL default '0',
   showredirect tinyint(1) NOT NULL default '0',
-  ppp smallint(6) NOT NULL default '0',
-  tpp smallint(6) NOT NULL default '0',
-  daysprune smallint(6) NOT NULL default '0',
+  ppp smallint(6) unsigned NOT NULL default '0',
+  tpp smallint(6) unsigned NOT NULL default '0',
+  daysprune smallint(6) unsigned NOT NULL default '0',
   dateformat varchar(4) NOT NULL default '',
   timeformat varchar(4) NOT NULL default '',
   timezone varchar(5) NOT NULL default '',
@@ -1102,9 +1101,9 @@
   language varchar(50) NOT NULL default '',
   timeonline int unsigned NOT NULL default '0',
   showcodebuttons tinyint(1) NOT NULL default '1',
-  totalpms int(10) NOT NULL default '0',
-  unreadpms int(10) NOT NULL default '0',
-  warningpoints int(3) NOT NULL default '0',
+  totalpms int(10) unsigned NOT NULL default '0',
+  unreadpms int(10) unsigned NOT NULL default '0',
+  warningpoints int(3) unsigned NOT NULL default '0',
   moderateposts tinyint(1) NOT NULL default '0',
   moderationtime int unsigned NOT NULL default '0',
   suspendposting tinyint(1) NOT NULL default '0',
@@ -1113,7 +1112,7 @@
   suspendsigtime int unsigned NOT NULL default '0',
   coppauser tinyint(1) NOT NULL default '0',
   classicpostbit tinyint(1) NOT NULL default '0',
-  loginattempts tinyint(2) NOT NULL default '1',
+  loginattempts smallint(2) unsigned NOT NULL default '1',
   usernotes text NOT NULL,
   sourceeditor tinyint(1) NOT NULL default '0',
   UNIQUE KEY username (username),
@@ -1127,14 +1126,14 @@ classicpostbit tinyint(1) NOT NULL default '0',
   utid smallint unsigned NOT NULL auto_increment,
   posts int unsigned NOT NULL default '0',
   title varchar(250) NOT NULL default '',
-  stars smallint(4) NOT NULL default '0',
+  stars smallint(4) unsigned NOT NULL default '0',
   starimage varchar(120) NOT NULL default '',
   PRIMARY KEY (utid)
 ) ENGINE=MyISAM;";
 
 $tables[] = "CREATE TABLE mybb_warninglevels (
 	lid int unsigned NOT NULL auto_increment,
-	percentage smallint(3) NOT NULL default '0',
+	percentage smallint(3) unsigned NOT NULL default '0',
 	action text NOT NULL,
 	PRIMARY KEY (lid)
 ) ENGINE=MyISAM;";
diff --git a/Upload/install/resources/output.php b/Upload/install/resources/output.php
index 54c78f6..1935d1f 100644
--- a/Upload/install/resources/output.php
+++ b/Upload/install/resources/output.php
@@ -61,7 +61,7 @@ function print_header($title="Rozpoczęcie", $image="welcome", $form=1, $error=0
 	<title>{$this->title} &gt; {$title}</title>
 	<link rel="stylesheet" href="stylesheet.css" type="text/css" />
 	<script type="text/javascript" src="../jscripts/jquery.js"></script>
-	<script type="text/javascript" src="../jscripts/general.js?ver=1806"></script>
+	<script type="text/javascript" src="../jscripts/general.js?ver=1807"></script>
 	{$dbconfig_add}
 </head>
 <body>
diff --git a/Upload/install/resources/pgsql_db_tables.php b/Upload/install/resources/pgsql_db_tables.php
index 3ce1aab..40a4e19 100644
--- a/Upload/install/resources/pgsql_db_tables.php
+++ b/Upload/install/resources/pgsql_db_tables.php
@@ -46,7 +46,7 @@
 	dateline int NOT NULL default '0',
 	lastactive int NOT NULL default '0',
 	data text NOT NULL default '',
-	useragent varchar(100) NOT NULL default '',
+	useragent varchar(200) NOT NULL default '',
 	authenticated smallint NOT NULL default '0'
 );";
 
@@ -148,9 +148,9 @@
 
 $tables[] = "CREATE TABLE mybb_buddyrequests (
  id serial,
- uid int NOT NULL,
- touid int NOT NULL,
- date int NOT NULL,
+ uid int NOT NULL default '0',
+ touid int NOT NULL default '0',
+ date int NOT NULL default '0',
  PRIMARY KEY (id)
 );";
 
@@ -672,7 +672,7 @@
   ip bytea NOT NULL default '',
   time int NOT NULL default '0',
   location varchar(150) NOT NULL default '',
-  useragent varchar(100) NOT NULL default '',
+  useragent varchar(200) NOT NULL default '',
   anonymous smallint NOT NULL default '0',
   nopermission smallint NOT NULL default '0',
   location1 int NOT NULL default '0',
@@ -878,7 +878,6 @@
   tid int NOT NULL default '0',
   notification smallint NOT NULL default '0',
   dateline int NOT NULL default '0',
-  subscriptionkey varchar(32) NOT NULL default '',
   PRIMARY KEY (sid)
 );";
 
diff --git a/Upload/install/resources/settings.xml b/Upload/install/resources/settings.xml
index 250824d..729ce2d 100644
--- a/Upload/install/resources/settings.xml
+++ b/Upload/install/resources/settings.xml
@@ -149,7 +149,6 @@
 0=No CAPTCHA
 1=MyBB Default CAPTCHA
 2=reCAPTCHA
-3=Are You a Human
 4=NoCAPTCHA reCAPTCHA]]></optionscode>
 			<settingvalue><![CDATA[1]]></settingvalue>
 			<isdefault>1</isdefault>
@@ -170,26 +169,10 @@
 			<settingvalue><![CDATA[]]></settingvalue>
 			<isdefault>1</isdefault>
 		</setting>
-		<setting name="ayahpublisherkey">
-			<title><![CDATA[Are You a Human Publisher Key]]></title>
-			<description><![CDATA[Your Are You a Human publisher key.]]></description>
-			<disporder>5</disporder>
-			<optionscode><![CDATA[text]]></optionscode>
-			<settingvalue><![CDATA[]]></settingvalue>
-			<isdefault>1</isdefault>
-		</setting>
-		<setting name="ayahscoringkey">
-			<title><![CDATA[Are You a Human Scoring Key]]></title>
-			<description><![CDATA[Your Are You a Human scoring key.]]></description>
-			<disporder>6</disporder>
-			<optionscode><![CDATA[text]]></optionscode>
-			<settingvalue><![CDATA[]]></settingvalue>
-			<isdefault>1</isdefault>
-		</setting>
 		<setting name="reportmethod">
 			<title>Reported Posts Medium</title>
 			<description><![CDATA[Please select from the list how you want reported posts to be dealt with. Storing them in the database is probably the better of the options listed.]]></description>
-			<disporder>7</disporder>
+			<disporder>5</disporder>
 			<optionscode><![CDATA[radio
 db=Stored in the Database
 pms=Sent as Private Messages
@@ -200,7 +183,7 @@ email=Sent via Email]]></optionscode>
 		<setting name="decpoint">
 			<title>Decimal Point</title>
 			<description><![CDATA[The decimal point you use in your region.]]></description>
-			<disporder>8</disporder>
+			<disporder>6</disporder>
 			<optionscode><![CDATA[text]]></optionscode>
 			<settingvalue><![CDATA[.]]></settingvalue>
 			<isdefault>1</isdefault>
@@ -208,7 +191,7 @@ email=Sent via Email]]></optionscode>
 		<setting name="thousandssep">
 			<title>Thousands Numeric Separator</title>
 			<description><![CDATA[The punctuation you want to use. For example, a setting of ',' with the number 1200 will give you 1,200.]]></description>
-			<disporder>9</disporder>
+			<disporder>7</disporder>
 			<optionscode><![CDATA[text]]></optionscode>
 			<settingvalue><![CDATA[,]]></settingvalue>
 			<isdefault>1</isdefault>
@@ -216,7 +199,7 @@ email=Sent via Email]]></optionscode>
 		<setting name="showlanguageselect">
 			<title>Show Language Selector in Footer</title>
 			<description><![CDATA[Set to no if you do not want to show the language selection area in the footer of all pages in the board. If you only have one language installed this setting will be ignored.]]></description>
-			<disporder>10</disporder>
+			<disporder>8</disporder>
 			<optionscode><![CDATA[yesno]]></optionscode>
 			<settingvalue><![CDATA[1]]></settingvalue>
 			<isdefault>1</isdefault>
@@ -224,7 +207,7 @@ email=Sent via Email]]></optionscode>
 		<setting name="showthemeselect">
 			<title>Show Theme Selector in Footer</title>
 			<description><![CDATA[Set to no if you do not want to show the theme selection area in the footer of all pages in the board.]]></description>
-			<disporder>11</disporder>
+			<disporder>9</disporder>
 			<optionscode><![CDATA[yesno]]></optionscode>
 			<settingvalue><![CDATA[1]]></settingvalue>
 			<isdefault>1</isdefault>
@@ -232,7 +215,7 @@ email=Sent via Email]]></optionscode>
 		<setting name="maxmultipagelinks">
 			<title>Maximum Page Links in Pagination</title>
 			<description><![CDATA[Here you can set the number of next and previous page links to show in the pagination for threads or forums with more than one page of results.]]></description>
-			<disporder>12</disporder>
+			<disporder>10</disporder>
 			<optionscode><![CDATA[numeric]]></optionscode>
 			<settingvalue><![CDATA[5]]></settingvalue>
 			<isdefault>1</isdefault>
@@ -240,7 +223,7 @@ email=Sent via Email]]></optionscode>
 		<setting name="jumptopagemultipage">
 			<title>Show Jump To Page form in Pagination</title>
 			<description><![CDATA[Do you want to show a "jump to page" form in pagination if number of pages exceeds "Maximum Page Links in Pagination"?]]></description>
-			<disporder>13</disporder>
+			<disporder>11</disporder>
 			<optionscode><![CDATA[yesno]]></optionscode>
 			<settingvalue><![CDATA[1]]></settingvalue>
 			<isdefault>1</isdefault>
@@ -248,7 +231,7 @@ email=Sent via Email]]></optionscode>
 		<setting name="no_plugins">
 			<title>Disable All Plugins</title>
 			<description><![CDATA[Setting this to yes will disable all plugins without deactivating or uninstalling them. This is equivalent of manually defining NO_PLUGINS at the top of ./inc/init.php.]]></description>
-			<disporder>14</disporder>
+			<disporder>12</disporder>
 			<optionscode><![CDATA[yesno]]></optionscode>
 			<settingvalue><![CDATA[0]]></settingvalue>
 			<isdefault>1</isdefault>
@@ -256,7 +239,7 @@ email=Sent via Email]]></optionscode>
 		<setting name="deleteinvites">
 			<title>Expire Old Group Invites</title>
 			<description><![CDATA[The number of days until any pending invites to user groups expire. Set to 0 to disable.]]></description>
-			<disporder>15</disporder>
+			<disporder>13</disporder>
 			<optionscode><![CDATA[numeric]]></optionscode>
 			<settingvalue><![CDATA[180]]></settingvalue>
 			<isdefault>1</isdefault>
@@ -264,7 +247,7 @@ email=Sent via Email]]></optionscode>
 		<setting name="redirects">
 			<title>Friendly Redirection Pages</title>
 			<description><![CDATA[This will enable friendly redirection pages instead of bumping the user directly to the page.]]></description>
-			<disporder>16</disporder>
+			<disporder>14</disporder>
 			<optionscode><![CDATA[onoff]]></optionscode>
 			<settingvalue><![CDATA[1]]></settingvalue>
 			<isdefault>1</isdefault>
@@ -272,7 +255,7 @@ email=Sent via Email]]></optionscode>
 		<setting name="enableforumjump">
 			<title>Enable Forum Jump Menu?</title>
 			<description><![CDATA[The forum jump menu is shown on the forum and thread view pages. It can add significant load to your forums if you have a large amount of forums. Set to 'No' to disable it.]]></description>
-			<disporder>17</disporder>
+			<disporder>15</disporder>
 			<optionscode><![CDATA[yesno]]></optionscode>
 			<settingvalue><![CDATA[1]]></settingvalue>
 			<isdefault>1</isdefault>
diff --git a/Upload/install/resources/sqlite_db_tables.php b/Upload/install/resources/sqlite_db_tables.php
index 6aadb13..5770fb4 100644
--- a/Upload/install/resources/sqlite_db_tables.php
+++ b/Upload/install/resources/sqlite_db_tables.php
@@ -9,24 +9,24 @@
  */
 
 $tables[] = "CREATE TABLE mybb_adminlog (
-	uid int unsigned NOT NULL default '0',
+	uid int NOT NULL default '0',
 	ipaddress blob(16) NOT NULL default '',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	module varchar(50) NOT NULL default '',
 	action varchar(50) NOT NULL default '',
 	data TEXT NOT NULL
  );";
 
 $tables[] = "CREATE TABLE mybb_adminoptions (
-	uid int unsigned NOT NULL default '0',
+	uid int NOT NULL default '0',
 	cpstyle varchar(50) NOT NULL default '',
 	cplanguage varchar(50) NOT NULL default '',
 	codepress tinyint(1) NOT NULL default '1',
 	notes TEXT NOT NULL,
 	permissions TEXT NOT NULL,
 	defaultviews TEXT NOT NULL,
-	loginattempts smallint unsigned NOT NULL default '0',
-	loginlockoutexpiry int unsigned NOT NULL default '0',
+	loginattempts smallint NOT NULL default '0',
+	loginlockoutexpiry int NOT NULL default '0',
 	authsecret varchar(16) NOT NULL default '',
 	recovery_codes varchar(177) NOT NULL default ''
  );";
@@ -36,10 +36,10 @@
 	uid int NOT NULL default '0',
 	loginkey varchar(50) NOT NULL default '',
 	ip blob(16) NOT NULL default '',
-	dateline int unsigned NOT NULL default '0',
-	lastactive int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
+	lastactive int NOT NULL default '0',
 	data TEXT NOT NULL,
-	useragent varchar(100) NOT NULL default '',
+	useragent varchar(200) NOT NULL default '',
 	authenticated tinyint(1) NOT NULL default '0'
 );";
 
@@ -64,8 +64,8 @@
 	uid int NOT NULL default '0',
 	subject varchar(120) NOT NULL default '',
 	message TEXT NOT NULL,
-	startdate int unsigned NOT NULL default '0',
-	enddate int unsigned NOT NULL default '0',
+	startdate int NOT NULL default '0',
+	enddate int NOT NULL default '0',
 	allowhtml tinyint(1) NOT NULL default '0',
 	allowmycode tinyint(1) NOT NULL default '0',
 	allowsmilies tinyint(1) NOT NULL default '0'
@@ -81,7 +81,7 @@
 	filesize int(10) NOT NULL default '0',
 	attachname varchar(120) NOT NULL default '',
 	downloads int NOT NULL default '0',
-	dateuploaded int unsigned NOT NULL default '0',
+	dateuploaded int NOT NULL default '0',
 	visible tinyint(1) NOT NULL default '0',
 	thumbnail varchar(120) NOT NULL default ''
 );";
@@ -98,7 +98,7 @@
 $tables[] = "CREATE TABLE mybb_awaitingactivation (
 	aid INTEGER PRIMARY KEY,
 	uid int NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	code varchar(100) NOT NULL default '',
 	type char(1) NOT NULL default '',
 	validated tinyint(1) NOT NULL default '0',
@@ -115,8 +115,8 @@
 	fid INTEGER PRIMARY KEY,
 	filter varchar(200) NOT NULL default '',
 	type tinyint(1) NOT NULL default '0',
-	lastuse int unsigned NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0'
+	lastuse int NOT NULL default '0',
+	dateline int NOT NULL default '0'
 );";
 
 $tables[] = "CREATE TABLE mybb_banned (
@@ -126,17 +126,17 @@
 	oldadditionalgroups TEXT NOT NULL,
 	olddisplaygroup int NOT NULL default '0',
 	admin int NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	bantime varchar(50) NOT NULL default '',
-	lifted int unsigned NOT NULL default '0',
+	lifted int NOT NULL default '0',
 	reason varchar(255) NOT NULL default ''
 );";
 
 $tables[] = "CREATE TABLE mybb_buddyrequests (
- id INTEGER PRIMARY KEY,
- uid bigint UNSIGNED NOT NULL,
- touid bigint UNSIGNED NOT NULL,
- date int UNSIGNED NOT NULL
+	id INTEGER PRIMARY KEY,
+	uid int NOT NULL default '0',
+	touid int NOT NULL default '0',
+	date int NOT NULL default '0'
 );";
 
 $tables[] = "CREATE TABLE mybb_calendars (
@@ -166,7 +166,7 @@
 $tables[] = "CREATE TABLE mybb_captcha (
 	imagehash varchar(32) NOT NULL default '',
 	imagestring varchar(8) NOT NULL default '',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	used tinyint(1) NOT NULL default '0'
 );";
 
@@ -178,11 +178,11 @@
 $tables[] = "CREATE TABLE mybb_delayedmoderation (
 	did integer PRIMARY KEY,
 	type varchar(30) NOT NULL default '',
-	delaydateline int unsigned NOT NULL default '0',
+	delaydateline int NOT NULL default '0',
 	uid int(10) NOT NULL default '0',
 	fid smallint(5) NOT NULL default '0',
 	tids text NOT NULL,
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	inputs text NOT NULL
 );";
 
@@ -325,7 +325,7 @@
 	uid int NOT NULL default '0',
 	gid smallint NOT NULL default '0',
 	reason varchar(250) NOT NULL default '',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	invite tinyint(1) NOT NULL default '0'
 );";
 
@@ -337,8 +337,8 @@
 	htmlmessage text NOT NULL,
 	type tinyint(1) NOT NULL default '0',
 	format tinyint(1) NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0',
-	senddate int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
+	senddate int NOT NULL default '0',
 	status tinyint(1) NOT NULL default '0',
 	sentcount int NOT NULL default '0',
 	totalcount int NOT NULL default '0',
@@ -352,7 +352,7 @@
 	message TEXT NOT NULL,
 	toaddress varchar(150) NOT NULL default '',
 	fromaddress varchar(150) NOT NULL default '',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	error TEXT NOT NULL,
 	smtperror varchar(200) NOT NULL default '',
 	smtpcode smallint(5) NOT NULL default '0'
@@ -362,10 +362,10 @@
 	mid INTEGER PRIMARY KEY,
 	subject varchar(200) not null default '',
 	message TEXT NOT NULL,
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	fromuid int NOT NULL default '0',
 	fromemail varchar(200) not null default '',
-	touid int unsigned NOT NULL default '0',
+	touid int NOT NULL default '0',
 	toemail varchar(200) NOT NULL default '',
 	tid int NOT NULL default '0',
 	ipaddress blob(16) NOT NULL default '',
@@ -382,7 +382,7 @@
 
 $tables[] = "CREATE TABLE mybb_moderatorlog (
 	uid int NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	fid smallint NOT NULL default '0',
 	tid int NOT NULL default '0',
 	pid int NOT NULL default '0',
@@ -446,12 +446,12 @@
 	pid INTEGER PRIMARY KEY,
 	tid int NOT NULL default '0',
 	question varchar(200) NOT NULL default '',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	options TEXT NOT NULL,
 	votes TEXT NOT NULL,
 	numoptions smallint NOT NULL default '0',
 	numvotes int NOT NULL default '0',
-	timeout int unsigned NOT NULL default '0',
+	timeout int NOT NULL default '0',
 	closed tinyint(1) NOT NULL default '0',
 	multiple tinyint(1) NOT NULL default '0',
 	public tinyint(1) NOT NULL default '0',
@@ -463,7 +463,7 @@
 	pid int NOT NULL default '0',
 	uid int NOT NULL default '0',
 	voteoption smallint NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0'
+	dateline int NOT NULL default '0'
 );";
 
 $tables[] = "CREATE TABLE mybb_posts (
@@ -475,7 +475,7 @@
 	icon smallint NOT NULL default '0',
 	uid int NOT NULL default '0',
 	username varchar(80) NOT NULL default '',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	message TEXT NOT NULL,
 	ipaddress blob(16) NOT NULL default '',
 	includesig tinyint(1) NOT NULL default '0',
@@ -496,14 +496,14 @@
 	subject varchar(120) NOT NULL default '',
 	icon smallint NOT NULL default '0',
 	message TEXT NOT NULL,
-	dateline int unsigned NOT NULL default '0',
-	deletetime int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
+	deletetime int NOT NULL default '0',
 	status tinyint(1) NOT NULL default '0',
-	statustime int unsigned NOT NULL default '0',
+	statustime int NOT NULL default '0',
 	includesig tinyint(1) NOT NULL default '0',
 	smilieoff tinyint(1) NOT NULL default '0',
 	receipt tinyint(1) NOT NULL default '0',
-	readtime int unsigned NOT NULL default '0',
+	readtime int NOT NULL default '0',
 	ipaddress blob(16) NOT NULL default ''
 );";
 
@@ -562,7 +562,7 @@
 	uid int NOT NULL default '0',
 	oldusergroup varchar(200) NOT NULL default '0',
 	newusergroup smallint NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	type varchar(9) NOT NULL default 'primary'
 );";
 
@@ -570,16 +570,16 @@
 	qid INTEGER PRIMARY KEY,
 	question varchar(200) NOT NULL default '',
 	answer varchar(150) NOT NULL default '',
-	shown int unsigned NOT NULL default 0,
-	correct int unsigned NOT NULL default 0,
-	incorrect int unsigned NOT NULL default 0,
+	shown int NOT NULL default 0,
+	correct int NOT NULL default 0,
+	incorrect int NOT NULL default 0,
 	active tinyint(1) NOT NULL default '0'
 );";
 
 $tables[] = "CREATE TABLE mybb_questionsessions (
 	sid varchar(32) NOT NULL default '',
-	qid int unsigned NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0'
+	qid int NOT NULL default '0',
+	dateline int NOT NULL default '0'
 );";
 
 $tables[] = "CREATE TABLE mybb_reportedcontent (
@@ -593,8 +593,8 @@
 	type varchar(50) NOT NULL default '',
 	reports int NOT NULL default '0',
 	reporters text NOT NULL,
-	dateline int unsigned NOT NULL default '0',
-	lastreport int unsigned NOT NULL default '0'
+	dateline int NOT NULL default '0',
+	lastreport int NOT NULL default '0'
 );";
 
 $tables[] = "CREATE TABLE mybb_reputation (
@@ -603,14 +603,14 @@
 	adduid int NOT NULL default '0',
 	pid int NOT NULL default '0',
 	reputation smallint NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	comments TEXT NOT NULL
 );";
 
 $tables[] = "CREATE TABLE mybb_searchlog (
 	sid varchar(32) NOT NULL default '',
 	uid int NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	ipaddress blob(16) NOT NULL default '',
 	threads LONGTEXT NOT NULL,
 	posts LONGTEXT NOT NULL,
@@ -623,9 +623,9 @@
 	sid varchar(32) NOT NULL default '',
 	uid int NOT NULL default '0',
 	ip blob(16) NOT NULL default '',
-	time int unsigned NOT NULL default '0',
+	time int NOT NULL default '0',
 	location varchar(150) NOT NULL default '',
-	useragent varchar(100) NOT NULL default '',
+	useragent varchar(200) NOT NULL default '',
 	anonymous tinyint(1) NOT NULL default '0',
 	nopermission tinyint(1) NOT NULL default '0',
 	location1 int(10) NOT NULL default '0',
@@ -667,7 +667,7 @@
 	username varchar(120) NOT NULL DEFAULT '',
 	email varchar(220) NOT NULL DEFAULT '',
 	ipaddress blob(16) NOT NULL default '',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	data TEXT NOT NULL default ''
 );";
 
@@ -678,14 +678,14 @@
 	language varchar(20) NOT NULL default '',
 	usergroup smallint NOT NULL default '0',
 	useragent varchar(200) NOT NULL default '',
-	lastvisit int unsigned NOT NULL default '0'
+	lastvisit int NOT NULL default '0'
 );";
 
 $tables[] = "CREATE TABLE mybb_stats (
-	dateline int unsigned NOT NULL default '0' PRIMARY KEY,
-	numusers int unsigned NOT NULL default '0',
-	numthreads int unsigned NOT NULL default '0',
-	numposts int unsigned NOT NULL default '0'
+	dateline int NOT NULL default '0' PRIMARY KEY,
+	numusers int NOT NULL default '0',
+	numthreads int NOT NULL default '0',
+	numposts int NOT NULL default '0'
 );";
 
 $tables[] = "CREATE TABLE mybb_tasks (
@@ -698,17 +698,17 @@
 	day varchar(100) NOT NULL default '',
 	month varchar(30) NOT NULL default '',
 	weekday varchar(15) NOT NULL default '',
-	nextrun int unsigned NOT NULL default '0',
-	lastrun int unsigned NOT NULL default '0',
+	nextrun int NOT NULL default '0',
+	lastrun int NOT NULL default '0',
 	enabled tinyint(1) NOT NULL default '1',
 	logging tinyint(1) NOT NULL default '0',
-	locked int unsigned NOT NULL default '0'
+	locked int NOT NULL default '0'
 );";
 
 $tables[] = "CREATE TABLE mybb_tasklog (
 	lid INTEGER PRIMARY KEY,
 	tid int NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	data TEXT NOT NULL
 );";
 
@@ -747,11 +747,11 @@
 $tables[] = "CREATE TABLE mybb_themestylesheets(
 	sid INTEGER PRIMARY KEY,
 	name varchar(30) NOT NULL default '',
-	tid smallint unsigned NOT NULL default '0',
+	tid smallint NOT NULL default '0',
 	attachedto TEXT NOT NULL,
 	stylesheet LONGTEXT NOT NULL,
 	cachefile varchar(100) NOT NULL default '',
-	lastmodified int unsigned NOT NULL default '0'
+	lastmodified int NOT NULL default '0'
 );";
 
 $tables[] = "CREATE TABLE mybb_threadprefixes (
@@ -766,7 +766,7 @@
 	rid INTEGER PRIMARY KEY,
 	tid int NOT NULL default '0',
 	uid int NOT NULL default '0',
-	rating smallint NOT NULL default '0',
+	rating tinyint(1) NOT NULL default '0',
 	ipaddress blob(16) NOT NULL default ''
 );";
 
@@ -783,9 +783,9 @@
 	poll int NOT NULL default '0',
 	uid int NOT NULL default '0',
 	username varchar(80) NOT NULL default '',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	firstpost int NOT NULL default '0',
-	lastpost int unsigned NOT NULL default '0',
+	lastpost int NOT NULL default '0',
 	lastposter varchar(120) NOT NULL default '',
 	lastposteruid int NOT NULL default '0',
 	views int(100) NOT NULL default '0',
@@ -813,8 +813,7 @@
 	uid int NOT NULL default '0',
 	tid int NOT NULL default '0',
 	notification tinyint(1) NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0',
-	subscriptionkey varchar(32) NOT NULL default ''
+	dateline int NOT NULL default '0'
 );";
 
 $tables[] = "CREATE TABLE mybb_userfields (
@@ -826,7 +825,7 @@
 
 $tables[] = "CREATE TABLE mybb_usergroups (
 	gid INTEGER PRIMARY KEY,
-	type smallint(2) NOT NULL default '2',
+	type tinyint(1) NOT NULL default '2',
 	title varchar(120) NOT NULL default '',
 	description TEXT NOT NULL,
 	namestyle varchar(200) NOT NULL default '{username}',
@@ -887,12 +886,12 @@
 	usereputationsystem tinyint(1) NOT NULL default '0',
 	cangivereputations tinyint(1) NOT NULL default '0',
 	candeletereputations tinyint(1) NOT NULL default '0',
-	reputationpower int unsigned NOT NULL default '0',
-	maxreputationsday int unsigned NOT NULL default '0',
-	maxreputationsperuser int unsigned NOT NULL default '0',
-	maxreputationsperthread int unsigned NOT NULL default '0',
+	reputationpower int NOT NULL default '0',
+	maxreputationsday int NOT NULL default '0',
+	maxreputationsperuser int NOT NULL default '0',
+	maxreputationsperthread int NOT NULL default '0',
 	candisplaygroup tinyint(1) NOT NULL default '0',
-	attachquota int unsigned NOT NULL default '0',
+	attachquota int NOT NULL default '0',
 	cancustomtitle tinyint(1) NOT NULL default '0',
 	canwarnusers tinyint(1) NOT NULL default '0',
 	canreceivewarnings tinyint(1) NOT NULL default '0',
@@ -901,7 +900,7 @@
 	showinbirthdaylist tinyint(1) NOT NULL default '0',
 	canoverridepm tinyint(1) NOT NULL default '0',
 	canusesig tinyint(1) NOT NULL default '0',
-	canusesigxposts int unsigned NOT NULL default '0',
+	canusesigxposts int NOT NULL default '0',
 	signofollow tinyint(1) NOT NULL default '0',
 	edittimelimit int(4) NOT NULL default '0',
 	maxposts int(4) NOT NULL default '0',
@@ -932,10 +931,10 @@
 	additionalgroups varchar(200) NOT NULL default '',
 	displaygroup smallint NOT NULL default '0',
 	usertitle varchar(250) NOT NULL default '',
-	regdate int unsigned NOT NULL default '0',
-	lastactive int unsigned NOT NULL default '0',
-	lastvisit int unsigned NOT NULL default '0',
-	lastpost int unsigned NOT NULL default '0',
+	regdate int NOT NULL default '0',
+	lastactive int NOT NULL default '0',
+	lastvisit int NOT NULL default '0',
+	lastpost int NOT NULL default '0',
 	website varchar(200) NOT NULL default '',
 	icq varchar(10) NOT NULL default '',
 	aim varchar(50) NOT NULL default '',
@@ -985,20 +984,20 @@
 	regip blob(16) NOT NULL default '',
 	lastip blob(16) NOT NULL default '',
 	language varchar(50) NOT NULL default '',
-	timeonline int unsigned NOT NULL default '0',
+	timeonline int NOT NULL default '0',
 	showcodebuttons tinyint(1) NOT NULL default '1',
 	totalpms int(10) NOT NULL default '0',
 	unreadpms int(10) NOT NULL default '0',
 	warningpoints int(3) NOT NULL default '0',
 	moderateposts tinyint(1) NOT NULL default '0',
-	moderationtime int unsigned NOT NULL default '0',
+	moderationtime int NOT NULL default '0',
 	suspendposting tinyint(1) NOT NULL default '0',
-	suspensiontime int unsigned NOT NULL default '0',
+	suspensiontime int NOT NULL default '0',
 	suspendsignature tinyint(1) NOT NULL default '0',
-	suspendsigtime int unsigned NOT NULL default '0',
+	suspendsigtime int NOT NULL default '0',
 	coppauser tinyint(1) NOT NULL default '0',
 	classicpostbit tinyint(1) NOT NULL default '0',
-	loginattempts tinyint(2) NOT NULL default '1',
+	loginattempts smallint(2) NOT NULL default '1',
 	usernotes TEXT NOT NULL,
 	sourceeditor tinyint(1) NOT NULL default '0'
 );";
@@ -1021,7 +1020,7 @@ classicpostbit tinyint(1) NOT NULL default '0',
 	tid INTEGER PRIMARY KEY,
 	title varchar(120) NOT NULL default '',
 	points smallint NOT NULL default '0',
-	expirationtime int unsigned NOT NULL default '0'
+	expirationtime int NOT NULL default '0'
 );";
 
 $tables[] = "CREATE TABLE mybb_warnings (
@@ -1031,11 +1030,11 @@ classicpostbit tinyint(1) NOT NULL default '0',
 	pid int NOT NULL default '0',
 	title varchar(120) NOT NULL default '',
 	points smallint NOT NULL default '0',
-	dateline int unsigned NOT NULL default '0',
+	dateline int NOT NULL default '0',
 	issuedby int NOT NULL default '0',
-	expires int unsigned NOT NULL default '0',
+	expires int NOT NULL default '0',
 	expired tinyint(1) NOT NULL default '0',
-	daterevoked int unsigned NOT NULL default '0',
+	daterevoked int NOT NULL default '0',
 	revokedby int NOT NULL default '0',
 	revokereason TEXT NOT NULL,
 	notes TEXT NOT NULL
diff --git a/Upload/install/resources/tasks.xml b/Upload/install/resources/tasks.xml
index 30ed204..8fa89c3 100644
--- a/Upload/install/resources/tasks.xml
+++ b/Upload/install/resources/tasks.xml
@@ -112,7 +112,7 @@
 		<title>Czyszczenie użytkowników</title>
 		<description><![CDATA[Codziennie automatycznie usuwa użytkowników według ustalonych wcześniej kryteriów.]]></description>
 		<file>userpruning</file>
-		<minute>*</minute>
+		<minute>0</minute>
 		<hour>2</hour>
 		<day>*</day>
 		<weekday>*</weekday>
@@ -156,4 +156,4 @@
         <enabled>0</enabled>
         <logging>1</logging>
     </task>
-</tasks>
\ No newline at end of file
+</tasks>
diff --git a/Upload/install/resources/upgrade13.php b/Upload/install/resources/upgrade13.php
index 1cbfb15..73276fc 100644
--- a/Upload/install/resources/upgrade13.php
+++ b/Upload/install/resources/upgrade13.php
@@ -43,7 +43,7 @@ function upgrade13_dbchanges()
 			$db->write_query("ALTER TABLE ".TABLE_PREFIX."users DROP KEY username");
 		}
 
-		$query = $db->simple_select("users", "username, uid", "1=1 GROUP BY username HAVING count(*) > 1");
+		$query = $db->simple_select("users", "username, uid", "1=1 GROUP BY uid, username HAVING count(*) > 1");
 		while($user = $db->fetch_array($query))
 		{
 			$db->update_query("users", array('username' => $user['username']."_dup".$user['uid']), "uid='{$user['uid']}'", 1);
diff --git a/Upload/install/resources/upgrade26.php b/Upload/install/resources/upgrade26.php
index 947ff32..ba422ce 100644
--- a/Upload/install/resources/upgrade26.php
+++ b/Upload/install/resources/upgrade26.php
@@ -30,7 +30,14 @@ function upgrade26_dbchanges()
 	$db->update_query("helpdocs", array('usetranslation' => 1));
 	$db->update_query("helpsections", array('usetranslation' => 1));
 
-	$db->modify_column("polls", "numvotes", "text NOT NULL");
+	if($db->type == 'pgsql')
+	{
+		$db->modify_column("polls", "numvotes", "text", "set");
+	}
+	else
+	{
+		$db->modify_column("polls", "numvotes", "text NOT NULL");
+	}
 
 	if($db->field_exists('failedlogin', 'users'))
 	{
diff --git a/Upload/install/resources/upgrade35.php b/Upload/install/resources/upgrade35.php
new file mode 100644
index 0000000..1b97f0c
--- /dev/null
+++ b/Upload/install/resources/upgrade35.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * MyBB 1.8
+ * Copyright 2014 MyBB Group, All Rights Reserved
+ *
+ * Website: http://www.mybb.com
+ * License: http://www.mybb.com/about/license
+ *
+ */
+
+/**
+ * Upgrade Script: 1.8.6
+ */
+
+$upgrade_detail = array(
+	"revert_all_templates" => 0,
+	"revert_all_themes" => 0,
+	"revert_all_settings" => 0
+);
+
+@set_time_limit(0);
+
+function upgrade35_dbchanges()
+{
+	global $db, $output;
+
+	$output->print_header("Updating Database");
+	echo "<p>Performing necessary upgrade queries...</p>";
+	flush();
+
+	if($db->field_exists('subscriptionkey', 'threadsubscriptions'))
+	{
+		$db->drop_column("threadsubscriptions", "subscriptionkey");
+	}
+
+	if($db->type != 'pgsql')
+	{
+		$db->modify_column('adminsessions', 'useragent', "varchar(200) NOT NULL default ''");
+		$db->modify_column('sessions', 'useragent', "varchar(200) NOT NULL default ''");
+	}
+	else
+	{
+		$db->modify_column('adminsessions', 'useragent', "varchar(200)", "set", "''");
+		$db->modify_column('sessions', 'useragent', "varchar(200)", "set", "''");
+	}
+
+	// Remove "Are You a Human" captcha
+	$db->update_query('settings', array('value' => 1), "name='captchaimage' AND value=3");
+	$db->delete_query('settings', "name IN ('ayahpublisherkey', 'ayahscoringkey')");
+	$db->delete_query('templates', "title IN ('member_register_regimage_ayah', 'post_captcha_ayah')");
+
+	global $footer_extra;
+	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";
+
+	$output->print_contents("<p>Click next to continue with the upgrade process.</p>");
+	$output->print_footer("35_dbchanges2");
+}
+
+function upgrade35_dbchanges2()
+{
+	global $db, $output;
+
+	$output->print_header("Updating Database");
+	echo "<p>Performing necessary optimization queries...</p>";
+	flush();
+
+	switch($db->type)
+	{
+		// PostgreSQL and SQLite do not support unsigned ints
+		case "pgsql":
+			$db->modify_column("buddyrequests", "uid", "int", "set", "'0'");
+			$db->modify_column("buddyrequests", "touid", "int", "set", "'0'");
+			$db->modify_column("buddyrequests", "date", "int", "set", "'0'");
+			break;
+		case "sqlite":
+			$db->modify_column("threadratings", "rating", "tinyint(1) NOT NULL default '0'");
+			$db->modify_column("buddyrequests", "uid", "int NOT NULL default '0'");
+			$db->modify_column("buddyrequests", "touid", "int NOT NULL default '0'");
+			$db->modify_column("buddyrequests", "date", "int NOT NULL default '0'");
+			break;
+		default:
+			$db->modify_column("adminviews", "perpage", "smallint(4) unsigned NOT NULL default '0'");
+			$db->modify_column("attachments", "filesize", "int(10) unsigned NOT NULL default '0'");
+			$db->modify_column("attachtypes", "maxsize", "int(15) unsigned NOT NULL default '0'");
+			$db->modify_column("banned", "olddisplaygroup", "int unsigned NOT NULL default '0'");
+			$db->modify_column("buddyrequests", "uid", "int unsigned NOT NULL default '0'");
+			$db->modify_column("buddyrequests", "touid", "int unsigned NOT NULL default '0'");
+			$db->modify_column("buddyrequests", "date", "int unsigned NOT NULL default '0'");
+			$db->modify_column("calendars", "eventlimit", "smallint(3) unsigned NOT NULL default '0'");
+			$db->modify_column("massemails", "perpage", "smallint(4) unsigned NOT NULL default '50'");
+			$db->modify_column("promotions", "posts", "int unsigned NOT NULL default '0'");
+			$db->modify_column("promotions", "threads", "int unsigned NOT NULL default '0'");
+			$db->modify_column("promotions", "registered", "int unsigned NOT NULL default '0'");
+			$db->modify_column("promotions", "online", "int unsigned NOT NULL default '0'");
+			$db->modify_column("promotions", "referrals", "int unsigned NOT NULL default '0'");
+			$db->modify_column("promotions", "warnings", "int unsigned NOT NULL default '0'");
+			$db->modify_column("sessions", "location1", "int(10) unsigned NOT NULL default '0'");
+			$db->modify_column("sessions", "location2", "int(10) unsigned NOT NULL default '0'");
+			$db->modify_column("threadratings", "rating", "tinyint(1) unsigned NOT NULL default '0'");
+			$db->modify_column("threads", "views", "int(100) unsigned NOT NULL default '0'");
+			$db->modify_column("threads", "replies", "int(100) unsigned NOT NULL default '0'");
+			break;
+	}
+
+	global $footer_extra;
+	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";
+
+	$output->print_contents("<p>Click next to continue with the upgrade process.</p>");
+	$output->print_footer("35_dbchanges3");
+}
+
+function upgrade35_dbchanges3()
+{
+	global $db, $output;
+
+	$output->print_header("Updating Database");
+	echo "<p>Performing necessary optimization queries...</p>";
+	flush();
+
+	switch($db->type)
+	{
+		// PostgreSQL and SQLite do not support unsigned ints
+		case "sqlite":
+			$db->modify_column("usergroups", "type", "tinyint(1) NOT NULL default '2'");
+			$db->modify_column("users", "loginattempts", "smallint(2) NOT NULL default '1'");
+			break;
+		case "mysql":
+		case "mysqli":
+			$db->modify_column("usergroups", "type", "tinyint(1) unsigned NOT NULL default '2'");
+			$db->modify_column("usergroups", "stars", "smallint(4) unsigned NOT NULL default '0'");
+			$db->modify_column("usergroups", "pmquota", "int(3) unsigned NOT NULL default '0'");
+			$db->modify_column("usergroups", "maxpmrecipients", "int(4) unsigned NOT NULL default '5'");
+			$db->modify_column("usergroups", "maxemails", "int(3) unsigned NOT NULL default '5'");
+			$db->modify_column("usergroups", "emailfloodtime", "int(3) unsigned NOT NULL default '5'");
+			$db->modify_column("usergroups", "maxwarningsday", "int(3) unsigned NOT NULL default '3'");
+			$db->modify_column("usergroups", "edittimelimit", "int(4) unsigned NOT NULL default '0'");
+			$db->modify_column("usergroups", "maxposts", "int(4) unsigned NOT NULL default '0'");
+			$db->modify_column("users", "postnum", "int(10) unsigned NOT NULL default '0'");
+			$db->modify_column("users", "threadnum", "int(10) unsigned NOT NULL default '0'");
+			$db->modify_column("users", "ppp", "smallint(6) unsigned NOT NULL default '0'");
+			$db->modify_column("users", "tpp", "smallint(6) unsigned NOT NULL default '0'");
+			$db->modify_column("users", "daysprune", "smallint(6) unsigned NOT NULL default '0'");
+			$db->modify_column("users", "totalpms", "int(10) unsigned NOT NULL default '0'");
+			$db->modify_column("users", "unreadpms", "int(10) unsigned NOT NULL default '0'");
+			$db->modify_column("users", "warningpoints", "int(3) unsigned NOT NULL default '0'");
+			$db->modify_column("users", "loginattempts", "smallint(2) unsigned NOT NULL default '1'");
+			$db->modify_column("usertitles", "stars", "smallint(4) unsigned NOT NULL default '0'");
+			$db->modify_column("warninglevels", "percentage", "smallint(3) unsigned NOT NULL default '0'");
+			break;
+	}
+
+	global $footer_extra;
+	$footer_extra = "<script type=\"text/javascript\">$(document).ready(function() { var button = $('.submit_button'); if(button) { button.val('Automatically Redirecting...'); button.prop('disabled', true); button.css('color', '#aaa'); button.css('border-color', '#aaa'); document.forms[0].submit(); } });</script>";
+
+	$output->print_contents("<p>Click next to continue with the upgrade process.</p>");
+	$output->print_footer("35_dbchanges4");
+}
+
+function upgrade35_dbchanges4()
+{
+	global $mybb, $output;
+
+	$output->print_header("Adding index files");
+	echo "<p>Adding index files to attachment directories...</p>";
+	flush();
+
+	$dir = @opendir('../'.$mybb->settings['uploadspath']);
+	if($dir)
+	{
+		while(($file = @readdir($dir)) !== false)
+		{
+			$filename = "../{$mybb->settings['uploadspath']}/{$file}";
+			$indexfile = "{$filename}/index.html";
+
+			if(preg_match('#^[0-9]{6}$#', $file) && @is_dir($filename) && @is_writable($filename) && !file_exists($indexfile))
+			{
+				$index = @fopen($indexfile, 'w');
+				@fwrite($index, "<html>\n<head>\n<title></title>\n</head>\n<body>\n&nbsp;\n</body>\n</html>");
+				@fclose($index);
+			}
+		}
+
+		@closedir($dir);
+	}
+
+	$output->print_contents("<p>Click next to continue with the upgrade process.</p>");
+	$output->print_footer("35_done");
+}
diff --git a/Upload/jscripts/general.js b/Upload/jscripts/general.js
index 910c679..c8fe439 100644
--- a/Upload/jscripts/general.js
+++ b/Upload/jscripts/general.js
@@ -633,4 +633,25 @@ var lang = {
 
 };
 
+/* add keepelement to jquery-modal plugin */
+(function($) {
+	if(typeof $.modal != 'undefined')
+	{
+		$.modal.defaults.keepelement = false;
+
+		$.modal.prototype.oldCloseFunction = $.modal.prototype.close;
+		$.modal.prototype.close = function()
+		{
+			this.oldCloseFunction();
+
+			// Deletes the element (multi-modal feature: e.g. when you click on multiple report buttons, you will want to see different content for each)
+			if(!this.options.keepelement)
+			{
+				this.$elm.remove();
+			}
+		};
+	}
+})(jQuery);
+
+
 MyBB.init();
diff --git a/Upload/jscripts/inline_moderation.js b/Upload/jscripts/inline_moderation.js
index 36bfcb8..a13bc2d 100644
--- a/Upload/jscripts/inline_moderation.js
+++ b/Upload/jscripts/inline_moderation.js
@@ -35,7 +35,7 @@ var inlineModeration = {
 					if(inlineIds.indexOf(id) != -1 || (inlineIds.indexOf('ALL') != -1 && removedIds.indexOf(id) == -1))
 					{
 						element.prop('checked', true);
-						var post = element.parents('.post_content');
+						var post = element.parents('.post');
 						var thread = element.parents('.inline_row');
 						var fieldset = element.parents('fieldset');
 						if(post.length)
@@ -56,7 +56,7 @@ var inlineModeration = {
 					else
 					{
 						element.prop('checked', false);
-						var post = element.parents('.post_content');
+						var post = element.parents('.post');
 						var thread = element.parents('.inline_row');
 						if(post.length)
 						{
@@ -131,7 +131,7 @@ var inlineModeration = {
 					}
 				}
 			}
-			var post = element.parents('.post_content');
+			var post = element.parents('.post');
 			var thread = element.parents('.inline_row');
 			if(post.length)
 			{
@@ -162,7 +162,7 @@ var inlineModeration = {
 					allSelectedRow.hide();
 				}
 			}
-			var post = element.parents('.post_content');
+			var post = element.parents('.post');
 			var thread = element.parents('.inline_row');
 			if(post.length)
 			{
@@ -239,7 +239,7 @@ var inlineModeration = {
 				var changed = (element.prop('checked') != master.prop('checked'));
 				element.prop('checked', master.prop('checked'));
 
-				var post = element.parents('.post_content');
+				var post = element.parents('.post');
 				var fieldset = element.parents('fieldset');
 				var thread = element.parents('.inline_row');
 				if(post.length)
diff --git a/Upload/jscripts/jeditable/jeditable.min.js b/Upload/jscripts/jeditable/jeditable.min.js
index ef885f0..ba73d23 100644
--- a/Upload/jscripts/jeditable/jeditable.min.js
+++ b/Upload/jscripts/jeditable/jeditable.min.js
@@ -1,38 +1,38 @@
-
-(function($){$.fn.editable=function(target,options){if('disable'==target){$(this).data('disabled.editable',true);return;}
-if('enable'==target){$(this).data('disabled.editable',false);return;}
-if('destroy'==target){$(this).unbind($(this).data('event.editable')).removeData('disabled.editable').removeData('event.editable');return;}
-var settings=$.extend({},$.fn.editable.defaults,{target:target},options);var plugin=$.editable.types[settings.type].plugin||function(){};var submit=$.editable.types[settings.type].submit||function(){};var buttons=$.editable.types[settings.type].buttons||$.editable.types['defaults'].buttons;var content=$.editable.types[settings.type].content||$.editable.types['defaults'].content;var element=$.editable.types[settings.type].element||$.editable.types['defaults'].element;var reset=$.editable.types[settings.type].reset||$.editable.types['defaults'].reset;var callback=settings.callback||function(){};var onedit=settings.onedit||function(){};var onsubmit=settings.onsubmit||function(){};var onreset=settings.onreset||function(){};var onerror=settings.onerror||reset;if(settings.tooltip){$(this).attr('title',settings.tooltip);}
-settings.autowidth='auto'==settings.width;settings.autoheight='auto'==settings.height;return this.each(function(){var self=this;var savedwidth=$(self).width();var savedheight=$(self).height();$(this).data('event.editable',settings.event);if(!$.trim($(this).html())){$(this).html(settings.placeholder);}
-$(this).bind(settings.event,function(e){if(true===$(this).data('disabled.editable')){return;}
-if(self.editing){return;}
-if(false===onedit.apply(this,[settings,self])){return;}
-e.preventDefault();e.stopPropagation();if(settings.tooltip){$(self).removeAttr('title');}
-if(0==$(self).width()){settings.width=savedwidth;settings.height=savedheight;}else{if(settings.width!='none'){settings.width=settings.autowidth?$(self).width():settings.width;}
-if(settings.height!='none'){settings.height=settings.autoheight?$(self).height():settings.height;}}
-if($(this).html().toLowerCase().replace(/(;|")/g,'')==settings.placeholder.toLowerCase().replace(/(;|")/g,'')){$(this).html('');}
-self.editing=true;self.revert=$(self).html();$(self).html('');var form=$('<form />');if(settings.cssclass){if('inherit'==settings.cssclass){form.attr('class',$(self).attr('class'));}else{form.attr('class',settings.cssclass);}}
-if(settings.style){if('inherit'==settings.style){form.attr('style',$(self).attr('style'));form.css('display',$(self).css('display'));}else{form.attr('style',settings.style);}}
-var input=element.apply(form,[settings,self]);var input_content;if(settings.loadurl){var t=setTimeout(function(){input.disabled=true;content.apply(form,[settings.loadtext,settings,self]);},100);var loaddata={};loaddata[settings.id]=self.id;if($.isFunction(settings.loaddata)){$.extend(loaddata,settings.loaddata.apply(self,[self.revert,settings]));}else{$.extend(loaddata,settings.loaddata);}
-$.ajax({type:settings.loadtype,url:settings.loadurl,data:loaddata,async:false,success:function(result){window.clearTimeout(t);input_content=result;input.disabled=false;}});}else if(settings.data){input_content=settings.data;if($.isFunction(settings.data)){input_content=settings.data.apply(self,[self.revert,settings]);}}else{input_content=self.revert;}
-content.apply(form,[input_content,settings,self]);input.attr('name',settings.name);buttons.apply(form,[settings,self]);$(self).append(form);plugin.apply(form,[settings,self]);$(':input:visible:enabled:first',form).focus();if(settings.select){input.select();}
-input.keydown(function(e){if(e.keyCode==27){e.preventDefault();reset.apply(form,[settings,self]);}});var t;if('cancel'==settings.onblur){input.blur(function(e){t=setTimeout(function(){reset.apply(form,[settings,self]);},500);});}else if('submit'==settings.onblur){input.blur(function(e){t=setTimeout(function(){form.submit();},200);});}else if($.isFunction(settings.onblur)){input.blur(function(e){settings.onblur.apply(self,[input.val(),settings]);});}else{input.blur(function(e){});}
-form.submit(function(e){if(t){clearTimeout(t);}
-e.preventDefault();if(false!==onsubmit.apply(form,[settings,self])){if(false!==submit.apply(form,[settings,self])){if($.isFunction(settings.target)){var str=settings.target.apply(self,[input.val(),settings]);$(self).html(str);self.editing=false;callback.apply(self,[self.innerHTML,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}}else{var submitdata={};submitdata[settings.name]=input.val();submitdata[settings.id]=self.id;if($.isFunction(settings.submitdata)){$.extend(submitdata,settings.submitdata.apply(self,[self.revert,settings]));}else{$.extend(submitdata,settings.submitdata);}
-if('PUT'==settings.method){submitdata['_method']='put';}
-$(self).html(settings.indicator);var ajaxoptions={type:'POST',data:submitdata,dataType:'html',url:settings.target,success:function(result,status){if(ajaxoptions.dataType=='html'){$(self).html(result);}
-self.editing=false;callback.apply(self,[result,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}},error:function(xhr,status,error){onerror.apply(form,[settings,self,xhr]);}};$.extend(ajaxoptions,settings.ajaxoptions);$.ajax(ajaxoptions);}}}
-$(self).attr('title',settings.tooltip);return false;});});this.reset=function(form){if(this.editing){if(false!==onreset.apply(form,[settings,self])){$(self).html(self.revert);self.editing=false;if(!$.trim($(self).html())){$(self).html(settings.placeholder);}
-if(settings.tooltip){$(self).attr('title',settings.tooltip);}}}};});};$.editable={types:{defaults:{element:function(settings,original){var input=$('<input type="hidden"></input>');$(this).append(input);return(input);},content:function(string,settings,original){$(':input:first',this).val(string);},reset:function(settings,original){original.reset(this);},buttons:function(settings,original){var form=this;if(settings.submit){if(settings.submit.match(/>$/)){var submit=$(settings.submit).click(function(){if(submit.attr("type")!="submit"){form.submit();}});}else{var submit=$('<button type="submit" />');submit.html(settings.submit);}
-$(this).append(submit);}
-if(settings.cancel){if(settings.cancel.match(/>$/)){var cancel=$(settings.cancel);}else{var cancel=$('<button type="cancel" />');cancel.html(settings.cancel);}
-$(this).append(cancel);$(cancel).click(function(event){if($.isFunction($.editable.types[settings.type].reset)){var reset=$.editable.types[settings.type].reset;}else{var reset=$.editable.types['defaults'].reset;}
-reset.apply(form,[settings,original]);return false;});}}},text:{element:function(settings,original){var input=$('<input />');if(settings.width!='none'){input.width(settings.width);}
-if(settings.height!='none'){input.height(settings.height);}
-input.attr('autocomplete','off');$(this).append(input);return(input);}},textarea:{element:function(settings,original){var textarea=$('<textarea />');if(settings.rows){textarea.attr('rows',settings.rows);}else if(settings.height!="none"){textarea.height(settings.height);}
-if(settings.cols){textarea.attr('cols',settings.cols);}else if(settings.width!="none"){textarea.width(settings.width);}
-$(this).append(textarea);return(textarea);}},select:{element:function(settings,original){var select=$('<select />');$(this).append(select);return(select);},content:function(data,settings,original){if(String==data.constructor){eval('var json = '+data);}else{var json=data;}
-for(var key in json){if(!json.hasOwnProperty(key)){continue;}
-if('selected'==key){continue;}
-var option=$('<option />').val(key).append(json[key]);$('select',this).append(option);}
+
+(function($){$.fn.editable=function(target,options){if('disable'==target){$(this).data('disabled.editable',true);return;}
+if('enable'==target){$(this).data('disabled.editable',false);return;}
+if('destroy'==target){$(this).unbind($(this).data('event.editable')).removeData('disabled.editable').removeData('event.editable');return;}
+var settings=$.extend({},$.fn.editable.defaults,{target:target},options);var plugin=$.editable.types[settings.type].plugin||function(){};var submit=$.editable.types[settings.type].submit||function(){};var buttons=$.editable.types[settings.type].buttons||$.editable.types['defaults'].buttons;var content=$.editable.types[settings.type].content||$.editable.types['defaults'].content;var element=$.editable.types[settings.type].element||$.editable.types['defaults'].element;var reset=$.editable.types[settings.type].reset||$.editable.types['defaults'].reset;var callback=settings.callback||function(){};var onedit=settings.onedit||function(){};var onsubmit=settings.onsubmit||function(){};var onreset=settings.onreset||function(){};var onerror=settings.onerror||reset;if(settings.tooltip){$(this).attr('title',settings.tooltip);}
+settings.autowidth='auto'==settings.width;settings.autoheight='auto'==settings.height;return this.each(function(){var self=this;var savedwidth=$(self).width();var savedheight=$(self).height();$(this).data('event.editable',settings.event);if(!$.trim($(this).html())){$(this).html(settings.placeholder);}
+$(this).bind(settings.event,function(e){if(true===$(this).data('disabled.editable')){return;}
+if(self.editing){return;}
+if(false===onedit.apply(this,[settings,self])){return;}
+e.preventDefault();e.stopPropagation();if(settings.tooltip){$(self).removeAttr('title');}
+if(0==$(self).width()){settings.width=savedwidth;settings.height=savedheight;}else{if(settings.width!='none'){settings.width=settings.autowidth?$(self).width():settings.width;}
+if(settings.height!='none'){settings.height=settings.autoheight?$(self).height():settings.height;}}
+if($(this).html().toLowerCase().replace(/(;|")/g,'')==settings.placeholder.toLowerCase().replace(/(;|")/g,'')){$(this).html('');}
+self.editing=true;self.revert=$(self).html();$(self).html('');var form=$('<form />');if(settings.cssclass){if('inherit'==settings.cssclass){form.attr('class',$(self).attr('class'));}else{form.attr('class',settings.cssclass);}}
+if(settings.style){if('inherit'==settings.style){form.attr('style',$(self).attr('style'));form.css('display',$(self).css('display'));}else{form.attr('style',settings.style);}}
+var input=element.apply(form,[settings,self]);var input_content;if(settings.loadurl){var t=setTimeout(function(){input.disabled=true;content.apply(form,[settings.loadtext,settings,self]);},100);var loaddata={};loaddata[settings.id]=self.id;if($.isFunction(settings.loaddata)){$.extend(loaddata,settings.loaddata.apply(self,[self.revert,settings]));}else{$.extend(loaddata,settings.loaddata);}
+$.ajax({type:settings.loadtype,url:settings.loadurl,data:loaddata,async:false,success:function(result){window.clearTimeout(t);input_content=result;input.disabled=false;}});}else if(settings.data){input_content=settings.data;if($.isFunction(settings.data)){input_content=settings.data.apply(self,[self.revert,settings]);}}else{input_content=self.revert;}
+content.apply(form,[input_content,settings,self]);input.attr('name',settings.name);buttons.apply(form,[settings,self]);$(self).append(form);plugin.apply(form,[settings,self]);$(':input:visible:enabled:first',form).focus();if(settings.select){input.select();}
+input.keydown(function(e){if(e.keyCode==27){e.preventDefault();reset.apply(form,[settings,self]);}});var t;if('cancel'==settings.onblur){input.blur(function(e){t=setTimeout(function(){reset.apply(form,[settings,self]);},500);});}else if('submit'==settings.onblur){input.blur(function(e){t=setTimeout(function(){form.submit();},200);});}else if($.isFunction(settings.onblur)){input.blur(function(e){settings.onblur.apply(self,[input.val(),settings]);});}else{input.blur(function(e){});}
+form.submit(function(e){if(t){clearTimeout(t);}
+e.preventDefault();if(false!==onsubmit.apply(form,[settings,self])){if(false!==submit.apply(form,[settings,self])){if($.isFunction(settings.target)){var str=settings.target.apply(self,[input.val(),settings]);$(self).html(str);self.editing=false;callback.apply(self,[self.innerHTML,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}}else{var submitdata={};submitdata[settings.name]=input.val();submitdata[settings.id]=self.id;if($.isFunction(settings.submitdata)){$.extend(submitdata,settings.submitdata.apply(self,[self.revert,settings]));}else{$.extend(submitdata,settings.submitdata);}
+if('PUT'==settings.method){submitdata['_method']='put';}
+$(self).html(settings.indicator);var ajaxoptions={type:'POST',data:submitdata,dataType:'html',url:settings.target,success:function(result,status){if(ajaxoptions.dataType=='html'){$(self).html(result);}
+self.editing=false;callback.apply(self,[result,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}},error:function(xhr,status,error){onerror.apply(form,[settings,self,xhr]);}};$.extend(ajaxoptions,settings.ajaxoptions);$.ajax(ajaxoptions);}}}
+$(self).attr('title',settings.tooltip);return false;});});this.reset=function(form){if(this.editing){if(false!==onreset.apply(form,[settings,self])){$(self).html(self.revert);self.editing=false;if(!$.trim($(self).html())){$(self).html(settings.placeholder);}
+if(settings.tooltip){$(self).attr('title',settings.tooltip);}}}};});};$.editable={types:{defaults:{element:function(settings,original){var input=$('<input type="hidden"></input>');$(this).append(input);return(input);},content:function(string,settings,original){$(':input:first',this).val(string);},reset:function(settings,original){original.reset(this);},buttons:function(settings,original){var form=this;if(settings.submit){if(settings.submit.match(/>$/)){var submit=$(settings.submit).click(function(){if(submit.attr("type")!="submit"){form.submit();}});}else{var submit=$('<button type="submit" />');submit.html(settings.submit);}
+$(this).append(submit);}
+if(settings.cancel){if(settings.cancel.match(/>$/)){var cancel=$(settings.cancel);}else{var cancel=$('<button type="cancel" />');cancel.html(settings.cancel);}
+$(this).append(cancel);$(cancel).click(function(event){if($.isFunction($.editable.types[settings.type].reset)){var reset=$.editable.types[settings.type].reset;}else{var reset=$.editable.types['defaults'].reset;}
+reset.apply(form,[settings,original]);return false;});}}},text:{element:function(settings,original){var input=$('<input />');if(settings.width!='none'){input.width(settings.width);}
+if(settings.height!='none'){input.height(settings.height);}
+input.attr('autocomplete','off');$(this).append(input);return(input);}},textarea:{element:function(settings,original){var textarea=$('<textarea />');if(settings.rows){textarea.attr('rows',settings.rows);}else if(settings.height!="none"){textarea.height(settings.height);}
+if(settings.cols){textarea.attr('cols',settings.cols);}else if(settings.width!="none"){textarea.width(settings.width);}
+$(this).append(textarea);return(textarea);}},select:{element:function(settings,original){var select=$('<select />');$(this).append(select);return(select);},content:function(data,settings,original){if(String==data.constructor){eval('var json = '+data);}else{var json=data;}
+for(var key in json){if(!json.hasOwnProperty(key)){continue;}
+if('selected'==key){continue;}
+var option=$('<option />').val(key).append(json[key]);$('select',this).append(option);}
 $('select',this).children().each(function(){if($(this).val()==json['selected']||$(this).text()==$.trim(original.revert)){$(this).attr('selected','selected');}});}}},addInputType:function(name,input){$.editable.types[name]=input;}};$.fn.editable.defaults={name:'value',id:'id',type:'text',width:'auto',height:'auto',event:'click.editable',onblur:'cancel',loadtype:'GET',loadtext:'Loading...',placeholder:'Click to edit',loaddata:{},submitdata:{},ajaxoptions:{}};})(jQuery);
\ No newline at end of file
diff --git a/Upload/jscripts/sceditor/editor_themes/emoticons/credits.txt b/Upload/jscripts/sceditor/editor_themes/emoticons/credits.txt
index 96b3e7a..2ffdaeb 100644
--- a/Upload/jscripts/sceditor/editor_themes/emoticons/credits.txt
+++ b/Upload/jscripts/sceditor/editor_themes/emoticons/credits.txt
@@ -1,9 +1,9 @@
-Presenting, Nomicons: The Full Monty :o
-
-Credits:
-Oscar Gruno, aka Nominell v. 2.0 -> oscargruno@mac.com
-Andy Fedosjeenko, aka Nightwolf -> bobo@animevanguard.com
-
-Copyright (C) 2001-Infinity, Oscar Gruno & Andy Fedosjeenko
-
+Presenting, Nomicons: The Full Monty :o
+
+Credits:
+Oscar Gruno, aka Nominell v. 2.0 -> oscargruno@mac.com
+Andy Fedosjeenko, aka Nightwolf -> bobo@animevanguard.com
+
+Copyright (C) 2001-Infinity, Oscar Gruno & Andy Fedosjeenko
+
 You can redistribute these files as much as you like, as long as you keep this file with them and give us the proper credit. You may even rape them if you please, just give us credit for our work.
\ No newline at end of file
diff --git a/Upload/jscripts/select2/select2.css b/Upload/jscripts/select2/select2.css
index 68ef385..ae227f4 100644
--- a/Upload/jscripts/select2/select2.css
+++ b/Upload/jscripts/select2/select2.css
@@ -83,6 +83,10 @@ html[dir="rtl"] .select2-container .select2-choice {
     text-overflow: ellipsis;
     float: none;
     width: auto;
+    
+    /* MyBB modification start - Search container min-width */
+    min-width: 120px;
+    /* MyBB modification end */
 }
 
 html[dir="rtl"] .select2-container .select2-choice > .select2-chosen {
@@ -689,4 +693,4 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
     .select2-search input {
         background-position: 100% -21px !important;
     }
-}
\ No newline at end of file
+}
diff --git a/Upload/managegroup.php b/Upload/managegroup.php
index 8990638..37529b8 100644
--- a/Upload/managegroup.php
+++ b/Upload/managegroup.php
@@ -352,7 +352,7 @@
 	$page = $mybb->get_input('page', MyBB::INPUT_INT);
 	if($page && $page > 0)
 	{
-		$start = ($page-1) *$perpage;
+		$start = ($page-1) * $perpage;
 	}
 	else
 	{
@@ -360,6 +360,17 @@
 		$page = 1;
 	}
 	$multipage = multipage($numusers, $perpage, $page, "managegroup.php?gid=".$gid);
+
+	switch($db->type)
+	{
+		case "pgsql":
+		case "sqlite":
+			$query = $db->simple_select("users", "*", "','||additionalgroups||',' LIKE '%,{$gid},%' OR usergroup='{$gid}'", array('order_by' => 'username', 'limit' => $perpage, 'limit_start' => $start));
+			break;
+		default:
+			$query = $db->simple_select("users", "*", "CONCAT(',',additionalgroups,',') LIKE '%,{$gid},%' OR usergroup='{$gid}'", array('order_by' => 'username', 'limit' => $perpage, 'limit_start' => $start));
+	}
+
 	$users = "";
 	while($user = $db->fetch_array($query))
 	{
diff --git a/Upload/member.php b/Upload/member.php
index 90dd55c..2f3ae18 100644
--- a/Upload/member.php
+++ b/Upload/member.php
@@ -15,13 +15,13 @@
 
 $nosession['avatar'] = 1;
 $templatelist = "member_register,member_register_hiddencaptcha,member_coppa_form,member_register_coppa,member_register_agreement_coppa,member_register_agreement,usercp_options_tppselect,usercp_options_pppselect,member_register_referrer,member_register_customfield,member_register_requiredfields";
-$templatelist .= ",member_resetpassword,member_loggedin_notice,member_profile_away,member_emailuser,member_register_regimage,member_register_regimage_recaptcha,member_register_regimage_nocaptcha,member_register_regimage_ayah,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_ayah,member_profile_addremove,member_emailuser_guest";
+$templatelist .= ",member_resetpassword,member_loggedin_notice,member_profile_away,member_emailuser,member_register_regimage,member_register_regimage_recaptcha,member_register_regimage_nocaptcha,post_captcha_hidden,post_captcha,post_captcha_recaptcha,member_profile_addremove,member_emailuser_guest";
 $templatelist .= ",member_profile_email,member_profile_offline,member_profile_reputation,member_profile_warn,member_profile_warninglevel,member_profile_customfields_field,member_profile_customfields,member_profile_adminoptions,member_profile,member_login,member_profile_online,member_viewnotes";
 $templatelist .= ",member_profile_signature,member_profile_avatar,member_profile_groupimage,member_profile_referrals,member_profile_website,member_profile_reputation_vote,member_activate,member_resendactivation,member_lostpw,member_register_additionalfields,member_register_password,usercp_options_pppselect_option";
 $templatelist .= ",member_profile_modoptions_manageuser,member_profile_modoptions_editprofile,member_profile_modoptions_banuser,member_profile_modoptions_viewnotes,member_profile_modoptions,member_profile_modoptions_editnotes,member_profile_modoptions_purgespammer,postbit_reputation_formatted,postbit_warninglevel_formatted";
 $templatelist .= ",usercp_profile_profilefields_select_option,usercp_profile_profilefields_multiselect,usercp_profile_profilefields_select,usercp_profile_profilefields_textarea,usercp_profile_profilefields_radio,usercp_profile_profilefields_checkbox,usercp_profile_profilefields_text,usercp_options_tppselect_option";
 $templatelist .= ",member_register_question,member_register_question_refresh,usercp_options_timezone,usercp_options_timezone_option,usercp_options_language_option,member_register_language,member_profile_userstar,member_profile_customfields_field_multi_item,member_profile_customfields_field_multi,member_register_day";
-$templatelist .= ",member_profile_contact_fields_aim,member_profile_contact_fields_google,member_profile_contact_fields_icq,member_profile_contact_fields_skype,member_profile_contact_fields_yahoo,member_profile_pm,member_profile_contact_details,member_profile_banned";
+$templatelist .= ",member_profile_contact_fields_aim,member_profile_contact_fields_google,member_profile_contact_fields_icq,member_profile_contact_fields_skype,member_profile_contact_fields_yahoo,member_profile_pm,member_profile_contact_details,member_profile_banned,member_profile_findposts,member_profile_findthreads";
 
 require_once "./global.php";
 require_once MYBB_ROOT."inc/functions_post.php";
@@ -1384,7 +1384,7 @@
 	{
 		$plugins->run_hooks("member_activate_form");
 
-		$code = $mybb->get_input('code');
+		$code = htmlspecialchars_uni($mybb->get_input('code'));
 
 		if(!isset($user['username']))
 		{
@@ -1728,7 +1728,7 @@
 
 		$mybb->input['url'] = $mybb->get_input('url');
 
-		if(!empty($mybb->input['url']) && my_strpos(basename($mybb->input['url']), 'member.php') === false)
+		if(!empty($mybb->input['url']) && my_strpos(basename($mybb->input['url']), 'member.php') === false && !preg_match('#^javascript:#i', $mybb->input['url']))
 		{
 			if((my_strpos(basename($mybb->input['url']), 'newthread.php') !== false || my_strpos(basename($mybb->input['url']), 'newreply.php') !== false) && my_strpos($mybb->input['url'], '&processed=1') !== false)
 			{
@@ -1797,10 +1797,6 @@
 		{
 			$login_captcha->build_recaptcha();
 		}
-		elseif($login_captcha->type == 3)
-		{
-			$login_captcha->build_ayah();
-		}
 
 		if($login_captcha->html)
 		{
@@ -2101,6 +2097,13 @@
 		$thread_percent = 100;
 	}
 
+	$findposts = $findthreads = '';
+	if($mybb->usergroup['cansearch'] == 1)
+	{
+		eval("\$findposts = \"".$templates->get("member_profile_findposts")."\";");
+		eval("\$findthreads = \"".$templates->get("member_profile_findthreads")."\";");
+	}
+
 	$awaybit = '';
 	if($memprofile['away'] == 1 && $mybb->settings['allowaway'] != 0)
 	{
diff --git a/Upload/misc.php b/Upload/misc.php
index ff58798..de48a1b 100644
--- a/Upload/misc.php
+++ b/Upload/misc.php
@@ -625,22 +625,32 @@
 		error($lang->error_invalidthread);
 	}
 
-	if(is_moderator($thread['fid'], "canviewunapprove"))
+	// Make sure we are looking at a real thread here.
+	if(($thread['visible'] == -1 && !is_moderator($thread['fid'], "canviewdeleted")) || ($thread['visible'] == 0 && !is_moderator($thread['fid'], "canviewunapprove")) || $thread['visible'] > 1)
 	{
-		$ismod = true;
-		$show_posts = "(p.visible = '1' OR p.visible = '0')";
+		error($lang->error_invalidthread);
 	}
-	else
+
+	if(is_moderator($thread['fid'], "canviewdeleted") || is_moderator($thread['fid'], "canviewunapprove"))
 	{
-		$ismod = false;
-		$show_posts = "p.visible = '1'";
+		if(is_moderator($thread['fid'], "canviewunapprove") && !is_moderator($thread['fid'], "canviewdeleted"))
+		{
+			$show_posts = "p.visible IN (0,1)";
+		}
+		elseif(is_moderator($thread['fid'], "canviewdeleted") && !is_moderator($thread['fid'], "canviewunapprove"))
+		{
+			$show_posts = "p.visible IN (-1,1)";
+		}
+		else
+		{
+			$show_posts = "p.visible IN (-1,0,1)";
+		}
 	}
-
-	// Make sure we are looking at a real thread here.
-	if(($thread['visible'] != 1 && $ismod == false) || ($thread['visible'] > 1 && $ismod == true))
+	else
 	{
-		error($lang->error_invalidthread);
+		$show_posts = "p.visible = 1";
 	}
+
 	// Does the thread belong to a valid forum?
 	$forum = get_forum($thread['fid']);
 	if(!$forum || $forum['type'] != "f")
diff --git a/Upload/modcp.php b/Upload/modcp.php
index d741c29..40107c7 100644
--- a/Upload/modcp.php
+++ b/Upload/modcp.php
@@ -2208,6 +2208,7 @@
 		{
 			$altbg = alt_trow();
 			$post['threadsubject'] = htmlspecialchars_uni($parser->parse_badwords($post['threadsubject']));
+			$post['subject'] = htmlspecialchars_uni($parser->parse_badwords($post['subject']));
 			$post['threadlink'] = get_thread_link($post['tid']);
 			$post['postlink'] = get_post_link($post['pid'], $post['tid']);
 			$forum_link = get_forum_link($post['fid']);
@@ -3017,6 +3018,7 @@
 	$lang->edit_profile = $lang->sprintf($lang->edit_profile, $user['username']);
 	$profile_link = build_profile_link(format_name($user['username'], $user['usergroup'], $user['displaygroup']), $user['uid']);
 
+	$user['signature'] = htmlspecialchars_uni($user['signature']);
 	$codebuttons = build_mycode_inserter("signature");
 
 	// Do we mark the suspend signature box?
@@ -3557,11 +3559,11 @@
 			{
 				if(!is_array($ip_range))
 				{
-					$post_ip_sql = "ipaddress=".$db->escape_binary($ip_range);
+					$post_ip_sql = "p.ipaddress=".$db->escape_binary($ip_range);
 				}
 				else
 				{
-					$post_ip_sql = "ipaddress BETWEEN ".$db->escape_binary($ip_range[0])." AND ".$db->escape_binary($ip_range[1]);
+					$post_ip_sql = "p.ipaddress BETWEEN ".$db->escape_binary($ip_range[0])." AND ".$db->escape_binary($ip_range[1]);
 				}
 			}
 
@@ -3569,7 +3571,77 @@
 
 			if($post_ip_sql)
 			{
-				$query = $db->simple_select('posts', 'COUNT(pid) AS count', "$post_ip_sql AND visible >= -1");
+				$where_sql = '';
+
+				$unviewable_forums = get_unviewable_forums(true);
+
+				if($unviewable_forums)
+				{
+					$where_sql .= " AND p.fid NOT IN ({$unviewable_forums})";
+				}
+
+				if($inactiveforums)
+				{
+					$where_sql .= " AND p.fid NOT IN ({$inactiveforums})";
+				}
+
+				// Check group permissions if we can't view threads not started by us
+				$onlyusfids = array();
+				$group_permissions = forum_permissions();
+				foreach($group_permissions as $fid => $forumpermissions)
+				{
+					if(isset($forumpermissions['canonlyviewownthreads']) && $forumpermissions['canonlyviewownthreads'] == 1)
+					{
+						$onlyusfids[] = $fid;
+					}
+				}
+
+				if(!empty($onlyusfids))
+				{
+					$where_sql .= " AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))";
+				}
+
+				// Moderators can view unapproved/deleted posts
+				if($mybb->usergroup['issupermod'] != 1)
+				{
+					$unapprove_forums = array();
+					$deleted_forums = array();
+					$visible_sql = " AND (p.visible = 1 AND t.visible = 1)";
+					$query = $db->simple_select("moderators", "fid, canviewunapprove, canviewdeleted", "(id='{$mybb->user['uid']}' AND isgroup='0') OR (id='{$mybb->user['usergroup']}' AND isgroup='1')");
+					while($moderator = $db->fetch_array($query))
+					{
+						if($moderator['canviewunapprove'] == 1)
+						{
+							$unapprove_forums[] = $moderator['fid'];
+						}
+
+						if($moderator['canviewdeleted'] == 1)
+						{
+							$deleted_forums[] = $moderator['fid'];
+						}
+					}
+
+					if(!empty($unapprove_forums))
+					{
+						$visible_sql .= " OR (p.visible = 0 AND p.fid IN(".implode(',', $unapprove_forums).")) OR (t.visible = 0 AND t.fid IN(".implode(',', $unapprove_forums)."))";
+					}
+					if(!empty($deleted_forums))
+					{
+						$visible_sql .= " OR (p.visible = -1 AND p.fid IN(".implode(',', $deleted_forums).")) OR (t.visible = -1 AND t.fid IN(".implode(',', $deleted_forums)."))";
+					}
+				}
+				else
+				{
+					// Super moderators (and admins)
+					$visible_sql = " AND p.visible >= -1";
+				}
+
+				$query = $db->query("
+					SELECT COUNT(p.pid) AS count
+					FROM ".TABLE_PREFIX."posts p
+					LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid = p.tid)
+					WHERE {$post_ip_sql}{$where_sql}{$visible_sql}
+				");
 				$post_results = $db->fetch_field($query, "count");
 			}
 		}
@@ -3711,10 +3783,15 @@
 		if(isset($mybb->input['search_posts']) && $post_results && (!isset($mybb->input['search_users']) || (isset($mybb->input['search_users']) && $post_limit > 0)))
 		{
 			$ipaddresses = $tids = $uids = array();
-			
-			$query = $db->simple_select('posts', 'username AS postusername, uid, subject, pid, tid, ipaddress', "$post_ip_sql AND visible >= -1",
-					array('order_by' => 'dateline', 'order_dir' => 'DESC', 'limit_start' => $post_start, 'limit' => $post_limit));
 
+			$query = $db->query("
+				SELECT p.username AS postusername, p.uid, p.subject, p.pid, p.tid, p.ipaddress
+				FROM ".TABLE_PREFIX."posts p
+				LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid = p.tid)
+				WHERE {$post_ip_sql}{$where_sql}{$visible_sql}
+				ORDER BY p.dateline desc
+				LIMIT {$post_start}, {$post_limit}
+			");
 			while($ipaddress = $db->fetch_array($query))
 			{
 				$tids[$ipaddress['tid']] = $ipaddress['pid'];
diff --git a/Upload/newreply.php b/Upload/newreply.php
index 880d862..57ba2c1 100644
--- a/Upload/newreply.php
+++ b/Upload/newreply.php
@@ -15,7 +15,7 @@
 $templatelist .= ",smilieinsert,smilieinsert_getmore,smilieinsert_smilie,smilieinsert_smilie_empty,codebuttons,post_attachments_new,post_attachments,post_savedraftbutton,newreply_modoptions,newreply_threadreview_more,newreply_disablesmilies,postbit_online";
 $templatelist .= ",postbit_www,postbit_email,postbit_reputation,postbit_warninglevel,postbit_author_user,postbit_edit,postbit_quickdelete,postbit_inlinecheck,postbit_posturl,postbit_quote,postbit_multiquote,postbit_report,postbit_ignored,postbit,postbit_userstar";
 $templatelist .= ",post_attachments_attachment_postinsert,post_attachments_attachment_remove,post_attachments_attachment_unapproved,post_attachments_attachment,postbit_attachments_attachment,postbit_attachments,newreply_options_signature,postbit_find";
-$templatelist .= ",member_register_regimage,member_register_regimage_recaptcha,member_register_regimage_ayah,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,post_captcha_ayah,postbit_groupimage,postbit_away,postbit_offline,postbit_avatar,postbit_icon";
+$templatelist .= ",member_register_regimage,member_register_regimage_recaptcha,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,postbit_groupimage,postbit_away,postbit_offline,postbit_avatar,postbit_icon";
 $templatelist .= ",postbit_rep_button,postbit_warn,postbit_author_guest,postbit_signature,postbit_classic,postbit_attachments_thumbnails_thumbnailpostbit_attachments_images_image,postbit_attachments_attachment_unapproved,postbit_pm,post_attachments_update";
 $templatelist .= ",postbit_attachments_thumbnails,postbit_attachments_images,postbit_gotopost,forumdisplay_password_wrongpass,forumdisplay_password,posticons_icon,attachment_icon,postbit_reputation_formatted_link,newreply_disablesmilies_hidden,forumdisplay_rules,global_moderation_notice";
 
@@ -76,7 +76,8 @@
 
 // Make navigation
 build_forum_breadcrumb($fid);
-$thread['subject'] = htmlspecialchars_uni($thread['subject']);
+$thread_subject = $thread['subject'];
+$thread['subject'] = htmlspecialchars_uni($parser->parse_badwords($thread['subject']));
 add_breadcrumb($thread['subject'], get_thread_link($thread['tid']));
 add_breadcrumb($lang->nav_newreply);
 
@@ -311,7 +312,7 @@
 			$username = $mybb->get_input('username');
 		}
 		$uid = 0;
-	
+
 
 		if($mybb->settings['stopforumspam_on_newreply'])
 		{
@@ -615,7 +616,7 @@
 						redirect(get_thread_link($tid, 0, "lastpost"));
 					}
 				}
-				
+
 				if(!$mybb->settings['postsperpage'] || (int)$mybb->settings['postsperpage'] < 1)
 				{
 					$mybb->settings['postsperpage'] = 20;
@@ -680,7 +681,7 @@
 				$data .= $post;
 
 				// Build a new posthash incase the user wishes to quick reply again
-			    $new_posthash = md5($mybb->user['uid'].random_str());
+				$new_posthash = md5($mybb->user['uid'].random_str());
 				$data .= "<script type=\"text/javascript\">\n";
 				$data .= "var hash = document.getElementById('posthash'); if(hash) { hash.value = '{$new_posthash}'; }\n";
 				$data .= "if(typeof(inlineModeration) != 'undefined') {
@@ -762,13 +763,38 @@
 			{
 				$inactiveforums = "AND t.fid NOT IN ({$inactiveforums})";
 			}
-			if(is_moderator($fid))
+
+			// Check group permissions if we can't view threads not started by us
+			$group_permissions = forum_permissions();
+			$onlyusfids = array();
+			$onlyusforums = '';
+			foreach($group_permissions as $fid => $forum_permissions)
+			{
+				if(isset($forum_permissions['canonlyviewownthreads']) && $forum_permissions['canonlyviewownthreads'] == 1)
+				{
+					$onlyusfids[] = $fid;
+				}
+			}
+			if(!empty($onlyusfids))
+			{
+				$onlyusforums = "AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))";
+			}
+
+			if(is_moderator($fid, 'canviewunapprove') && is_moderator($fid, 'canviewdeleted'))
+			{
+				$visible_where = "AND p.visible IN (-1,0,1)";
+			}
+			elseif(is_moderator($fid, 'canviewunapprove') && !is_moderator($fid, 'canviewdeleted'))
+			{
+				$visible_where = "AND p.visible IN (0,1)";
+			}
+			elseif(!is_moderator($fid, 'canviewunapprove') && is_moderator($fid, 'canviewdeleted'))
 			{
-				$visible_where = "AND p.visible != 2";
+				$visible_where = "AND p.visible IN (-1,1)";
 			}
 			else
 			{
-				$visible_where = "AND p.visible > 0";
+				$visible_where = "AND p.visible=1";
 			}
 
 			require_once MYBB_ROOT."inc/functions_posting.php";
@@ -777,7 +803,7 @@
 				FROM ".TABLE_PREFIX."posts p
 				LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=p.tid)
 				LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=p.uid)
-				WHERE p.pid IN ({$quoted_posts}) {$unviewable_forums} {$inactiveforums} {$visible_where}
+				WHERE p.pid IN ({$quoted_posts}) {$unviewable_forums} {$inactiveforums} {$onlyusforums} {$visible_where}
 			");
 			$load_all = $mybb->get_input('load_all_quotes', MyBB::INPUT_INT);
 			while($quoted_post = $db->fetch_array($query))
@@ -949,7 +975,7 @@
 		}
 		else
 		{
-			$subject = $thread['subject'];
+			$subject = $thread_subject;
 			// Subject too long? Shorten it to avoid error message
 			if(my_strlen($subject) > 85)
 			{
@@ -1014,7 +1040,7 @@
 		// Now let the post handler do all the hard work.
 		$valid_post = $posthandler->verify_message();
 		$valid_subject = $posthandler->verify_subject();
-		
+
 		// guest post --> verify author
 		if($post['uid'] == 0)
 		{
@@ -1217,7 +1243,7 @@
 
 		if(!$correct)
 		{
- 			if($post_captcha->type == 1)
+			if($post_captcha->type == 1)
 			{
 				$post_captcha->build_captcha();
 			}
@@ -1225,10 +1251,6 @@
 			{
 				$post_captcha->build_recaptcha();
 			}
-			elseif($post_captcha->type == 3)
-			{
-				$post_captcha->build_ayah();
-			}
 
 			if($post_captcha->html)
 			{
@@ -1239,15 +1261,6 @@
 		{
 			$post_captcha->build_recaptcha();
 
-			if($post_captcha->html)
-			{
-				$captcha = $post_captcha->html;
-			}
-		}
-		else if($correct && $post_captcha->type == 3)
-		{
-			$post_captcha->build_ayah();
-
 			if($post_captcha->html)
 			{
 				$captcha = $post_captcha->html;
@@ -1273,7 +1286,7 @@
 		}
 		$query = $db->simple_select("posts", "COUNT(pid) AS post_count", "tid='{$tid}' AND {$visibility}");
 		$numposts = $db->fetch_field($query, "post_count");
-		
+
 		if(!$mybb->settings['postsperpage'] || (int)$mybb->settings['postsperpage'] < 1)
 		{
 			$mybb->settings['postsperpage'] = 20;
diff --git a/Upload/newthread.php b/Upload/newthread.php
index 85ff53e..a2bab59 100644
--- a/Upload/newthread.php
+++ b/Upload/newthread.php
@@ -14,7 +14,7 @@
 $templatelist = "newthread,previewpost,loginbox,changeuserbox,newthread_postpoll,posticons,codebuttons,smilieinsert,newthread_multiquote_external,post_attachments_attachment_unapproved,newthread_disablesmilies_hidden";
 $templatelist .= ",newthread_disablesmilies,newreply_modoptions,post_attachments_new,post_attachments,post_savedraftbutton,post_subscription_method,post_attachments_attachment_remove,posticons_icon,postbit_warninglevel_formatted";
 $templatelist .= ",forumdisplay_rules,forumdisplay_rules_link,post_attachments_attachment_postinsert,post_attachments_attachment,post_attachments_add,newthread_options_signature,post_prefixselect_prefix,post_prefixselect_single";
-$templatelist .= ",member_register_regimage,member_register_regimage_recaptcha,member_register_regimage_ayah,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,post_captcha_ayah,postbit_groupimage,postbit_online,postbit_away";
+$templatelist .= ",member_register_regimage,member_register_regimage_recaptcha,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,postbit_groupimage,postbit_online,postbit_away";
 $templatelist .= ",postbit_avatar,postbit_find,postbit_pm,postbit_rep_button,postbit_www,postbit_email,postbit_reputation,postbit_warn,postbit_warninglevel,postbit_author_user,postbit_author_guest,postbit_offline,postbit_icon,postbit_userstar";
 $templatelist .= ",postbit_signature,postbit_classic,postbit,postbit_attachments_thumbnails_thumbnail,postbit_attachments_images_image,postbit_attachments_attachment,postbit_attachments_attachment_unapproved,post_attachments_update";
 $templatelist .= ",postbit_attachments_thumbnails,postbit_attachments_images,postbit_attachments,postbit_gotopost,smilieinsert_getmore,smilieinsert_smilie,smilieinsert_smilie_empty,attachment_icon,postbit_reputation_formatted_link,global_moderation_notice";
@@ -467,6 +467,16 @@
 			$force_redirect = true;
 		}
 
+		// The thread is being made in a forum the user cannot see threads in, send them back to the forum.
+		else if($visible == 1 && $forumpermissions['canviewthreads'] != 1)
+		{
+			$lang->redirect_newthread .= $lang->redirect_newthread_unviewable;
+			$url = get_forum_link($fid);
+
+			// User must see permission notice, regardless of redirect settings
+			$force_redirect = true;
+		}
+
 		// This is just a normal thread - send them to it.
 		else
 		{
@@ -1027,10 +1037,6 @@
 			{
 				$post_captcha->build_recaptcha();
 			}
-			elseif($post_captcha->type == 3)
-			{
-				$post_captcha->build_ayah();
-			}
 
 			if($post_captcha->html)
 			{
@@ -1041,15 +1047,6 @@
 		{
 			$post_captcha->build_recaptcha();
 
-			if($post_captcha->html)
-			{
-				$captcha = $post_captcha->html;
-			}
-		}
-		else if($correct && $post_captcha->type == 3)
-		{
-			$post_captcha->build_ayah();
-
 			if($post_captcha->html)
 			{
 				$captcha = $post_captcha->html;
diff --git a/Upload/polls.php b/Upload/polls.php
index cb55ec6..5712274 100644
--- a/Upload/polls.php
+++ b/Upload/polls.php
@@ -57,14 +57,7 @@
 	}
 
 	// Is the currently logged in user a moderator of this forum?
-	if(is_moderator($thread['fid']))
-	{
-		$ismod = true;
-	}
-	else
-	{
-		$ismod = false;
-	}
+	$ismod = is_moderator($thread['fid']);
 
 	// Make sure we are looking at a real thread here.
 	if(($thread['visible'] != 1 && $ismod == false) || ($thread['visible'] > 1 && $ismod == true))
@@ -166,7 +159,7 @@
 	{
 		$timeout = 0;
 	}
-	
+
 	if($mybb->get_input('maxoptions', MyBB::INPUT_INT) > 0 && $mybb->get_input('maxoptions', MyBB::INPUT_INT) < $polloptions)
 	{
 		$maxoptions = $mybb->get_input('maxoptions', MyBB::INPUT_INT);
@@ -277,7 +270,7 @@
 	{
 		error($lang->error_polloptiontoolong);
 	}
-	
+
 	if(isset($sequenceerror))
 	{
 		error($lang->error_polloptionsequence);
@@ -323,7 +316,7 @@
 	{
 		$maxoptions = 0;
 	}
-	
+
 	$newpoll = array(
 		"tid" => $thread['tid'],
 		"question" => $db->escape_string($mybb->input['question']),
@@ -466,7 +459,7 @@
 		{
 			$timeout = $poll['timeout'];
 		}
-		
+
 		if(!$poll['maxoptions'])
 		{
 			$maxoptions = 0;
@@ -542,7 +535,7 @@
 		{
 			$timeout = 0;
 		}
-		
+
 		if(!$poll['maxoptions'])
 		{
 			$maxoptions = 0;
@@ -709,7 +702,7 @@
 	{
 		$timeout = 0;
 	}
-	
+
 	if($mybb->get_input('maxoptions', MyBB::INPUT_INT) > 0 && $mybb->get_input('maxoptions', MyBB::INPUT_INT) < $numoptions)
 	{
 		$maxoptions = $mybb->get_input('maxoptions', MyBB::INPUT_INT);
@@ -1002,7 +995,7 @@
 		if(is_array($option))
 		{
 			$total_options = 0;
-		
+
 			foreach($option as $voteoption => $vote)
 			{
 				if($vote == 1 && isset($votesarray[$voteoption-1]))
@@ -1017,7 +1010,7 @@
 					$total_options++;
 				}
 			}
-			
+
 			if($total_options > $poll['maxoptions'] && $poll['maxoptions'] != 0)
 			{
 				error($lang->sprintf($lang->error_maxpolloptions, $poll['maxoptions']));
diff --git a/Upload/printthread.php b/Upload/printthread.php
index 35b12c2..2a61675 100644
--- a/Upload/printthread.php
+++ b/Upload/printthread.php
@@ -49,14 +49,7 @@
 $tid = $thread['tid'];
 
 // Is the currently logged in user a moderator of this forum?
-if(is_moderator($fid))
-{
-	$ismod = true;
-}
-else
-{
-	$ismod = false;
-}
+$ismod = is_moderator($fid);
 
 // Make sure we are looking at a real thread here.
 if(($thread['visible'] != 1 && $ismod == false) || ($thread['visible'] > 1 && $ismod == true))
@@ -133,18 +126,18 @@
 $postrows = '';
 if(is_moderator($forum['fid'], "canviewunapprove"))
 {
-    $visible = "AND (p.visible='0' OR p.visible='1')";
+	$visible = "AND (p.visible='0' OR p.visible='1')";
 }
 else
 {
-    $visible = "AND p.visible='1'";
+	$visible = "AND p.visible='1'";
 }
 $query = $db->query("
-    SELECT u.*, u.username AS userusername, p.*
-    FROM ".TABLE_PREFIX."posts p
-    LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=p.uid)
-    WHERE p.tid='$tid' {$visible}
-    ORDER BY p.dateline
+	SELECT u.*, u.username AS userusername, p.*
+	FROM ".TABLE_PREFIX."posts p
+	LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=p.uid)
+	WHERE p.tid='$tid' {$visible}
+	ORDER BY p.dateline
 	LIMIT {$start}, {$perpage}
 ");
 while($postrow = $db->fetch_array($query))
diff --git a/Upload/private.php b/Upload/private.php
index 0e88a7e..50fc950 100644
--- a/Upload/private.php
+++ b/Upload/private.php
@@ -51,13 +51,6 @@
 	$db->update_query("users", $sql_array, "uid = ".$mybb->user['uid']);
 }
 
-// On a random occassion, recount the user's pms just to make sure everything is in sync.
-$rand = my_rand(0, 9);
-if($rand == 5)
-{
-	update_pm_count();
-}
-
 $mybb->input['fid'] = $mybb->get_input('fid', MyBB::INPUT_INT);
 
 $folder_id = $folder_name = '';
diff --git a/Upload/ratethread.php b/Upload/ratethread.php
index a988524..23c54ea 100644
--- a/Upload/ratethread.php
+++ b/Upload/ratethread.php
@@ -27,14 +27,7 @@
 }
 
 // Is the currently logged in user a moderator of this forum?
-if(is_moderator($thread['fid']))
-{
-	$ismod = true;
-}
-else
-{
-	$ismod = false;
-}
+$ismod = is_moderator($thread['fid']);
 
 // Make sure we are looking at a real thread here.
 if(($thread['visible'] != 1 && $ismod == false) || ($thread['visible'] > 1 && $ismod == true))
diff --git a/Upload/reputation.php b/Upload/reputation.php
index 329b6c6..4a03ab7 100644
--- a/Upload/reputation.php
+++ b/Upload/reputation.php
@@ -161,12 +161,12 @@
 			$forum = get_forum($thread['fid']);
 			$forumpermissions = forum_permissions($forum['fid']);
 			// Post doesn't belong to that user or isn't visible
-			if($uid != $post['uid'] || ($post['visible'] == 0 && !is_moderator($fid, "canviewunapprove")) || $post['visible'] < 0)
+			if($uid != $post['uid'] || $post['visible'] != 1)
 			{
 				$mybb->input['pid'] = 0;
 			}
 			// Thread isn't visible
-			elseif(($thread['visible'] == 0 && !is_moderator($forum['fid'], "canviewunapprove")) || $thread['visible'] < 0)
+			elseif($thread['visible'] != 1)
 			{
 				$mybb->input['pid'] = 0;
 			}
diff --git a/Upload/search.php b/Upload/search.php
index d8c1e47..c3106d9 100644
--- a/Upload/search.php
+++ b/Upload/search.php
@@ -166,7 +166,7 @@
 	$sorturl = "search.php?action=results&amp;sid={$sid}";
 	$thread_url = "";
 	$post_url = "";
-	
+
 	$orderarrow = array('replies' => '', 'views' => '', 'subject' => '', 'forum' => '', 'starter' => '', 'lastpost' => '', 'dateline' => '');
 
 	eval("\$orderarrow['$sortby'] = \"".$templates->get("search_orderarrow")."\";");
@@ -236,7 +236,7 @@
 		$threadcount = 0;
 
 		// Moderators can view unapproved threads
-		$query = $db->simple_select("moderators", "fid", "(id='{$mybb->user['uid']}' AND isgroup='0') OR (id='{$mybb->user['usergroup']}' AND isgroup='1')");
+		$query = $db->simple_select("moderators", "fid, canviewunapprove, canviewdeleted", "(id='{$mybb->user['uid']}' AND isgroup='0') OR (id='{$mybb->user['usergroup']}' AND isgroup='1')");
 		if($mybb->usergroup['issupermod'] == 1)
 		{
 			// Super moderators (and admins)
@@ -245,12 +245,30 @@
 		elseif($db->num_rows($query))
 		{
 			// Normal moderators
-			$moderated_forums = '0';
-			while($forum = $db->fetch_array($query))
+			$unapprove_forums = array();
+			$deleted_forums = array();
+			$unapproved_where = 't.visible = 1';
+			while($moderator = $db->fetch_array($query))
+			{
+				if($moderator['canviewunapprove'] == 1)
+				{
+					$unapprove_forums[] = $moderator['fid'];
+				}
+
+				if($moderator['canviewdeleted'] == 1)
+				{
+					$deleted_forums[] = $moderator['fid'];
+				}
+			}
+
+			if(!empty($unapprove_forums))
+			{
+				$unapproved_where .= " OR (t.visible = 0 AND t.fid IN(".implode(',', $unapprove_forums)."))";
+			}
+			if(!empty($deleted_forums))
 			{
-				$moderated_forums .= ','.$forum['fid'];
+				$unapproved_where .= " OR (t.visible = -1 AND t.fid IN(".implode(',', $deleted_forums)."))";
 			}
-			$unapproved_where = "(t.visible>0 OR (t.visible IN (-1,0) AND t.fid IN ({$moderated_forums})))";
 		}
 		else
 		{
@@ -522,6 +540,11 @@
 			{
 				$thread['posts'] += $thread['unapprovedposts'];
 			}
+			if(is_moderator($thread['fid'], "canviewdeleted"))
+			{
+				$thread['posts'] += $thread['deletedposts'];
+			}
+
 			if($thread['posts'] > $mybb->settings['postsperpage'])
 			{
 				$thread['pages'] = $thread['posts'] / $mybb->settings['postsperpage'];
@@ -688,30 +711,45 @@
 		$postcount = 0;
 
 		// Moderators can view unapproved threads
-		$query = $db->simple_select("moderators", "fid", "(id='{$mybb->user['uid']}' AND isgroup='0') OR (id='{$mybb->user['usergroup']}' AND isgroup='1')");
+		$query = $db->simple_select("moderators", "fid, canviewunapprove, canviewdeleted", "(id='{$mybb->user['uid']}' AND isgroup='0') OR (id='{$mybb->user['usergroup']}' AND isgroup='1')");
 		if($mybb->usergroup['issupermod'] == 1)
 		{
 			// Super moderators (and admins)
-			$p_unapproved_where = "visible >= -1";
-			$t_unapproved_where = "visible < -1";
+			$unapproved_where = "visible >= -1";
 		}
 		elseif($db->num_rows($query))
 		{
 			// Normal moderators
-			$moderated_forums = '0';
-			while($forum = $db->fetch_array($query))
+			$unapprove_forums = array();
+			$deleted_forums = array();
+			$unapproved_where = 'visible = 1';
+
+			while($moderator = $db->fetch_array($query))
 			{
-				$moderated_forums .= ','.$forum['fid'];
-				$test_moderated_forums[$forum['fid']] = $forum['fid'];
+				if($moderator['canviewunapprove'] == 1)
+				{
+					$unapprove_forums[] = $moderator['fid'];
+				}
+
+				if($moderator['canviewdeleted'] == 1)
+				{
+					$deleted_forums[] = $moderator['fid'];
+				}
+			}
+
+			if(!empty($unapprove_forums))
+			{
+				$unapproved_where .= " OR (visible = 0 AND fid IN(".implode(',', $unapprove_forums)."))";
+			}
+			if(!empty($deleted_forums))
+			{
+				$unapproved_where .= " OR (visible = -1 AND fid IN(".implode(',', $deleted_forums)."))";
 			}
-			$p_unapproved_where = "(visible>0 OR (visible IN (-1,0) AND fid IN ({$moderated_forums})))";
-			$t_unapproved_where = "(visible<0 AND (visible <1 OR fid NOT IN ({$moderated_forums})))";
 		}
 		else
 		{
 			// Normal users
-			$p_unapproved_where = 'visible=1';
-			$t_unapproved_where = 'visible < 1';
+			$unapproved_where = 'visible = 1';
 		}
 
 		$post_cache_options = array();
@@ -729,7 +767,7 @@
 		$tids = array();
 		$pids = array();
 		// Make sure the posts we're viewing we have permission to view.
-		$query = $db->simple_select("posts", "pid, tid", "pid IN(".$db->escape_string($search['posts']).") AND {$p_unapproved_where}", $post_cache_options);
+		$query = $db->simple_select("posts", "pid, tid", "pid IN(".$db->escape_string($search['posts']).") AND {$unapproved_where}", $post_cache_options);
 		while($post = $db->fetch_array($query))
 		{
 			$pids[$post['pid']] = $post['tid'];
@@ -768,10 +806,10 @@
 			}
 
 			// Check the thread records as well. If we don't have permissions, remove them from the listing.
-			$query = $db->simple_select("threads", "tid", "tid IN(".$db->escape_string(implode(',', $pids)).") AND ({$t_unapproved_where}{$permsql} OR closed LIKE 'moved|%')");
+			$query = $db->simple_select("threads", "tid", "tid IN(".$db->escape_string(implode(',', $pids)).") AND ({$unapproved_where}{$permsql} OR closed LIKE 'moved|%')");
 			while($thread = $db->fetch_array($query))
 			{
-				if(array_key_exists($thread['tid'], $tids) != false)
+				if(array_key_exists($thread['tid'], $tids) != true)
 				{
 					$temp_pids = $tids[$thread['tid']];
 					foreach($temp_pids as $pid)
@@ -810,7 +848,7 @@
 		$dot_icon = array();
 		if($mybb->settings['dotfolders'] != 0 && $mybb->user['uid'] != 0)
 		{
-			$query = $db->simple_select("posts", "DISTINCT tid,uid", "uid='{$mybb->user['uid']}' AND tid IN({$db->escape_string($tids)}) AND {$p_unapproved_where}");
+			$query = $db->simple_select("posts", "DISTINCT tid,uid", "uid='{$mybb->user['uid']}' AND tid IN({$db->escape_string($tids)}) AND {$unapproved_where}");
 			while($post = $db->fetch_array($query))
 			{
 				$dot_icon[$post['tid']] = true;
@@ -1529,15 +1567,9 @@
 {
 	// Fetch thread info
 	$thread = get_thread($mybb->get_input('tid', MyBB::INPUT_INT));
-	if(is_moderator($fid))
-	{
-		$ismod = true;
-	}
-	else
-	{
-		$ismod = false;
-	}
-	if(!$thread || ($thread['visible'] != 1 && $ismod == false && ($thread['visible'] != -1 || $mybb->settings['soft_delete'] != 1 || $mybb->settings['soft_delete_show_own'] != 1 || !$mybb->user['uid'] || $mybb->user['uid'] != $thread['uid'])) || ($thread['visible'] > 1 && $ismod == true))
+	$ismod = is_moderator($thread['fid']);
+
+	if(!$thread || ($thread['visible'] != 1 && $ismod == false && ($thread['visible'] != -1 || $mybb->settings['soft_delete'] != 1 || !$mybb->user['uid'] || $mybb->user['uid'] != $thread['uid'])) || ($thread['visible'] > 1 && $ismod == true))
 	{
 		error($lang->error_invalidthread);
 	}
diff --git a/Upload/sendthread.php b/Upload/sendthread.php
index 4730cc8..236b68f 100644
--- a/Upload/sendthread.php
+++ b/Upload/sendthread.php
@@ -11,7 +11,7 @@
 define("IN_MYBB", 1);
 define('THIS_SCRIPT', 'sendthread.php');
 
-$templatelist = "sendthread,sendthread_fromemail,forumdisplay_password_wrongpass,forumdisplay_password,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,post_captcha_ayah";
+$templatelist = "sendthread,sendthread_fromemail,forumdisplay_password_wrongpass,forumdisplay_password,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha";
 
 require_once "./global.php";
 require_once MYBB_ROOT."inc/functions_post.php";
diff --git a/Upload/showthread.php b/Upload/showthread.php
index bd69099..04933f9 100644
--- a/Upload/showthread.php
+++ b/Upload/showthread.php
@@ -19,7 +19,7 @@
 $templatelist .= ",showthread_usersbrowsing,showthread_usersbrowsing_user,showthread_poll_option_multiple,showthread_poll_option,showthread_poll,showthread_quickreply_options_signature,showthread_threaded_bitactive,showthread_threaded_bit,postbit_attachments_attachment_unapproved,showthread_threadnotes,showthread_threadnotes_viewnotes";
 $templatelist .= ",showthread_moderationoptions_openclose,showthread_moderationoptions_stickunstick,showthread_moderationoptions_delete,showthread_moderationoptions_threadnotes,showthread_moderationoptions_manage,showthread_moderationoptions_deletepoll,showthread_threadnoteslink,showthread_poll_results,showthread_classic_header,postbit_warn";
 $templatelist .= ",postbit_userstar,postbit_reputation_formatted_link,postbit_warninglevel_formatted,postbit_quickrestore,forumdisplay_password,forumdisplay_password_wrongpass,postbit_classic,postbit_purgespammer,showthread_inlinemoderation_approve,forumdisplay_thread_icon,showthread_poll_resultbit,postbit_warninglevel,postbit_gotopost";
-$templatelist .= ",showthread_moderationoptions_softdelete,showthread_moderationoptions_restore,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,post_captcha_ayah,showthread_moderationoptions,showthread_inlinemoderation_standard,showthread_threadedbox,postbit_rep_button,showthread_inlinemoderation_manage,global_moderation_notice";
+$templatelist .= ",showthread_moderationoptions_softdelete,showthread_moderationoptions_restore,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,showthread_moderationoptions,showthread_inlinemoderation_standard,showthread_threadedbox,postbit_rep_button,showthread_inlinemoderation_manage,global_moderation_notice";
 
 require_once "./global.php";
 require_once MYBB_ROOT."inc/functions_post.php";
diff --git a/Upload/usercp.php b/Upload/usercp.php
index 225fe10..d1580f1 100644
--- a/Upload/usercp.php
+++ b/Upload/usercp.php
@@ -2151,7 +2151,7 @@
 			$s = "?s={$maxheight}&r={$rating}&d=mm";
 
 			$updated_avatar = array(
-				"avatar" => "http://www.gravatar.com/avatar/{$email}{$s}.jpg",
+				"avatar" => "https://www.gravatar.com/avatar/{$email}{$s}",
 				"avatardimensions" => "{$maxheight}|{$maxheight}",
 				"avatartype" => "gravatar"
 			);
@@ -3221,15 +3221,18 @@
 
 			$db->insert_query("joinrequests", $joinrequest);
 
-			foreach($groupleaders[$usergroup['gid']] as $leader)
+			if(array_key_exists($usergroup['gid'], $groupleaders))
 			{
-				// Load language
-				$lang->set_language($leader['language']);
-				$lang->load("messages");
-					
-				$subject = $lang->sprintf($lang->emailsubject_newjoinrequest, $mybb->settings['bbname']);
-				$message = $lang->sprintf($lang->email_groupleader_joinrequest, $leader['username'], $mybb->user['username'], $usergroup['title'], $mybb->settings['bbname'], $mybb->get_input('reason'), $mybb->settings['bburl'], $leader['gid']);
-				my_mail($leader['email'], $subject, $message);
+				foreach($groupleaders[$usergroup['gid']] as $leader)
+				{
+					// Load language
+					$lang->set_language($leader['language']);
+					$lang->load("messages");
+						
+					$subject = $lang->sprintf($lang->emailsubject_newjoinrequest, $mybb->settings['bbname']);
+					$message = $lang->sprintf($lang->email_groupleader_joinrequest, $leader['username'], $mybb->user['username'], $usergroup['title'], $mybb->settings['bbname'], $mybb->get_input('reason'), $mybb->settings['bburl'], $leader['gid']);
+					my_mail($leader['email'], $subject, $message);
+				}
 			}
 
 			// Load language
@@ -3309,7 +3312,7 @@
 				LEFT JOIN ".TABLE_PREFIX."users u ON(((CONCAT(',', u.additionalgroups, ',') LIKE CONCAT('%,', g.gid, ',%')) OR u.usergroup = g.gid))
 				LEFT JOIN ".TABLE_PREFIX."joinrequests j ON(j.gid=g.gid AND j.uid != 0)
 				WHERE l.uid='".$mybb->user['uid']."'
-				GROUP BY l.gid
+				GROUP BY g.gid, g.title, g.type, l.canmanagerequests, l.canmanagemembers, l.caninvitemembers
 			");
 	}
 
@@ -3675,6 +3678,7 @@
 	$regdate = my_date('relative', $mybb->user['regdate']);
 
 	$useravatar = format_avatar($mybb->user['avatar'], $mybb->user['avatardimensions'], '100x100');
+	$avatar_username = htmlspecialchars_uni($mybb->user['username']);
 	eval("\$avatar = \"".$templates->get("usercp_currentavatar")."\";");
 
 	$usergroup = htmlspecialchars_uni($groupscache[$mybb->user['usergroup']]['title']);
diff --git a/Upload/usercp2.php b/Upload/usercp2.php
index 5f2ddbc..e9914f7 100644
--- a/Upload/usercp2.php
+++ b/Upload/usercp2.php
@@ -42,14 +42,7 @@
 	}
 
 	// Is the currently logged in user a moderator of this forum?
-	if(is_moderator($thread['fid']))
-	{
-		$ismod = true;
-	}
-	else
-	{
-		$ismod = false;
-	}
+	$ismod = is_moderator($thread['fid']);
 
 	// Make sure we are looking at a real thread here.
 	if(($thread['visible'] != 1 && $ismod == false) || ($thread['visible'] > 1 && $ismod == true))
@@ -114,14 +107,7 @@
 		}
 
 		// Is the currently logged in user a moderator of this forum?
-		if(is_moderator($thread['fid']))
-		{
-			$ismod = true;
-		}
-		else
-		{
-			$ismod = false;
-		}
+		$ismod = is_moderator($thread['fid']);
 
 		// Make sure we are looking at a real thread here.
 		if(($thread['visible'] != 1 && $ismod == false) || ($thread['visible'] > 1 && $ismod == true))
@@ -202,14 +188,7 @@
 		}
 
 		// Is the currently logged in user a moderator of this forum?
-		if(is_moderator($thread['fid']))
-		{
-			$ismod = true;
-		}
-		else
-		{
-			$ismod = false;
-		}
+		$ismod = is_moderator($thread['fid']);
 
 		// Make sure we are looking at a real thread here.
 		if(($thread['visible'] != 1 && $ismod == false) || ($thread['visible'] > 1 && $ismod == true))
diff --git a/Upload/warnings.php b/Upload/warnings.php
index 9a6c7dc..d434692 100644
--- a/Upload/warnings.php
+++ b/Upload/warnings.php
@@ -161,7 +161,7 @@
 		$given_today = $db->fetch_field($query, "given_today");
 		if($given_today >= $mybb->usergroup['maxwarningsday'])
 		{
-			error($lang->sprintf($lang->reached_max_warnings_day, $mybb->usergroup['maxwarningsday']));
+			error($lang->sprintf($lang->warnings_reached_max_warnings_day, $mybb->usergroup['maxwarningsday']));
 		}
 	}
 
@@ -173,12 +173,12 @@
 
 	if($user['uid'] == $mybb->user['uid'])
 	{
-		error($lang->cannot_warn_self);
+		error($lang->warnings_error_cannot_warn_self);
 	}
 
 	if($user['warningpoints'] >= $mybb->settings['maxwarningpoints'])
 	{
-		error($lang->user_reached_max_warning);
+		error($lang->warnings_error_user_reached_max_warning);
 	}
 
 	$group_permissions = user_permissions($user['uid']);
@@ -207,7 +207,7 @@
 
 		if(!$post || !$thread)
 		{
-			error($lang->error_invalid_post);
+			error($lang->warnings_error_invalid_post);
 		}
 
 		$forum_permissions = forum_permissions($thread['fid']);
@@ -346,6 +346,11 @@
 		$mybb->settings['maxwarningpoints'] = 10;
 	}
 
+	if(!is_array($groupscache))
+	{
+		$groupscache = $cache->read("usergroups");
+	}
+
 	$current_level = round($user['warningpoints']/$mybb->settings['maxwarningpoints']*100);
 
 	// Fetch warning levels
diff --git a/Upload/xmlhttp.php b/Upload/xmlhttp.php
index c0199bd..6e78b1e 100644
--- a/Upload/xmlhttp.php
+++ b/Upload/xmlhttp.php
@@ -223,8 +223,8 @@
 {
 	$mybb->input['query'] = ltrim($mybb->get_input('query'));
 
-	// If the string is less than 3 characters, quit.
-	if(my_strlen($mybb->input['query']) < 3)
+	// If the string is less than 2 characters, quit.
+	if(my_strlen($mybb->input['query']) < 2)
 	{
 		exit;
 	}
@@ -373,6 +373,7 @@
 		$updatepost = array(
 			"pid" => $post['pid'],
 			"tid" => $thread['tid'],
+			"prefix" => $thread['prefix'],
 			"subject" => $subject,
 			"edit_uid" => $mybb->user['uid']
 		);